summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acinclude.m4300
-rw-r--r--aclocal.m48
m---------admin0
-rw-r--r--config.h.in3
-rw-r--r--src/backends/recipedb.cpp4
-rw-r--r--src/convert_sqlite3.cpp8
-rw-r--r--src/convert_sqlite3.h4
-rw-r--r--translations/messages/ka.po527
8 files changed, 267 insertions, 587 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 4cffb8b..9b85293 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -752,9 +752,6 @@ support])
# more headers that need to be explicitly included on darwin
AC_CHECK_HEADERS(sys/types.h stdint.h)
- # sys/bitypes.h is needed for uint32_t and friends on Tru64
- AC_CHECK_HEADERS(sys/bitypes.h)
-
# darwin requires a poll emulation library
AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
@@ -816,30 +813,6 @@ AH_VERBATIM(_AIX_STRINGS_H_BZERO,
])
AC_CHECK_FUNCS([vsnprintf snprintf])
-
-AH_VERBATIM(_TRU64,[
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-])
-
])
dnl ------------------------------------------------------------------------
@@ -3275,9 +3248,9 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
AC_TRY_COMPILE(
[
#include <tqglobal.h>
-#if Q_EXPORT - 0 != 0
-/* if this compiles, then Q_EXPORT is undefined */
-/* if Q_EXPORT is nonempty, this will break compilation */
+#if TQ_EXPORT - 0 != 0
+/* if this compiles, then TQ_EXPORT is undefined */
+/* if TQ_EXPORT is nonempty, this will break compilation */
#endif
], [/* elvis is alive */],
kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
@@ -4210,23 +4183,11 @@ AC_DEFUN([KDE_CHECK_LIBPTHREAD],
fi
fi
- dnl Is this test really needed, in the face of the Tru64 test below?
+ dnl Is this test really needed?
if test -z "$LIBPTHREAD"; then
AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"])
fi
- dnl This is a special Tru64 check, see BR 76171 issue #18.
- if test -z "$LIBPTHREAD" ; then
- AC_MSG_CHECKING([for pthread_create in -lpthread])
- kde_safe_libs=$LIBS
- LIBS="$LIBS -lpthread"
- AC_TRY_LINK([#include <pthread.h>],[(void)pthread_create(0,0,0,0);],[
- AC_MSG_RESULT(yes)
- LIBPTHREAD="-lpthread"],[
- AC_MSG_RESULT(no)])
- LIBS=$kde_safe_libs
- fi
-
dnl Un-special-case for FreeBSD.
if test "x$LIBPTHREAD" = "xPTHREAD" ; then
LIBPTHREAD=""
@@ -6338,19 +6299,6 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
rm -rf conftest*
;;
-*-*-sco3.2v5*)
- # On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS -belf"
- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
- [AC_LANG_PUSH(C)
- AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
- AC_LANG_POP])
- 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
- ;;
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
@@ -7315,24 +7263,6 @@ os2*)
shlibpath_var=LIBPATH
;;
-osf3* | osf4* | osf5*)
- version_type=osf
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
- ;;
-
-sco3.2v5*)
- version_type=osf
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- shlibpath_var=LD_LIBRARY_PATH
- ;;
-
solaris*)
version_type=linux
need_lib_prefix=no
@@ -8025,17 +7955,6 @@ openbsd*)
fi
;;
-osf3* | osf4* | osf5*)
- # this will be overridden with pass_all, but let us keep it just in case
- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
- lt_cv_file_magic_test_file=/shlib/libc.so
- lt_cv_deplibs_check_method=pass_all
- ;;
-
-sco3.2v5*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
solaris*)
lt_cv_deplibs_check_method=pass_all
lt_cv_file_magic_test_file=/lib/libc.so
@@ -8094,9 +8013,8 @@ else
# 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'*)
+ *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
break
;;
@@ -8295,13 +8213,6 @@ _LT_AC_SYS_COMPILER
# Check for any special shared library compilation flags.
#
_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
- case $host_os in
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
- ;;
- esac
-fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
@@ -8996,129 +8907,6 @@ case $host_os in
# Workaround some broken pre-1.5 toolchains
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
;;
- osf3*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # "CC -Bstatic", where "CC" is the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
- ;;
- RCC)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # 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 $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; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # 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"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
- osf4* | osf5*)
- case $cc_basename in
- KCC)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-
- # KCC will only create a shared library if the output file
- # ends with ".so" (or ".sl" for HP-UX), so rename the library
- # to its proper name (with version) after linking.
- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Archives containing C++ object files must be created using
- # the KAI C++ compiler.
- _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
- ;;
- RCC)
- # Rational C++ 2.4.1
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- ;;
- cxx)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
- _LT_AC_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 $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
- $rm $lib.exp'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
- #
- # There doesn't appear to be a way to prevent this compiler from
- # 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 $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; echo $list'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
- # 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"'
-
- else
- # FIXME: insert proper C++ library support
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
- esac
- ;;
psos*)
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -10166,9 +9954,6 @@ hpux*) # Its linker distinguishes data from code symbols
irix* | nonstopux*)
symcode='[[BCDEGRST]]'
;;
-osf*)
- symcode='[[BCDEGQRST]]'
- ;;
solaris* | sysv5*)
symcode='[[BDT]]'
;;
@@ -10334,7 +10119,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | cygwin* | irix5* | irix6* | nonstopux*)
# PIC is the default for these OSes.
;;
mingw* | os2* | pw32*)
@@ -10458,7 +10243,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
+ # Linux objects are PIC.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -10481,27 +10266,6 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
;;
netbsd*)
;;
- osf3* | osf4* | osf5*)
- case $cc_basename in
- KCC)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
- ;;
- RCC)
- # Rational C++ 2.4.1
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
- ;;
- cxx)
- # Digital/Compaq C++
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # Make sure the PIC flag is empty. It appears that all Alpha
- # Linux and Compaq Tru64 Unix objects are PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
- *)
- ;;
- esac
- ;;
psos*)
;;
sco*)
@@ -10585,7 +10349,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ beos* | cygwin* | irix5* | irix6* | nonstopux*)
# PIC is the default for these OSes.
;;
@@ -10692,17 +10456,6 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
esac
;;
- osf3* | osf4* | osf5*)
- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- # All OSF/1 code is PIC.
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
- sco3.2v5*)
- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
- ;;
-
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -11348,43 +11101,6 @@ EOF
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
- osf3*)
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
- _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_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~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
- # Both c and cxx compiler support -rpath directly
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- fi
- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
- ;;
-
- sco3.2v5*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
- runpath_var=LD_RUN_PATH
- hardcode_runpath_var=yes
- ;;
-
solaris*)
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
diff --git a/aclocal.m4 b/aclocal.m4
index dd92cb3..7f4fde3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -169,11 +169,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
cp "$am_depcomp" conftest.dir
cd conftest.dir
# We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
+ # it helps to detect inapplicable dependency modes.
mkdir sub
am_cv_$1_dependencies_compiler_type=none
@@ -798,7 +794,7 @@ AC_MSG_CHECKING([how to create a $1 tar archive])
# 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
+# Do not fold the above two line into one, because
# Solaris sh will not grok spaces in the rhs of `-'.
for _am_tool in $_am_tools
do
diff --git a/admin b/admin
-Subproject 85116532467b2bb4c73caf54c106c91a22dbe37
+Subproject 43b0c7bdb9af44dc13b0fd17b95ae172a4a382d
diff --git a/config.h.in b/config.h.in
index bd4eef4..ac77943 100644
--- a/config.h.in
+++ b/config.h.in
@@ -81,9 +81,6 @@
/* Define if you have the strlcpy prototype */
#undef HAVE_STRLCPY_PROTO
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-#undef HAVE_SYS_BITYPES_H
-
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
diff --git a/src/backends/recipedb.cpp b/src/backends/recipedb.cpp
index 1e4dd19..fff517b 100644
--- a/src/backends/recipedb.cpp
+++ b/src/backends/recipedb.cpp
@@ -26,7 +26,7 @@
#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdeprocess.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
#include <kfilterdev.h>
#include <tdemessagebox.h>
@@ -414,7 +414,7 @@ bool RecipeDB::restore( const TQString &file, TQString *errMsg )
//by loading the old schema and then porting it to the current version.
empty(); //the user had better be warned!
- KProcIO *process = new KProcIO;
+ TDEProcIO *process = new TDEProcIO;
TQStringList command = restoreCommand();
kdDebug()<<"Restoring backup using: "<<command[0]<<endl;
diff --git a/src/convert_sqlite3.cpp b/src/convert_sqlite3.cpp
index ddb144e..6e663ad 100644
--- a/src/convert_sqlite3.cpp
+++ b/src/convert_sqlite3.cpp
@@ -17,7 +17,7 @@
#include <tdeglobal.h>
#include <tdeconfig.h>
#include <tdemessagebox.h>
-#include <kprocio.h>
+#include <tdeprocio.h>
//FIXME: Some messages should be given to the user about success/failure, but that can't be done in the 0.8.x branch due to i18n.
@@ -30,14 +30,14 @@ ConvertSQLite3::ConvertSQLite3( const TQString &db_file ) : TQObject(), error(fa
file = config->readEntry("DBFile");
}
- KProcIO *p = new KProcIO;
+ TDEProcIO *p = new TDEProcIO;
p->setUseShell(true);
//sqlite OLD.DB .dump | sqlite3 NEW.DB
*p << "sqlite" << file << ".dump" <<
"|" << "sqlite3" << file+".new";
- TQApplication::connect( p, TQ_SIGNAL(readReady(KProcIO*)), this, TQ_SLOT(processOutput(KProcIO*)) );
+ TQApplication::connect( p, TQ_SIGNAL(readReady(TDEProcIO*)), this, TQ_SLOT(processOutput(TDEProcIO*)) );
bool success = p->start( TDEProcess::Block, true );
if ( !success ) {
@@ -77,7 +77,7 @@ ConvertSQLite3::~ConvertSQLite3()
{
}
-void ConvertSQLite3::processOutput( KProcIO* p )
+void ConvertSQLite3::processOutput( TDEProcIO* p )
{
TQString error_str, buffer;
while ( p->readln(buffer) != -1 ) {
diff --git a/src/convert_sqlite3.h b/src/convert_sqlite3.h
index 4f23bf5..9b8f2f1 100644
--- a/src/convert_sqlite3.h
+++ b/src/convert_sqlite3.h
@@ -13,7 +13,7 @@
#include <tqobject.h>
-class KProcIO;
+class TDEProcIO;
class ConvertSQLite3 : public TQObject
{
@@ -24,7 +24,7 @@ public:
~ConvertSQLite3();
public slots:
- void processOutput( KProcIO* p );
+ void processOutput( TDEProcIO* p );
private:
bool copyFile( const TQString &oldFilePath, const TQString &newFilePath );
diff --git a/translations/messages/ka.po b/translations/messages/ka.po
index 48e808f..bdc5c8e 100644
--- a/translations/messages/ka.po
+++ b/translations/messages/ka.po
@@ -3,18 +3,21 @@
# Rusudan Tsiskreli <r_tsiskreli@caucasus.net>, 2006.
# რუსუდან ცისკრელი <tsiskreli@gmail.com>, 2006.
# Rusudan Tsiskreli <tsiskreli@gmail.com>, 2006.
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2025.
msgid ""
msgstr ""
"Project-Id-Version: krecipes\n"
"POT-Creation-Date: 2024-10-29 19:27+0100\n"
-"PO-Revision-Date: 2006-03-28 01:56+0400\n"
-"Last-Translator: Giasher <giasher@telenet.ge>\n"
-"Language-Team: <www.gia.ge>\n"
-"Language: \n"
+"PO-Revision-Date: 2025-01-06 14:00+0000\n"
+"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
+"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/krecipes/ka/>\n"
+"Language: ka\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
msgid ""
@@ -58,13 +61,12 @@ msgid "TQSqlRecipeDB: Opening Database..."
msgstr "QSqlRecipeDB: მონაცემთა ბაზის გახსნა..."
#: src/backends/qsqlrecipedb.cpp:83
-#, fuzzy
msgid ""
"The TQt database plug-in (%1) is not installed. This plug-in is required "
"for using this database backend."
msgstr ""
-"TQt მონაცემთა ბაზის მოდული (%1) არაა დაყენებული. ეს მოდული საჭიროა საჭიროა "
-"ბაზის backend-ის გამოყენებისას."
+"TQt მონაცემთა ბაზის დამატება (%1) არაა დაყენებული. ეს დამატებასაჭიროა ბაზის "
+"უკანაბოლოს გამოყენებისას."
#: src/backends/qsqlrecipedb.cpp:104
msgid "Parameters set. Calling db->open()"
@@ -213,7 +215,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:28
msgid "allspice"
-msgstr ""
+msgstr "ბაჰარი"
#: src/backends/usda_ingredient_data.h:29
msgid "almond extract"
@@ -221,7 +223,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:30
msgid "almonds"
-msgstr ""
+msgstr "ნუში"
#: src/backends/usda_ingredient_data.h:31
msgid "apple juice"
@@ -233,11 +235,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:33
msgid "apples"
-msgstr ""
+msgstr "ვაშლი"
#: src/backends/usda_ingredient_data.h:34
msgid "applesauce"
-msgstr ""
+msgstr "ვაშლის სოუსი"
#: src/backends/usda_ingredient_data.h:35
msgid "applesauce, unsweetened"
@@ -249,7 +251,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:37
msgid "bacon"
-msgstr ""
+msgstr "ბეკონი"
#: src/backends/usda_ingredient_data.h:38
msgid "baking potato"
@@ -265,15 +267,15 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:41
msgid "bananas"
-msgstr ""
+msgstr "ბანანი"
#: src/backends/usda_ingredient_data.h:42
msgid "barley"
-msgstr ""
+msgstr "ქერი"
#: src/backends/usda_ingredient_data.h:43
msgid "basil"
-msgstr ""
+msgstr "რეჰანი"
#: src/backends/usda_ingredient_data.h:44
msgid "bay leaf"
@@ -309,7 +311,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:52
msgid "beer"
-msgstr ""
+msgstr "ლუდი"
#: src/backends/usda_ingredient_data.h:53
msgid "bell peppers (red, green, yellow)"
@@ -325,11 +327,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:56
msgid "bologna"
-msgstr ""
+msgstr "ბოლონია"
#: src/backends/usda_ingredient_data.h:57
msgid "bourbon"
-msgstr ""
+msgstr "ბურბონი"
#: src/backends/usda_ingredient_data.h:58
msgid "bran flakes"
@@ -337,7 +339,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:59
msgid "bread"
-msgstr ""
+msgstr "პური"
#: src/backends/usda_ingredient_data.h:60
msgid "bread crumbs"
@@ -349,7 +351,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:62
msgid "broccoli"
-msgstr ""
+msgstr "ბროკოლი"
#: src/backends/usda_ingredient_data.h:63
msgid "broccoli (frozen-thawed)"
@@ -373,11 +375,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:68
msgid "bulgur"
-msgstr ""
+msgstr "ბულღური"
#: src/backends/usda_ingredient_data.h:69
msgid "butter"
-msgstr ""
+msgstr "კარაქი"
#: src/backends/usda_ingredient_data.h:70
msgid "butter (1/2 stick)"
@@ -390,11 +392,11 @@ msgstr "ქვედა მინდორი"
#: src/backends/usda_ingredient_data.h:72
msgid "buttermilk"
-msgstr ""
+msgstr "დო"
#: src/backends/usda_ingredient_data.h:73
msgid "cabbage"
-msgstr ""
+msgstr "კომბოსტო"
#: src/backends/usda_ingredient_data.h:74
msgid "canned apple slices"
@@ -482,7 +484,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:95
msgid "carrot"
-msgstr ""
+msgstr "სტაფილო"
#: src/backends/usda_ingredient_data.h:96
msgid "carrot slices, canned"
@@ -490,7 +492,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:97
msgid "carrots"
-msgstr ""
+msgstr "სტაფილო"
#: src/backends/usda_ingredient_data.h:98
msgid "carrots, frozen"
@@ -502,7 +504,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:100
msgid "catsup"
-msgstr ""
+msgstr "კეტჩუპი"
#: src/backends/usda_ingredient_data.h:101
msgid "cauliflower, frozen"
@@ -510,11 +512,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:102
msgid "cayenne"
-msgstr ""
+msgstr "კაიენი"
#: src/backends/usda_ingredient_data.h:103
msgid "celery"
-msgstr ""
+msgstr "ნიახური"
#: src/backends/usda_ingredient_data.h:104
msgid "celery leaf"
@@ -534,7 +536,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:108
msgid "cheese"
-msgstr ""
+msgstr "ყველი"
#: src/backends/usda_ingredient_data.h:109
#, fuzzy
@@ -543,7 +545,7 @@ msgstr "მარლთწერის შემოწმება"
#: src/backends/usda_ingredient_data.h:110
msgid "chicken"
-msgstr ""
+msgstr "ქათამი"
#: src/backends/usda_ingredient_data.h:111
msgid "chicken (1-2 lb)"
@@ -583,7 +585,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:120
msgid "chili"
-msgstr ""
+msgstr "წიწაკა"
#: src/backends/usda_ingredient_data.h:121
msgid "chili powder"
@@ -595,7 +597,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:123
msgid "chives"
-msgstr ""
+msgstr "ჩაივსი"
#: src/backends/usda_ingredient_data.h:124
msgid "chocolate chip"
@@ -655,11 +657,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:138
msgid "cilantro"
-msgstr ""
+msgstr "ქინძი"
#: src/backends/usda_ingredient_data.h:139
msgid "cinnamon"
-msgstr ""
+msgstr "დარიჩინი"
#: src/backends/usda_ingredient_data.h:140
#, fuzzy
@@ -668,7 +670,7 @@ msgstr "ფოტოს გაწმენდა"
#: src/backends/usda_ingredient_data.h:141
msgid "cloves"
-msgstr ""
+msgstr "მიხაკი"
#: src/backends/usda_ingredient_data.h:142
msgid "cloves garlic"
@@ -680,11 +682,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:144
msgid "cocoa"
-msgstr ""
+msgstr "კაკაო"
#: src/backends/usda_ingredient_data.h:145
msgid "coconut"
-msgstr ""
+msgstr "ქოქოსი"
#: src/backends/usda_ingredient_data.h:146
msgid "coconut milk (canned)"
@@ -753,11 +755,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:162
msgid "cornmeal"
-msgstr ""
+msgstr "სიმინდის უხეში ფქვილი"
#: src/backends/usda_ingredient_data.h:163
msgid "cornstarch"
-msgstr ""
+msgstr "სიმინდის სახამებელი"
#: src/backends/usda_ingredient_data.h:164
msgid "cottage cheese"
@@ -801,7 +803,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:174
msgid "cucumber"
-msgstr ""
+msgstr "კიტრი"
#: src/backends/usda_ingredient_data.h:175
msgid "cucumber, whole"
@@ -809,7 +811,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:176
msgid "cucumbers"
-msgstr ""
+msgstr "კიტრი"
#: src/backends/usda_ingredient_data.h:177
msgid "cucumbers, whole"
@@ -817,11 +819,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:178
msgid "cumin"
-msgstr ""
+msgstr "ძირა"
#: src/backends/usda_ingredient_data.h:179
msgid "currants"
-msgstr ""
+msgstr "მოცხარი"
#: src/backends/usda_ingredient_data.h:180
msgid "dehydrated onion flakes"
@@ -873,7 +875,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:192
msgid "egg"
-msgstr ""
+msgstr "კვერცხი"
#: src/backends/usda_ingredient_data.h:193
msgid "egg noodles (medium)"
@@ -885,7 +887,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:195
msgid "eggplant"
-msgstr ""
+msgstr "ბადრიჯანი"
#: src/backends/usda_ingredient_data.h:196
msgid "eggplant (baby)"
@@ -893,7 +895,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:197
msgid "eggs"
-msgstr ""
+msgstr "კვერცხი"
#: src/backends/usda_ingredient_data.h:198
msgid "eggs, hard cooked"
@@ -929,7 +931,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:206
msgid "flour"
-msgstr ""
+msgstr "ფქვილი"
#: src/backends/usda_ingredient_data.h:207
msgid "flour tortillas"
@@ -1001,7 +1003,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:224
msgid "garlic"
-msgstr ""
+msgstr "ნიორი"
#: src/backends/usda_ingredient_data.h:225
msgid "garlic clove"
@@ -1020,9 +1022,8 @@ msgid "garlic salt"
msgstr ""
#: src/backends/usda_ingredient_data.h:229
-#, fuzzy
msgid "gelatin"
-msgstr "რეიტინგი"
+msgstr "ჟელატინი"
#: src/backends/usda_ingredient_data.h:230
msgid "gelatin (peach-flavored)"
@@ -1030,7 +1031,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:231
msgid "ginger"
-msgstr ""
+msgstr "კოჭა"
#: src/backends/usda_ingredient_data.h:232
msgid "ginger, fresh"
@@ -1050,11 +1051,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:236
msgid "grapefruit"
-msgstr ""
+msgstr "გრეიფრუტი"
#: src/backends/usda_ingredient_data.h:237
msgid "gravy"
-msgstr ""
+msgstr "საწებელი"
#: src/backends/usda_ingredient_data.h:238
msgid "green beans (fresh)"
@@ -1134,11 +1135,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:257
msgid "ham"
-msgstr ""
+msgstr "შაშხი"
#: src/backends/usda_ingredient_data.h:258
msgid "hamburger"
-msgstr ""
+msgstr "ჰამბურგერი"
#: src/backends/usda_ingredient_data.h:259
msgid "hamburger bun"
@@ -1154,7 +1155,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:262
msgid "hazelnuts"
-msgstr ""
+msgstr "თხილი"
#: src/backends/usda_ingredient_data.h:263
msgid "heavy cream"
@@ -1166,11 +1167,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:265
msgid "honey"
-msgstr ""
+msgstr "თაფლი"
#: src/backends/usda_ingredient_data.h:266
msgid "horseradish"
-msgstr ""
+msgstr "პირშუშხა"
#: src/backends/usda_ingredient_data.h:267
msgid "hot pepper flakes"
@@ -1210,7 +1211,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:276
msgid "ketchup"
-msgstr ""
+msgstr "კეტჩუპი"
#: src/backends/usda_ingredient_data.h:277
msgid "lasagna noodles (8 noodles)"
@@ -1222,11 +1223,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:279
msgid "leeks"
-msgstr ""
+msgstr "პრასი"
#: src/backends/usda_ingredient_data.h:280
msgid "lemon"
-msgstr ""
+msgstr "ლიმონი"
#: src/backends/usda_ingredient_data.h:281
msgid "lemon juice"
@@ -1250,11 +1251,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:286
msgid "lentil"
-msgstr ""
+msgstr "ოსპი"
#: src/backends/usda_ingredient_data.h:287
msgid "lettuce"
-msgstr ""
+msgstr "სალათის ფოთლები"
#: src/backends/usda_ingredient_data.h:288
msgid "lime juice"
@@ -1310,9 +1311,8 @@ msgid "low-sodium vegetable stock"
msgstr ""
#: src/backends/usda_ingredient_data.h:301
-#, fuzzy
msgid "margarine"
-msgstr "ზედა მინდორი"
+msgstr "მარგარინი"
#: src/backends/usda_ingredient_data.h:302
msgid "margarine, soft"
@@ -1320,7 +1320,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:303
msgid "marjoram"
-msgstr ""
+msgstr "მაიორანი"
#: src/backends/usda_ingredient_data.h:304
msgid "marjoram leaves"
@@ -1328,7 +1328,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:305
msgid "mayonnaise"
-msgstr ""
+msgstr "მაიონეზი"
#: src/backends/usda_ingredient_data.h:306
msgid "medium-size egg"
@@ -1336,7 +1336,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:307
msgid "milk"
-msgstr ""
+msgstr "რძე"
#: src/backends/usda_ingredient_data.h:308
msgid "mint leaves"
@@ -1356,7 +1356,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:312
msgid "molasses"
-msgstr ""
+msgstr "მოლასა"
#: src/backends/usda_ingredient_data.h:313
msgid "molasses, dark"
@@ -1376,16 +1376,15 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:317
msgid "mushroom"
-msgstr ""
+msgstr "სოკო"
#: src/backends/usda_ingredient_data.h:318
msgid "mushrooms"
-msgstr ""
+msgstr "სოკო"
#: src/backends/usda_ingredient_data.h:319
-#, fuzzy
msgid "mustard"
-msgstr "ვარლსკვავები"
+msgstr "მდოგვი"
#: src/backends/usda_ingredient_data.h:320
msgid "mustard seeds"
@@ -1405,7 +1404,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:324
msgid "noodles"
-msgstr ""
+msgstr "ლაფშა"
#: src/backends/usda_ingredient_data.h:325
msgid "noodles (lasagne)"
@@ -1421,7 +1420,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:328
msgid "nutmeg"
-msgstr ""
+msgstr "მუსკატის კაკალი"
#: src/backends/usda_ingredient_data.h:329
msgid "nuts, chopped"
@@ -1429,7 +1428,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:330
msgid "oil"
-msgstr ""
+msgstr "ზეთი"
#: src/backends/usda_ingredient_data.h:331
msgid "oil, peanut"
@@ -1445,7 +1444,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:334
msgid "onion"
-msgstr ""
+msgstr "ხახვი"
#: src/backends/usda_ingredient_data.h:335
msgid "onion, medium"
@@ -1473,7 +1472,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:341
msgid "onions"
-msgstr ""
+msgstr "ხახვი"
#: src/backends/usda_ingredient_data.h:342
msgid "onions, chopped"
@@ -1497,11 +1496,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:347
msgid "oranges"
-msgstr ""
+msgstr "ფორთოხალი"
#: src/backends/usda_ingredient_data.h:348
msgid "oregano"
-msgstr ""
+msgstr "თავშავა"
#: src/backends/usda_ingredient_data.h:349
msgid "Oreo Cookies"
@@ -1509,7 +1508,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:350
msgid "paprika"
-msgstr ""
+msgstr "პაპრიკა"
#: src/backends/usda_ingredient_data.h:351
msgid "paprika pepper"
@@ -1521,7 +1520,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:353
msgid "parsley"
-msgstr ""
+msgstr "ოხრახუში"
#: src/backends/usda_ingredient_data.h:354
msgid "parsley flakes"
@@ -1533,7 +1532,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:356
msgid "parsnips"
-msgstr ""
+msgstr "ძირთეთრა"
#: src/backends/usda_ingredient_data.h:357
msgid "pasta shells"
@@ -1561,11 +1560,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:363
msgid "pecans"
-msgstr ""
+msgstr "პეკანი"
#: src/backends/usda_ingredient_data.h:364
msgid "pepper"
-msgstr ""
+msgstr "პილპილი"
#: src/backends/usda_ingredient_data.h:365
msgid "Pepperidge Farm stuffing"
@@ -1577,12 +1576,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:367
msgid "pickles"
-msgstr ""
+msgstr "მწნილი"
#: src/backends/usda_ingredient_data.h:368
-#, fuzzy
msgid "pimento"
-msgstr "გასწორება"
+msgstr "პიმენტა"
#: src/backends/usda_ingredient_data.h:369
msgid "pine kernels"
@@ -1622,7 +1620,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:378
msgid "potato"
-msgstr ""
+msgstr "კარტოფილი"
#: src/backends/usda_ingredient_data.h:379
msgid "potato flakes"
@@ -1638,7 +1636,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:382
msgid "potatoes"
-msgstr ""
+msgstr "კარტოფილი"
#: src/backends/usda_ingredient_data.h:383
msgid "potatoes (red-skinned)"
@@ -1662,19 +1660,19 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:388
msgid "prunes"
-msgstr ""
+msgstr "ქლიავის ჩირი"
#: src/backends/usda_ingredient_data.h:389
msgid "pumpkin"
-msgstr ""
+msgstr "გოგრა"
#: src/backends/usda_ingredient_data.h:390
msgid "radishes"
-msgstr ""
+msgstr "ბოლოკი"
#: src/backends/usda_ingredient_data.h:391
msgid "raisins"
-msgstr ""
+msgstr "ქიშმიში"
#: src/backends/usda_ingredient_data.h:392
msgid "red burgundy wine"
@@ -1702,11 +1700,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:398
msgid "relish"
-msgstr ""
+msgstr "რელიში"
#: src/backends/usda_ingredient_data.h:399
msgid "rice"
-msgstr ""
+msgstr "ბრინჯი"
#: src/backends/usda_ingredient_data.h:400
msgid "ricotta cheese"
@@ -1722,7 +1720,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:403
msgid "rosemary"
-msgstr ""
+msgstr "როზმარინი"
#: src/backends/usda_ingredient_data.h:404
msgid "rum flavoring or vanilla"
@@ -1730,7 +1728,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:405
msgid "sage"
-msgstr ""
+msgstr "სალბი"
#: src/backends/usda_ingredient_data.h:406
msgid "salad dressing (Miracle Whip)"
@@ -1742,11 +1740,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:408
msgid "salsa"
-msgstr ""
+msgstr "სალსა"
#: src/backends/usda_ingredient_data.h:409
msgid "salt"
-msgstr ""
+msgstr "მარილი"
#: src/backends/usda_ingredient_data.h:410
msgid "sandwich rolls"
@@ -1754,11 +1752,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:411
msgid "sausage"
-msgstr ""
+msgstr "სოსისი"
#: src/backends/usda_ingredient_data.h:412
msgid "scallions"
-msgstr ""
+msgstr "მწვანე ხახვი"
#: src/backends/usda_ingredient_data.h:413
msgid "self-raising flour"
@@ -1770,11 +1768,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:415
msgid "shallots"
-msgstr ""
+msgstr "შალოტი"
#: src/backends/usda_ingredient_data.h:416
msgid "shortening"
-msgstr ""
+msgstr "შორთენინგი"
#: src/backends/usda_ingredient_data.h:417
msgid "shredded carrots"
@@ -1826,7 +1824,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:429
msgid "spaghetti"
-msgstr ""
+msgstr "სპაგეტი"
#: src/backends/usda_ingredient_data.h:430
msgid "spinach leaf"
@@ -1842,11 +1840,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:433
msgid "stock"
-msgstr ""
+msgstr "სტოკი"
#: src/backends/usda_ingredient_data.h:434 src/backends/usda_property_data.h:37
msgid "sugar"
-msgstr ""
+msgstr "შაქარი"
#: src/backends/usda_ingredient_data.h:435
msgid "sweet pickle"
@@ -1886,7 +1884,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:444
msgid "thyme"
-msgstr ""
+msgstr "ბეგქონდარა"
#: src/backends/usda_ingredient_data.h:445
msgid "tomato juice"
@@ -1902,7 +1900,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:448
msgid "tomatoes"
-msgstr ""
+msgstr "პომიდორი"
#: src/backends/usda_ingredient_data.h:449
msgid "tomatoes, canned"
@@ -1922,7 +1920,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:453
msgid "tuna"
-msgstr ""
+msgstr "თინუსი"
#: src/backends/usda_ingredient_data.h:454
msgid "tuna in water, canned"
@@ -1930,7 +1928,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:455
msgid "turkey"
-msgstr ""
+msgstr "ინდაური"
#: src/backends/usda_ingredient_data.h:456
msgid "turkey ham"
@@ -1938,11 +1936,11 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:457
msgid "turmeric"
-msgstr ""
+msgstr "კურკუმა"
#: src/backends/usda_ingredient_data.h:458
msgid "turnip"
-msgstr ""
+msgstr "თალგამი"
#: src/backends/usda_ingredient_data.h:459
msgid "unflavored gelatin"
@@ -1950,7 +1948,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:460
msgid "vanilla"
-msgstr ""
+msgstr "ვანილი"
#: src/backends/usda_ingredient_data.h:461
msgid "vanilla extract"
@@ -1974,15 +1972,15 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:466
msgid "Velveeta"
-msgstr ""
+msgstr "ველვეტა"
#: src/backends/usda_ingredient_data.h:467
msgid "vinegar"
-msgstr ""
+msgstr "ძმარი"
#: src/backends/usda_ingredient_data.h:468
msgid "walnuts"
-msgstr ""
+msgstr "კაკალი"
#: src/backends/usda_ingredient_data.h:469
msgid "warm water"
@@ -1990,7 +1988,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:470 src/backends/usda_property_data.h:30
msgid "water"
-msgstr ""
+msgstr "წყალი"
#: src/backends/usda_ingredient_data.h:471
msgid "whipped topping"
@@ -2026,7 +2024,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:479
msgid "yeast"
-msgstr ""
+msgstr "საფუარი"
#: src/backends/usda_ingredient_data.h:480
msgid "yellow squash"
@@ -2034,7 +2032,7 @@ msgstr ""
#: src/backends/usda_ingredient_data.h:481
msgid "zucchini"
-msgstr ""
+msgstr "ყაბაყი"
#: src/backends/usda_ingredient_data.h:482
msgid "zucchini slices"
@@ -2042,23 +2040,23 @@ msgstr ""
#: src/backends/usda_property_data.h:31
msgid "energy"
-msgstr ""
+msgstr "ენერგია"
#: src/backends/usda_property_data.h:32
msgid "protein"
-msgstr ""
+msgstr "ცილა"
#: src/backends/usda_property_data.h:33
msgid "fat"
-msgstr ""
+msgstr "ცხიმი"
#: src/backends/usda_property_data.h:34
msgid "ash"
-msgstr ""
+msgstr "ფერფლი"
#: src/backends/usda_property_data.h:35
msgid "carbohydrates"
-msgstr ""
+msgstr "ნახშირწყლები"
#: src/backends/usda_property_data.h:36
msgid "dietary fiber"
@@ -2066,43 +2064,43 @@ msgstr ""
#: src/backends/usda_property_data.h:38
msgid "calcuim"
-msgstr ""
+msgstr "კალციუმი"
#: src/backends/usda_property_data.h:39
msgid "iron"
-msgstr ""
+msgstr "რკინა"
#: src/backends/usda_property_data.h:40
msgid "magnesium"
-msgstr ""
+msgstr "მაგნიუმი"
#: src/backends/usda_property_data.h:41
msgid "phosphorus"
-msgstr ""
+msgstr "ფოსფორი"
#: src/backends/usda_property_data.h:42
msgid "potassium"
-msgstr ""
+msgstr "კალიუმი"
#: src/backends/usda_property_data.h:43
msgid "sodium"
-msgstr ""
+msgstr "ნატრიუმი"
#: src/backends/usda_property_data.h:44
msgid "zinc"
-msgstr ""
+msgstr "თუთია"
#: src/backends/usda_property_data.h:45
msgid "copper"
-msgstr ""
+msgstr "სპილენძი"
#: src/backends/usda_property_data.h:46
msgid "manganese"
-msgstr ""
+msgstr "მანგანუმი"
#: src/backends/usda_property_data.h:47
msgid "selenium"
-msgstr ""
+msgstr "სელენი"
#: src/backends/usda_property_data.h:48
msgid "vitamin C"
@@ -2110,15 +2108,15 @@ msgstr ""
#: src/backends/usda_property_data.h:49
msgid "thiamin"
-msgstr ""
+msgstr "თიამინი"
#: src/backends/usda_property_data.h:50
msgid "riboflavin"
-msgstr ""
+msgstr "რიბოფლავინი"
#: src/backends/usda_property_data.h:51
msgid "niacin"
-msgstr ""
+msgstr "ნიაცინი"
#: src/backends/usda_property_data.h:52
msgid "pantothenic acid"
@@ -2130,7 +2128,7 @@ msgstr ""
#: src/backends/usda_property_data.h:54
msgid "folate"
-msgstr ""
+msgstr "ფოლატი"
#: src/backends/usda_property_data.h:55
msgid "folic acid"
@@ -2158,7 +2156,7 @@ msgstr ""
#: src/backends/usda_property_data.h:61
msgid "retinol"
-msgstr ""
+msgstr "რეტინოლი"
#: src/backends/usda_property_data.h:62
msgid "vitamin E"
@@ -2170,23 +2168,23 @@ msgstr ""
#: src/backends/usda_property_data.h:64
msgid "alpha-carotene"
-msgstr ""
+msgstr "ალფა-კაროტინი"
#: src/backends/usda_property_data.h:65
msgid "beta-carotene"
-msgstr ""
+msgstr "ბეტა-კაროტინი"
#: src/backends/usda_property_data.h:66
msgid "beta-cryptoxanthin"
-msgstr ""
+msgstr "ბეტა-კრიპტოქსანტინი"
#: src/backends/usda_property_data.h:67
msgid "lycopene"
-msgstr ""
+msgstr "ლიკოპენი"
#: src/backends/usda_property_data.h:68
msgid "lutein+zeazanthin"
-msgstr ""
+msgstr "ლუტეინი+ზეაზანტინი"
#: src/backends/usda_property_data.h:69
msgid "saturated fat"
@@ -2202,7 +2200,7 @@ msgstr ""
#: src/backends/usda_property_data.h:72
msgid "cholesterol"
-msgstr ""
+msgstr "ქოლესტერინი"
#: src/dialogs/advancedsearchdialog.cpp:89
#: src/dialogs/advancedsearchdialog.cpp:293
@@ -2334,7 +2332,7 @@ msgstr ""
#: src/dialogs/recipeinputdialog.cpp:241 src/dialogs/setupdisplay.cpp:126
#: src/exporters/htmlexporter.cpp:283
msgid "Yield"
-msgstr "Yield"
+msgstr "გამოსავალი"
#: src/dialogs/advancedsearchdialog.cpp:556
#: src/dialogs/advancedsearchdialog.cpp:562
@@ -2396,7 +2394,7 @@ msgstr "ვარლსკვავები"
#: src/dialogs/advancedsearchdialog.cpp:572
msgid "By criteria:"
-msgstr "კრიტერიუმით"
+msgstr "პირობით:"
#: src/dialogs/advancedsearchdialog.cpp:573
msgid "+"
@@ -2499,43 +2497,39 @@ msgstr "საზღვრის წინასწარ ნახვა"
#: src/dialogs/conversiondialog.cpp:34
msgid "Measurement Converter"
-msgstr ""
+msgstr "გაზომვის გადაყვანა"
#: src/dialogs/conversiondialog.cpp:39 src/dialogs/conversiondialog.cpp:94
msgid "Convert"
-msgstr ""
+msgstr "გადაყვანა"
#: src/dialogs/conversiondialog.cpp:59
-#, fuzzy
msgid "--Ingredient (optional)--"
-msgstr "ინგრედიენტთა თვისებები"
+msgstr "--ინგრედიენტი (არასავალდებულო)--"
#: src/dialogs/conversiondialog.cpp:62
#: src/dialogs/createingredientweightdialog.cpp:69
#: src/widgets/weightinput.cpp:24
-#, fuzzy
msgid "-No Preparation-"
-msgstr "მომზადების შემსუბუქება"
+msgstr "-მომზადების გარეშე-"
#: src/dialogs/conversiondialog.cpp:95
msgid "To"
-msgstr ""
+msgstr "სადამდე"
#: src/dialogs/conversiondialog.cpp:96 src/dialogs/conversiondialog.cpp:136
-#, fuzzy
msgid "<b>Result:</b>"
-msgstr "<b>რეცეპტების სია</b>"
+msgstr "<b>შედეგები</b>"
#: src/dialogs/conversiondialog.cpp:140
-#, fuzzy
msgid "<b>Approximated result:</b>"
-msgstr "<b>რეცეპტების სია</b>"
+msgstr "<b>დაახლოებითი შედეგი.</b>"
#: src/dialogs/conversiondialog.cpp:144 src/dialogs/conversiondialog.cpp:148
#: src/dialogs/conversiondialog.cpp:152 src/dialogs/conversiondialog.cpp:156
#: src/dialogs/conversiondialog.cpp:160
msgid "<b>Error:</b>"
-msgstr ""
+msgstr "<b>შეცდომა:</b>"
#: src/dialogs/conversiondialog.cpp:145
#, fuzzy
@@ -2543,14 +2537,12 @@ msgid "Missing unit conversion"
msgstr "ერთეულთა კონვერტორი"
#: src/dialogs/conversiondialog.cpp:149
-#, fuzzy
msgid "No ingredient weight available"
-msgstr "ინგრედიენტი არაა არჩეული."
+msgstr "ინგრედიენტის წონა ხელმისაწვდომი არაა"
#: src/dialogs/conversiondialog.cpp:153
-#, fuzzy
msgid "No ingredient weight available for this method of preparation"
-msgstr "ინგრედიენტი არაა არჩეული."
+msgstr "ამ მომზადების მეთოდისთვის ინგრედიენტის წონა ხელმისაწვდომი არაა"
#: src/dialogs/conversiondialog.cpp:157
msgid "Ingredient required for conversion"
@@ -2579,14 +2571,12 @@ msgid "New Ingredient Weight"
msgstr "ახალი ინგრედიენტი"
#: src/dialogs/createingredientweightdialog.cpp:87
-#, fuzzy
msgid "Per Amount:"
-msgstr "რაოდენობა:"
+msgstr "თითოეული რაოდენობისთვის:"
#: src/dialogs/createingredientweightdialog.cpp:88
-#, fuzzy
msgid "Weight:"
-msgstr "&სიმაღლე:"
+msgstr "წონა:"
#: src/dialogs/createingredientweightdialog.cpp:94
#: src/dialogs/createingredientweightdialog.cpp:101
@@ -2633,33 +2623,31 @@ msgid "Singular:"
msgstr "მხოლობითი:"
#: src/dialogs/createunitdialog.cpp:42 src/dialogs/createunitdialog.cpp:54
-#, fuzzy
msgid "Abbreviation:"
-msgstr "წილადი"
+msgstr "აბრევიატურა:"
#: src/dialogs/createunitdialog.cpp:48
msgid "Plural:"
msgstr "მრავლობითი:"
#: src/dialogs/createunitdialog.cpp:60
-#, fuzzy
msgid "Type:"
-msgstr "ტიპი"
+msgstr "ტიპი:"
#: src/dialogs/createunitdialog.cpp:62 src/widgets/unitlistview.cpp:72
#: src/widgets/unitlistview.cpp:144
msgid "Other"
-msgstr ""
+msgstr "სხვა"
#: src/dialogs/createunitdialog.cpp:63 src/widgets/unitlistview.cpp:73
#: src/widgets/unitlistview.cpp:145
msgid "Mass"
-msgstr ""
+msgstr "მასა"
#: src/dialogs/createunitdialog.cpp:64 src/widgets/unitlistview.cpp:74
#: src/widgets/unitlistview.cpp:146
msgid "Volume"
-msgstr ""
+msgstr "მოცულობა"
#: src/dialogs/dbimportdialog.cpp:39
msgid "Database Import"
@@ -2694,9 +2682,8 @@ msgid "Database name:"
msgstr "მონაცემთა ბაზის სახელი:"
#: src/dialogs/dbimportdialog.cpp:160 src/pref.cpp:145 src/pref.cpp:272
-#, fuzzy
msgid "Port:"
-msgstr "მდგომარეობა"
+msgstr "პორტი:"
#: src/dialogs/dependanciesdialog.cpp:56
msgid ""
@@ -2769,12 +2756,12 @@ msgid ""
"I could not create a full diet list given the constraints. Either the recipe "
"list is too short or the constraints are too demanding. "
msgstr ""
-"იძულებით დიეტის სრული სია ვერ შევქმენი. რეცეპტთა სია ან ძალიან მოკლეა, ან "
+"იძულებით დიეტის სრული სია ვერ შევქმენი. რეცეპტთა სია ან ძალიან მოკლეა, ან "
"იძულება ძალიან ოფიციალურია. "
#: src/dialogs/dietwizarddialog.cpp:325
msgid "No. of dishes: "
-msgstr "კერძების რაოდენობა:"
+msgstr "კერძების რაოდენობა: "
#: src/dialogs/dietwizarddialog.cpp:341
msgid "Previous Dish"
@@ -2827,20 +2814,19 @@ msgstr "კომენტარები:"
#: src/dialogs/editratingdialog.cpp:155
msgid "Rater:"
-msgstr ""
+msgstr "კატეგორია:"
#: src/dialogs/ingredientgroupsdialog.cpp:27
msgid "Header list"
msgstr "ზედა კოლონტიტულთა სია"
#: src/dialogs/ingredientmatcherdialog.cpp:78
-#, fuzzy
msgid "Ingredient (required?)"
-msgstr "ინგრედიენტთა ანალიზატორი"
+msgstr "ინგრედიენტი (აუცილებელია?)"
#: src/dialogs/ingredientmatcherdialog.cpp:79
msgid "Amount Available"
-msgstr ""
+msgstr "ხელმისაწვდომი რაოდენობა"
#: src/dialogs/ingredientmatcherdialog.cpp:86
msgid "Missing ingredients allowed:"
@@ -2864,9 +2850,8 @@ msgstr "დამთხვეული რეცეპტების ძიე
#: src/dialogs/ingredientmatcherdialog.cpp:142
#: src/dialogs/ingredientsdialog.cpp:386 src/dialogs/ingredientsdialog.cpp:409
-#, fuzzy
msgid "Enter amount"
-msgstr "რაოდენობა"
+msgstr "შეიყვანეთ რაოდენობა"
#: src/dialogs/ingredientmatcherdialog.cpp:144
#: src/dialogs/ingredientparserdialog.cpp:59
@@ -2889,7 +2874,7 @@ msgstr "თქვენ გაკლიათ %n ინგრედიენტ
#: src/dialogs/ingredientmatcherdialog.h:55 src/widgets/inglistviewitem.cpp:29
#: src/widgets/inglistviewitem.cpp:41 src/widgets/ingredientinputwidget.cpp:94
msgid "OR"
-msgstr ""
+msgstr "ან"
#: src/dialogs/ingredientparserdialog.cpp:37
msgid "Ingredient Parser"
@@ -2974,19 +2959,16 @@ msgid "Property"
msgstr "მდგომარეობა"
#: src/dialogs/ingredientsdialog.cpp:213 src/widgets/unitlistview.cpp:241
-#, fuzzy
msgid "Ingredient Weights"
-msgstr "ინგრედიენტთა სია"
+msgstr "ინგრედიენტების წონა"
#: src/dialogs/ingredientsdialog.cpp:214
-#, fuzzy
msgid "Weight"
-msgstr "&სიმაღლე:"
+msgstr "წონა"
#: src/dialogs/ingredientsdialog.cpp:215
-#, fuzzy
msgid "Per Amount"
-msgstr "რაოდენობა"
+msgstr "თითოეული რაოდენობისთვის"
#: src/dialogs/ingredientsdialog.cpp:252
msgid "Load USDA data"
@@ -3169,22 +3151,20 @@ msgid "Paste Ingredients"
msgstr "ინგრედიენტის ჩასმა"
#: src/dialogs/recipeinputdialog.cpp:361
-#, fuzzy
msgid "Property Status:"
-msgstr "თვისების სახელი:"
+msgstr "თვისების სტატუსი:"
#: src/dialogs/recipeinputdialog.cpp:365
msgid "Details..."
-msgstr ""
+msgstr "დეტალები..."
#: src/dialogs/recipeinputdialog.cpp:376
msgid "Update"
-msgstr ""
+msgstr "განახლება"
#: src/dialogs/recipeinputdialog.cpp:378
-#, fuzzy
msgid "Property details"
-msgstr "მდგომარეობა არსებობს"
+msgstr "მდგომარეობის დეტალები"
#: src/dialogs/recipeinputdialog.cpp:408
msgid "Check spelling"
@@ -3289,7 +3269,7 @@ msgstr ""
#: src/dialogs/recipeinputdialog.cpp:1532
#: src/dialogs/selectpropertydialog.cpp:110 src/dialogs/selectunitdialog.cpp:69
msgid "-No unit-"
-msgstr ""
+msgstr "-ერთეულის გარეშე-"
#: src/dialogs/recipeinputdialog.cpp:1538
msgid ""
@@ -3323,9 +3303,8 @@ msgid ""
msgstr ""
#: src/dialogs/recipeinputdialog.cpp:1571
-#, fuzzy
msgid "Complete"
-msgstr "კომენტარი"
+msgstr "დასრულდა"
#: src/dialogs/recipeinputdialog.cpp:1576
msgid "Complete, but approximations made"
@@ -3333,7 +3312,7 @@ msgstr ""
#: src/dialogs/recipeinputdialog.cpp:1582
msgid "Incomplete"
-msgstr ""
+msgstr "დაუსრულებელი"
#: src/dialogs/recipeinputdialog.cpp:1597
msgid ""
@@ -3348,9 +3327,8 @@ msgid ""
msgstr ""
#: src/dialogs/recipeprintpreview.cpp:22
-#, fuzzy
msgid "Print Preview"
-msgstr "გვერდის წინასწარ ნახვა"
+msgstr "ბეჭდვის გადახედვა"
#: src/dialogs/recipeprintpreview.cpp:27
msgid "&Print"
@@ -3488,7 +3466,7 @@ msgstr "ინგრედიენტი 2"
#: src/dialogs/setupdisplay.cpp:90 src/widgets/ratingdisplaywidget.ui:113
#, no-c-format
msgid "Rater"
-msgstr ""
+msgstr "კატეგორია"
#: src/dialogs/setupdisplay.cpp:91
msgid "Comment"
@@ -3573,17 +3551,15 @@ msgstr "ყველა კატეგორია"
#: src/dialogs/similarcategoriesdialog.cpp:138
msgid "Threshold:"
-msgstr ""
+msgstr "ზღვარი:"
#: src/dialogs/similarcategoriesdialog.cpp:139
-#, fuzzy
msgid "Category:"
-msgstr "კატეგორია"
+msgstr "კატეგორია:"
#: src/dialogs/similarcategoriesdialog.cpp:140
-#, fuzzy
msgid "Search"
-msgstr "ძიება:"
+msgstr "ძებნა"
#: src/dialogs/similarcategoriesdialog.cpp:141
#, fuzzy
@@ -3592,11 +3568,11 @@ msgstr "ყველა კატეგორია"
#: src/dialogs/similarcategoriesdialog.cpp:142
msgid "<<"
-msgstr ""
+msgstr "<<"
#: src/dialogs/similarcategoriesdialog.cpp:143
msgid ">>"
-msgstr ""
+msgstr ">>"
#: src/dialogs/similarcategoriesdialog.cpp:144
#, fuzzy
@@ -3605,7 +3581,7 @@ msgstr "კატეგორიები >>"
#: src/dialogs/similarcategoriesdialog.cpp:145
msgid "Merge"
-msgstr ""
+msgstr "შერწყმა"
#: src/dialogs/similarcategoriesdialog.cpp:148
#: src/dialogs/similarcategoriesdialog.cpp:150
@@ -3629,14 +3605,12 @@ msgid "No categories selected to merge."
msgstr "რეცეპტი არაა არჩეული."
#: src/dialogs/unitsdialog.cpp:63
-#, fuzzy
msgid "Mass Conversions"
-msgstr "ერთეულთა კონვერტორი"
+msgstr "წონის გადაყვანა"
#: src/dialogs/unitsdialog.cpp:66
-#, fuzzy
msgid "Volume Conversions"
-msgstr "ერთეულთა კონვერტორი"
+msgstr "მოცულობის გადაყვანა"
#: src/dialogs/unitsdialog.cpp:174
msgid "Finding Unit Ratios"
@@ -3673,7 +3647,7 @@ msgstr "Krecipes რეცეპტები"
#: src/exporters/plaintextexporter.cpp:116
#: src/exporters/plaintextexporter.cpp:126
msgid "or"
-msgstr ""
+msgstr "ან"
#: src/exporters/htmlexporter.cpp:520
#, fuzzy
@@ -4251,20 +4225,19 @@ msgstr "tsiskreli@gmail.com"
#: src/mmdata.h:26
msgid "bunch"
-msgstr ""
+msgstr "კონა"
#: src/mmdata.h:26
msgid "bunches"
-msgstr ""
+msgstr "კონა"
#: src/mmdata.h:27
-#, fuzzy
msgid "cup"
-msgstr "სარეზერვო ასლი"
+msgstr "ჭიქა"
#: src/mmdata.h:27
msgid "cups"
-msgstr ""
+msgstr "ჭიქა"
#: src/mmdata.h:28
msgid "cubic cm"
@@ -4272,79 +4245,79 @@ msgstr ""
#: src/mmdata.h:29
msgid "centigram"
-msgstr ""
+msgstr "ცენტიგრამი"
#: src/mmdata.h:29
msgid "centigrams"
-msgstr ""
+msgstr "ცენტიგრამი"
#: src/mmdata.h:30
msgid "centiliter"
-msgstr ""
+msgstr "ცენტილიტრი"
#: src/mmdata.h:30
msgid "centiliters"
-msgstr ""
+msgstr "ცენტილიტრი"
#: src/mmdata.h:31
msgid "can"
-msgstr ""
+msgstr "ქილა"
#: src/mmdata.h:31
msgid "cans"
-msgstr ""
+msgstr "ქილა"
#: src/mmdata.h:32
msgid "carton"
-msgstr ""
+msgstr "მუყაო"
#: src/mmdata.h:32
msgid "cartons"
-msgstr ""
+msgstr "მუყაო"
#: src/mmdata.h:33
msgid "decigram"
-msgstr ""
+msgstr "დეციგრამი"
#: src/mmdata.h:33
msgid "decigrams"
-msgstr ""
+msgstr "დეციგრამი"
#: src/mmdata.h:34
msgid "deciliter"
-msgstr ""
+msgstr "დეცილიტრი"
#: src/mmdata.h:34
msgid "deciliters"
-msgstr ""
+msgstr "დეცილიტრი"
#: src/mmdata.h:35
msgid "drop"
-msgstr ""
+msgstr "დაგდება"
#: src/mmdata.h:35
msgid "drops"
-msgstr ""
+msgstr "დაგდება"
#: src/mmdata.h:36
msgid "dash"
-msgstr ""
+msgstr "ტირე"
#: src/mmdata.h:36
msgid "dashes"
-msgstr ""
+msgstr "ტირე"
#: src/mmdata.h:37
msgid "each"
-msgstr ""
+msgstr "თითოეული"
#: src/mmdata.h:38
msgid "kilogram"
-msgstr ""
+msgstr "კილოგრამი"
#: src/mmdata.h:38
msgid "kilograms"
-msgstr ""
+msgstr "კილოგრამი"
#: src/mmdata.h:39
msgid "fluid ounce"
@@ -4356,128 +4329,127 @@ msgstr ""
#: src/mmdata.h:40
msgid "gram"
-msgstr ""
+msgstr "გრამი"
#: src/mmdata.h:40
msgid "grams"
-msgstr ""
+msgstr "გრამი"
#: src/mmdata.h:41
msgid "gallon"
-msgstr ""
+msgstr "გალონი"
#: src/mmdata.h:41
msgid "gallons"
-msgstr ""
+msgstr "გალონი"
#: src/mmdata.h:42
-#, fuzzy
msgid "liter"
-msgstr "კრიტერიუმი"
+msgstr "ლიტრი"
#: src/mmdata.h:42
msgid "liters"
-msgstr ""
+msgstr "ლიტრი"
#: src/mmdata.h:43
msgid "pound"
-msgstr ""
+msgstr "გირვანქა"
#: src/mmdata.h:43
msgid "pounds"
-msgstr ""
+msgstr "გირვანქა"
#: src/mmdata.h:44
msgid "large"
-msgstr ""
+msgstr "დიდი"
#: src/mmdata.h:45
msgid "medium"
-msgstr ""
+msgstr "საშუალო"
#: src/mmdata.h:46
msgid "milligram"
-msgstr ""
+msgstr "მილიგრამი"
#: src/mmdata.h:46
msgid "milligrams"
-msgstr ""
+msgstr "მილიგრამი"
#: src/mmdata.h:47
msgid "milliliter"
-msgstr ""
+msgstr "მილილიტრი"
#: src/mmdata.h:47
msgid "milliliters"
-msgstr ""
+msgstr "მილილიტრი"
#: src/mmdata.h:48 src/mmdata.h:49
msgid "package"
-msgstr ""
+msgstr "პაკეტი"
#: src/mmdata.h:48 src/mmdata.h:49
msgid "packages"
-msgstr ""
+msgstr "პაკეტი"
#: src/mmdata.h:50
msgid "pinch"
-msgstr ""
+msgstr "მწიკვი"
#: src/mmdata.h:50
msgid "pinches"
-msgstr ""
+msgstr "მწიკვი"
#: src/mmdata.h:51
msgid "pint"
-msgstr ""
+msgstr "პინტი"
#: src/mmdata.h:51
msgid "pints"
-msgstr ""
+msgstr "პინტა"
#: src/mmdata.h:52
msgid "ounce"
-msgstr ""
+msgstr "უნცია"
#: src/mmdata.h:52
msgid "ounces"
-msgstr ""
+msgstr "უნცია"
#: src/mmdata.h:53
msgid "quart"
-msgstr ""
+msgstr "კვარტი"
#: src/mmdata.h:53
msgid "quarts"
-msgstr ""
+msgstr "კვარტი"
#: src/mmdata.h:54
msgid "slice"
-msgstr ""
+msgstr "თხელი ფენა"
#: src/mmdata.h:54
msgid "slices"
-msgstr ""
+msgstr "თხელი ფენა"
#: src/mmdata.h:55
msgid "small"
-msgstr ""
+msgstr "პატარა"
#: src/mmdata.h:56 src/mmdata.h:58
msgid "teaspoon"
-msgstr ""
+msgstr "ჩაის კოვზი"
#: src/mmdata.h:56 src/mmdata.h:58
msgid "teaspoons"
-msgstr ""
+msgstr "ჩაის კოვზი"
#: src/mmdata.h:57 src/mmdata.h:59
msgid "tablespoon"
-msgstr ""
+msgstr "სუფრის კოვზი"
#: src/mmdata.h:57 src/mmdata.h:59
msgid "tablespoons"
-msgstr ""
+msgstr "სუფრის კოვზი"
#: src/mmdata.h:60
#, fuzzy
@@ -5084,9 +5056,8 @@ msgid "Loading recipes"
msgstr "რეცეპტის ჩატვირთვა"
#: src/widgets/unitlistview.cpp:117 src/widgets/unitlistview.cpp:119
-#, fuzzy
msgid "Abbreviation"
-msgstr "წილადი"
+msgstr "აბრევიატურა"
#: src/widgets/unitlistview.cpp:118
msgid "Plural"
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-08 22:26:07 +0000