Projects
Multimedia
LiVES
Sign Up
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 29
View file
LiVES.changes
Changed
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sun Nov 29 12:52:19 UTC 2015 - avvissu@yandex.ru + +- Update to 2.4.4: + * see: /usr/share/doc/packages/lives/ChangeLog + +------------------------------------------------------------------- Sun Nov 15 13:39:18 UTC 2015 - avvissu@yandex.ru - Update to 2.4.3:
View file
LiVES.spec
Changed
@@ -20,7 +20,7 @@ %define soname 0 Name: LiVES -Version: 2.4.3 +Version: 2.4.4 Release: 0 Summary: Video Editor and VJ Tool License: GPL-2.0+ @@ -196,11 +196,9 @@ %find_lang lives %post -n libweed%{soname} -p /sbin/ldconfig - %postun -n libweed%{soname} -p /sbin/ldconfig %post -n libOSC%{soname} -p /sbin/ldconfig - %postun -n libOSC%{soname} -p /sbin/ldconfig %files
View file
LiVES-2.4.3.tar.bz2/ChangeLog -> LiVES-2.4.4.tar.bz2/ChangeLog
Changed
@@ -1,3 +1,19 @@ +Version 2.4.4 (22 November 2015) +-------------------------------- +Fix regression in audio resampling with sox. +GUI improvements to joystick / midi learner for gtk+ 3.x +GUI improvements for Events window. +Add support for joystick analog stick control. +Add improved warnings for letterboxing with missing imageMagick. +Fix overwide Clip Info windows. + + + + + + + + Version 2.4.3 (15 November 2015) -------------------------------- Fix occasional hang when inserting frames in clips.
View file
LiVES-2.4.3.tar.bz2/LiVES.doxygen -> LiVES-2.4.4.tar.bz2/LiVES.doxygen
Changed
@@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.4.3 +PROJECT_NUMBER = 2.4.4 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a
View file
LiVES-2.4.3.tar.bz2/README -> LiVES-2.4.4.tar.bz2/README
Changed
@@ -64,16 +64,16 @@ If you got LiVES as a tar.gz or tar.bz2, at a terminal prompt, enter the following: - bzip2 -d LiVES-2.4.3.tar.bz2 + bzip2 -d LiVES-2.4.4.tar.bz2 or, - gzip -d LiVES-2.4.3.tar.gz + gzip -d LiVES-2.4.4.tar.gz depending on which version you have. Then: - tar xvf LIVES-2.4.3.tar + tar xvf LIVES-2.4.4.tar - cd lives-2.4.3 + cd lives-2.4.4
View file
LiVES-2.4.3.tar.bz2/build-lives-rfx-plugin -> LiVES-2.4.4.tar.bz2/build-lives-rfx-plugin
Changed
@@ -78,7 +78,7 @@ } -$builder_version="2.4.3"; +$builder_version="2.4.4"; if ($in_channels==0&&$properties&0x0004) { #batch mode generator
View file
LiVES-2.4.3.tar.bz2/configure -> LiVES-2.4.4.tar.bz2/configure
Changed
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for LiVES 2.4.3. +# Generated by GNU Autoconf 2.69 for LiVES 2.4.4. # # Report bugs to <https://sourceforge.net/p/lives/bugs/>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='LiVES' PACKAGE_TARNAME='lives' -PACKAGE_VERSION='2.4.3' -PACKAGE_STRING='LiVES 2.4.3' +PACKAGE_VERSION='2.4.4' +PACKAGE_STRING='LiVES 2.4.4' PACKAGE_BUGREPORT='https://sourceforge.net/p/lives/bugs/' PACKAGE_URL='' @@ -1699,7 +1699,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 LiVES 2.4.3 to adapt to many kinds of systems. +\`configure' configures LiVES 2.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1770,7 +1770,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of LiVES 2.4.3:";; + short | recursive ) echo "Configuration of LiVES 2.4.4:";; esac cat <<\_ACEOF @@ -2028,7 +2028,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -LiVES configure 2.4.3 +LiVES configure 2.4.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2755,7 +2755,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by LiVES $as_me 2.4.3, which was +It was created by LiVES $as_me 2.4.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3736,7 +3736,7 @@ # Define the identity of the package. PACKAGE='lives' - VERSION='2.4.3' + VERSION='2.4.4' cat >>confdefs.h <<_ACEOF @@ -29548,7 +29548,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by LiVES $as_me 2.4.3, which was +This file was extended by LiVES $as_me 2.4.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29605,7 +29605,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -LiVES config.status 2.4.3 +LiVES config.status 2.4.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\"
View file
LiVES-2.4.3.tar.bz2/configure.ac -> LiVES-2.4.4.tar.bz2/configure.ac
Changed
@@ -5,7 +5,7 @@ [m4_pattern_allow([^AC_.*])]) dnl IMPORTANT !! $version must also be set to exactly the same string in smogrify -AC_INIT(LiVES,2.4.3,https://sourceforge.net/p/lives/bugs/) +AC_INIT(LiVES,2.4.4,https://sourceforge.net/p/lives/bugs/) AC_CANONICAL_HOST AC_CANONICAL_TARGET
View file
LiVES-2.4.3.tar.bz2/intl/bindtextdom.c -> LiVES-2.4.4.tar.bz2/intl/bindtextdom.c
Changed
@@ -49,7 +49,7 @@ /* @@ end of prolog @@ */ /* Lock variable to protect the global data in the gettext implementation. */ -gl_rwlock_define(extern, _nl_state_lock attribute_hidden) +gl_rwlock_define (extern, _nl_state_lock attribute_hidden) /* Names for the libintl functions are a problem. They must not clash @@ -74,236 +74,267 @@ If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither modified nor returned. */ static void -set_binding_values(const char *domainname, - const char **dirnamep, const char **codesetp) { +set_binding_values (const char *domainname, + const char **dirnamep, const char **codesetp) +{ struct binding *binding; int modified; /* Some sanity checks. */ - if (domainname == NULL || domainname[0] == '\0') { - if (dirnamep) - *dirnamep = NULL; - if (codesetp) - *codesetp = NULL; - return; - } + if (domainname == NULL || domainname[0] == '\0') + { + if (dirnamep) + *dirnamep = NULL; + if (codesetp) + *codesetp = NULL; + return; + } - gl_rwlock_wrlock(_nl_state_lock); + gl_rwlock_wrlock (_nl_state_lock); modified = 0; - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) { - int compare = strcmp(domainname, binding->domainname); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) { - /* It is not in the list. */ - binding = NULL; - break; + for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) + { + int compare = strcmp (domainname, binding->domainname); + if (compare == 0) + /* We found it! */ + break; + if (compare < 0) + { + /* It is not in the list. */ + binding = NULL; + break; + } } - } - - if (binding != NULL) { - if (dirnamep) { - const char *dirname = *dirnamep; - - if (dirname == NULL) - /* The current binding has be to returned. */ - *dirnamep = binding->dirname; - else { - /* The domain is already bound. If the new value and the old - one are equal we simply do nothing. Otherwise replace the - old binding. */ - char *result = binding->dirname; - if (strcmp(dirname, result) != 0) { - if (strcmp(dirname, _nl_default_dirname) == 0) - result = (char *) _nl_default_dirname; - else { + + if (binding != NULL) + { + if (dirnamep) + { + const char *dirname = *dirnamep; + + if (dirname == NULL) + /* The current binding has be to returned. */ + *dirnamep = binding->dirname; + else + { + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + char *result = binding->dirname; + if (strcmp (dirname, result) != 0) + { + if (strcmp (dirname, _nl_default_dirname) == 0) + result = (char *) _nl_default_dirname; + else + { #if defined _LIBC || defined HAVE_STRDUP - result = strdup(dirname); + result = strdup (dirname); #else - size_t len = strlen(dirname) + 1; - result = (char *) malloc(len); - if (__builtin_expect(result != NULL, 1)) - memcpy(result, dirname, len); + size_t len = strlen (dirname) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result != NULL, 1)) + memcpy (result, dirname, len); #endif - } - - if (__builtin_expect(result != NULL, 1)) { - if (binding->dirname != _nl_default_dirname) - free(binding->dirname); - - binding->dirname = result; - modified = 1; - } - } - *dirnamep = result; - } - } + } - if (codesetp) { - const char *codeset = *codesetp; - - if (codeset == NULL) - /* The current binding has be to returned. */ - *codesetp = binding->codeset; - else { - /* The domain is already bound. If the new value and the old - one are equal we simply do nothing. Otherwise replace the - old binding. */ - char *result = binding->codeset; - if (result == NULL || strcmp(codeset, result) != 0) { + if (__builtin_expect (result != NULL, 1)) + { + if (binding->dirname != _nl_default_dirname) + free (binding->dirname); + + binding->dirname = result; + modified = 1; + } + } + *dirnamep = result; + } + } + + if (codesetp) + { + const char *codeset = *codesetp; + + if (codeset == NULL) + /* The current binding has be to returned. */ + *codesetp = binding->codeset; + else + { + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + char *result = binding->codeset; + if (result == NULL || strcmp (codeset, result) != 0) + { #if defined _LIBC || defined HAVE_STRDUP - result = strdup(codeset); + result = strdup (codeset); #else - size_t len = strlen(codeset) + 1; - result = (char *) malloc(len); - if (__builtin_expect(result != NULL, 1)) - memcpy(result, codeset, len); + size_t len = strlen (codeset) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result != NULL, 1)) + memcpy (result, codeset, len); #endif - if (__builtin_expect(result != NULL, 1)) { - if (binding->codeset != NULL) - free(binding->codeset); - - binding->codeset = result; - modified = 1; - } - } - *codesetp = result; - } + if (__builtin_expect (result != NULL, 1)) + { + if (binding->codeset != NULL)
View file
LiVES-2.4.3.tar.bz2/intl/dcgettext.c -> LiVES-2.4.4.tar.bz2/intl/dcgettext.c
Changed
@@ -44,12 +44,13 @@ /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale. */ char * -DCGETTEXT(const char *domainname, const char *msgid, int category) { - return DCIGETTEXT(domainname, msgid, NULL, 0, 0, category); +DCGETTEXT (const char *domainname, const char *msgid, int category) +{ + return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); } #ifdef _LIBC /* Alias for function name in GNU C Library. */ INTDEF(__dcgettext) -weak_alias(__dcgettext, dcgettext); +weak_alias (__dcgettext, dcgettext); #endif
View file
LiVES-2.4.3.tar.bz2/intl/dcigettext.c -> LiVES-2.4.4.tar.bz2/intl/dcigettext.c
Changed
@@ -44,10 +44,10 @@ # include <alloca.h> # else # ifdef _AIX -#pragma alloca + #pragma alloca # else # ifndef alloca -char *alloca(); +char *alloca (); # endif # endif # endif @@ -73,8 +73,8 @@ #include <locale.h> #ifdef _LIBC -/* Guess whether integer division by zero raises signal SIGFPE. - Set to 1 only if you know for sure. In case of doubt, set to 0. */ + /* Guess whether integer division by zero raises signal SIGFPE. + Set to 1 only if you know for sure. In case of doubt, set to 0. */ # if defined __alpha__ || defined __arm__ || defined __i386__ \ || defined __m68k__ || defined __s390__ # define INTDIV0_RAISES_SIGFPE 1 @@ -146,20 +146,20 @@ # define tfind __tfind #else # if !defined HAVE_GETCWD -char *getwd(); +char *getwd (); # define getcwd(buf, max) getwd (buf) # else # if VMS # define getcwd(buf, max) (getcwd) (buf, max, 0) # else -char *getcwd(); +char *getcwd (); # endif # endif # ifndef HAVE_STPCPY -static char *stpcpy(char *dest, const char *src); +static char *stpcpy (char *dest, const char *src); # endif # ifndef HAVE_MEMPCPY -static void *mempcpy(void *dest, const void *src, size_t n); +static void *mempcpy (void *dest, const void *src, size_t n); # endif #endif @@ -218,7 +218,7 @@ IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. */ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -/* Win32, Cygwin, OS/2, DOS */ + /* Win32, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') # define HAS_DEVICE(P) \ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ @@ -227,7 +227,7 @@ # define IS_PATH_WITH_DIR(P) \ (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) #else -/* Unix */ + /* Unix */ # define ISSLASH(C) ((C) == '/') # define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) # define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) @@ -240,7 +240,8 @@ /* This is the type used for the search tree where known translations are stored. */ -struct known_translation_t { +struct known_translation_t +{ /* Domain in which to search. */ const char *domainname; @@ -271,14 +272,15 @@ char msgid[ZERO]; }; -gl_rwlock_define_initialized(static, tree_lock) +gl_rwlock_define_initialized (static, tree_lock) /* Root of the search tree with known translations. */ static void *root; /* Function to compare two entries in the table of known translations. */ static int -transcmp(const void *p1, const void *p2) { +transcmp (const void *p1, const void *p2) +{ const struct known_translation_t *s1; const struct known_translation_t *s2; int result; @@ -286,26 +288,28 @@ s1 = (const struct known_translation_t *) p1; s2 = (const struct known_translation_t *) p2; - result = strcmp(s1->msgid, s2->msgid); - if (result == 0) { - result = strcmp(s1->domainname, s2->domainname); - if (result == 0) { -#ifdef HAVE_PER_THREAD_LOCALE - result = strcmp(s1->localename, s2->localename); + result = strcmp (s1->msgid, s2->msgid); + if (result == 0) + { + result = strcmp (s1->domainname, s2->domainname); if (result == 0) + { +#ifdef HAVE_PER_THREAD_LOCALE + result = strcmp (s1->localename, s2->localename); + if (result == 0) #endif - { + { #ifdef IN_LIBGLOCALE - result = strcmp(s1->encoding, s2->encoding); - if (result == 0) -#endif - /* We compare the category last (though this is the cheapest - operation) since it is hopefully always the same (namely - LC_MESSAGES). */ - result = s1->category - s2->category; - } + result = strcmp (s1->encoding, s2->encoding); + if (result == 0) +#endif + /* We compare the category last (though this is the cheapest + operation) since it is hopefully always the same (namely + LC_MESSAGES). */ + result = s1->category - s2->category; + } + } } - } return result; } @@ -317,7 +321,7 @@ #ifndef IN_LIBGLOCALE /* Value used as the default domain for gettext(3). */ const char *_nl_current_default_domain attribute_hidden - = _nl_default_default_domain; + = _nl_default_default_domain; #endif /* Contains the default location of the message catalogs. */ @@ -326,11 +330,11 @@ #else # ifdef _LIBC extern const char _nl_default_dirname[]; -libc_hidden_proto(_nl_default_dirname) +libc_hidden_proto (_nl_default_dirname) # endif const char _nl_default_dirname[] = LOCALEDIR; # ifdef _LIBC -libc_hidden_data_def(_nl_default_dirname) +libc_hidden_data_def (_nl_default_dirname) # endif #endif @@ -341,20 +345,20 @@ #endif /* Prototypes for local functions. */ -static char *plural_lookup(struct loaded_l10nfile *domain, - unsigned long int n, - const char *translation, size_t translation_len) -internal_function; +static char *plural_lookup (struct loaded_l10nfile *domain, + unsigned long int n, + const char *translation, size_t translation_len) + internal_function; #ifdef IN_LIBGLOCALE -static const char *guess_category_value(int category, - const char *categoryname, - const char *localename) -internal_function; +static const char *guess_category_value (int category, + const char *categoryname, + const char *localename) + internal_function; #else -static const char *guess_category_value(int category, - const char *categoryname) -internal_function; +static const char *guess_category_value (int category, + const char *categoryname) + internal_function; #endif #ifdef _LIBC @@ -362,11 +366,11 @@ # define category_to_name(category) \ _nl_category_names.str + _nl_category_name_idxs[category] #else -static const char *category_to_name(int category) internal_function;
View file
LiVES-2.4.3.tar.bz2/intl/dcngettext.c -> LiVES-2.4.4.tar.bz2/intl/dcngettext.c
Changed
@@ -44,13 +44,14 @@ /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY locale. */ char * -DCNGETTEXT(const char *domainname, - const char *msgid1, const char *msgid2, unsigned long int n, - int category) { - return DCIGETTEXT(domainname, msgid1, msgid2, 1, n, category); +DCNGETTEXT (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n, + int category) +{ + return DCIGETTEXT (domainname, msgid1, msgid2, 1, n, category); } #ifdef _LIBC /* Alias for function name in GNU C Library. */ -weak_alias(__dcngettext, dcngettext); +weak_alias (__dcngettext, dcngettext); #endif
View file
LiVES-2.4.3.tar.bz2/intl/dgettext.c -> LiVES-2.4.4.tar.bz2/intl/dgettext.c
Changed
@@ -47,11 +47,12 @@ /* Look up MSGID in the DOMAINNAME message catalog of the current LC_MESSAGES locale. */ char * -DGETTEXT(const char *domainname, const char *msgid) { - return DCGETTEXT(domainname, msgid, LC_MESSAGES); +DGETTEXT (const char *domainname, const char *msgid) +{ + return DCGETTEXT (domainname, msgid, LC_MESSAGES); } #ifdef _LIBC /* Alias for function name in GNU C Library. */ -weak_alias(__dgettext, dgettext); +weak_alias (__dgettext, dgettext); #endif
View file
LiVES-2.4.3.tar.bz2/intl/dngettext.c -> LiVES-2.4.4.tar.bz2/intl/dngettext.c
Changed
@@ -47,12 +47,13 @@ /* Look up MSGID in the DOMAINNAME message catalog of the current LC_MESSAGES locale and skip message according to the plural form. */ char * -DNGETTEXT(const char *domainname, - const char *msgid1, const char *msgid2, unsigned long int n) { - return DCNGETTEXT(domainname, msgid1, msgid2, n, LC_MESSAGES); +DNGETTEXT (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n) +{ + return DCNGETTEXT (domainname, msgid1, msgid2, n, LC_MESSAGES); } #ifdef _LIBC /* Alias for function name in GNU C Library. */ -weak_alias(__dngettext, dngettext); +weak_alias (__dngettext, dngettext); #endif
View file
LiVES-2.4.3.tar.bz2/intl/eval-plural.h -> LiVES-2.4.4.tar.bz2/intl/eval-plural.h
Changed
@@ -24,77 +24,85 @@ STATIC unsigned long int internal_function -plural_eval(const struct expression *pexp, unsigned long int n) { - switch (pexp->nargs) { - case 0: - switch (pexp->operation) { - case var: - return n; - case num: - return pexp->val.num; - default: +plural_eval (const struct expression *pexp, unsigned long int n) +{ + switch (pexp->nargs) + { + case 0: + switch (pexp->operation) + { + case var: + return n; + case num: + return pexp->val.num; + default: + break; + } + /* NOTREACHED */ break; - } - /* NOTREACHED */ - break; - case 1: { - /* pexp->operation must be lnot. */ - unsigned long int arg = plural_eval(pexp->val.args[0], n); - return ! arg; - } - case 2: { - unsigned long int leftarg = plural_eval(pexp->val.args[0], n); - if (pexp->operation == lor) - return leftarg || plural_eval(pexp->val.args[1], n); - else if (pexp->operation == land) - return leftarg && plural_eval(pexp->val.args[1], n); - else { - unsigned long int rightarg = plural_eval(pexp->val.args[1], n); + case 1: + { + /* pexp->operation must be lnot. */ + unsigned long int arg = plural_eval (pexp->val.args[0], n); + return ! arg; + } + case 2: + { + unsigned long int leftarg = plural_eval (pexp->val.args[0], n); + if (pexp->operation == lor) + return leftarg || plural_eval (pexp->val.args[1], n); + else if (pexp->operation == land) + return leftarg && plural_eval (pexp->val.args[1], n); + else + { + unsigned long int rightarg = plural_eval (pexp->val.args[1], n); - switch (pexp->operation) { - case mult: - return leftarg * rightarg; - case divide: + switch (pexp->operation) + { + case mult: + return leftarg * rightarg; + case divide: #if !INTDIV0_RAISES_SIGFPE - if (rightarg == 0) - raise(SIGFPE); + if (rightarg == 0) + raise (SIGFPE); #endif - return leftarg / rightarg; - case module: + return leftarg / rightarg; + case module: #if !INTDIV0_RAISES_SIGFPE - if (rightarg == 0) - raise(SIGFPE); + if (rightarg == 0) + raise (SIGFPE); #endif - return leftarg % rightarg; - case plus: - return leftarg + rightarg; - case minus: - return leftarg - rightarg; - case less_than: - return leftarg < rightarg; - case greater_than: - return leftarg > rightarg; - case less_or_equal: - return leftarg <= rightarg; - case greater_or_equal: - return leftarg >= rightarg; - case equal: - return leftarg == rightarg; - case not_equal: - return leftarg != rightarg; - default: - break; + return leftarg % rightarg; + case plus: + return leftarg + rightarg; + case minus: + return leftarg - rightarg; + case less_than: + return leftarg < rightarg; + case greater_than: + return leftarg > rightarg; + case less_or_equal: + return leftarg <= rightarg; + case greater_or_equal: + return leftarg >= rightarg; + case equal: + return leftarg == rightarg; + case not_equal: + return leftarg != rightarg; + default: + break; + } + } + /* NOTREACHED */ + break; + } + case 3: + { + /* pexp->operation must be qmop. */ + unsigned long int boolarg = plural_eval (pexp->val.args[0], n); + return plural_eval (pexp->val.args[boolarg ? 1 : 2], n); } } - /* NOTREACHED */ - break; - } - case 3: { - /* pexp->operation must be qmop. */ - unsigned long int boolarg = plural_eval(pexp->val.args[0], n); - return plural_eval(pexp->val.args[boolarg ? 1 : 2], n); - } - } /* NOTREACHED */ return 0; }
View file
LiVES-2.4.3.tar.bz2/intl/explodename.c -> LiVES-2.4.4.tar.bz2/intl/explodename.c
Changed
@@ -40,10 +40,11 @@ /* Split a locale name NAME into a leading language part and all the rest. Return a pointer to the first character after the language, i.e. to the first byte of the rest. */ -static char *_nl_find_language(const char *name); +static char *_nl_find_language (const char *name); static char * -_nl_find_language(const char *name) { +_nl_find_language (const char *name) +{ while (name[0] != '\0' && name[0] != '_' && name[0] != '@' && name[0] != '.') ++name; @@ -52,10 +53,11 @@ int -_nl_explode_name(char *name, - const char **language, const char **modifier, - const char **territory, const char **codeset, - const char **normalized_codeset) { +_nl_explode_name (char *name, + const char **language, const char **modifier, + const char **territory, const char **codeset, + const char **normalized_codeset) +{ char *cp; int mask; @@ -68,55 +70,60 @@ look for the language. Termination symbols are `_', '.', and `@'. */ mask = 0; *language = cp = name; - cp = _nl_find_language(*language); + cp = _nl_find_language (*language); if (*language == cp) /* This does not make sense: language has to be specified. Use this entry as it is without exploding. Perhaps it is an alias. */ - cp = strchr(*language, '\0'); - else { - if (cp[0] == '_') { - /* Next is the territory. */ - cp[0] = '\0'; - *territory = ++cp; - - while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@') - ++cp; - - mask |= XPG_TERRITORY; + cp = strchr (*language, '\0'); + else + { + if (cp[0] == '_') + { + /* Next is the territory. */ + cp[0] = '\0'; + *territory = ++cp; + + while (cp[0] != '\0' && cp[0] != '.' && cp[0] != '@') + ++cp; + + mask |= XPG_TERRITORY; + } + + if (cp[0] == '.') + { + /* Next is the codeset. */ + cp[0] = '\0'; + *codeset = ++cp; + + while (cp[0] != '\0' && cp[0] != '@') + ++cp; + + mask |= XPG_CODESET; + + if (*codeset != cp && (*codeset)[0] != '\0') + { + *normalized_codeset = _nl_normalize_codeset (*codeset, + cp - *codeset); + if (*normalized_codeset == NULL) + return -1; + else if (strcmp (*codeset, *normalized_codeset) == 0) + free ((char *) *normalized_codeset); + else + mask |= XPG_NORM_CODESET; + } + } } - if (cp[0] == '.') { - /* Next is the codeset. */ + if (cp[0] == '@') + { + /* Next is the modifier. */ cp[0] = '\0'; - *codeset = ++cp; - - while (cp[0] != '\0' && cp[0] != '@') - ++cp; - - mask |= XPG_CODESET; - - if (*codeset != cp && (*codeset)[0] != '\0') { - *normalized_codeset = _nl_normalize_codeset(*codeset, - cp - *codeset); - if (*normalized_codeset == NULL) - return -1; - else if (strcmp(*codeset, *normalized_codeset) == 0) - free((char *) *normalized_codeset); - else - mask |= XPG_NORM_CODESET; - } - } - } - - if (cp[0] == '@') { - /* Next is the modifier. */ - cp[0] = '\0'; - *modifier = ++cp; + *modifier = ++cp; - if (cp[0] != '\0') - mask |= XPG_MODIFIER; - } + if (cp[0] != '\0') + mask |= XPG_MODIFIER; + } if (*territory != NULL && (*territory)[0] == '\0') mask &= ~XPG_TERRITORY;
View file
LiVES-2.4.3.tar.bz2/intl/finddomain.c -> LiVES-2.4.4.tar.bz2/intl/finddomain.c
Changed
@@ -57,9 +57,10 @@ the DOMAINNAME and CATEGORY parameters with respect to the currently established bindings. */ struct loaded_l10nfile * - internal_function -_nl_find_domain(const char *dirname, char *locale, - const char *domainname, struct binding *domainbinding) { +internal_function +_nl_find_domain (const char *dirname, char *locale, + const char *domainname, struct binding *domainbinding) +{ struct loaded_l10nfile *retval; const char *language; const char *modifier; @@ -71,115 +72,120 @@ /* LOCALE can consist of up to four recognized parts for the XPG syntax: - language[_territory][.codeset][@modifier] + language[_territory][.codeset][@modifier] Beside the first part all of them are allowed to be missing. If the full specified locale is not found, the less specific one are looked for. The various parts will be stripped off according to the following order: - (1) codeset - (2) normalized codeset - (3) territory - (4) modifier + (1) codeset + (2) normalized codeset + (3) territory + (4) modifier */ /* We need to protect modifying the _NL_LOADED_DOMAINS data. */ - gl_rwlock_define_initialized(static, lock); - gl_rwlock_rdlock(lock); + gl_rwlock_define_initialized (static, lock); + gl_rwlock_rdlock (lock); /* If we have already tested for this locale entry there has to be one data set in the list of loaded domains. */ - retval = _nl_make_l10nflist(&_nl_loaded_domains, dirname, - strlen(dirname) + 1, 0, locale, NULL, NULL, - NULL, NULL, domainname, 0); + retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, + strlen (dirname) + 1, 0, locale, NULL, NULL, + NULL, NULL, domainname, 0); - gl_rwlock_unlock(lock); + gl_rwlock_unlock (lock); - if (retval != NULL) { - /* We know something about this locale. */ - int cnt; + if (retval != NULL) + { + /* We know something about this locale. */ + int cnt; - if (retval->decided <= 0) - _nl_load_domain(retval, domainbinding); + if (retval->decided <= 0) + _nl_load_domain (retval, domainbinding); - if (retval->data != NULL) - return retval; + if (retval->data != NULL) + return retval; - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) { - if (retval->successor[cnt]->decided <= 0) - _nl_load_domain(retval->successor[cnt], domainbinding); + for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) + { + if (retval->successor[cnt]->decided <= 0) + _nl_load_domain (retval->successor[cnt], domainbinding); - if (retval->successor[cnt]->data != NULL) - break; - } + if (retval->successor[cnt]->data != NULL) + break; + } - return retval; - /* NOTREACHED */ - } + return retval; + /* NOTREACHED */ + } /* See whether the locale value is an alias. If yes its value *overwrites* the alias name. No test for the original value is done. */ - alias_value = _nl_expand_alias(locale); - if (alias_value != NULL) { + alias_value = _nl_expand_alias (locale); + if (alias_value != NULL) + { #if defined _LIBC || defined HAVE_STRDUP - locale = strdup(alias_value); - if (locale == NULL) - return NULL; + locale = strdup (alias_value); + if (locale == NULL) + return NULL; #else - size_t len = strlen(alias_value) + 1; - locale = (char *) malloc(len); - if (locale == NULL) - return NULL; + size_t len = strlen (alias_value) + 1; + locale = (char *) malloc (len); + if (locale == NULL) + return NULL; - memcpy(locale, alias_value, len); + memcpy (locale, alias_value, len); #endif - } + } /* Now we determine the single parts of the locale name. First look for the language. Termination symbols are `_', '.', and `@'. */ - mask = _nl_explode_name(locale, &language, &modifier, &territory, - &codeset, &normalized_codeset); + mask = _nl_explode_name (locale, &language, &modifier, &territory, + &codeset, &normalized_codeset); if (mask == -1) /* This means we are out of core. */ return NULL; /* We need to protect modifying the _NL_LOADED_DOMAINS data. */ - gl_rwlock_wrlock(lock); + gl_rwlock_wrlock (lock); /* Create all possible locale entries which might be interested in generalization. */ - retval = _nl_make_l10nflist(&_nl_loaded_domains, dirname, - strlen(dirname) + 1, mask, language, territory, - codeset, normalized_codeset, modifier, - domainname, 1); + retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, + strlen (dirname) + 1, mask, language, territory, + codeset, normalized_codeset, modifier, + domainname, 1); - gl_rwlock_unlock(lock); + gl_rwlock_unlock (lock); if (retval == NULL) /* This means we are out of core. */ goto out; if (retval->decided <= 0) - _nl_load_domain(retval, domainbinding); - if (retval->data == NULL) { - int cnt; - for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) { - if (retval->successor[cnt]->decided <= 0) - _nl_load_domain(retval->successor[cnt], domainbinding); - if (retval->successor[cnt]->data != NULL) - break; + _nl_load_domain (retval, domainbinding); + if (retval->data == NULL) + { + int cnt; + for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) + { + if (retval->successor[cnt]->decided <= 0) + _nl_load_domain (retval->successor[cnt], domainbinding); + if (retval->successor[cnt]->data != NULL) + break; + } } - } /* The room for an alias was dynamically allocated. Free it now. */ if (alias_value != NULL) - free(locale); + free (locale); out: /* The space for normalized_codeset is dynamically allocated. Free it. */ if (mask & XPG_NORM_CODESET) - free((void *) normalized_codeset); + free ((void *) normalized_codeset); return retval; } @@ -189,16 +195,18 @@ /* This is called from iconv/gconv_db.c's free_mem, as locales must be freed before freeing gconv steps arrays. */ void __libc_freeres_fn_section -_nl_finddomain_subfreeres() { +_nl_finddomain_subfreeres () +{ struct loaded_l10nfile *runp = _nl_loaded_domains;
View file
LiVES-2.4.3.tar.bz2/intl/gettext.c -> LiVES-2.4.4.tar.bz2/intl/gettext.c
Changed
@@ -52,11 +52,12 @@ LC_MESSAGES locale. If not found, returns MSGID itself (the default text). */ char * -GETTEXT(const char *msgid) { - return DCGETTEXT(NULL, msgid, LC_MESSAGES); +GETTEXT (const char *msgid) +{ + return DCGETTEXT (NULL, msgid, LC_MESSAGES); } #ifdef _LIBC /* Alias for function name in GNU C Library. */ -weak_alias(__gettext, gettext); +weak_alias (__gettext, gettext); #endif
View file
LiVES-2.4.3.tar.bz2/intl/gettextP.h -> LiVES-2.4.4.tar.bz2/intl/gettextP.h
Changed
@@ -39,30 +39,30 @@ #endif #ifdef _LIBC -extern char *__gettext(const char *__msgid); -extern char *__dgettext(const char *__domainname, const char *__msgid); -extern char *__dcgettext(const char *__domainname, const char *__msgid, - int __category); -extern char *__ngettext(const char *__msgid1, const char *__msgid2, - unsigned long int __n); -extern char *__dngettext(const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int n); -extern char *__dcngettext(const char *__domainname, - const char *__msgid1, const char *__msgid2, - unsigned long int __n, int __category); -extern char *__dcigettext(const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category); -extern char *__textdomain(const char *__domainname); -extern char *__bindtextdomain(const char *__domainname, - const char *__dirname); -extern char *__bind_textdomain_codeset(const char *__domainname, - const char *__codeset); -extern void _nl_finddomain_subfreeres(void) attribute_hidden; -extern void _nl_unload_domain(struct loaded_domain *__domain) -internal_function attribute_hidden; +extern char *__gettext (const char *__msgid); +extern char *__dgettext (const char *__domainname, const char *__msgid); +extern char *__dcgettext (const char *__domainname, const char *__msgid, + int __category); +extern char *__ngettext (const char *__msgid1, const char *__msgid2, + unsigned long int __n); +extern char *__dngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int n); +extern char *__dcngettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category); +extern char *__dcigettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category); +extern char *__textdomain (const char *__domainname); +extern char *__bindtextdomain (const char *__domainname, + const char *__dirname); +extern char *__bind_textdomain_codeset (const char *__domainname, + const char *__codeset); +extern void _nl_finddomain_subfreeres (void) attribute_hidden; +extern void _nl_unload_domain (struct loaded_domain *__domain) + internal_function attribute_hidden; #else /* Declare the exported libintl_* functions, in a way that allows us to call them under their real name. */ @@ -71,16 +71,16 @@ # define _INTL_REDIRECT_MACROS # include "libgnuintl.h" # ifdef IN_LIBGLOCALE -extern char *gl_dcigettext(const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category, - const char *__localename, const char *__encoding); +extern char *gl_dcigettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category, + const char *__localename, const char *__encoding); # else -extern char *libintl_dcigettext(const char *__domainname, - const char *__msgid1, const char *__msgid2, - int __plural, unsigned long int __n, - int __category); +extern char *libintl_dcigettext (const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category); # endif #endif @@ -115,10 +115,10 @@ #else static inline nls_uint32 # ifdef __cplusplus -SWAP(nls_uint32 i) +SWAP (nls_uint32 i) # else -SWAP(i) -nls_uint32 i; +SWAP (i) + nls_uint32 i; # endif { return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); @@ -127,7 +127,8 @@ /* In-memory representation of system dependent string. */ -struct sysdep_string_desc { +struct sysdep_string_desc +{ /* Length of addressed string, including the trailing NUL. */ size_t length; /* Pointer to addressed string. */ @@ -137,7 +138,8 @@ /* Cache of translated strings after charset conversion. Note: The strings are converted to the target encoding only on an as-needed basis. */ -struct converted_domain { +struct converted_domain +{ /* The target encoding name. */ const char *encoding; /* The descriptor for conversion from the message catalog's encoding to @@ -154,7 +156,8 @@ }; /* The representation of an opened message catalog. */ -struct loaded_domain { +struct loaded_domain +{ /* Pointer to memory containing the .mo file. */ const char *data; /* 1 if the memory is mmap()ed, 0 if the memory is malloc()ed. */ @@ -190,7 +193,7 @@ /* Cache of charset conversions of the translated strings. */ struct converted_domain *conversions; size_t nconversions; - gl_rwlock_define(, conversions_lock) + gl_rwlock_define (, conversions_lock) const struct expression *plural; unsigned long int nplurals; @@ -206,7 +209,8 @@ /* A set of settings bound to a message domain. Used to store settings from bindtextdomain() and bind_textdomain_codeset(). */ -struct binding { +struct binding +{ struct binding *next; char *dirname; char *codeset; @@ -224,37 +228,37 @@ #endif #ifndef _LIBC -extern const char *_nl_language_preferences_default(void); +extern const char *_nl_language_preferences_default (void); # define gl_locale_name_canonicalize _nl_locale_name_canonicalize -extern void _nl_locale_name_canonicalize(char *name); +extern void _nl_locale_name_canonicalize (char *name); # define gl_locale_name_posix _nl_locale_name_posix -extern const char *_nl_locale_name_posix(int category, - const char *categoryname); +extern const char *_nl_locale_name_posix (int category, + const char *categoryname); # define gl_locale_name_default _nl_locale_name_default -extern const char *_nl_locale_name_default(void); +extern const char *_nl_locale_name_default (void); # define gl_locale_name _nl_locale_name -extern const char *_nl_locale_name(int category, const char *categoryname); +extern const char *_nl_locale_name (int category, const char *categoryname); #endif -struct loaded_l10nfile *_nl_find_domain(const char *__dirname, char *__locale, - const char *__domainname, - struct binding *__domainbinding) -internal_function; -void _nl_load_domain(struct loaded_l10nfile *__domain, - struct binding *__domainbinding) -internal_function; +struct loaded_l10nfile *_nl_find_domain (const char *__dirname, char *__locale, + const char *__domainname, + struct binding *__domainbinding) + internal_function; +void _nl_load_domain (struct loaded_l10nfile *__domain, + struct binding *__domainbinding) + internal_function; #ifdef IN_LIBGLOCALE -char *_nl_find_msg(struct loaded_l10nfile *domain_file, - struct binding *domainbinding, const char *encoding, - const char *msgid, - size_t *lengthp) -internal_function; +char *_nl_find_msg (struct loaded_l10nfile *domain_file, + struct binding *domainbinding, const char *encoding, + const char *msgid, + size_t *lengthp) + internal_function; #else -char *_nl_find_msg(struct loaded_l10nfile *domain_file, - struct binding *domainbinding, const char *msgid, - int convert, size_t *lengthp) -internal_function; +char *_nl_find_msg (struct loaded_l10nfile *domain_file, + struct binding *domainbinding, const char *msgid, + int convert, size_t *lengthp)
View file
LiVES-2.4.3.tar.bz2/intl/gmo.h -> LiVES-2.4.4.tar.bz2/intl/gmo.h
Changed
@@ -61,16 +61,17 @@ # if ULONG_MAX == UINT_MAX_32_BITS typedef unsigned long nls_uint32; # else -/* The following line is intended to throw an error. Using #error is - not portable enough. */ -"Cannot determine unsigned 32-bit data type." + /* The following line is intended to throw an error. Using #error is + not portable enough. */ + "Cannot determine unsigned 32-bit data type." # endif # endif #endif /* Header for binary .mo file format. */ -struct mo_file_header { +struct mo_file_header +{ /* The magic number. */ nls_uint32 magic; /* The revision number of the file format. */ @@ -104,7 +105,8 @@ }; /* Descriptor for static string contained in the binary .mo file. */ -struct string_desc { +struct string_desc +{ /* Length of addressed string, not including the trailing NUL. */ nls_uint32 length; /* Offset of string in file. */ @@ -114,7 +116,8 @@ /* The following are only used in .mo files with minor revision >= 1. */ /* Descriptor for system dependent string segment. */ -struct sysdep_segment { +struct sysdep_segment +{ /* Length of addressed string, including the trailing NUL. */ nls_uint32 length; /* Offset of string in file. */ @@ -122,7 +125,8 @@ }; /* Pair of a static and a system dependent segment, in struct sysdep_string. */ -struct segment_pair { +struct segment_pair +{ /* Size of static segment. */ nls_uint32 segsize; /* Reference to system dependent string segment, or ~0 at the end. */ @@ -130,7 +134,8 @@ }; /* Descriptor for system dependent string. */ -struct sysdep_string { +struct sysdep_string +{ /* Offset of static string segments in file. */ nls_uint32 offset; /* Alternating sequence of static and system dependent segments.
View file
LiVES-2.4.3.tar.bz2/intl/hash-string.c -> LiVES-2.4.4.tar.bz2/intl/hash-string.c
Changed
@@ -29,20 +29,23 @@ [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, 1986, 1987 Bell Telephone Laboratories, Inc.] */ unsigned long int -__hash_string(const char *str_param) { +__hash_string (const char *str_param) +{ unsigned long int hval, g; const char *str = str_param; /* Compute the hash value for the given string. */ hval = 0; - while (*str != '\0') { - hval <<= 4; - hval += (unsigned char) *str++; - g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); - if (g != 0) { - hval ^= g >> (HASHWORDBITS - 8); - hval ^= g; + while (*str != '\0') + { + hval <<= 4; + hval += (unsigned char) *str++; + g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); + if (g != 0) + { + hval ^= g >> (HASHWORDBITS - 8); + hval ^= g; + } } - } return hval; }
View file
LiVES-2.4.3.tar.bz2/intl/hash-string.h -> LiVES-2.4.4.tar.bz2/intl/hash-string.h
Changed
@@ -33,4 +33,4 @@ /* Defines the so called `hashpjw' function by P.J. Weinberger [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, 1986, 1987 Bell Telephone Laboratories, Inc.] */ -extern unsigned long int __hash_string(const char *str_param); +extern unsigned long int __hash_string (const char *str_param);
View file
LiVES-2.4.3.tar.bz2/intl/intl-compat.c -> LiVES-2.4.4.tar.bz2/intl/intl-compat.c
Changed
@@ -60,65 +60,74 @@ DLL_EXPORTED char * -gettext(const char *msgid) { - return libintl_gettext(msgid); +gettext (const char *msgid) +{ + return libintl_gettext (msgid); } DLL_EXPORTED char * -dgettext(const char *domainname, const char *msgid) { - return libintl_dgettext(domainname, msgid); +dgettext (const char *domainname, const char *msgid) +{ + return libintl_dgettext (domainname, msgid); } DLL_EXPORTED char * -dcgettext(const char *domainname, const char *msgid, int category) { - return libintl_dcgettext(domainname, msgid, category); +dcgettext (const char *domainname, const char *msgid, int category) +{ + return libintl_dcgettext (domainname, msgid, category); } DLL_EXPORTED char * -ngettext(const char *msgid1, const char *msgid2, unsigned long int n) { - return libintl_ngettext(msgid1, msgid2, n); +ngettext (const char *msgid1, const char *msgid2, unsigned long int n) +{ + return libintl_ngettext (msgid1, msgid2, n); } DLL_EXPORTED char * -dngettext(const char *domainname, - const char *msgid1, const char *msgid2, unsigned long int n) { - return libintl_dngettext(domainname, msgid1, msgid2, n); +dngettext (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n) +{ + return libintl_dngettext (domainname, msgid1, msgid2, n); } DLL_EXPORTED char * -dcngettext(const char *domainname, - const char *msgid1, const char *msgid2, unsigned long int n, - int category) { - return libintl_dcngettext(domainname, msgid1, msgid2, n, category); +dcngettext (const char *domainname, + const char *msgid1, const char *msgid2, unsigned long int n, + int category) +{ + return libintl_dcngettext (domainname, msgid1, msgid2, n, category); } DLL_EXPORTED char * -textdomain(const char *domainname) { - return libintl_textdomain(domainname); +textdomain (const char *domainname) +{ + return libintl_textdomain (domainname); } DLL_EXPORTED char * -bindtextdomain(const char *domainname, const char *dirname) { - return libintl_bindtextdomain(domainname, dirname); +bindtextdomain (const char *domainname, const char *dirname) +{ + return libintl_bindtextdomain (domainname, dirname); } DLL_EXPORTED char * -bind_textdomain_codeset(const char *domainname, const char *codeset) { - return libintl_bind_textdomain_codeset(domainname, codeset); +bind_textdomain_codeset (const char *domainname, const char *codeset) +{ + return libintl_bind_textdomain_codeset (domainname, codeset); }
View file
LiVES-2.4.3.tar.bz2/intl/intl-exports.c -> LiVES-2.4.4.tar.bz2/intl/intl-exports.c
Changed
@@ -17,11 +17,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* IMP(x) is a symbol that contains the address of x. */ + /* IMP(x) is a symbol that contains the address of x. */ #define IMP(x) _imp__##x -/* Ensure that the variable x is exported from the library, and that a - pseudo-variable IMP(x) is available. */ + /* Ensure that the variable x is exported from the library, and that a + pseudo-variable IMP(x) is available. */ #define VARIABLE(x) \ /* Export x without redefining x. This code was found by compiling a \ snippet: \
View file
LiVES-2.4.3.tar.bz2/intl/l10nflist.c -> LiVES-2.4.4.tar.bz2/intl/l10nflist.c
Changed
@@ -58,7 +58,7 @@ # endif #else # ifndef HAVE_STPCPY -static char *stpcpy(char *dest, const char *src); +static char *stpcpy (char *dest, const char *src); # endif #endif @@ -68,14 +68,14 @@ it may be concatenated to a directory pathname. */ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -/* Win32, Cygwin, OS/2, DOS */ + /* Win32, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') # define HAS_DEVICE(P) \ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ && (P)[1] == ':') # define IS_ABSOLUTE_PATH(P) (ISSLASH ((P)[0]) || HAS_DEVICE (P)) #else -/* Unix */ + /* Unix */ # define ISSLASH(C) ((C) == '/') # define IS_ABSOLUTE_PATH(P) ISSLASH ((P)[0]) #endif @@ -90,14 +90,16 @@ #else /* Returns the number of strings in ARGZ. */ static size_t -argz_count__(const char *argz, size_t len) { +argz_count__ (const char *argz, size_t len) +{ size_t count = 0; - while (len > 0) { - size_t part_len = strlen(argz); - argz += part_len + 1; - len -= part_len + 1; - count++; - } + while (len > 0) + { + size_t part_len = strlen (argz); + argz += part_len + 1; + len -= part_len + 1; + count++; + } return count; } # undef __argz_count @@ -114,14 +116,16 @@ /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's except the last into the character SEP. */ static void -argz_stringify__(char *argz, size_t len, int sep) { - while (len > 0) { - size_t part_len = strlen(argz); - argz += part_len; - len -= part_len + 1; - if (len > 0) - *argz++ = sep; - } +argz_stringify__ (char *argz, size_t len, int sep) +{ + while (len > 0) + { + size_t part_len = strlen (argz); + argz += part_len; + len -= part_len + 1; + if (len > 0) + *argz++ = sep; + } } # undef __argz_stringify # define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep) @@ -133,16 +137,20 @@ # define __argz_next argz_next #else static char * -argz_next__(char *argz, size_t argz_len, const char *entry) { - if (entry) { - if (entry < argz + argz_len) - entry = strchr(entry, '\0') + 1; - - return entry >= argz + argz_len ? NULL : (char *) entry; - } else if (argz_len > 0) - return argz; +argz_next__ (char *argz, size_t argz_len, const char *entry) +{ + if (entry) + { + if (entry < argz + argz_len) + entry = strchr (entry, '\0') + 1; + + return entry >= argz + argz_len ? NULL : (char *) entry; + } else - return 0; + if (argz_len > 0) + return argz; + else + return 0; } # undef __argz_next # define __argz_next(argz, len, entry) argz_next__ (argz, len, entry) @@ -151,7 +159,8 @@ /* Return number of bits set in X. */ static inline int -pop(int x) { +pop (int x) +{ /* We assume that no more than 16 bits are used. */ x = ((x & ~0x5555) >> 1) + (x & 0x5555); x = ((x & ~0x3333) >> 2) + (x & 0x3333); @@ -163,12 +172,13 @@  struct loaded_l10nfile * -_nl_make_l10nflist(struct loaded_l10nfile **l10nfile_list, - const char *dirlist, size_t dirlist_len, - int mask, const char *language, const char *territory, - const char *codeset, const char *normalized_codeset, - const char *modifier, - const char *filename, int do_allocate) { +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, + const char *dirlist, size_t dirlist_len, + int mask, const char *language, const char *territory, + const char *codeset, const char *normalized_codeset, + const char *modifier, + const char *filename, int do_allocate) +{ char *abs_filename; struct loaded_l10nfile **lastp; struct loaded_l10nfile *retval; @@ -179,91 +189,100 @@ /* If LANGUAGE contains an absolute directory specification, we ignore DIRLIST. */ - if (IS_ABSOLUTE_PATH(language)) + if (IS_ABSOLUTE_PATH (language)) dirlist_len = 0; /* Allocate room for the full file name. */ - abs_filename = (char *) malloc(dirlist_len - + strlen(language) - + ((mask & XPG_TERRITORY) != 0 - ? strlen(territory) + 1 : 0) - + ((mask & XPG_CODESET) != 0 - ? strlen(codeset) + 1 : 0) - + ((mask & XPG_NORM_CODESET) != 0 - ? strlen(normalized_codeset) + 1 : 0) - + ((mask & XPG_MODIFIER) != 0 - ? strlen(modifier) + 1 : 0) - + 1 + strlen(filename) + 1); + abs_filename = (char *) malloc (dirlist_len + + strlen (language) + + ((mask & XPG_TERRITORY) != 0 + ? strlen (territory) + 1 : 0) + + ((mask & XPG_CODESET) != 0 + ? strlen (codeset) + 1 : 0) + + ((mask & XPG_NORM_CODESET) != 0 + ? strlen (normalized_codeset) + 1 : 0) + + ((mask & XPG_MODIFIER) != 0 + ? strlen (modifier) + 1 : 0) + + 1 + strlen (filename) + 1); if (abs_filename == NULL) return NULL; /* Construct file name. */ cp = abs_filename; - if (dirlist_len > 0) { - memcpy(cp, dirlist, dirlist_len); - __argz_stringify(cp, dirlist_len, PATH_SEPARATOR); - cp += dirlist_len; - cp[-1] = '/'; - } - - cp = stpcpy(cp, language); - - if ((mask & XPG_TERRITORY) != 0) { - *cp++ = '_'; - cp = stpcpy(cp, territory); - } - if ((mask & XPG_CODESET) != 0) { - *cp++ = '.'; - cp = stpcpy(cp, codeset); - } - if ((mask & XPG_NORM_CODESET) != 0) { - *cp++ = '.'; - cp = stpcpy(cp, normalized_codeset); - } - if ((mask & XPG_MODIFIER) != 0) { - *cp++ = '@'; - cp = stpcpy(cp, modifier); - } + if (dirlist_len > 0) + { + memcpy (cp, dirlist, dirlist_len);
View file
LiVES-2.4.3.tar.bz2/intl/langprefs.c -> LiVES-2.4.4.tar.bz2/intl/langprefs.c
Changed
@@ -30,7 +30,7 @@ # include <CoreFoundation/CFPropertyList.h> # include <CoreFoundation/CFArray.h> # include <CoreFoundation/CFString.h> -extern void _nl_locale_name_canonicalize(char *name); +extern void _nl_locale_name_canonicalize (char *name); #endif /* Determine the user's language preferences, as a colon separated list of @@ -41,75 +41,86 @@ already taken into account by the caller. */ const char * -_nl_language_preferences_default(void) { +_nl_language_preferences_default (void) +{ #if HAVE_CFPREFERENCESCOPYAPPVALUE /* MacOS X 10.2 or newer */ { /* Cache the preferences list, since CoreFoundation calls are expensive. */ static const char *cached_languages; static int cache_initialized; - if (!cache_initialized) { - CFTypeRef preferences = - CFPreferencesCopyAppValue(CFSTR("AppleLanguages"), - kCFPreferencesCurrentApplication); - if (preferences != NULL - && CFGetTypeID(preferences) == CFArrayGetTypeID()) { - CFArrayRef prefArray = (CFArrayRef)preferences; - int n = CFArrayGetCount(prefArray); - char buf[256]; - size_t size = 0; - int i; + if (!cache_initialized) + { + CFTypeRef preferences = + CFPreferencesCopyAppValue (CFSTR ("AppleLanguages"), + kCFPreferencesCurrentApplication); + if (preferences != NULL + && CFGetTypeID (preferences) == CFArrayGetTypeID ()) + { + CFArrayRef prefArray = (CFArrayRef)preferences; + int n = CFArrayGetCount (prefArray); + char buf[256]; + size_t size = 0; + int i; - for (i = 0; i < n; i++) { - CFTypeRef element = CFArrayGetValueAtIndex(prefArray, i); - if (element != NULL - && CFGetTypeID(element) == CFStringGetTypeID() - && CFStringGetCString((CFStringRef)element, - buf, sizeof(buf), - kCFStringEncodingASCII)) { - _nl_locale_name_canonicalize(buf); - size += strlen(buf) + 1; - /* Most GNU programs use msgids in English and don't ship - an en.mo message catalog. Therefore when we see "en" - in the preferences list, arrange for gettext() to - return the msgid, and ignore all further elements of - the preferences list. */ - if (strcmp(buf, "en") == 0) - break; - } else - break; - } - if (size > 0) { - char *languages = (char *) malloc(size); + for (i = 0; i < n; i++) + { + CFTypeRef element = CFArrayGetValueAtIndex (prefArray, i); + if (element != NULL + && CFGetTypeID (element) == CFStringGetTypeID () + && CFStringGetCString ((CFStringRef)element, + buf, sizeof (buf), + kCFStringEncodingASCII)) + { + _nl_locale_name_canonicalize (buf); + size += strlen (buf) + 1; + /* Most GNU programs use msgids in English and don't ship + an en.mo message catalog. Therefore when we see "en" + in the preferences list, arrange for gettext() to + return the msgid, and ignore all further elements of + the preferences list. */ + if (strcmp (buf, "en") == 0) + break; + } + else + break; + } + if (size > 0) + { + char *languages = (char *) malloc (size); - if (languages != NULL) { - char *p = languages; + if (languages != NULL) + { + char *p = languages; - for (i = 0; i < n; i++) { - CFTypeRef element = - CFArrayGetValueAtIndex(prefArray, i); - if (element != NULL - && CFGetTypeID(element) == CFStringGetTypeID() - && CFStringGetCString((CFStringRef)element, - buf, sizeof(buf), - kCFStringEncodingASCII)) { - _nl_locale_name_canonicalize(buf); - strcpy(p, buf); - p += strlen(buf); - *p++ = ':'; - if (strcmp(buf, "en") == 0) - break; - } else - break; - } - *--p = '\0'; + for (i = 0; i < n; i++) + { + CFTypeRef element = + CFArrayGetValueAtIndex (prefArray, i); + if (element != NULL + && CFGetTypeID (element) == CFStringGetTypeID () + && CFStringGetCString ((CFStringRef)element, + buf, sizeof (buf), + kCFStringEncodingASCII)) + { + _nl_locale_name_canonicalize (buf); + strcpy (p, buf); + p += strlen (buf); + *p++ = ':'; + if (strcmp (buf, "en") == 0) + break; + } + else + break; + } + *--p = '\0'; - cached_languages = languages; - } - } + cached_languages = languages; + } + } + } + cache_initialized = 1; } - cache_initialized = 1; - } if (cached_languages != NULL) return cached_languages; }
View file
LiVES-2.4.3.tar.bz2/intl/loadinfo.h -> LiVES-2.4.4.tar.bz2/intl/loadinfo.h
Changed
@@ -48,10 +48,10 @@ /* Separator in PATH like lists of pathnames. */ #if ((defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__) || defined __EMX__ || defined __DJGPP__ -/* Win32, OS/2, DOS */ + /* Win32, OS/2, DOS */ # define PATH_SEPARATOR ';' #else -/* Unix */ + /* Unix */ # define PATH_SEPARATOR ':' #endif @@ -62,7 +62,8 @@ #define XPG_MODIFIER 8 -struct loaded_l10nfile { +struct loaded_l10nfile +{ const char *filename; int decided; @@ -77,8 +78,8 @@ names. Normalization allows the user to use any of the common names. The return value is dynamically allocated and has to be freed by the caller. */ -extern const char *_nl_normalize_codeset(const char *codeset, - size_t name_len); +extern const char *_nl_normalize_codeset (const char *codeset, + size_t name_len); /* Lookup a locale dependent file. *L10NFILE_LIST denotes a pool of lookup results of locale dependent @@ -95,18 +96,18 @@ furthermore its ->successor[] field contains a list of other lookup results from which this lookup result inherits. */ extern struct loaded_l10nfile * -_nl_make_l10nflist(struct loaded_l10nfile **l10nfile_list, - const char *dirlist, size_t dirlist_len, int mask, - const char *language, const char *territory, - const char *codeset, const char *normalized_codeset, - const char *modifier, - const char *filename, int do_allocate); +_nl_make_l10nflist (struct loaded_l10nfile **l10nfile_list, + const char *dirlist, size_t dirlist_len, int mask, + const char *language, const char *territory, + const char *codeset, const char *normalized_codeset, + const char *modifier, + const char *filename, int do_allocate); /* Lookup the real locale name for a locale alias NAME, or NULL if NAME is not a locale alias (but possibly a real locale name). The return value is statically allocated and must not be freed. */ /* Part of the libintl ABI only for the sake of the gettext.m4 macro. */ -extern LIBINTL_DLL_EXPORTED const char *_nl_expand_alias(const char *name); +extern LIBINTL_DLL_EXPORTED const char *_nl_expand_alias (const char *name); /* Split a locale name NAME into its pieces: language, modifier, territory, codeset. @@ -123,9 +124,9 @@ XPG_CODESET for *CODESET, XPG_NORM_CODESET for *NORMALIZED_CODESET. */ -extern int _nl_explode_name(char *name, const char **language, - const char **modifier, const char **territory, - const char **codeset, - const char **normalized_codeset); +extern int _nl_explode_name (char *name, const char **language, + const char **modifier, const char **territory, + const char **codeset, + const char **normalized_codeset); #endif /* loadinfo.h */
View file
LiVES-2.4.3.tar.bz2/intl/loadmsgcat.c -> LiVES-2.4.4.tar.bz2/intl/loadmsgcat.c
Changed
@@ -46,10 +46,10 @@ # include <alloca.h> # else # ifdef _AIX -#pragma alloca + #pragma alloca # else # ifndef alloca -char *alloca(); +char *alloca (); # endif # endif # endif @@ -485,12 +485,12 @@ /* For systems that distinguish between text and binary I/O. O_BINARY is usually declared in <fcntl.h>. */ #if !defined O_BINARY && defined _O_BINARY -/* For MSC-compatible compilers. */ + /* For MSC-compatible compilers. */ # define O_BINARY _O_BINARY # define O_TEXT _O_TEXT #endif #ifdef __BEOS__ -/* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ + /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ # undef O_BINARY # undef O_TEXT #endif @@ -508,247 +508,267 @@ /* Expand a system dependent string segment. Return NULL if unsupported. */ static const char * -get_sysdep_segment_value(const char *name) { +get_sysdep_segment_value (const char *name) +{ /* Test for an ISO C 99 section 7.8.1 format string directive. Syntax: P R I { d | i | o | u | x | X } { { | LEAST | FAST } { 8 | 16 | 32 | 64 } | MAX | PTR } */ /* We don't use a table of 14 times 6 'const char *' strings here, because data relocations cost startup time. */ - if (name[0] == 'P' && name[1] == 'R' && name[2] == 'I') { - if (name[3] == 'd' || name[3] == 'i' || name[3] == 'o' || name[3] == 'u' - || name[3] == 'x' || name[3] == 'X') { - if (name[4] == '8' && name[5] == '\0') { - if (name[3] == 'd') - return PRId8; - if (name[3] == 'i') - return PRIi8; - if (name[3] == 'o') - return PRIo8; - if (name[3] == 'u') - return PRIu8; - if (name[3] == 'x') - return PRIx8; - if (name[3] == 'X') - return PRIX8; - abort(); - } - if (name[4] == '1' && name[5] == '6' && name[6] == '\0') { - if (name[3] == 'd') - return PRId16; - if (name[3] == 'i') - return PRIi16; - if (name[3] == 'o') - return PRIo16; - if (name[3] == 'u') - return PRIu16; - if (name[3] == 'x') - return PRIx16; - if (name[3] == 'X') - return PRIX16; - abort(); - } - if (name[4] == '3' && name[5] == '2' && name[6] == '\0') { - if (name[3] == 'd') - return PRId32; - if (name[3] == 'i') - return PRIi32; - if (name[3] == 'o') - return PRIo32; - if (name[3] == 'u') - return PRIu32; - if (name[3] == 'x') - return PRIx32; - if (name[3] == 'X') - return PRIX32; - abort(); - } - if (name[4] == '6' && name[5] == '4' && name[6] == '\0') { - if (name[3] == 'd') - return PRId64; - if (name[3] == 'i') - return PRIi64; - if (name[3] == 'o') - return PRIo64; - if (name[3] == 'u') - return PRIu64; - if (name[3] == 'x') - return PRIx64; - if (name[3] == 'X') - return PRIX64; - abort(); - } - if (name[4] == 'L' && name[5] == 'E' && name[6] == 'A' - && name[7] == 'S' && name[8] == 'T') { - if (name[9] == '8' && name[10] == '\0') { - if (name[3] == 'd') - return PRIdLEAST8; - if (name[3] == 'i') - return PRIiLEAST8; - if (name[3] == 'o') - return PRIoLEAST8; - if (name[3] == 'u') - return PRIuLEAST8; - if (name[3] == 'x') - return PRIxLEAST8; - if (name[3] == 'X') - return PRIXLEAST8; - abort(); - } - if (name[9] == '1' && name[10] == '6' && name[11] == '\0') { - if (name[3] == 'd') - return PRIdLEAST16; - if (name[3] == 'i') - return PRIiLEAST16; - if (name[3] == 'o') - return PRIoLEAST16; - if (name[3] == 'u') - return PRIuLEAST16; - if (name[3] == 'x') - return PRIxLEAST16; - if (name[3] == 'X') - return PRIXLEAST16; - abort(); - } - if (name[9] == '3' && name[10] == '2' && name[11] == '\0') { - if (name[3] == 'd') - return PRIdLEAST32; - if (name[3] == 'i') - return PRIiLEAST32; - if (name[3] == 'o') - return PRIoLEAST32; - if (name[3] == 'u') - return PRIuLEAST32; - if (name[3] == 'x') - return PRIxLEAST32; - if (name[3] == 'X') - return PRIXLEAST32; - abort(); - } - if (name[9] == '6' && name[10] == '4' && name[11] == '\0') { - if (name[3] == 'd') - return PRIdLEAST64; - if (name[3] == 'i') - return PRIiLEAST64; - if (name[3] == 'o') - return PRIoLEAST64; - if (name[3] == 'u') - return PRIuLEAST64; - if (name[3] == 'x') - return PRIxLEAST64; - if (name[3] == 'X') - return PRIXLEAST64; - abort(); - } - } - if (name[4] == 'F' && name[5] == 'A' && name[6] == 'S' - && name[7] == 'T') { - if (name[8] == '8' && name[9] == '\0') { - if (name[3] == 'd') - return PRIdFAST8; - if (name[3] == 'i') - return PRIiFAST8; - if (name[3] == 'o') - return PRIoFAST8; - if (name[3] == 'u') - return PRIuFAST8; - if (name[3] == 'x') - return PRIxFAST8; - if (name[3] == 'X') - return PRIXFAST8; - abort(); - } - if (name[8] == '1' && name[9] == '6' && name[10] == '\0') { - if (name[3] == 'd') - return PRIdFAST16; - if (name[3] == 'i') - return PRIiFAST16; - if (name[3] == 'o') - return PRIoFAST16; - if (name[3] == 'u') - return PRIuFAST16; - if (name[3] == 'x') - return PRIxFAST16; - if (name[3] == 'X') - return PRIXFAST16; - abort(); - } - if (name[8] == '3' && name[9] == '2' && name[10] == '\0') {
View file
LiVES-2.4.3.tar.bz2/intl/localcharset.c -> LiVES-2.4.4.tar.bz2/intl/localcharset.c
Changed
@@ -71,7 +71,7 @@ #endif #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -/* Win32, Cygwin, OS/2, DOS */ + /* Win32, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') #endif @@ -100,165 +100,176 @@ /* Pointer to the contents of the charset.alias file, if it has already been read, else NULL. Its format is: ALIAS_1 '\0' CANONICAL_1 '\0' ... ALIAS_n '\0' CANONICAL_n '\0' '\0' */ -static const char *volatile charset_aliases; +static const char * volatile charset_aliases; /* Return a pointer to the contents of the charset.alias file. */ static const char * -get_charset_aliases(void) { +get_charset_aliases (void) +{ const char *cp; cp = charset_aliases; - if (cp == NULL) { -#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) - FILE *fp; - const char *dir; - const char *base = "charset.alias"; - char *file_name; - - /* Make it possible to override the charset.alias location. This is - necessary for running the testsuite before "make install". */ - dir = getenv("CHARSETALIASDIR"); - if (dir == NULL || dir[0] == '\0') - dir = relocate(LIBDIR); - - /* Concatenate dir and base into freshly allocated file_name. */ + if (cp == NULL) { - size_t dir_len = strlen(dir); - size_t base_len = strlen(base); - int add_slash = (dir_len > 0 && !ISSLASH(dir[dir_len - 1])); - file_name = (char *) malloc(dir_len + add_slash + base_len + 1); - if (file_name != NULL) { - memcpy(file_name, dir, dir_len); - if (add_slash) - file_name[dir_len] = DIRECTORY_SEPARATOR; - memcpy(file_name + dir_len + add_slash, base, base_len + 1); - } - } - - if (file_name == NULL || (fp = fopen(file_name, "r")) == NULL) - /* Out of memory or file not found, treat it as empty. */ - cp = ""; - else { - /* Parse the file's contents. */ - char *res_ptr = NULL; - size_t res_size = 0; - - for (;;) { - int c; - char buf1[50+1]; - char buf2[50+1]; - size_t l1, l2; - char *old_res_ptr; - - c = getc(fp); - if (c == EOF) - break; - if (c == '\n' || c == ' ' || c == '\t') - continue; - if (c == '#') { - /* Skip comment, to end of line. */ - do - c = getc(fp); - while (!(c == EOF || c == '\n')); - if (c == EOF) - break; - continue; - } - ungetc(c, fp); - if (fscanf(fp, "%50s %50s", buf1, buf2) < 2) - break; - l1 = strlen(buf1); - l2 = strlen(buf2); - old_res_ptr = res_ptr; - if (res_size == 0) { - res_size = l1 + 1 + l2 + 1; - res_ptr = (char *) malloc(res_size + 1); - } else { - res_size += l1 + 1 + l2 + 1; - res_ptr = (char *) realloc(res_ptr, res_size + 1); - } - if (res_ptr == NULL) { - /* Out of memory. */ - res_size = 0; - if (old_res_ptr != NULL) - free(old_res_ptr); - break; - } - strcpy(res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); - strcpy(res_ptr + res_size - (l2 + 1), buf2); - } - fclose(fp); - if (res_size == 0) - cp = ""; - else { - *(res_ptr + res_size) = '\0'; - cp = res_ptr; +#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) + FILE *fp; + const char *dir; + const char *base = "charset.alias"; + char *file_name; + + /* Make it possible to override the charset.alias location. This is + necessary for running the testsuite before "make install". */ + dir = getenv ("CHARSETALIASDIR"); + if (dir == NULL || dir[0] == '\0') + dir = relocate (LIBDIR); + + /* Concatenate dir and base into freshly allocated file_name. */ + { + size_t dir_len = strlen (dir); + size_t base_len = strlen (base); + int add_slash = (dir_len > 0 && !ISSLASH (dir[dir_len - 1])); + file_name = (char *) malloc (dir_len + add_slash + base_len + 1); + if (file_name != NULL) + { + memcpy (file_name, dir, dir_len); + if (add_slash) + file_name[dir_len] = DIRECTORY_SEPARATOR; + memcpy (file_name + dir_len + add_slash, base, base_len + 1); + } } - } - if (file_name != NULL) - free(file_name); + if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL) + /* Out of memory or file not found, treat it as empty. */ + cp = ""; + else + { + /* Parse the file's contents. */ + char *res_ptr = NULL; + size_t res_size = 0; + + for (;;) + { + int c; + char buf1[50+1]; + char buf2[50+1]; + size_t l1, l2; + char *old_res_ptr; + + c = getc (fp); + if (c == EOF) + break; + if (c == '\n' || c == ' ' || c == '\t') + continue; + if (c == '#') + { + /* Skip comment, to end of line. */ + do + c = getc (fp); + while (!(c == EOF || c == '\n')); + if (c == EOF) + break; + continue; + } + ungetc (c, fp); + if (fscanf (fp, "%50s %50s", buf1, buf2) < 2) + break; + l1 = strlen (buf1); + l2 = strlen (buf2); + old_res_ptr = res_ptr; + if (res_size == 0) + { + res_size = l1 + 1 + l2 + 1; + res_ptr = (char *) malloc (res_size + 1); + } + else + { + res_size += l1 + 1 + l2 + 1; + res_ptr = (char *) realloc (res_ptr, res_size + 1); + } + if (res_ptr == NULL) + { + /* Out of memory. */ + res_size = 0; + if (old_res_ptr != NULL) + free (old_res_ptr); + break; + } + strcpy (res_ptr + res_size - (l2 + 1) - (l1 + 1), buf1); + strcpy (res_ptr + res_size - (l2 + 1), buf2); + } + fclose (fp);
View file
LiVES-2.4.3.tar.bz2/intl/localcharset.h -> LiVES-2.4.4.tar.bz2/intl/localcharset.h
Changed
@@ -31,7 +31,7 @@ The result must not be freed; it is statically allocated. If the canonical name cannot be determined, the result is a non-canonical name. */ -extern const char *locale_charset(void); +extern const char * locale_charset (void); #ifdef __cplusplus
View file
LiVES-2.4.3.tar.bz2/intl/localealias.c -> LiVES-2.4.4.tar.bz2/intl/localealias.c
Changed
@@ -47,10 +47,10 @@ # include <alloca.h> # else # ifdef _AIX -#pragma alloca + #pragma alloca # else # ifndef alloca -char *alloca(); +char *alloca (); # endif # endif # endif @@ -122,10 +122,11 @@ #endif -__libc_lock_define_initialized(static, lock) +__libc_lock_define_initialized (static, lock) -struct alias_map { +struct alias_map +{ const char *alias; const char *value; }; @@ -135,73 +136,78 @@ # define libc_freeres_ptr(decl) decl #endif -libc_freeres_ptr(static char *string_space); +libc_freeres_ptr (static char *string_space); static size_t string_space_act; static size_t string_space_max; -libc_freeres_ptr(static struct alias_map *map); +libc_freeres_ptr (static struct alias_map *map); static size_t nmap; static size_t maxmap; /* Prototypes for local functions. */ -static size_t read_alias_file(const char *fname, int fname_len) -internal_function; -static int extend_alias_table(void); -static int alias_compare(const struct alias_map *map1, - const struct alias_map *map2); +static size_t read_alias_file (const char *fname, int fname_len) + internal_function; +static int extend_alias_table (void); +static int alias_compare (const struct alias_map *map1, + const struct alias_map *map2); const char * -_nl_expand_alias(const char *name) { +_nl_expand_alias (const char *name) +{ static const char *locale_alias_path; struct alias_map *retval; const char *result = NULL; size_t added; - __libc_lock_lock(lock); + __libc_lock_lock (lock); if (locale_alias_path == NULL) locale_alias_path = LOCALE_ALIAS_PATH; - do { - struct alias_map item; - - item.alias = name; - - if (nmap > 0) - retval = (struct alias_map *) bsearch(&item, map, nmap, - sizeof(struct alias_map), - (int ( *)(const void *, - const void *) - ) alias_compare); - else - retval = NULL; - - /* We really found an alias. Return the value. */ - if (retval != NULL) { - result = retval->value; - break; + do + { + struct alias_map item; + + item.alias = name; + + if (nmap > 0) + retval = (struct alias_map *) bsearch (&item, map, nmap, + sizeof (struct alias_map), + (int (*) (const void *, + const void *) + ) alias_compare); + else + retval = NULL; + + /* We really found an alias. Return the value. */ + if (retval != NULL) + { + result = retval->value; + break; + } + + /* Perhaps we can find another alias file. */ + added = 0; + while (added == 0 && locale_alias_path[0] != '\0') + { + const char *start; + + while (locale_alias_path[0] == PATH_SEPARATOR) + ++locale_alias_path; + start = locale_alias_path; + + while (locale_alias_path[0] != '\0' + && locale_alias_path[0] != PATH_SEPARATOR) + ++locale_alias_path; + + if (start < locale_alias_path) + added = read_alias_file (start, locale_alias_path - start); + } } + while (added != 0); - /* Perhaps we can find another alias file. */ - added = 0; - while (added == 0 && locale_alias_path[0] != '\0') { - const char *start; - - while (locale_alias_path[0] == PATH_SEPARATOR) - ++locale_alias_path; - start = locale_alias_path; - - while (locale_alias_path[0] != '\0' - && locale_alias_path[0] != PATH_SEPARATOR) - ++locale_alias_path; - - if (start < locale_alias_path) - added = read_alias_file(start, locale_alias_path - start); - } - } while (added != 0); - - __libc_lock_unlock(lock); + __libc_lock_unlock (lock); return result; } @@ -209,179 +215,189 @@ static size_t internal_function -read_alias_file(const char *fname, int fname_len) { +read_alias_file (const char *fname, int fname_len) +{ FILE *fp; char *full_fname; size_t added; static const char aliasfile[] = "/locale.alias"; - full_fname = (char *) alloca(fname_len + sizeof aliasfile); + full_fname = (char *) alloca (fname_len + sizeof aliasfile); #ifdef HAVE_MEMPCPY - mempcpy(mempcpy(full_fname, fname, fname_len), - aliasfile, sizeof aliasfile); + mempcpy (mempcpy (full_fname, fname, fname_len), + aliasfile, sizeof aliasfile); #else - memcpy(full_fname, fname, fname_len); - memcpy(&full_fname[fname_len], aliasfile, sizeof aliasfile); + memcpy (full_fname, fname, fname_len); + memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); #endif #ifdef _LIBC /* Note the file is opened with cancellation in the I/O functions disabled. */ - fp = fopen(relocate(full_fname), "rc"); + fp = fopen (relocate (full_fname), "rc"); #else - fp = fopen(relocate(full_fname), "r"); + fp = fopen (relocate (full_fname), "r"); #endif - freea(full_fname); + freea (full_fname); if (fp == NULL) return 0; #ifdef HAVE___FSETLOCKING /* No threads present. */ - __fsetlocking(fp, FSETLOCKING_BYCALLER); + __fsetlocking (fp, FSETLOCKING_BYCALLER); #endif added = 0; - while (!FEOF(fp)) {
View file
LiVES-2.4.3.tar.bz2/intl/localename.c -> LiVES-2.4.4.tar.bz2/intl/localename.c
Changed
@@ -709,7 +709,8 @@ static # endif void -gl_locale_name_canonicalize(char *name) { +gl_locale_name_canonicalize (char *name) +{ /* This conversion is based on a posting by Deborah GoldSmith <goldsmit@apple.com> on 2005-03-08, http://lists.apple.com/archives/carbon-dev/2005/Mar/msg00293.html */ @@ -719,11 +720,8 @@ Therefore we do it ourselves, using a table based on the results of the MacOS X 10.3.8 function CFLocaleCreateCanonicalLocaleIdentifierFromString(). */ - typedef struct { - const char legacy[21+1]; - const char unixy[5+1]; - } - legacy_entry; + typedef struct { const char legacy[21+1]; const char unixy[5+1]; } + legacy_entry; static const legacy_entry legacy_table[] = { { "Afrikaans", "af" }, { "Albanian", "sq" }, @@ -860,11 +858,8 @@ /* Convert new-style locale names with language tags (ISO 639 and ISO 15924) to Unix (ISO 639 and ISO 3166) names. */ - typedef struct { - const char langtag[7+1]; - const char unixy[12+1]; - } - langtag_entry; + typedef struct { const char langtag[7+1]; const char unixy[12+1]; } + langtag_entry; static const langtag_entry langtag_table[] = { /* MacOS X has "az-Arab", "az-Cyrl", "az-Latn". The default script for az on Unix is Latin. */ @@ -893,11 +888,8 @@ /* Convert script names (ISO 15924) to Unix conventions. See http://www.unicode.org/iso15924/iso15924-codes.html */ - typedef struct { - const char script[4+1]; - const char unixy[9+1]; - } - script_entry; + typedef struct { const char script[4+1]; const char unixy[9+1]; } + script_entry; static const script_entry script_table[] = { { "Arab", "arabic" }, { "Cyrl", "cyrillic" }, @@ -905,71 +897,79 @@ }; /* Step 1: Convert using legacy_table. */ - if (name[0] >= 'A' && name[0] <= 'Z') { - unsigned int i1, i2; - i1 = 0; - i2 = sizeof(legacy_table) / sizeof(legacy_entry); - while (i2 - i1 > 1) { - /* At this point we know that if name occurs in legacy_table, - its index must be >= i1 and < i2. */ - unsigned int i = (i1 + i2) >> 1; - const legacy_entry *p = &legacy_table[i]; - if (strcmp(name, p->legacy) < 0) - i2 = i; - else - i1 = i; + if (name[0] >= 'A' && name[0] <= 'Z') + { + unsigned int i1, i2; + i1 = 0; + i2 = sizeof (legacy_table) / sizeof (legacy_entry); + while (i2 - i1 > 1) + { + /* At this point we know that if name occurs in legacy_table, + its index must be >= i1 and < i2. */ + unsigned int i = (i1 + i2) >> 1; + const legacy_entry *p = &legacy_table[i]; + if (strcmp (name, p->legacy) < 0) + i2 = i; + else + i1 = i; + } + if (strcmp (name, legacy_table[i1].legacy) == 0) + { + strcpy (name, legacy_table[i1].unixy); + return; + } } - if (strcmp(name, legacy_table[i1].legacy) == 0) { - strcpy(name, legacy_table[i1].unixy); - return; - } - } /* Step 2: Convert using langtag_table and script_table. */ - if (strlen(name) == 7 && name[2] == '-') { - unsigned int i1, i2; - i1 = 0; - i2 = sizeof(langtag_table) / sizeof(langtag_entry); - while (i2 - i1 > 1) { - /* At this point we know that if name occurs in langtag_table, - its index must be >= i1 and < i2. */ - unsigned int i = (i1 + i2) >> 1; - const langtag_entry *p = &langtag_table[i]; - if (strcmp(name, p->langtag) < 0) - i2 = i; - else - i1 = i; - } - if (strcmp(name, langtag_table[i1].langtag) == 0) { - strcpy(name, langtag_table[i1].unixy); - return; - } + if (strlen (name) == 7 && name[2] == '-') + { + unsigned int i1, i2; + i1 = 0; + i2 = sizeof (langtag_table) / sizeof (langtag_entry); + while (i2 - i1 > 1) + { + /* At this point we know that if name occurs in langtag_table, + its index must be >= i1 and < i2. */ + unsigned int i = (i1 + i2) >> 1; + const langtag_entry *p = &langtag_table[i]; + if (strcmp (name, p->langtag) < 0) + i2 = i; + else + i1 = i; + } + if (strcmp (name, langtag_table[i1].langtag) == 0) + { + strcpy (name, langtag_table[i1].unixy); + return; + } - i1 = 0; - i2 = sizeof(script_table) / sizeof(script_entry); - while (i2 - i1 > 1) { - /* At this point we know that if (name + 3) occurs in script_table, - its index must be >= i1 and < i2. */ - unsigned int i = (i1 + i2) >> 1; - const script_entry *p = &script_table[i]; - if (strcmp(name + 3, p->script) < 0) - i2 = i; - else - i1 = i; - } - if (strcmp(name + 3, script_table[i1].script) == 0) { - name[2] = '@'; - strcpy(name + 3, script_table[i1].unixy); - return; + i1 = 0; + i2 = sizeof (script_table) / sizeof (script_entry); + while (i2 - i1 > 1) + { + /* At this point we know that if (name + 3) occurs in script_table, + its index must be >= i1 and < i2. */ + unsigned int i = (i1 + i2) >> 1; + const script_entry *p = &script_table[i]; + if (strcmp (name + 3, p->script) < 0) + i2 = i; + else + i1 = i; + } + if (strcmp (name + 3, script_table[i1].script) == 0) + { + name[2] = '@'; + strcpy (name + 3, script_table[i1].unixy); + return; + } } - } /* Step 3: Convert new-style dash to Unix underscore. */ { char *p; for (p = name; *p != '\0'; p++) if (*p == '-') - *p = '_'; + *p = '_'; } } @@ -992,24 +992,25 @@ The result must not be freed; it is statically allocated. */ const char * -gl_locale_name_posix(int category, const char *categoryname) { +gl_locale_name_posix (int category, const char *categoryname) +{ /* Use the POSIX methods of looking to 'LC_ALL', 'LC_xxx', and 'LANG'. On some systems this can be done by the 'setlocale' function itself. */ #if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL - return setlocale(category, NULL); + return setlocale (category, NULL); #else const char *retval;
View file
LiVES-2.4.3.tar.bz2/intl/lock.c -> LiVES-2.4.4.tar.bz2/intl/lock.c
Changed
@@ -34,30 +34,34 @@ /* The function to be executed by a dummy thread. */ static void * -dummy_thread_func(void *arg) { +dummy_thread_func (void *arg) +{ return arg; } int -glthread_in_use(void) { +glthread_in_use (void) +{ static int tested; static int result; /* 1: linked with -lpthread, 0: only with libc */ - if (!tested) { - pthread_t thread; - - if (pthread_create(&thread, NULL, dummy_thread_func, NULL) != 0) - /* Thread creation failed. */ - result = 0; - else { - /* Thread creation works. */ - void *retval; - if (pthread_join(thread, &retval) != 0) - abort(); - result = 1; + if (!tested) + { + pthread_t thread; + + if (pthread_create (&thread, NULL, dummy_thread_func, NULL) != 0) + /* Thread creation failed. */ + result = 0; + else + { + /* Thread creation works. */ + void *retval; + if (pthread_join (thread, &retval) != 0) + abort (); + result = 1; + } + tested = 1; } - tested = 1; - } return result; } @@ -72,54 +76,61 @@ # if !defined PTHREAD_RWLOCK_INITIALIZER void -glthread_rwlock_init(gl_rwlock_t *lock) { - if (pthread_rwlock_init(&lock->rwlock, NULL) != 0) - abort(); +glthread_rwlock_init (gl_rwlock_t *lock) +{ + if (pthread_rwlock_init (&lock->rwlock, NULL) != 0) + abort (); lock->initialized = 1; } void -glthread_rwlock_rdlock(gl_rwlock_t *lock) { - if (!lock->initialized) { - if (pthread_mutex_lock(&lock->guard) != 0) - abort(); - if (!lock->initialized) - glthread_rwlock_init(lock); - if (pthread_mutex_unlock(&lock->guard) != 0) - abort(); - } - if (pthread_rwlock_rdlock(&lock->rwlock) != 0) - abort(); +glthread_rwlock_rdlock (gl_rwlock_t *lock) +{ + if (!lock->initialized) + { + if (pthread_mutex_lock (&lock->guard) != 0) + abort (); + if (!lock->initialized) + glthread_rwlock_init (lock); + if (pthread_mutex_unlock (&lock->guard) != 0) + abort (); + } + if (pthread_rwlock_rdlock (&lock->rwlock) != 0) + abort (); } void -glthread_rwlock_wrlock(gl_rwlock_t *lock) { - if (!lock->initialized) { - if (pthread_mutex_lock(&lock->guard) != 0) - abort(); - if (!lock->initialized) - glthread_rwlock_init(lock); - if (pthread_mutex_unlock(&lock->guard) != 0) - abort(); - } - if (pthread_rwlock_wrlock(&lock->rwlock) != 0) - abort(); +glthread_rwlock_wrlock (gl_rwlock_t *lock) +{ + if (!lock->initialized) + { + if (pthread_mutex_lock (&lock->guard) != 0) + abort (); + if (!lock->initialized) + glthread_rwlock_init (lock); + if (pthread_mutex_unlock (&lock->guard) != 0) + abort (); + } + if (pthread_rwlock_wrlock (&lock->rwlock) != 0) + abort (); } void -glthread_rwlock_unlock(gl_rwlock_t *lock) { +glthread_rwlock_unlock (gl_rwlock_t *lock) +{ if (!lock->initialized) - abort(); - if (pthread_rwlock_unlock(&lock->rwlock) != 0) - abort(); + abort (); + if (pthread_rwlock_unlock (&lock->rwlock) != 0) + abort (); } void -glthread_rwlock_destroy(gl_rwlock_t *lock) { +glthread_rwlock_destroy (gl_rwlock_t *lock) +{ if (!lock->initialized) - abort(); - if (pthread_rwlock_destroy(&lock->rwlock) != 0) - abort(); + abort (); + if (pthread_rwlock_destroy (&lock->rwlock) != 0) + abort (); lock->initialized = 0; } @@ -128,96 +139,110 @@ # else void -glthread_rwlock_init(gl_rwlock_t *lock) { - if (pthread_mutex_init(&lock->lock, NULL) != 0) - abort(); - if (pthread_cond_init(&lock->waiting_readers, NULL) != 0) - abort(); - if (pthread_cond_init(&lock->waiting_writers, NULL) != 0) - abort(); +glthread_rwlock_init (gl_rwlock_t *lock) +{ + if (pthread_mutex_init (&lock->lock, NULL) != 0) + abort (); + if (pthread_cond_init (&lock->waiting_readers, NULL) != 0) + abort (); + if (pthread_cond_init (&lock->waiting_writers, NULL) != 0) + abort (); lock->waiting_writers_count = 0; lock->runcount = 0; } void -glthread_rwlock_rdlock(gl_rwlock_t *lock) { - if (pthread_mutex_lock(&lock->lock) != 0) - abort(); +glthread_rwlock_rdlock (gl_rwlock_t *lock) +{ + if (pthread_mutex_lock (&lock->lock) != 0) + abort (); /* Test whether only readers are currently running, and whether the runcount field will not overflow. */ /* POSIX says: "It is implementation-defined whether the calling thread acquires the lock when a writer does not hold the lock and there are writers blocked on the lock." Let's say, no: give the writers a higher priority. */ - while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0)) { - /* This thread has to wait for a while. Enqueue it among the - waiting_readers. */ - if (pthread_cond_wait(&lock->waiting_readers, &lock->lock) != 0) - abort(); - } + while (!(lock->runcount + 1 > 0 && lock->waiting_writers_count == 0)) + { + /* This thread has to wait for a while. Enqueue it among the + waiting_readers. */ + if (pthread_cond_wait (&lock->waiting_readers, &lock->lock) != 0) + abort (); + } lock->runcount++; - if (pthread_mutex_unlock(&lock->lock) != 0) - abort(); + if (pthread_mutex_unlock (&lock->lock) != 0)
View file
LiVES-2.4.3.tar.bz2/intl/lock.h -> LiVES-2.4.4.tar.bz2/intl/lock.h
Changed
@@ -80,7 +80,7 @@ /* The pthread_in_use() detection needs to be done at runtime. */ # define pthread_in_use() \ glthread_in_use () -extern int glthread_in_use(void); +extern int glthread_in_use (void); # endif @@ -227,12 +227,13 @@ # else -typedef struct { - int initialized; - pthread_mutex_t guard; /* protects the initialization */ - pthread_rwlock_t rwlock; /* read-write lock */ -} -gl_rwlock_t; +typedef struct + { + int initialized; + pthread_mutex_t guard; /* protects the initialization */ + pthread_rwlock_t rwlock; /* read-write lock */ + } + gl_rwlock_t; # define gl_rwlock_define(STORAGECLASS, NAME) \ STORAGECLASS gl_rwlock_t NAME; # define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ @@ -274,24 +275,25 @@ glthread_rwlock_destroy (&NAME); \ } \ while (0) -extern void glthread_rwlock_init(gl_rwlock_t *lock); -extern void glthread_rwlock_rdlock(gl_rwlock_t *lock); -extern void glthread_rwlock_wrlock(gl_rwlock_t *lock); -extern void glthread_rwlock_unlock(gl_rwlock_t *lock); -extern void glthread_rwlock_destroy(gl_rwlock_t *lock); +extern void glthread_rwlock_init (gl_rwlock_t *lock); +extern void glthread_rwlock_rdlock (gl_rwlock_t *lock); +extern void glthread_rwlock_wrlock (gl_rwlock_t *lock); +extern void glthread_rwlock_unlock (gl_rwlock_t *lock); +extern void glthread_rwlock_destroy (gl_rwlock_t *lock); # endif # else -typedef struct { - pthread_mutex_t lock; /* protects the remaining fields */ - pthread_cond_t waiting_readers; /* waiting readers */ - pthread_cond_t waiting_writers; /* waiting writers */ - unsigned int waiting_writers_count; /* number of waiting writers */ - int runcount; /* number of readers running, or -1 when a writer runs */ -} -gl_rwlock_t; +typedef struct + { + pthread_mutex_t lock; /* protects the remaining fields */ + pthread_cond_t waiting_readers; /* waiting readers */ + pthread_cond_t waiting_writers; /* waiting writers */ + unsigned int waiting_writers_count; /* number of waiting writers */ + int runcount; /* number of readers running, or -1 when a writer runs */ + } + gl_rwlock_t; # define gl_rwlock_define(STORAGECLASS, NAME) \ STORAGECLASS gl_rwlock_t NAME; # define gl_rwlock_define_initialized(STORAGECLASS, NAME) \ @@ -333,11 +335,11 @@ glthread_rwlock_destroy (&NAME); \ } \ while (0) -extern void glthread_rwlock_init(gl_rwlock_t *lock); -extern void glthread_rwlock_rdlock(gl_rwlock_t *lock); -extern void glthread_rwlock_wrlock(gl_rwlock_t *lock); -extern void glthread_rwlock_unlock(gl_rwlock_t *lock); -extern void glthread_rwlock_destroy(gl_rwlock_t *lock); +extern void glthread_rwlock_init (gl_rwlock_t *lock); +extern void glthread_rwlock_rdlock (gl_rwlock_t *lock); +extern void glthread_rwlock_wrlock (gl_rwlock_t *lock); +extern void glthread_rwlock_unlock (gl_rwlock_t *lock); +extern void glthread_rwlock_destroy (gl_rwlock_t *lock); # endif @@ -390,12 +392,13 @@ # else -typedef struct { - pthread_mutex_t recmutex; /* recursive mutex */ - pthread_mutex_t guard; /* protects the initialization */ - int initialized; -} -gl_recursive_lock_t; +typedef struct + { + pthread_mutex_t recmutex; /* recursive mutex */ + pthread_mutex_t guard; /* protects the initialization */ + int initialized; + } + gl_recursive_lock_t; # define gl_recursive_lock_define(STORAGECLASS, NAME) \ STORAGECLASS gl_recursive_lock_t NAME; # define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ @@ -430,10 +433,10 @@ glthread_recursive_lock_destroy (&NAME); \ } \ while (0) -extern void glthread_recursive_lock_init(gl_recursive_lock_t *lock); -extern void glthread_recursive_lock_lock(gl_recursive_lock_t *lock); -extern void glthread_recursive_lock_unlock(gl_recursive_lock_t *lock); -extern void glthread_recursive_lock_destroy(gl_recursive_lock_t *lock); +extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock); +extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock); +extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock); +extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock); # endif @@ -442,12 +445,13 @@ /* Old versions of POSIX threads on Solaris did not have recursive locks. We have to implement them ourselves. */ -typedef struct { - pthread_mutex_t mutex; - pthread_t owner; - unsigned long depth; -} -gl_recursive_lock_t; +typedef struct + { + pthread_mutex_t mutex; + pthread_t owner; + unsigned long depth; + } + gl_recursive_lock_t; # define gl_recursive_lock_define(STORAGECLASS, NAME) \ STORAGECLASS gl_recursive_lock_t NAME; # define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ @@ -482,10 +486,10 @@ glthread_recursive_lock_destroy (&NAME); \ } \ while (0) -extern void glthread_recursive_lock_init(gl_recursive_lock_t *lock); -extern void glthread_recursive_lock_lock(gl_recursive_lock_t *lock); -extern void glthread_recursive_lock_unlock(gl_recursive_lock_t *lock); -extern void glthread_recursive_lock_destroy(gl_recursive_lock_t *lock); +extern void glthread_recursive_lock_init (gl_recursive_lock_t *lock); +extern void glthread_recursive_lock_lock (gl_recursive_lock_t *lock); +extern void glthread_recursive_lock_unlock (gl_recursive_lock_t *lock); +extern void glthread_recursive_lock_destroy (gl_recursive_lock_t *lock); # endif @@ -509,7 +513,7 @@ } \ } \ while (0) -extern int glthread_once_singlethreaded(pthread_once_t *once_control); +extern int glthread_once_singlethreaded (pthread_once_t *once_control); # ifdef __cplusplus } @@ -681,8 +685,8 @@ } \ } \ while (0) -extern void glthread_once_call(void *arg); -extern int glthread_once_singlethreaded(pth_once_t *once_control); +extern void glthread_once_call (void *arg); +extern int glthread_once_singlethreaded (pth_once_t *once_control); # ifdef __cplusplus } @@ -816,12 +820,13 @@ /* Old Solaris threads did not have recursive locks. We have to implement them ourselves. */ -typedef struct { - mutex_t mutex; - thread_t owner; - unsigned long depth; -} -gl_recursive_lock_t; +typedef struct + { + mutex_t mutex; + thread_t owner; + unsigned long depth; + } + gl_recursive_lock_t; # define gl_recursive_lock_define(STORAGECLASS, NAME) \ STORAGECLASS gl_recursive_lock_t NAME; # define gl_recursive_lock_define_initialized(STORAGECLASS, NAME) \ @@ -856,18 +861,19 @@ glthread_recursive_lock_destroy (&NAME); \ } \ while (0) -extern void glthread_recursive_lock_init(gl_recursive_lock_t *lock);
View file
LiVES-2.4.3.tar.bz2/intl/log.c -> LiVES-2.4.4.tar.bz2/intl/log.c
Changed
@@ -35,71 +35,82 @@ /* Print an ASCII string with quotes and escape sequences where needed. */ static void -print_escaped(FILE *stream, const char *str) { - putc('"', stream); +print_escaped (FILE *stream, const char *str) +{ + putc ('"', stream); for (; *str != '\0'; str++) - if (*str == '\n') { - fputs("\\n\"", stream); - if (str[1] == '\0') - return; - fputs("\n\"", stream); - } else { - if (*str == '"' || *str == '\\') - putc('\\', stream); - putc(*str, stream); - } - putc('"', stream); + if (*str == '\n') + { + fputs ("\\n\"", stream); + if (str[1] == '\0') + return; + fputs ("\n\"", stream); + } + else + { + if (*str == '"' || *str == '\\') + putc ('\\', stream); + putc (*str, stream); + } + putc ('"', stream); } static char *last_logfilename = NULL; static FILE *last_logfile = NULL; -__libc_lock_define_initialized(static, lock) +__libc_lock_define_initialized (static, lock) static inline void -_nl_log_untranslated_locked(const char *logfilename, const char *domainname, - const char *msgid1, const char *msgid2, int plural) { +_nl_log_untranslated_locked (const char *logfilename, const char *domainname, + const char *msgid1, const char *msgid2, int plural) +{ FILE *logfile; /* Can we reuse the last opened logfile? */ - if (last_logfilename == NULL || strcmp(logfilename, last_logfilename) != 0) { - /* Close the last used logfile. */ - if (last_logfilename != NULL) { - if (last_logfile != NULL) { - fclose(last_logfile); - last_logfile = NULL; - } - free(last_logfilename); - last_logfilename = NULL; + if (last_logfilename == NULL || strcmp (logfilename, last_logfilename) != 0) + { + /* Close the last used logfile. */ + if (last_logfilename != NULL) + { + if (last_logfile != NULL) + { + fclose (last_logfile); + last_logfile = NULL; + } + free (last_logfilename); + last_logfilename = NULL; + } + /* Open the logfile. */ + last_logfilename = (char *) malloc (strlen (logfilename) + 1); + if (last_logfilename == NULL) + return; + strcpy (last_logfilename, logfilename); + last_logfile = fopen (logfilename, "a"); + if (last_logfile == NULL) + return; } - /* Open the logfile. */ - last_logfilename = (char *) malloc(strlen(logfilename) + 1); - if (last_logfilename == NULL) - return; - strcpy(last_logfilename, logfilename); - last_logfile = fopen(logfilename, "a"); - if (last_logfile == NULL) - return; - } logfile = last_logfile; - fprintf(logfile, "domain "); - print_escaped(logfile, domainname); - fprintf(logfile, "\nmsgid "); - print_escaped(logfile, msgid1); - if (plural) { - fprintf(logfile, "\nmsgid_plural "); - print_escaped(logfile, msgid2); - fprintf(logfile, "\nmsgstr[0] \"\"\n"); - } else - fprintf(logfile, "\nmsgstr \"\"\n"); - putc('\n', logfile); + fprintf (logfile, "domain "); + print_escaped (logfile, domainname); + fprintf (logfile, "\nmsgid "); + print_escaped (logfile, msgid1); + if (plural) + { + fprintf (logfile, "\nmsgid_plural "); + print_escaped (logfile, msgid2); + fprintf (logfile, "\nmsgstr[0] \"\"\n"); + } + else + fprintf (logfile, "\nmsgstr \"\"\n"); + putc ('\n', logfile); } /* Add to the log file an entry denoting a failed translation. */ void -_nl_log_untranslated(const char *logfilename, const char *domainname, - const char *msgid1, const char *msgid2, int plural) { - __libc_lock_lock(lock); - _nl_log_untranslated_locked(logfilename, domainname, msgid1, msgid2, plural); - __libc_lock_unlock(lock); +_nl_log_untranslated (const char *logfilename, const char *domainname, + const char *msgid1, const char *msgid2, int plural) +{ + __libc_lock_lock (lock); + _nl_log_untranslated_locked (logfilename, domainname, msgid1, msgid2, plural); + __libc_lock_unlock (lock); }
View file
LiVES-2.4.3.tar.bz2/intl/ngettext.c -> LiVES-2.4.4.tar.bz2/intl/ngettext.c
Changed
@@ -54,11 +54,12 @@ LC_MESSAGES locale. If not found, returns MSGID itself (the default text). */ char * -NGETTEXT(const char *msgid1, const char *msgid2, unsigned long int n) { - return DCNGETTEXT(NULL, msgid1, msgid2, n, LC_MESSAGES); +NGETTEXT (const char *msgid1, const char *msgid2, unsigned long int n) +{ + return DCNGETTEXT (NULL, msgid1, msgid2, n, LC_MESSAGES); } #ifdef _LIBC /* Alias for function name in GNU C Library. */ -weak_alias(__ngettext, ngettext); +weak_alias (__ngettext, ngettext); #endif
View file
LiVES-2.4.3.tar.bz2/intl/os2compat.c -> LiVES-2.4.4.tar.bz2/intl/os2compat.c
Changed
@@ -26,12 +26,13 @@ #include <sys/param.h> /* A version of getenv() that works from DLLs */ -extern unsigned long DosScanEnv(const unsigned char *pszName, unsigned char **ppszValue); +extern unsigned long DosScanEnv (const unsigned char *pszName, unsigned char **ppszValue); char * -_nl_getenv(const char *name) { +_nl_getenv (const char *name) +{ unsigned char *value; - if (DosScanEnv(name, &value)) + if (DosScanEnv (name, &value)) return NULL; else return value; @@ -45,43 +46,53 @@ char *_nlos2_localedir = NULL; static __attribute__((constructor)) void -nlos2_initialize() { - char *root = getenv("UNIXROOT"); - char *gnulocaledir = getenv("GNULOCALEDIR"); +nlos2_initialize () +{ + char *root = getenv ("UNIXROOT"); + char *gnulocaledir = getenv ("GNULOCALEDIR"); _nlos2_libdir = gnulocaledir; - if (!_nlos2_libdir) { - if (root) { - size_t sl = strlen(root); - _nlos2_libdir = (char *) malloc(sl + strlen(LIBDIR) + 1); - memcpy(_nlos2_libdir, root, sl); - memcpy(_nlos2_libdir + sl, LIBDIR, strlen(LIBDIR) + 1); - } else - _nlos2_libdir = LIBDIR; - } + if (!_nlos2_libdir) + { + if (root) + { + size_t sl = strlen (root); + _nlos2_libdir = (char *) malloc (sl + strlen (LIBDIR) + 1); + memcpy (_nlos2_libdir, root, sl); + memcpy (_nlos2_libdir + sl, LIBDIR, strlen (LIBDIR) + 1); + } + else + _nlos2_libdir = LIBDIR; + } _nlos2_localealiaspath = gnulocaledir; - if (!_nlos2_localealiaspath) { - if (root) { - size_t sl = strlen(root); - _nlos2_localealiaspath = (char *) malloc(sl + strlen(LOCALE_ALIAS_PATH) + 1); - memcpy(_nlos2_localealiaspath, root, sl); - memcpy(_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen(LOCALE_ALIAS_PATH) + 1); - } else - _nlos2_localealiaspath = LOCALE_ALIAS_PATH; - } + if (!_nlos2_localealiaspath) + { + if (root) + { + size_t sl = strlen (root); + _nlos2_localealiaspath = (char *) malloc (sl + strlen (LOCALE_ALIAS_PATH) + 1); + memcpy (_nlos2_localealiaspath, root, sl); + memcpy (_nlos2_localealiaspath + sl, LOCALE_ALIAS_PATH, strlen (LOCALE_ALIAS_PATH) + 1); + } + else + _nlos2_localealiaspath = LOCALE_ALIAS_PATH; + } _nlos2_localedir = gnulocaledir; - if (!_nlos2_localedir) { - if (root) { - size_t sl = strlen(root); - _nlos2_localedir = (char *) malloc(sl + strlen(LOCALEDIR) + 1); - memcpy(_nlos2_localedir, root, sl); - memcpy(_nlos2_localedir + sl, LOCALEDIR, strlen(LOCALEDIR) + 1); - } else - _nlos2_localedir = LOCALEDIR; - } + if (!_nlos2_localedir) + { + if (root) + { + size_t sl = strlen (root); + _nlos2_localedir = (char *) malloc (sl + strlen (LOCALEDIR) + 1); + memcpy (_nlos2_localedir, root, sl); + memcpy (_nlos2_localedir + sl, LOCALEDIR, strlen (LOCALEDIR) + 1); + } + else + _nlos2_localedir = LOCALEDIR; + } - if (strlen(_nlos2_localedir) <= MAXPATHLEN) - strcpy(libintl_nl_default_dirname, _nlos2_localedir); + if (strlen (_nlos2_localedir) <= MAXPATHLEN) + strcpy (libintl_nl_default_dirname, _nlos2_localedir); }
View file
LiVES-2.4.3.tar.bz2/intl/plural-exp.c -> LiVES-2.4.4.tar.bz2/intl/plural-exp.c
Changed
@@ -32,11 +32,13 @@ /* These structs are the constant expression for the germanic plural form determination. It represents the expression "n != 1". */ -static const struct expression plvar = { +static const struct expression plvar = +{ .nargs = 0, .operation = var, }; -static const struct expression plone = { +static const struct expression plone = +{ .nargs = 0, .operation = num, .val = @@ -44,7 +46,8 @@ .num = 1 } }; -struct expression GERMANIC_PLURAL = { +struct expression GERMANIC_PLURAL = +{ .nargs = 2, .operation = not_equal, .val = @@ -69,20 +72,22 @@ struct expression GERMANIC_PLURAL; static void -init_germanic_plural() { - if (plone.val.num == 0) { - plvar.nargs = 0; - plvar.operation = var; - - plone.nargs = 0; - plone.operation = num; - plone.val.num = 1; - - GERMANIC_PLURAL.nargs = 2; - GERMANIC_PLURAL.operation = not_equal; - GERMANIC_PLURAL.val.args[0] = &plvar; - GERMANIC_PLURAL.val.args[1] = &plone; - } +init_germanic_plural () +{ + if (plone.val.num == 0) + { + plvar.nargs = 0; + plvar.operation = var; + + plone.nargs = 0; + plone.operation = num; + plone.val.num = 1; + + GERMANIC_PLURAL.nargs = 2; + GERMANIC_PLURAL.operation = not_equal; + GERMANIC_PLURAL.val.args[0] = &plvar; + GERMANIC_PLURAL.val.args[1] = &plone; + } } # define INIT_GERMANIC_PLURAL() init_germanic_plural () @@ -91,55 +96,60 @@ void internal_function -EXTRACT_PLURAL_EXPRESSION(const char *nullentry, - const struct expression **pluralp, - unsigned long int *npluralsp) { - if (nullentry != NULL) { - const char *plural; - const char *nplurals; - - plural = strstr(nullentry, "plural="); - nplurals = strstr(nullentry, "nplurals="); - if (plural == NULL || nplurals == NULL) - goto no_plural; - else { - char *endp; - unsigned long int n; - struct parse_args args; - - /* First get the number. */ - nplurals += 9; - while (*nplurals != '\0' && isspace((unsigned char) *nplurals)) - ++nplurals; - if (!(*nplurals >= '0' && *nplurals <= '9')) - goto no_plural; +EXTRACT_PLURAL_EXPRESSION (const char *nullentry, + const struct expression **pluralp, + unsigned long int *npluralsp) +{ + if (nullentry != NULL) + { + const char *plural; + const char *nplurals; + + plural = strstr (nullentry, "plural="); + nplurals = strstr (nullentry, "nplurals="); + if (plural == NULL || nplurals == NULL) + goto no_plural; + else + { + char *endp; + unsigned long int n; + struct parse_args args; + + /* First get the number. */ + nplurals += 9; + while (*nplurals != '\0' && isspace ((unsigned char) *nplurals)) + ++nplurals; + if (!(*nplurals >= '0' && *nplurals <= '9')) + goto no_plural; #if defined HAVE_STRTOUL || defined _LIBC - n = strtoul(nplurals, &endp, 10); + n = strtoul (nplurals, &endp, 10); #else - for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++) - n = n * 10 + (*endp - '0'); + for (endp = nplurals, n = 0; *endp >= '0' && *endp <= '9'; endp++) + n = n * 10 + (*endp - '0'); #endif - if (nplurals == endp) - goto no_plural; - *npluralsp = n; - - /* Due to the restrictions bison imposes onto the interface of the - scanner function we have to put the input string and the result - passed up from the parser into the same structure which address - is passed down to the parser. */ - plural += 7; - args.cp = plural; - if (PLURAL_PARSE(&args) != 0) - goto no_plural; - *pluralp = args.res; + if (nplurals == endp) + goto no_plural; + *npluralsp = n; + + /* Due to the restrictions bison imposes onto the interface of the + scanner function we have to put the input string and the result + passed up from the parser into the same structure which address + is passed down to the parser. */ + plural += 7; + args.cp = plural; + if (PLURAL_PARSE (&args) != 0) + goto no_plural; + *pluralp = args.res; + } + } + else + { + /* By default we are using the Germanic form: singular form only + for `one', the plural form otherwise. Yes, this is also what + English is using since English is a Germanic language. */ + no_plural: + INIT_GERMANIC_PLURAL (); + *pluralp = &GERMANIC_PLURAL; + *npluralsp = 2; } - } else { - /* By default we are using the Germanic form: singular form only - for `one', the plural form otherwise. Yes, this is also what - English is using since English is a Germanic language. */ -no_plural: - INIT_GERMANIC_PLURAL(); - *pluralp = &GERMANIC_PLURAL; - *npluralsp = 2; - } }
View file
LiVES-2.4.3.tar.bz2/intl/plural-exp.h -> LiVES-2.4.4.tar.bz2/intl/plural-exp.h
Changed
@@ -60,10 +60,12 @@ /* This is the representation of the expressions to determine the plural form. */ -struct expression { +struct expression +{ int nargs; /* Number of arguments. */ enum expression_operator operation; - union { + union + { unsigned long int num; /* Number value for `num'. */ struct expression *args[3]; /* Up to three arguments. */ } val; @@ -71,7 +73,8 @@ /* This is the data structure to pass information to the parser and get the result in a thread-safe way. */ -struct parse_args { +struct parse_args +{ const char *cp; struct expression *res; }; @@ -104,18 +107,18 @@ # define EXTRACT_PLURAL_EXPRESSION extract_plural_expression #endif -extern void FREE_EXPRESSION(struct expression *exp) -internal_function; -extern int PLURAL_PARSE(void *arg); +extern void FREE_EXPRESSION (struct expression *exp) + internal_function; +extern int PLURAL_PARSE (void *arg); extern struct expression GERMANIC_PLURAL attribute_hidden; -extern void EXTRACT_PLURAL_EXPRESSION(const char *nullentry, - const struct expression **pluralp, - unsigned long int *npluralsp) -internal_function; +extern void EXTRACT_PLURAL_EXPRESSION (const char *nullentry, + const struct expression **pluralp, + unsigned long int *npluralsp) + internal_function; #if !defined (_LIBC) && !defined (IN_LIBINTL) && !defined (IN_LIBGLOCALE) -extern unsigned long int plural_eval(const struct expression *pexp, - unsigned long int n); +extern unsigned long int plural_eval (const struct expression *pexp, + unsigned long int n); #endif
View file
LiVES-2.4.3.tar.bz2/intl/plural.c -> LiVES-2.4.4.tar.bz2/intl/plural.c
Changed
@@ -97,7 +97,7 @@ because <config.h> may include arbitrary system headers. This can go away once the AM_INTL_SUBDIR macro requires bison >= 2.0. */ #if defined _AIX && !defined __GNUC__ -#pragma alloca + #pragma alloca #endif #ifdef HAVE_CONFIG_H @@ -141,15 +141,15 @@ /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE -/* Put the tokens into the symbol table, so that GDB and other debuggers - know about them. */ -enum yytokentype { - EQUOP2 = 258, - CMPOP2 = 259, - ADDOP2 = 260, - MULOP2 = 261, - NUMBER = 262 -}; + /* Put the tokens into the symbol table, so that GDB and other debuggers + know about them. */ + enum yytokentype { + EQUOP2 = 258, + CMPOP2 = 259, + ADDOP2 = 260, + MULOP2 = 261, + NUMBER = 262 + }; #endif /* Tokens. */ #define EQUOP2 258 @@ -162,8 +162,8 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED -typedef union YYSTYPE { - /* Line 191 of yacc.c. */ +typedef union YYSTYPE +{/* Line 191 of yacc.c. */ #line 51 "plural.y" unsigned long int num; @@ -172,7 +172,7 @@ } /* Line 191 of yacc.c. */ #line 175 "plural.c" -YYSTYPE; + YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -186,14 +186,15 @@ #line 57 "plural.y" /* Prototypes for local functions. */ -static int yylex(YYSTYPE *lval, const char **pexp); -static void yyerror(const char *str); +static int yylex (YYSTYPE *lval, const char **pexp); +static void yyerror (const char *str); /* Allocation of expressions. */ static struct expression * -new_exp(int nargs, enum expression_operator op, - struct expression *const *args) { +new_exp (int nargs, enum expression_operator op, + struct expression * const *args) +{ int i; struct expression *newp; @@ -203,54 +204,59 @@ goto fail; /* Allocate a new expression. */ - newp = (struct expression *) malloc(sizeof(*newp)); - if (newp != NULL) { - newp->nargs = nargs; - newp->operation = op; - for (i = nargs - 1; i >= 0; i--) - newp->val.args[i] = args[i]; - return newp; - } - -fail: + newp = (struct expression *) malloc (sizeof (*newp)); + if (newp != NULL) + { + newp->nargs = nargs; + newp->operation = op; + for (i = nargs - 1; i >= 0; i--) + newp->val.args[i] = args[i]; + return newp; + } + + fail: for (i = nargs - 1; i >= 0; i--) - FREE_EXPRESSION(args[i]); + FREE_EXPRESSION (args[i]); return NULL; } static inline struct expression * -new_exp_0(enum expression_operator op) { - return new_exp(0, op, NULL); +new_exp_0 (enum expression_operator op) +{ + return new_exp (0, op, NULL); } static inline struct expression * -new_exp_1(enum expression_operator op, struct expression *right) { +new_exp_1 (enum expression_operator op, struct expression *right) +{ struct expression *args[1]; args[0] = right; - return new_exp(1, op, args); + return new_exp (1, op, args); } static struct expression * -new_exp_2(enum expression_operator op, struct expression *left, - struct expression *right) { +new_exp_2 (enum expression_operator op, struct expression *left, + struct expression *right) +{ struct expression *args[2]; args[0] = left; args[1] = right; - return new_exp(2, op, args); + return new_exp (2, op, args); } static inline struct expression * -new_exp_3(enum expression_operator op, struct expression *bexp, - struct expression *tbranch, struct expression *fbranch) { +new_exp_3 (enum expression_operator op, struct expression *bexp, + struct expression *tbranch, struct expression *fbranch) +{ struct expression *args[3]; args[0] = bexp; args[1] = tbranch; args[2] = fbranch; - return new_exp(3, op, args); + return new_exp (3, op, args); } @@ -330,11 +336,11 @@ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static int -YYID(int yyi) +YYID (int yyi) #else static int -YYID(yyi) -int yyi; +YYID (yyi) + int yyi; #endif { return yyi; @@ -370,13 +376,13 @@ # endif # ifdef YYSTACK_ALLOC -/* Pacify GCC's `empty if-body' warning. */ + /* Pacify GCC's `empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0)) # ifndef YYSTACK_ALLOC_MAXIMUM -/* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ + /* The OS might guarantee only one guard page at the bottom of the stack, + and a page size can be as small as 4096 bytes. So we cannot safely + invoke alloca (N) if N exceeds 4096. Use a slightly smaller number + to allow for a few compiler-allocated temporary stack slots. */ # define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ # endif # else @@ -397,14 +403,14 @@ # define YYMALLOC malloc # if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) -void *malloc(YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ +void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free # if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
View file
LiVES-2.4.3.tar.bz2/intl/printf-args.c -> LiVES-2.4.4.tar.bz2/intl/printf-args.c
Changed
@@ -34,148 +34,155 @@ STATIC #endif int -PRINTF_FETCHARGS(va_list args, arguments *a) { +PRINTF_FETCHARGS (va_list args, arguments *a) +{ size_t i; argument *ap; for (i = 0, ap = &a->arg[0]; i < a->count; i++, ap++) - switch (ap->type) { - case TYPE_SCHAR: - ap->a.a_schar = va_arg(args, /*signed char*/ int); - break; - case TYPE_UCHAR: - ap->a.a_uchar = va_arg(args, /*unsigned char*/ int); - break; - case TYPE_SHORT: - ap->a.a_short = va_arg(args, /*short*/ int); - break; - case TYPE_USHORT: - ap->a.a_ushort = va_arg(args, /*unsigned short*/ int); - break; - case TYPE_INT: - ap->a.a_int = va_arg(args, int); - break; - case TYPE_UINT: - ap->a.a_uint = va_arg(args, unsigned int); - break; - case TYPE_LONGINT: - ap->a.a_longint = va_arg(args, long int); - break; - case TYPE_ULONGINT: - ap->a.a_ulongint = va_arg(args, unsigned long int); - break; + switch (ap->type) + { + case TYPE_SCHAR: + ap->a.a_schar = va_arg (args, /*signed char*/ int); + break; + case TYPE_UCHAR: + ap->a.a_uchar = va_arg (args, /*unsigned char*/ int); + break; + case TYPE_SHORT: + ap->a.a_short = va_arg (args, /*short*/ int); + break; + case TYPE_USHORT: + ap->a.a_ushort = va_arg (args, /*unsigned short*/ int); + break; + case TYPE_INT: + ap->a.a_int = va_arg (args, int); + break; + case TYPE_UINT: + ap->a.a_uint = va_arg (args, unsigned int); + break; + case TYPE_LONGINT: + ap->a.a_longint = va_arg (args, long int); + break; + case TYPE_ULONGINT: + ap->a.a_ulongint = va_arg (args, unsigned long int); + break; #if HAVE_LONG_LONG_INT - case TYPE_LONGLONGINT: - ap->a.a_longlongint = va_arg(args, long long int); - break; - case TYPE_ULONGLONGINT: - ap->a.a_ulonglongint = va_arg(args, unsigned long long int); - break; + case TYPE_LONGLONGINT: + ap->a.a_longlongint = va_arg (args, long long int); + break; + case TYPE_ULONGLONGINT: + ap->a.a_ulonglongint = va_arg (args, unsigned long long int); + break; #endif - case TYPE_DOUBLE: - ap->a.a_double = va_arg(args, double); - break; - case TYPE_LONGDOUBLE: - ap->a.a_longdouble = va_arg(args, long double); - break; - case TYPE_CHAR: - ap->a.a_char = va_arg(args, int); - break; + case TYPE_DOUBLE: + ap->a.a_double = va_arg (args, double); + break; + case TYPE_LONGDOUBLE: + ap->a.a_longdouble = va_arg (args, long double); + break; + case TYPE_CHAR: + ap->a.a_char = va_arg (args, int); + break; #if HAVE_WINT_T - case TYPE_WIDE_CHAR: - /* Although ISO C 99 7.24.1.(2) says that wint_t is "unchanged by - default argument promotions", this is not the case in mingw32, - where wint_t is 'unsigned short'. */ - ap->a.a_wide_char = - (sizeof(wint_t) < sizeof(int) - ? va_arg(args, int) - : va_arg(args, wint_t)); - break; + case TYPE_WIDE_CHAR: + /* Although ISO C 99 7.24.1.(2) says that wint_t is "unchanged by + default argument promotions", this is not the case in mingw32, + where wint_t is 'unsigned short'. */ + ap->a.a_wide_char = + (sizeof (wint_t) < sizeof (int) + ? va_arg (args, int) + : va_arg (args, wint_t)); + break; #endif - case TYPE_STRING: - ap->a.a_string = va_arg(args, const char *); - /* A null pointer is an invalid argument for "%s", but in practice - it occurs quite frequently in printf statements that produce - debug output. Use a fallback in this case. */ - if (ap->a.a_string == NULL) - ap->a.a_string = "(NULL)"; - break; + case TYPE_STRING: + ap->a.a_string = va_arg (args, const char *); + /* A null pointer is an invalid argument for "%s", but in practice + it occurs quite frequently in printf statements that produce + debug output. Use a fallback in this case. */ + if (ap->a.a_string == NULL) + ap->a.a_string = "(NULL)"; + break; #if HAVE_WCHAR_T - case TYPE_WIDE_STRING: - ap->a.a_wide_string = va_arg(args, const wchar_t *); - /* A null pointer is an invalid argument for "%ls", but in practice - it occurs quite frequently in printf statements that produce - debug output. Use a fallback in this case. */ - if (ap->a.a_wide_string == NULL) { - static const wchar_t wide_null_string[] = { - (wchar_t)'(', - (wchar_t)'N', (wchar_t)'U', (wchar_t)'L', (wchar_t)'L', - (wchar_t)')', - (wchar_t)0 - }; - ap->a.a_wide_string = wide_null_string; - } - break; + case TYPE_WIDE_STRING: + ap->a.a_wide_string = va_arg (args, const wchar_t *); + /* A null pointer is an invalid argument for "%ls", but in practice + it occurs quite frequently in printf statements that produce + debug output. Use a fallback in this case. */ + if (ap->a.a_wide_string == NULL) + { + static const wchar_t wide_null_string[] = + { + (wchar_t)'(', + (wchar_t)'N', (wchar_t)'U', (wchar_t)'L', (wchar_t)'L', + (wchar_t)')', + (wchar_t)0 + }; + ap->a.a_wide_string = wide_null_string; + } + break; #endif - case TYPE_POINTER: - ap->a.a_pointer = va_arg(args, void *); - break; - case TYPE_COUNT_SCHAR_POINTER: - ap->a.a_count_schar_pointer = va_arg(args, signed char *); - break; - case TYPE_COUNT_SHORT_POINTER: - ap->a.a_count_short_pointer = va_arg(args, short *); - break; - case TYPE_COUNT_INT_POINTER: - ap->a.a_count_int_pointer = va_arg(args, int *); - break; - case TYPE_COUNT_LONGINT_POINTER: - ap->a.a_count_longint_pointer = va_arg(args, long int *); - break; + case TYPE_POINTER: + ap->a.a_pointer = va_arg (args, void *); + break; + case TYPE_COUNT_SCHAR_POINTER: + ap->a.a_count_schar_pointer = va_arg (args, signed char *); + break; + case TYPE_COUNT_SHORT_POINTER: + ap->a.a_count_short_pointer = va_arg (args, short *); + break; + case TYPE_COUNT_INT_POINTER: + ap->a.a_count_int_pointer = va_arg (args, int *); + break; + case TYPE_COUNT_LONGINT_POINTER: + ap->a.a_count_longint_pointer = va_arg (args, long int *); + break; #if HAVE_LONG_LONG_INT - case TYPE_COUNT_LONGLONGINT_POINTER: - ap->a.a_count_longlongint_pointer = va_arg(args, long long int *); - break; + case TYPE_COUNT_LONGLONGINT_POINTER: + ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
View file
LiVES-2.4.3.tar.bz2/intl/printf-args.h -> LiVES-2.4.4.tar.bz2/intl/printf-args.h
Changed
@@ -47,7 +47,8 @@ /* Argument types */ -typedef enum { +typedef enum +{ TYPE_NONE, TYPE_SCHAR, TYPE_UCHAR, @@ -77,20 +78,22 @@ TYPE_COUNT_INT_POINTER, TYPE_COUNT_LONGINT_POINTER #if HAVE_LONG_LONG_INT - , TYPE_COUNT_LONGLONGINT_POINTER +, TYPE_COUNT_LONGLONGINT_POINTER #endif #if ENABLE_UNISTDIO /* The unistdio extensions. */ - , TYPE_U8_STRING - , TYPE_U16_STRING - , TYPE_U32_STRING +, TYPE_U8_STRING +, TYPE_U16_STRING +, TYPE_U32_STRING #endif } arg_type; /* Polymorphic argument */ -typedef struct { +typedef struct +{ arg_type type; - union { + union + { signed char a_schar; unsigned char a_uchar; short a_short; @@ -110,30 +113,31 @@ #if HAVE_WINT_T wint_t a_wide_char; #endif - const char *a_string; + const char* a_string; #if HAVE_WCHAR_T - const wchar_t *a_wide_string; + const wchar_t* a_wide_string; #endif - void *a_pointer; - signed char *a_count_schar_pointer; - short *a_count_short_pointer; - int *a_count_int_pointer; - long int *a_count_longint_pointer; + void* a_pointer; + signed char * a_count_schar_pointer; + short * a_count_short_pointer; + int * a_count_int_pointer; + long int * a_count_longint_pointer; #if HAVE_LONG_LONG_INT - long long int *a_count_longlongint_pointer; + long long int * a_count_longlongint_pointer; #endif #if ENABLE_UNISTDIO /* The unistdio extensions. */ - const uint8_t *a_u8_string; - const uint16_t *a_u16_string; - const uint32_t *a_u32_string; + const uint8_t * a_u8_string; + const uint16_t * a_u16_string; + const uint32_t * a_u32_string; #endif } a; } argument; -typedef struct { +typedef struct +{ size_t count; argument *arg; } @@ -146,6 +150,6 @@ #else extern #endif -int PRINTF_FETCHARGS(va_list args, arguments *a); +int PRINTF_FETCHARGS (va_list args, arguments *a); #endif /* _PRINTF_ARGS_H */
View file
LiVES-2.4.3.tar.bz2/intl/printf-parse.c -> LiVES-2.4.4.tar.bz2/intl/printf-parse.c
Changed
@@ -79,7 +79,8 @@ STATIC #endif int -PRINTF_PARSE(const CHAR_T *format, DIRECTIVES *d, arguments *a) { +PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) +{ const CHAR_T *cp = format; /* pointer into format */ size_t arg_posn = 0; /* number of regular arguments consumed */ size_t d_allocated; /* allocated elements of d->dir */ @@ -89,7 +90,7 @@ d->count = 0; d_allocated = 1; - d->dir = (DIRECTIVE *) malloc(d_allocated * sizeof(DIRECTIVE)); + d->dir = (DIRECTIVE *) malloc (d_allocated * sizeof (DIRECTIVE)); if (d->dir == NULL) /* Out of memory. */ goto out_of_memory_1; @@ -130,387 +131,434 @@ goto error; \ } - while (*cp != '\0') { - CHAR_T c = *cp++; - if (c == '%') { - size_t arg_index = ARG_NONE; - DIRECTIVE *dp = &d->dir[d->count]; /* pointer to next directive */ - - /* Initialize the next directive. */ - dp->dir_start = cp - 1; - dp->flags = 0; - dp->width_start = NULL; - dp->width_end = NULL; - dp->width_arg_index = ARG_NONE; - dp->precision_start = NULL; - dp->precision_end = NULL; - dp->precision_arg_index = ARG_NONE; - dp->arg_index = ARG_NONE; - - /* Test for positional argument. */ - if (*cp >= '0' && *cp <= '9') { - const CHAR_T *np; - - for (np = cp; *np >= '0' && *np <= '9'; np++) - ; - if (*np == '$') { - size_t n = 0; - - for (np = cp; *np >= '0' && *np <= '9'; np++) - n = xsum(xtimes(n, 10), *np - '0'); - if (n == 0) - /* Positional argument 0. */ - goto error; - if (size_overflow_p(n)) - /* n too large, would lead to out of memory later. */ - goto error; - arg_index = n - 1; - cp = np + 1; - } - } - - /* Read the flags. */ - for (;;) { - if (*cp == '\'') { - dp->flags |= FLAG_GROUP; - cp++; - } else if (*cp == '-') { - dp->flags |= FLAG_LEFT; - cp++; - } else if (*cp == '+') { - dp->flags |= FLAG_SHOWSIGN; - cp++; - } else if (*cp == ' ') { - dp->flags |= FLAG_SPACE; - cp++; - } else if (*cp == '#') { - dp->flags |= FLAG_ALT; - cp++; - } else if (*cp == '0') { - dp->flags |= FLAG_ZERO; - cp++; - } else - break; - } - - /* Parse the field width. */ - if (*cp == '*') { - dp->width_start = cp; - cp++; - dp->width_end = cp; - if (max_width_length < 1) - max_width_length = 1; - - /* Test for positional argument. */ - if (*cp >= '0' && *cp <= '9') { - const CHAR_T *np; - - for (np = cp; *np >= '0' && *np <= '9'; np++) - ; - if (*np == '$') { - size_t n = 0; - - for (np = cp; *np >= '0' && *np <= '9'; np++) - n = xsum(xtimes(n, 10), *np - '0'); - if (n == 0) - /* Positional argument 0. */ - goto error; - if (size_overflow_p(n)) - /* n too large, would lead to out of memory later. */ - goto error; - dp->width_arg_index = n - 1; - cp = np + 1; - } - } - if (dp->width_arg_index == ARG_NONE) { - dp->width_arg_index = arg_posn++; - if (dp->width_arg_index == ARG_NONE) - /* arg_posn wrapped around. */ - goto error; - } - REGISTER_ARG(dp->width_arg_index, TYPE_INT); - } else if (*cp >= '0' && *cp <= '9') { - size_t width_length; - - dp->width_start = cp; - for (; *cp >= '0' && *cp <= '9'; cp++) - ; - dp->width_end = cp; - width_length = dp->width_end - dp->width_start; - if (max_width_length < width_length) - max_width_length = width_length; - } - - /* Parse the precision. */ - if (*cp == '.') { - cp++; - if (*cp == '*') { - dp->precision_start = cp - 1; - cp++; - dp->precision_end = cp; - if (max_precision_length < 2) - max_precision_length = 2; - - /* Test for positional argument. */ - if (*cp >= '0' && *cp <= '9') { - const CHAR_T *np; - - for (np = cp; *np >= '0' && *np <= '9'; np++) - ; - if (*np == '$') { - size_t n = 0; - - for (np = cp; *np >= '0' && *np <= '9'; np++) - n = xsum(xtimes(n, 10), *np - '0'); - if (n == 0) - /* Positional argument 0. */ - goto error; - if (size_overflow_p(n)) - /* n too large, would lead to out of memory - later. */ - goto error; - dp->precision_arg_index = n - 1; - cp = np + 1; - } - } - if (dp->precision_arg_index == ARG_NONE) { - dp->precision_arg_index = arg_posn++; - if (dp->precision_arg_index == ARG_NONE) - /* arg_posn wrapped around. */ - goto error; - } - REGISTER_ARG(dp->precision_arg_index, TYPE_INT); - } else { - size_t precision_length; - - dp->precision_start = cp - 1; - for (; *cp >= '0' && *cp <= '9'; cp++) - ; - dp->precision_end = cp; - precision_length = dp->precision_end - dp->precision_start; - if (max_precision_length < precision_length) - max_precision_length = precision_length; - } - } - - { - arg_type type; - - /* Parse argument type/size specifiers. */ - { - int flags = 0; - - for (;;) { - if (*cp == 'h') { - flags |= (1 << (flags & 1)); - cp++; - } else if (*cp == 'L') { - flags |= 4; - cp++;
View file
LiVES-2.4.3.tar.bz2/intl/printf-parse.h -> LiVES-2.4.4.tar.bz2/intl/printf-parse.h
Changed
@@ -34,15 +34,16 @@ #define ARG_NONE (~(size_t)0) /* A parsed directive. */ -typedef struct { - const char *dir_start; - const char *dir_end; +typedef struct +{ + const char* dir_start; + const char* dir_end; int flags; - const char *width_start; - const char *width_end; + const char* width_start; + const char* width_end; size_t width_arg_index; - const char *precision_start; - const char *precision_end; + const char* precision_start; + const char* precision_end; size_t precision_arg_index; char conversion; /* d i o u x X f e E g G c s p n U % but not C S */ size_t arg_index; @@ -50,7 +51,8 @@ char_directive; /* A parsed format string. */ -typedef struct { +typedef struct +{ size_t count; char_directive *dir; size_t max_width_length; @@ -68,6 +70,6 @@ #else extern #endif -int printf_parse(const char *format, char_directives *d, arguments *a); +int printf_parse (const char *format, char_directives *d, arguments *a); #endif /* _PRINTF_PARSE_H */
View file
LiVES-2.4.3.tar.bz2/intl/printf.c -> LiVES-2.4.4.tar.bz2/intl/printf.c
Changed
@@ -33,10 +33,10 @@ # include <alloca.h> # else # ifdef _AIX -#pragma alloca + #pragma alloca # else # ifndef alloca -char *alloca(); +char *alloca (); # endif # endif # endif @@ -92,133 +92,153 @@ DLL_EXPORTED int -libintl_vfprintf(FILE *stream, const char *format, va_list args) { - if (strchr(format, '$') == NULL) - return vfprintf(stream, format, args); - else { - size_t length; - char *result = libintl_vasnprintf(NULL, &length, format, args); - int retval = -1; - if (result != NULL) { - size_t written = fwrite(result, 1, length, stream); - free(result); - if (written == length) { - if (length > INT_MAX) - errno = EOVERFLOW; - else - retval = length; - } +libintl_vfprintf (FILE *stream, const char *format, va_list args) +{ + if (strchr (format, '$') == NULL) + return vfprintf (stream, format, args); + else + { + size_t length; + char *result = libintl_vasnprintf (NULL, &length, format, args); + int retval = -1; + if (result != NULL) + { + size_t written = fwrite (result, 1, length, stream); + free (result); + if (written == length) + { + if (length > INT_MAX) + errno = EOVERFLOW; + else + retval = length; + } + } + return retval; } - return retval; - } } DLL_EXPORTED int -libintl_fprintf(FILE *stream, const char *format, ...) { +libintl_fprintf (FILE *stream, const char *format, ...) +{ va_list args; int retval; - va_start(args, format); - retval = libintl_vfprintf(stream, format, args); - va_end(args); + va_start (args, format); + retval = libintl_vfprintf (stream, format, args); + va_end (args); return retval; } DLL_EXPORTED int -libintl_vprintf(const char *format, va_list args) { - return libintl_vfprintf(stdout, format, args); +libintl_vprintf (const char *format, va_list args) +{ + return libintl_vfprintf (stdout, format, args); } DLL_EXPORTED int -libintl_printf(const char *format, ...) { +libintl_printf (const char *format, ...) +{ va_list args; int retval; - va_start(args, format); - retval = libintl_vprintf(format, args); - va_end(args); + va_start (args, format); + retval = libintl_vprintf (format, args); + va_end (args); return retval; } DLL_EXPORTED int -libintl_vsprintf(char *resultbuf, const char *format, va_list args) { - if (strchr(format, '$') == NULL) - return vsprintf(resultbuf, format, args); - else { - size_t length = (size_t) ~0 / (4 * sizeof(char)); - char *result = libintl_vasnprintf(resultbuf, &length, format, args); - if (result != resultbuf) { - free(result); - return -1; +libintl_vsprintf (char *resultbuf, const char *format, va_list args) +{ + if (strchr (format, '$') == NULL) + return vsprintf (resultbuf, format, args); + else + { + size_t length = (size_t) ~0 / (4 * sizeof (char)); + char *result = libintl_vasnprintf (resultbuf, &length, format, args); + if (result != resultbuf) + { + free (result); + return -1; + } + if (length > INT_MAX) + { + errno = EOVERFLOW; + return -1; + } + else + return length; } - if (length > INT_MAX) { - errno = EOVERFLOW; - return -1; - } else - return length; - } } DLL_EXPORTED int -libintl_sprintf(char *resultbuf, const char *format, ...) { +libintl_sprintf (char *resultbuf, const char *format, ...) +{ va_list args; int retval; - va_start(args, format); - retval = libintl_vsprintf(resultbuf, format, args); - va_end(args); + va_start (args, format); + retval = libintl_vsprintf (resultbuf, format, args); + va_end (args); return retval; } #if HAVE_SNPRINTF # if HAVE_DECL__SNPRINTF -/* Windows. */ + /* Windows. */ # define system_vsnprintf _vsnprintf # else -/* Unix. */ + /* Unix. */ # define system_vsnprintf vsnprintf # endif DLL_EXPORTED int -libintl_vsnprintf(char *resultbuf, size_t length, const char *format, va_list args) { - if (strchr(format, '$') == NULL) - return system_vsnprintf(resultbuf, length, format, args); - else { - size_t maxlength = length; - char *result = libintl_vasnprintf(resultbuf, &length, format, args); - if (result != resultbuf) { - if (maxlength > 0) { - size_t pruned_length = - (length < maxlength ? length : maxlength - 1); - memcpy(resultbuf, result, pruned_length); - resultbuf[pruned_length] = '\0'; - } - free(result); +libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args) +{ + if (strchr (format, '$') == NULL) + return system_vsnprintf (resultbuf, length, format, args); + else + { + size_t maxlength = length; + char *result = libintl_vasnprintf (resultbuf, &length, format, args); + if (result != resultbuf) + { + if (maxlength > 0) + {
View file
LiVES-2.4.3.tar.bz2/intl/relocatable.c -> LiVES-2.4.4.tar.bz2/intl/relocatable.c
Changed
@@ -71,7 +71,7 @@ IS_PATH_WITH_DIR(P) tests whether P contains a directory specification. */ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ -/* Win32, Cygwin, OS/2, DOS */ + /* Win32, Cygwin, OS/2, DOS */ # define ISSLASH(C) ((C) == '/' || (C) == '\\') # define HAS_DEVICE(P) \ ((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \ @@ -80,7 +80,7 @@ (strchr (P, '/') != NULL || strchr (P, '\\') != NULL || HAS_DEVICE (P)) # define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0) #else -/* Unix */ + /* Unix */ # define ISSLASH(C) ((C) == '/') # define IS_PATH_WITH_DIR(P) (strchr (P, '/') != NULL) # define FILE_SYSTEM_PREFIX_LEN(P) 0 @@ -101,30 +101,32 @@ prefixes should be directory names without trailing slash (i.e. use "" instead of "/"). */ static void -set_this_relocation_prefix(const char *orig_prefix_arg, - const char *curr_prefix_arg) { +set_this_relocation_prefix (const char *orig_prefix_arg, + const char *curr_prefix_arg) +{ if (orig_prefix_arg != NULL && curr_prefix_arg != NULL /* Optimization: if orig_prefix and curr_prefix are equal, the - relocation is a nop. */ - && strcmp(orig_prefix_arg, curr_prefix_arg) != 0) { - /* Duplicate the argument strings. */ - char *memory; - - orig_prefix_len = strlen(orig_prefix_arg); - curr_prefix_len = strlen(curr_prefix_arg); - memory = (char *) xmalloc(orig_prefix_len + 1 + curr_prefix_len + 1); + relocation is a nop. */ + && strcmp (orig_prefix_arg, curr_prefix_arg) != 0) + { + /* Duplicate the argument strings. */ + char *memory; + + orig_prefix_len = strlen (orig_prefix_arg); + curr_prefix_len = strlen (curr_prefix_arg); + memory = (char *) xmalloc (orig_prefix_len + 1 + curr_prefix_len + 1); #ifdef NO_XMALLOC - if (memory != NULL) + if (memory != NULL) #endif - { - memcpy(memory, orig_prefix_arg, orig_prefix_len + 1); - orig_prefix = memory; - memory += orig_prefix_len + 1; - memcpy(memory, curr_prefix_arg, curr_prefix_len + 1); - curr_prefix = memory; - return; + { + memcpy (memory, orig_prefix_arg, orig_prefix_len + 1); + orig_prefix = memory; + memory += orig_prefix_len + 1; + memcpy (memory, curr_prefix_arg, curr_prefix_len + 1); + curr_prefix = memory; + return; + } } - } orig_prefix = NULL; curr_prefix = NULL; /* Don't worry about wasted memory here - this function is usually only @@ -137,18 +139,19 @@ prefixes should be directory names without trailing slash (i.e. use "" instead of "/"). */ void -set_relocation_prefix(const char *orig_prefix_arg, const char *curr_prefix_arg) { - set_this_relocation_prefix(orig_prefix_arg, curr_prefix_arg); +set_relocation_prefix (const char *orig_prefix_arg, const char *curr_prefix_arg) +{ + set_this_relocation_prefix (orig_prefix_arg, curr_prefix_arg); /* Now notify all dependent libraries. */ #if DEPENDS_ON_LIBCHARSET - libcharset_set_relocation_prefix(orig_prefix_arg, curr_prefix_arg); + libcharset_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); #endif #if DEPENDS_ON_LIBICONV && HAVE_ICONV && _LIBICONV_VERSION >= 0x0109 - libiconv_set_relocation_prefix(orig_prefix_arg, curr_prefix_arg); + libiconv_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); #endif #if DEPENDS_ON_LIBINTL && ENABLE_NLS && defined libintl_set_relocation_prefix - libintl_set_relocation_prefix(orig_prefix_arg, curr_prefix_arg); + libintl_set_relocation_prefix (orig_prefix_arg, curr_prefix_arg); #endif } @@ -163,9 +166,10 @@ static #endif const char * -compute_curr_prefix(const char *orig_installprefix, - const char *orig_installdir, - const char *curr_pathname) { +compute_curr_prefix (const char *orig_installprefix, + const char *orig_installdir, + const char *curr_pathname) +{ const char *curr_installdir; const char *rel_installdir; @@ -175,30 +179,31 @@ /* Determine the relative installation directory, relative to the prefix. This is simply the difference between orig_installprefix and orig_installdir. */ - if (strncmp(orig_installprefix, orig_installdir, strlen(orig_installprefix)) + if (strncmp (orig_installprefix, orig_installdir, strlen (orig_installprefix)) != 0) /* Shouldn't happen - nothing should be installed outside $(prefix). */ return NULL; - rel_installdir = orig_installdir + strlen(orig_installprefix); + rel_installdir = orig_installdir + strlen (orig_installprefix); /* Determine the current installation directory. */ { - const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN(curr_pathname); - const char *p = curr_pathname + strlen(curr_pathname); + const char *p_base = curr_pathname + FILE_SYSTEM_PREFIX_LEN (curr_pathname); + const char *p = curr_pathname + strlen (curr_pathname); char *q; - while (p > p_base) { - p--; - if (ISSLASH(*p)) - break; - } + while (p > p_base) + { + p--; + if (ISSLASH (*p)) + break; + } - q = (char *) xmalloc(p - curr_pathname + 1); + q = (char *) xmalloc (p - curr_pathname + 1); #ifdef NO_XMALLOC if (q == NULL) return NULL; #endif - memcpy(q, curr_pathname, p - curr_pathname); + memcpy (q, curr_pathname, p - curr_pathname); q[p - curr_pathname] = '\0'; curr_installdir = q; } @@ -206,44 +211,47 @@ /* Compute the current installation prefix by removing the trailing rel_installdir from it. */ { - const char *rp = rel_installdir + strlen(rel_installdir); - const char *cp = curr_installdir + strlen(curr_installdir); + const char *rp = rel_installdir + strlen (rel_installdir); + const char *cp = curr_installdir + strlen (curr_installdir); const char *cp_base = - curr_installdir + FILE_SYSTEM_PREFIX_LEN(curr_installdir); - - while (rp > rel_installdir && cp > cp_base) { - bool same = false; - const char *rpi = rp; - const char *cpi = cp; - - while (rpi > rel_installdir && cpi > cp_base) { - rpi--; - cpi--; - if (ISSLASH(*rpi) || ISSLASH(*cpi)) { - if (ISSLASH(*rpi) && ISSLASH(*cpi)) - same = true; - break; - } - /* Do case-insensitive comparison if the filesystem is always or - often case-insensitive. It's better to accept the comparison - if the difference is only in case, rather than to fail. */ + curr_installdir + FILE_SYSTEM_PREFIX_LEN (curr_installdir); + + while (rp > rel_installdir && cp > cp_base) + { + bool same = false; + const char *rpi = rp; + const char *cpi = cp; + + while (rpi > rel_installdir && cpi > cp_base) + { + rpi--; + cpi--; + if (ISSLASH (*rpi) || ISSLASH (*cpi)) + { + if (ISSLASH (*rpi) && ISSLASH (*cpi)) + same = true; + break; + } + /* Do case-insensitive comparison if the filesystem is always or + often case-insensitive. It's better to accept the comparison + if the difference is only in case, rather than to fail. */
View file
LiVES-2.4.3.tar.bz2/intl/relocatable.h -> LiVES-2.4.4.tar.bz2/intl/relocatable.h
Changed
@@ -45,12 +45,12 @@ prefixes should be directory names without trailing slash (i.e. use "" instead of "/"). */ extern RELOCATABLE_DLL_EXPORTED void -set_relocation_prefix(const char *orig_prefix, - const char *curr_prefix); + set_relocation_prefix (const char *orig_prefix, + const char *curr_prefix); /* Returns the pathname, relocated according to the current installation directory. */ -extern const char *relocate(const char *pathname); +extern const char * relocate (const char *pathname); /* Memory management: relocate() leaks memory, because it has to construct a fresh pathname. If this is a problem because your program calls @@ -60,9 +60,9 @@ Computes the current installation prefix, based on the original installation prefix, the original installation directory of a particular file, and the current pathname of this file. Returns NULL upon failure. */ -extern const char *compute_curr_prefix(const char *orig_installprefix, - const char *orig_installdir, - const char *curr_pathname); +extern const char * compute_curr_prefix (const char *orig_installprefix, + const char *orig_installdir, + const char *curr_pathname); #else
View file
LiVES-2.4.3.tar.bz2/intl/textdomain.c -> LiVES-2.4.4.tar.bz2/intl/textdomain.c
Changed
@@ -57,13 +57,14 @@ #endif /* Lock variable to protect the global data in the gettext implementation. */ -gl_rwlock_define(extern, _nl_state_lock attribute_hidden) +gl_rwlock_define (extern, _nl_state_lock attribute_hidden) /* Set the current default message catalog to DOMAINNAME. If DOMAINNAME is null, return the current default. If DOMAINNAME is "", reset to the default of "messages". */ char * -TEXTDOMAIN(const char *domainname) { +TEXTDOMAIN (const char *domainname) +{ char *new_domain; char *old_domain; @@ -71,52 +72,56 @@ if (domainname == NULL) return (char *) _nl_current_default_domain; - gl_rwlock_wrlock(_nl_state_lock); + gl_rwlock_wrlock (_nl_state_lock); old_domain = (char *) _nl_current_default_domain; /* If domain name is the null string set to default domain "messages". */ if (domainname[0] == '\0' - || strcmp(domainname, _nl_default_default_domain) == 0) { - _nl_current_default_domain = _nl_default_default_domain; - new_domain = (char *) _nl_current_default_domain; - } else if (strcmp(domainname, old_domain) == 0) + || strcmp (domainname, _nl_default_default_domain) == 0) + { + _nl_current_default_domain = _nl_default_default_domain; + new_domain = (char *) _nl_current_default_domain; + } + else if (strcmp (domainname, old_domain) == 0) /* This can happen and people will use it to signal that some environment variable changed. */ new_domain = old_domain; - else { - /* If the following malloc fails `_nl_current_default_domain' - will be NULL. This value will be returned and so signals we - are out of core. */ + else + { + /* If the following malloc fails `_nl_current_default_domain' + will be NULL. This value will be returned and so signals we + are out of core. */ #if defined _LIBC || defined HAVE_STRDUP - new_domain = strdup(domainname); + new_domain = strdup (domainname); #else - size_t len = strlen(domainname) + 1; - new_domain = (char *) malloc(len); - if (new_domain != NULL) - memcpy(new_domain, domainname, len); + size_t len = strlen (domainname) + 1; + new_domain = (char *) malloc (len); + if (new_domain != NULL) + memcpy (new_domain, domainname, len); #endif - if (new_domain != NULL) - _nl_current_default_domain = new_domain; - } + if (new_domain != NULL) + _nl_current_default_domain = new_domain; + } /* We use this possibility to signal a change of the loaded catalogs since this is most likely the case and there is no other easy we to do it. Do it only when the call was successful. */ - if (new_domain != NULL) { - ++_nl_msg_cat_cntr; + if (new_domain != NULL) + { + ++_nl_msg_cat_cntr; - if (old_domain != new_domain && old_domain != _nl_default_default_domain) - free(old_domain); - } + if (old_domain != new_domain && old_domain != _nl_default_default_domain) + free (old_domain); + } - gl_rwlock_unlock(_nl_state_lock); + gl_rwlock_unlock (_nl_state_lock); return new_domain; } #ifdef _LIBC /* Alias for function name in GNU C Library. */ -weak_alias(__textdomain, textdomain); +weak_alias (__textdomain, textdomain); #endif
View file
LiVES-2.4.3.tar.bz2/intl/tsearch.c -> LiVES-2.4.4.tar.bz2/intl/tsearch.c
Changed
@@ -97,8 +97,8 @@ #include <stdlib.h> -typedef int (*__compar_fn_t)(const void *, const void *); -typedef void (*__action_fn_t)(const void *, VISIT, int); +typedef int (*__compar_fn_t) (const void *, const void *); +typedef void (*__action_fn_t) (const void *, VISIT, int); #ifndef weak_alias # define __tsearch tsearch @@ -113,7 +113,8 @@ # define internal_function #endif -typedef struct node_t { +typedef struct node_t +{ /* Callers expect this to be the first element in the structure - do not move! */ const void *key; @@ -134,30 +135,33 @@ #define CHECK_TREE(a) check_tree(a) static void -check_tree_recurse(node p, int d_sofar, int d_total) { - if (p == NULL) { - assert(d_sofar == d_total); - return; - } +check_tree_recurse (node p, int d_sofar, int d_total) +{ + if (p == NULL) + { + assert (d_sofar == d_total); + return; + } - check_tree_recurse(p->left, d_sofar + (p->left && !p->left->red), d_total); - check_tree_recurse(p->right, d_sofar + (p->right && !p->right->red), d_total); + check_tree_recurse (p->left, d_sofar + (p->left && !p->left->red), d_total); + check_tree_recurse (p->right, d_sofar + (p->right && !p->right->red), d_total); if (p->left) - assert(!(p->left->red && p->red)); + assert (!(p->left->red && p->red)); if (p->right) - assert(!(p->right->red && p->red)); + assert (!(p->right->red && p->red)); } static void -check_tree(node root) { +check_tree (node root) +{ int cnt = 0; node p; if (root == NULL) return; root->red = 0; - for (p = root->left; p; p = p->left) + for(p = root->left; p; p = p->left) cnt += !p->red; - check_tree_recurse(root, 0, cnt); + check_tree_recurse (root, 0, cnt); } @@ -174,8 +178,9 @@ ROOTP. MODE is 1 if we need not do the split, but must check for two red edges between GPARENTP and ROOTP. */ static void -maybe_split_for_insert(node *rootp, node *parentp, node *gparentp, - int p_r, int gp_r, int mode) { +maybe_split_for_insert (node *rootp, node *parentp, node *gparentp, + int p_r, int gp_r, int mode) +{ node root = *rootp; node *rp, *lp; rp = &(*rootp)->right; @@ -183,69 +188,81 @@ /* See if we have to split this node (both successors red). */ if (mode == 1 - || ((*rp) != NULL && (*lp) != NULL && (*rp)->red && (*lp)->red)) { - /* This node becomes red, its successors black. */ - root->red = 1; - if (*rp) - (*rp)->red = 0; - if (*lp) - (*lp)->red = 0; - - /* If the parent of this node is also red, we have to do - rotations. */ - if (parentp != NULL && (*parentp)->red) { - node gp = *gparentp; - node p = *parentp; - /* There are two main cases: - 1. The edge types (left or right) of the two red edges differ. - 2. Both red edges are of the same type. - There exist two symmetries of each case, so there is a total of - 4 cases. */ - if ((p_r > 0) != (gp_r > 0)) { - /* Put the child at the top of the tree, with its parent - and grandparent as successors. */ - p->red = 1; - gp->red = 1; - root->red = 0; - if (p_r < 0) { - /* Child is left of parent. */ - p->left = *rp; - *rp = p; - gp->right = *lp; - *lp = gp; - } else { - /* Child is right of parent. */ - p->right = *lp; - *lp = p; - gp->left = *rp; - *rp = gp; - } - *gparentp = root; - } else { - *gparentp = *parentp; - /* Parent becomes the top of the tree, grandparent and - child are its successors. */ - p->red = 0; - gp->red = 1; - if (p_r < 0) { - /* Left edges. */ - gp->left = p->right; - p->right = gp; - } else { - /* Right edges. */ - gp->right = p->left; - p->left = gp; - } - } + || ((*rp) != NULL && (*lp) != NULL && (*rp)->red && (*lp)->red)) + { + /* This node becomes red, its successors black. */ + root->red = 1; + if (*rp) + (*rp)->red = 0; + if (*lp) + (*lp)->red = 0; + + /* If the parent of this node is also red, we have to do + rotations. */ + if (parentp != NULL && (*parentp)->red) + { + node gp = *gparentp; + node p = *parentp; + /* There are two main cases: + 1. The edge types (left or right) of the two red edges differ. + 2. Both red edges are of the same type. + There exist two symmetries of each case, so there is a total of + 4 cases. */ + if ((p_r > 0) != (gp_r > 0)) + { + /* Put the child at the top of the tree, with its parent + and grandparent as successors. */ + p->red = 1; + gp->red = 1; + root->red = 0; + if (p_r < 0) + { + /* Child is left of parent. */ + p->left = *rp; + *rp = p; + gp->right = *lp; + *lp = gp; + } + else + { + /* Child is right of parent. */ + p->right = *lp; + *lp = p; + gp->left = *rp; + *rp = gp; + } + *gparentp = root; + } + else + { + *gparentp = *parentp; + /* Parent becomes the top of the tree, grandparent and + child are its successors. */ + p->red = 0; + gp->red = 1; + if (p_r < 0) + { + /* Left edges. */ + gp->left = p->right; + p->right = gp; + } + else + { + /* Right edges. */ + gp->right = p->left; + p->left = gp;
View file
LiVES-2.4.3.tar.bz2/intl/tsearch.h -> LiVES-2.4.4.tar.bz2/intl/tsearch.h
Changed
@@ -30,49 +30,49 @@ extern "C" { #endif - /* See <http://www.opengroup.org/susv3xbd/search.h.html>, - <http://www.opengroup.org/susv3xsh/tsearch.html> - for details. */ - - typedef enum - { - preorder, - postorder, - endorder, - leaf - } - VISIT; - - /* Searches an element in the tree *VROOTP that compares equal to KEY. - If one is found, it is returned. Otherwise, a new element equal to KEY - is inserted in the tree and is returned. */ - extern void *tsearch(const void *key, void **vrootp, - int (*compar)(const void *, const void *)); - - /* Searches an element in the tree *VROOTP that compares equal to KEY. - If one is found, it is returned. Otherwise, NULL is returned. */ - extern void *tfind(const void *key, void *const *vrootp, - int (*compar)(const void *, const void *)); - - /* Searches an element in the tree *VROOTP that compares equal to KEY. - If one is found, it is removed from the tree, and its parent node is - returned. Otherwise, NULL is returned. */ - extern void *tdelete(const void *key, void **vrootp, - int (*compar)(const void *, const void *)); - - /* Perform a depth-first, left-to-right traversal of the tree VROOT. - The ACTION function is called: - - for non-leaf nodes: 3 times, before the left subtree traversal, - after the left subtree traversal but before the right subtree traversal, - and after the right subtree traversal, - - for leaf nodes: once. - The arguments passed to ACTION are: - 1. the node; it can be casted to a 'const void * const *', i.e. into a - pointer to the key, - 2. an indicator which visit of the node this is, - 3. the level of the node in the tree (0 for the root). */ - extern void twalk(const void *vroot, - void (*action)(const void *, VISIT, int)); +/* See <http://www.opengroup.org/susv3xbd/search.h.html>, + <http://www.opengroup.org/susv3xsh/tsearch.html> + for details. */ + +typedef enum +{ + preorder, + postorder, + endorder, + leaf +} +VISIT; + +/* Searches an element in the tree *VROOTP that compares equal to KEY. + If one is found, it is returned. Otherwise, a new element equal to KEY + is inserted in the tree and is returned. */ +extern void * tsearch (const void *key, void **vrootp, + int (*compar) (const void *, const void *)); + +/* Searches an element in the tree *VROOTP that compares equal to KEY. + If one is found, it is returned. Otherwise, NULL is returned. */ +extern void * tfind (const void *key, void *const *vrootp, + int (*compar) (const void *, const void *)); + +/* Searches an element in the tree *VROOTP that compares equal to KEY. + If one is found, it is removed from the tree, and its parent node is + returned. Otherwise, NULL is returned. */ +extern void * tdelete (const void *key, void **vrootp, + int (*compar) (const void *, const void *)); + +/* Perform a depth-first, left-to-right traversal of the tree VROOT. + The ACTION function is called: + - for non-leaf nodes: 3 times, before the left subtree traversal, + after the left subtree traversal but before the right subtree traversal, + and after the right subtree traversal, + - for leaf nodes: once. + The arguments passed to ACTION are: + 1. the node; it can be casted to a 'const void * const *', i.e. into a + pointer to the key, + 2. an indicator which visit of the node this is, + 3. the level of the node in the tree (0 for the root). */ +extern void twalk (const void *vroot, + void (*action) (const void *, VISIT, int)); #ifdef __cplusplus }
View file
LiVES-2.4.3.tar.bz2/intl/vasnprintf.c -> LiVES-2.4.4.tar.bz2/intl/vasnprintf.c
Changed
@@ -127,14 +127,15 @@ # if HAVE_WCSLEN # define local_wcslen wcslen # else -/* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid - a dependency towards this library, here is a local substitute. - Define this substitute only once, even if this file is included - twice in the same compilation unit. */ + /* Solaris 2.5.1 has wcslen() in a separate library libw.so. To avoid + a dependency towards this library, here is a local substitute. + Define this substitute only once, even if this file is included + twice in the same compilation unit. */ # ifndef local_wcslen_defined # define local_wcslen_defined 1 static size_t -local_wcslen(const wchar_t *s) { +local_wcslen (const wchar_t *s) +{ const wchar_t *ptr; for (ptr = s; *ptr != (wchar_t) 0; ptr++) @@ -170,18 +171,18 @@ # endif #endif #if WIDE_CHAR_VERSION -/* TCHAR_T is wchar_t. */ + /* TCHAR_T is wchar_t. */ # define USE_SNPRINTF 1 # if HAVE_DECL__SNWPRINTF -/* On Windows, the function swprintf() has a different signature than - on Unix; we use the _snwprintf() function instead. */ + /* On Windows, the function swprintf() has a different signature than + on Unix; we use the _snwprintf() function instead. */ # define SNPRINTF _snwprintf # else -/* Unix. */ + /* Unix. */ # define SNPRINTF swprintf # endif #else -/* TCHAR_T is char. */ + /* TCHAR_T is char. */ # /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'. But don't use it on BeOS, since BeOS snprintf produces no output if the size argument is >= 0x3000000. */ @@ -191,12 +192,12 @@ # define USE_SNPRINTF 0 # endif # if HAVE_DECL__SNPRINTF -/* Windows. */ + /* Windows. */ # define SNPRINTF _snprintf # else -/* Unix. */ + /* Unix. */ # define SNPRINTF snprintf -/* Here we need to call the native snprintf, not rpl_snprintf. */ + /* Here we need to call the native snprintf, not rpl_snprintf. */ # undef snprintf # endif #endif @@ -208,20 +209,21 @@ # ifndef decimal_point_char_defined # define decimal_point_char_defined 1 static char -decimal_point_char() { +decimal_point_char () +{ const char *point; /* Determine it in a multithread-safe way. We know nl_langinfo is multithread-safe on glibc systems, but is not required to be multithread- safe by POSIX. sprintf(), however, is multithread-safe. localeconv() is rarely multithread-safe. */ # if HAVE_NL_LANGINFO && __GLIBC__ - point = nl_langinfo(RADIXCHAR); + point = nl_langinfo (RADIXCHAR); # elif 1 char pointbuf[5]; - sprintf(pointbuf, "%#.0f", 1.0); + sprintf (pointbuf, "%#.0f", 1.0); point = &pointbuf[1]; # else - point = localeconv() -> decimal_point; + point = localeconv () -> decimal_point; # endif /* The decimal point is always a single byte: either '.' or ','. */ return (point[0] != '\0' ? point[0] : '.'); @@ -233,8 +235,9 @@ /* Equivalent to !isfinite(x) || x == 0, but does not require libm. */ static int -is_infinite_or_zero(double x) { - return isnan(x) || x + x == x; +is_infinite_or_zero (double x) +{ + return isnan (x) || x + x == x; } #endif @@ -243,8 +246,9 @@ /* Equivalent to !isfinite(x), but does not require libm. */ static int -is_infinitel(long double x) { - return isnanl(x) || (x + x == x && x != 0.0L); +is_infinitel (long double x) +{ + return isnanl (x) || (x + x == x && x != 0.0L); } #endif @@ -257,14 +261,15 @@ typedef unsigned int mp_limb_t; # define GMP_LIMB_BITS 32 -typedef int mp_limb_verify[2 * (sizeof(mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS) - 1]; +typedef int mp_limb_verify[2 * (sizeof (mp_limb_t) * CHAR_BIT == GMP_LIMB_BITS) - 1]; typedef unsigned long long mp_twolimb_t; # define GMP_TWOLIMB_BITS 64 -typedef int mp_twolimb_verify[2 * (sizeof(mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS) - 1]; +typedef int mp_twolimb_verify[2 * (sizeof (mp_twolimb_t) * CHAR_BIT == GMP_TWOLIMB_BITS) - 1]; /* Representation of a bignum >= 0. */ -typedef struct { +typedef struct +{ size_t nlimbs; mp_limb_t *limbs; /* Bits in little-endian order, allocated with malloc(). */ } mpn_t; @@ -273,58 +278,67 @@ Return the allocated memory in case of success, NULL in case of memory allocation failure. */ static void * -multiply(mpn_t src1, mpn_t src2, mpn_t *dest) { +multiply (mpn_t src1, mpn_t src2, mpn_t *dest) +{ const mp_limb_t *p1; const mp_limb_t *p2; size_t len1; size_t len2; - if (src1.nlimbs <= src2.nlimbs) { - len1 = src1.nlimbs; - p1 = src1.limbs; - len2 = src2.nlimbs; - p2 = src2.limbs; - } else { - len1 = src2.nlimbs; - p1 = src2.limbs; - len2 = src1.nlimbs; - p2 = src1.limbs; - } + if (src1.nlimbs <= src2.nlimbs) + { + len1 = src1.nlimbs; + p1 = src1.limbs; + len2 = src2.nlimbs; + p2 = src2.limbs; + } + else + { + len1 = src2.nlimbs; + p1 = src2.limbs; + len2 = src1.nlimbs; + p2 = src1.limbs; + } /* Now 0 <= len1 <= len2. */ - if (len1 == 0) { - /* src1 or src2 is zero. */ - dest->nlimbs = 0; - dest->limbs = (mp_limb_t *) malloc(1); - } else { - /* Here 1 <= len1 <= len2. */ - size_t dlen; - mp_limb_t *dp; - size_t k, i, j; - - dlen = len1 + len2; - dp = (mp_limb_t *) malloc(dlen * sizeof(mp_limb_t)); - if (dp == NULL) - return NULL; - for (k = len2; k > 0;) - dp[--k] = 0; - for (i = 0; i < len1; i++) { - mp_limb_t digit1 = p1[i]; - mp_twolimb_t carry = 0; - for (j = 0; j < len2; j++) { - mp_limb_t digit2 = p2[j]; - carry += (mp_twolimb_t) digit1 * (mp_twolimb_t) digit2; - carry += dp[i + j]; - dp[i + j] = (mp_limb_t) carry; - carry = carry >> GMP_LIMB_BITS; - } - dp[i + len2] = (mp_limb_t) carry; + if (len1 == 0) + { + /* src1 or src2 is zero. */ + dest->nlimbs = 0; + dest->limbs = (mp_limb_t *) malloc (1);
View file
LiVES-2.4.3.tar.bz2/intl/vasnprintf.h -> LiVES-2.4.4.tar.bz2/intl/vasnprintf.h
Changed
@@ -66,10 +66,10 @@ free (output); } */ -extern char *asnprintf(char *resultbuf, size_t *lengthp, const char *format, ...) -__attribute__((__format__(__printf__, 3, 4))); -extern char *vasnprintf(char *resultbuf, size_t *lengthp, const char *format, va_list args) -__attribute__((__format__(__printf__, 3, 0))); +extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...) + __attribute__ ((__format__ (__printf__, 3, 4))); +extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args) + __attribute__ ((__format__ (__printf__, 3, 0))); #ifdef __cplusplus }
View file
LiVES-2.4.3.tar.bz2/intl/vasnwprintf.h -> LiVES-2.4.4.tar.bz2/intl/vasnwprintf.h
Changed
@@ -36,8 +36,8 @@ if no dynamic memory allocation was necessary) and set *LENGTHP to the number of resulting bytes, excluding the trailing NUL. Upon error, set errno and return NULL. */ -extern wchar_t *asnwprintf(wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...); -extern wchar_t *vasnwprintf(wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args); +extern wchar_t * asnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, ...); +extern wchar_t * vasnwprintf (wchar_t *resultbuf, size_t *lengthp, const wchar_t *format, va_list args); #ifdef __cplusplus }
View file
LiVES-2.4.3.tar.bz2/intl/wprintf-parse.h -> LiVES-2.4.4.tar.bz2/intl/wprintf-parse.h
Changed
@@ -34,15 +34,16 @@ #define ARG_NONE (~(size_t)0) /* A parsed directive. */ -typedef struct { - const wchar_t *dir_start; - const wchar_t *dir_end; +typedef struct +{ + const wchar_t* dir_start; + const wchar_t* dir_end; int flags; - const wchar_t *width_start; - const wchar_t *width_end; + const wchar_t* width_start; + const wchar_t* width_end; size_t width_arg_index; - const wchar_t *precision_start; - const wchar_t *precision_end; + const wchar_t* precision_start; + const wchar_t* precision_end; size_t precision_arg_index; wchar_t conversion; /* d i o u x X f e E g G c s p n U % but not C S */ size_t arg_index; @@ -50,7 +51,8 @@ wchar_t_directive; /* A parsed format string. */ -typedef struct { +typedef struct +{ size_t count; wchar_t_directive *dir; size_t max_width_length; @@ -68,6 +70,6 @@ #else extern #endif -int wprintf_parse(const wchar_t *format, wchar_t_directives *d, arguments *a); +int wprintf_parse (const wchar_t *format, wchar_t_directives *d, arguments *a); #endif /* _WPRINTF_PARSE_H */
View file
LiVES-2.4.3.tar.bz2/intl/xsize.h -> LiVES-2.4.4.tar.bz2/intl/xsize.h
Changed
@@ -52,9 +52,10 @@ /* Sum of two sizes, with overflow check. */ static inline size_t #if __GNUC__ >= 3 -__attribute__((__pure__)) +__attribute__ ((__pure__)) #endif -xsum(size_t size1, size_t size2) { +xsum (size_t size1, size_t size2) +{ size_t sum = size1 + size2; return (sum >= size1 ? sum : SIZE_MAX); } @@ -62,27 +63,30 @@ /* Sum of three sizes, with overflow check. */ static inline size_t #if __GNUC__ >= 3 -__attribute__((__pure__)) +__attribute__ ((__pure__)) #endif -xsum3(size_t size1, size_t size2, size_t size3) { - return xsum(xsum(size1, size2), size3); +xsum3 (size_t size1, size_t size2, size_t size3) +{ + return xsum (xsum (size1, size2), size3); } /* Sum of four sizes, with overflow check. */ static inline size_t #if __GNUC__ >= 3 -__attribute__((__pure__)) +__attribute__ ((__pure__)) #endif -xsum4(size_t size1, size_t size2, size_t size3, size_t size4) { - return xsum(xsum(xsum(size1, size2), size3), size4); +xsum4 (size_t size1, size_t size2, size_t size3, size_t size4) +{ + return xsum (xsum (xsum (size1, size2), size3), size4); } /* Maximum of two sizes, with overflow check. */ static inline size_t #if __GNUC__ >= 3 -__attribute__((__pure__)) +__attribute__ ((__pure__)) #endif -xmax(size_t size1, size_t size2) { +xmax (size_t size1, size_t size2) +{ /* No explicit check is needed here, because for any n: max (SIZE_MAX, n) == SIZE_MAX and max (n, SIZE_MAX) == SIZE_MAX. */ return (size1 >= size2 ? size1 : size2);
View file
LiVES-2.4.3.tar.bz2/liblives.doxygen -> LiVES-2.4.4.tar.bz2/liblives.doxygen
Changed
@@ -38,7 +38,7 @@ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.4.3 +PROJECT_NUMBER = 2.4.4-svn # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a
View file
LiVES-2.4.3.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c -> LiVES-2.4.4.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c
Changed
@@ -2830,7 +2830,7 @@ // decode any frames from this packet if (priv->picture==NULL) priv->picture=av_frame_alloc(); -#if LIBAVCODEC_VERSION_MAJOR >= 53 +#if LIBAVCODEC_VERSION_MAJOR >= 52 avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt); #else avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
View file
LiVES-2.4.3.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c -> LiVES-2.4.4.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c
Changed
@@ -1069,11 +1069,12 @@ if (priv->pFrame==NULL) priv->pFrame=av_frame_alloc(); -#if LIBAVCODEC_VERSION_MAJOR >= 53 +#if LIBAVCODEC_VERSION_MAJOR >= 52 avcodec_decode_video2(cc, priv->pFrame, &gotFrame, &priv->packet); #else avcodec_decode_video(cc, priv->pFrame, &gotFrame, priv->packet.data, priv->packet.size); #endif + #ifdef DEBUG fprintf(stderr,"pt 1 %ld %d %ld\n",tframe,gotFrame,MyPts); #endif
View file
LiVES-2.4.3.tar.bz2/lives-plugins/plugins/decoders/libav_helper.h -> LiVES-2.4.4.tar.bz2/lives-plugins/plugins/decoders/libav_helper.h
Changed
@@ -94,7 +94,6 @@ #endif - #endif // HAVE_LIBAV_LIBS #endif // HAVE_LIBAV_HELPER_H
View file
LiVES-2.4.3.tar.bz2/po/ar.po -> LiVES-2.4.4.tar.bz2/po/ar.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Arabic <ar@li.org>\n" @@ -305,11 +305,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -500,7 +500,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "- صَحّح : حاول تصحيح الأعطاب (يحتاج تثبيت 'gdb')\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "بداية تشغيل الواجة الرسومية..." @@ -704,23 +704,23 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "شغّل" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -728,35 +728,35 @@ "لم يتمكن برنامج لايفز من إلتقاط هذه الصورة\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "ملف مغلق %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_تراجع" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_كرّر" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "فيديو" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "الصوت الأيسر" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "الصوت الأيمن" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -765,7 +765,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -913,7 +913,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1097,11 +1097,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "معاينة" @@ -1117,7 +1117,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1130,8 +1130,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1143,7 +1143,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_كاف" @@ -1151,11 +1151,11 @@ msgid "_Preview" msgstr "_معاينة" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1172,146 +1172,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "التنسيق" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "حجم الإطار" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "حجم الملف"
View file
LiVES-2.4.3.tar.bz2/po/ca.po -> LiVES-2.4.4.tar.bz2/po/ca.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Catalan <ca@li.org>\n" @@ -305,11 +305,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -494,7 +494,7 @@ msgstr "" "-debug : tractar d'accidents de depuració (requereix 'gdb' instal lat)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "A partir GUI ..." @@ -665,57 +665,57 @@ msgstr "LiVES-%s: <N d'arxiu>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Reprodueix" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Tancat el fitxer %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Desfés" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Refés" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Vídeo" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -724,7 +724,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -870,7 +870,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Següent" @@ -1054,11 +1054,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Visualització prèvia" @@ -1074,7 +1074,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1092,8 +1092,8 @@ "\n" "Recordeu apagar els efectes (ctrl-0) després !" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1105,7 +1105,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Suficient" @@ -1113,11 +1113,11 @@ msgid "_Preview" msgstr "_Previsualització" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1134,146 +1134,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formata" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Mida del marc" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Mida del fitxer" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/cs.po -> LiVES-2.4.4.tar.bz2/po/cs.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: LiVEScz\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: <martin@svobodicz.com, ales@mur.at>\n" @@ -304,11 +304,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "malý endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "velký endian" @@ -494,7 +494,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : próby debugowania awarii (wymaga 'gdb' zainstalowane)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Startuji grafické rozhraní..." @@ -698,23 +698,23 @@ msgstr "LiVES-%s: <žádný soubor>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Přehrát" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -722,35 +722,35 @@ "LiVES nebyl schopen zachytit tento obrázek\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Zavřený soubor %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Zpět" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Znovu" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Levý zvuk" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Pravý zvuk" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -765,7 +765,7 @@ "přepínat klipy při otevírání.\n" "Upravte nastavení přehrávání v Nastavení a zkuste to znova.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Přehrávací okno" @@ -914,7 +914,7 @@ msgid "Use _mplayer2 audio player" msgstr "Použijte _mplayer audio přehrávač" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1100,11 +1100,11 @@ "Je-li zapnuto, ze snímků bude odstraněno prokládání tak, jak jsou " "importovány." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Náhled" @@ -1121,7 +1121,7 @@ msgid "Click here to _Preview the video" msgstr "Kliknutím zobrazíte _náhled vybraného videa" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Zpracovávám..." @@ -1139,8 +1139,8 @@ "\n" "Nezapomeňte poté vypnout (ctrl-0) efekty!" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1152,7 +1152,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Dost" @@ -1160,11 +1160,11 @@ msgid "_Preview" msgstr "_Náhled" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1181,146 +1181,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formátovat" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Velikost snímku" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Velikost souboru"
View file
LiVES-2.4.3.tar.bz2/po/da.po -> LiVES-2.4.4.tar.bz2/po/da.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Danish <da@li.org>\n" @@ -284,11 +284,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -467,7 +467,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "" @@ -638,57 +638,57 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Afspil" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "Fortryd" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -697,7 +697,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -843,7 +843,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Næste" @@ -1027,11 +1027,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Forhåndsvisning" @@ -1047,7 +1047,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1060,8 +1060,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1073,7 +1073,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "" @@ -1081,11 +1081,11 @@ msgid "_Preview" msgstr "" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1102,146 +1102,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Format" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Filstørrelse" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/de_DE.po -> LiVES-2.4.4.tar.bz2/po/de_DE.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Lives 0.9.5\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2015-04-05 16:14+0000\n" "Last-Translator: Michael Kohl <rolf.michael.kohl@googlemail.com>\n" "Language-Team: Herbert U. Hübner <herbert.u.huebner@friendglow.net>\n" @@ -308,11 +308,11 @@ msgid "Number of CPUs detected: %d " msgstr "Anzahl an Prozessoren erkannt: %d " -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "Little Endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "Big Endian" @@ -493,7 +493,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : Versuchen, Probleme zu finden ('gdb' muss installiert sein)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Starte das GUI..." @@ -664,23 +664,23 @@ msgstr "LiVES-%s: <Keine Datei>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Wiedergabe" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -688,35 +688,35 @@ "LiVES konnte das Bild nicht aufnehmen\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Datei %s geschlossen\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Rückgängig" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Wiederherstellen" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Links Audio" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Rechts Audio" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -725,7 +725,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -871,7 +871,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1055,11 +1055,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Vorschau" @@ -1075,7 +1075,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Verarbeiten..." @@ -1088,8 +1088,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1101,7 +1101,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Genug" @@ -1109,11 +1109,11 @@ msgid "_Preview" msgstr "_Vorschau" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Paus_e" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "Pause/_Genug" @@ -1130,146 +1130,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Dateigröße"
View file
LiVES-2.4.3.tar.bz2/po/en_GB.po -> LiVES-2.4.4.tar.bz2/po/en_GB.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2015-04-16 10:52+0000\n" "Last-Translator: Andi Chandler <Unknown>\n" "Language-Team: English (United Kingdom) <en_GB@li.org>\n" @@ -316,11 +316,11 @@ msgid "Number of CPUs detected: %d " msgstr "Number of CPUs detected: %d " -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "little endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "big endian" @@ -518,7 +518,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : try to debug crashes (requires 'gdb' installed)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Starting GUI..." @@ -756,23 +756,23 @@ msgstr "LiVES-%s: <No File>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!rec %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Play" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -780,35 +780,35 @@ "LiVES was unable to capture this image\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Closed file %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Undo" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Redo" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Left Audio" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Right Audio" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -823,7 +823,7 @@ "mplayer.\n" "Please adjust the playback options in Preferences and try again.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Play Window" @@ -1017,7 +1017,7 @@ msgid "Use _mplayer2 audio player" msgstr "Use _mplayer audio player" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Next" @@ -1224,11 +1224,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "If this is set, frames will be deinterlaced as they are imported." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Preview" @@ -1244,7 +1244,7 @@ msgid "Click here to _Preview the video" msgstr "Click here to _Preview the video" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Processing..." @@ -1262,8 +1262,8 @@ "\n" "Remember to switch off effects (ctrl-0) afterwards !" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1275,7 +1275,7 @@ msgid "Show Details" msgstr "Show Details" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Enough" @@ -1283,11 +1283,11 @@ msgid "_Preview" msgstr "_Preview" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Paus_e" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "Pause/_Enough" @@ -1304,67 +1304,67 @@ msgid "LiVES: - Multitrack details" msgstr "LiVES: - Multitrack details" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Format" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Frame size" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "File size"
View file
LiVES-2.4.3.tar.bz2/po/es.po -> LiVES-2.4.4.tar.bz2/po/es.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2014-01-01 22:33+0000\n" "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n" "Language-Team: Spanish <es@li.org>\n" @@ -309,11 +309,11 @@ msgid "Number of CPUs detected: %d " msgstr "Cantidad de CPU detectadas: %d " -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -507,7 +507,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-depurar: trata de errores de depuración (requiere 'gdb' instalado)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Iniciando GUI..." @@ -725,23 +725,23 @@ msgstr "LiVES-%s: <No hay archivo>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!rec %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Reproducir" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -749,35 +749,35 @@ "LiVES no pudo capturar esta imagen\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Archivo %s cerrado\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Deshacer" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Rehacer" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Vídeo" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Audio izquierda" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Audio derecha" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -793,7 +793,7 @@ "Por favor, ajuste las opciones de reproducción en Preferencias e intente " "nuevamente.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Ventana de reproducción" @@ -966,7 +966,7 @@ msgid "Use _mplayer2 audio player" msgstr "Usar reproductor _mplayer audio" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Siguiente" @@ -1173,11 +1173,11 @@ msgstr "" "Si esto se elige, los cuadros serán desentrelazados mientras son importados." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Previsualización" @@ -1195,7 +1195,7 @@ msgid "Click here to _Preview the video" msgstr "Clic aquí para _Preview el vídeo" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Procesando..." @@ -1213,8 +1213,8 @@ "\n" "¡Recuerde desactivar los efectos (ctrl-0) después!" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1226,7 +1226,7 @@ msgid "Show Details" msgstr "Mostrar detalles" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Suficiente" @@ -1234,11 +1234,11 @@ msgid "_Preview" msgstr "_Previsualizar" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Pau_sa" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1255,146 +1255,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formatear" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Tamaño del fotograma" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Tamaño de archivo"
View file
LiVES-2.4.3.tar.bz2/po/et.po -> LiVES-2.4.4.tar.bz2/po/et.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Estonian <et@li.org>\n" @@ -302,11 +302,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -485,7 +485,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "" @@ -656,57 +656,57 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Esita" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "Võta _tagasi" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Taasta" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -715,7 +715,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -861,7 +861,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1045,11 +1045,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Eelvaade" @@ -1065,7 +1065,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1078,8 +1078,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1091,7 +1091,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "" @@ -1099,11 +1099,11 @@ msgid "_Preview" msgstr "_Eelvaade" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1120,146 +1120,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Vorming" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Raami suurus" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Failisuurus" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/fi.po -> LiVES-2.4.4.tar.bz2/po/fi.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Finnish <fi@li.org>\n" @@ -311,11 +311,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -507,7 +507,7 @@ "-debug : yritä jäljittää kaatumisen aiheuttavaa vikaa (\"gdb\" " "oltava asennettuna)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Käynnistetään graafinen käyttöliittymä..." @@ -696,23 +696,23 @@ msgstr "LiVES-%s: <Ei tiedostoa>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Toista" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -720,35 +720,35 @@ "LiVES ei pystynyt kaappaamaan tätä kuvaa\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Tiedosto %s suljettiin\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "Kum_oa" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Tee uudestaan" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Vasen ääni" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Oikea ääni" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -757,7 +757,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Toistoikkuna" @@ -935,7 +935,7 @@ msgid "Use _mplayer2 audio player" msgstr "Käytä _mplayer-äänisoitinta" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Seuraava" @@ -1124,11 +1124,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Esikatselu" @@ -1146,7 +1146,7 @@ msgid "Click here to _Preview the video" msgstr "Klikkaa tästä _Esikatselu video" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Käsitellään..." @@ -1164,8 +1164,8 @@ "\n" "Muista poistaa tehosteet käytöstä (ctrl-0) myöhemmin!" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1177,7 +1177,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Riittää jo" @@ -1185,11 +1185,11 @@ msgid "_Preview" msgstr "_Esikatselu" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1206,146 +1206,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formaatti" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Kuvakoko" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Tiedostokoko"
View file
LiVES-2.4.3.tar.bz2/po/fr.po -> LiVES-2.4.4.tar.bz2/po/fr.po
Changed
@@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2015-04-13 18:06+0000\n" "Last-Translator: Jean Marc <Unknown>\n" "Language-Team: Français <kwizart@gmail.com>\n" @@ -308,11 +308,11 @@ msgid "Number of CPUs detected: %d " msgstr "nombre de CPU détectés : %d " -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "petit boutien" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "grand boutien" @@ -520,7 +520,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : essayer de debugger les crashs (nécessite 'gdb' installé)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Démarrage de l'interface graphique..." @@ -730,23 +730,23 @@ msgstr "LiVES-%s: <Pas de Fichier>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "enr %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!enr %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Lecture" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -754,35 +754,35 @@ "LiVES ne peut capturer cette image\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Fichier Fermé %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Annuler" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Rétablir" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Vidéo" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Audio Gauche" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Audio Droite" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -798,7 +798,7 @@ "Changez SVP les options de lecture dans les Préférences et essayez à " "nouveau.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Fenêtre de Lecture" @@ -992,7 +992,7 @@ msgid "Use _mplayer2 audio player" msgstr "Utilise le lecteur audui _mplayer" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Suivant" @@ -1194,11 +1194,11 @@ "Si vous sélectionnez cela, la vidéo sera désentrelacée durant son " "importation." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Voir" @@ -1216,7 +1216,7 @@ msgid "Click here to _Preview the video" msgstr "Cliquez ici pour prévisualiser la vidéo." -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Traitement..." @@ -1234,8 +1234,8 @@ "\n" "N'oubliez pas de désactiver les effets (ctrl-0) par la suite !" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1247,7 +1247,7 @@ msgid "Show Details" msgstr "Afficher les détails" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Assez" @@ -1255,11 +1255,11 @@ msgid "_Preview" msgstr "_Voir" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Paus_e" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1276,146 +1276,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Format" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Taille de l'encadrement" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Taille Fichier"
View file
LiVES-2.4.3.tar.bz2/po/gl.po -> LiVES-2.4.4.tar.bz2/po/gl.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2015-04-20 18:32+0000\n" "Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -304,11 +304,11 @@ msgid "Number of CPUs detected: %d " msgstr "Número de CPU detectadas: %d " -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "little endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "big endian" @@ -518,7 +518,7 @@ "-debug : tentar depurar erros (require ter «gdb» " "instalado)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Iniciando a interface..." @@ -739,23 +739,23 @@ msgstr "LiVES-%s: <Non hai ficheiro>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Reproducir" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -763,35 +763,35 @@ "LiVES non puido capturar esta imaxe\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Pechado o ficheiro %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Desfacer" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Refacer" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Vídeo" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Son esquerdo" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Son dereito" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -806,7 +806,7 @@ "configurado a mplayer.\n" "Axuste as opcións de reprodución en Preferencias e tenteo de novo.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Xanela de reprodución" @@ -967,7 +967,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Seguinte" @@ -1151,11 +1151,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Vista previa" @@ -1171,7 +1171,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Procesamento da..." @@ -1189,8 +1189,8 @@ "\n" "Lembre apagar efectos (ctrl) despois !" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1202,7 +1202,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Suficiente" @@ -1210,11 +1210,11 @@ msgid "_Preview" msgstr "_Vista previa" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1231,146 +1231,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formato" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Tamaño do fotograma" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Tamaño do ficheiro"
View file
LiVES-2.4.3.tar.bz2/po/he.po -> LiVES-2.4.4.tar.bz2/po/he.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Hebrew <he@li.org>\n" @@ -310,11 +310,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "little endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "big endian" @@ -504,7 +504,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : try to debug crashes (requires 'gdb' installed)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "מפעיל את מנשק המשתמש הגרפי..." @@ -708,23 +708,23 @@ msgstr "LiVES-%s <ללא קובץ>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "הקלטה %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!הקלטה %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "נגן" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -732,35 +732,35 @@ "ל־LiVES לא הית אפשרות ללכוד תמונה זו\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "הקובץ %s נסגר\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_ביטול" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "ב_צע שוב" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "וידאו" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "ערוץ שמע שמאלי" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "ערוץ שמע ימני" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -774,7 +774,7 @@ "ל־LiVES אין אפשרות לעבור בין קטעים בעת הפתיחה באם נגן השמע מוגדר כ־mplayer.\n" "נא לכוון את אפשרויות הנגינה בהעדפות ולנסות שוב.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - חלון הנגינה" @@ -947,7 +947,7 @@ msgid "Use _mplayer2 audio player" msgstr "שימוש בנגן השמע _mplayer" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_הבא" @@ -1146,11 +1146,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "באם מוגדר, תבוצע פעולת deinterlace על השקופיות בעת הייבוא." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "תצוגה מקדימה" @@ -1166,7 +1166,7 @@ msgid "Click here to _Preview the video" msgstr "יש ללחוץ כאן כדי _להציג את הוידאו" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - בתהליכי עיבוד..." @@ -1184,8 +1184,8 @@ "\n" "נא לזכור לכבות את האפקטים (Ctrl-0) לאחר מכן !" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1197,7 +1197,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_מספיק" @@ -1205,11 +1205,11 @@ msgid "_Preview" msgstr "_תצוגה מקדימה" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "הש_הייה" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "השהייה/_מספיק" @@ -1226,146 +1226,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "מבנה" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "גודל השקופית" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "גודל הקובץ"
View file
LiVES-2.4.3.tar.bz2/po/hr.po -> LiVES-2.4.4.tar.bz2/po/hr.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Croatian <hr@li.org>\n" @@ -305,11 +305,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -493,7 +493,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Početna GUI..." @@ -664,23 +664,23 @@ msgstr "LiVES-%s: <Nema datoteka>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!rec %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Reproduciraj" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -688,35 +688,35 @@ "LiVES nije bio u mogućnosti to hvatanje ovu sliku\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Zatvoreno datoteke %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Poništi" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Ponovi" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -725,7 +725,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -873,7 +873,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Slijedeće" @@ -1064,11 +1064,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Pregled" @@ -1084,7 +1084,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1097,8 +1097,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1110,7 +1110,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Dovoljno" @@ -1118,11 +1118,11 @@ msgid "_Preview" msgstr "_Pregled" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Pauz_a" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "Pauza/_Dosta" @@ -1139,146 +1139,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Oblik" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Veličina datoteke"
View file
LiVES-2.4.3.tar.bz2/po/hu.po -> LiVES-2.4.4.tar.bz2/po/hu.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2012-08-08 08:49+0000\n" "Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@gmail.com>\n" "Language-Team: Magyar <lisovszki@gmail.com>\n" @@ -305,11 +305,11 @@ msgid "Number of CPUs detected: %d " msgstr "monitorok száma: %d\n" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "kicsi endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "nagy endian" @@ -503,7 +503,7 @@ "-debug : megpróbálja kideríteni az összeomlás okát ('gdb' program megléte " "szükséges)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Grafikus felhasználói felület indítása..." @@ -707,23 +707,23 @@ msgstr "LiVES-%s: <Nincs fájl>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Lejátszás" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -731,35 +731,35 @@ "LiVES nem tudja rögzíteni ezt a képet\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "%s fájl bezárva\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Visszavonás" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "Új_ra" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Videó" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Bal oldali hang" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Jobb oldali hang" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -774,7 +774,7 @@ "lejátszó az mplayer.\n" "Kérlek állítsd be a lejátszási beállításokat, majd próbáld újra.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Lejátszó Ablak" @@ -951,7 +951,7 @@ msgid "Use _mplayer2 audio player" msgstr "_mplayer használata" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Következő" @@ -1138,11 +1138,11 @@ "Ha ez be van állítva, a képkockák deinterlacelve lesznek amint importálják " "őket." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Előnézet" @@ -1158,7 +1158,7 @@ msgid "Click here to _Preview the video" msgstr "Kattints ide a video előnézetéhez" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Feldolgozás..." @@ -1176,8 +1176,8 @@ "\n" "Ne felejtsd el kikapcsolni az effekteket (ctr-0) utána!" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1190,7 +1190,7 @@ msgid "Show Details" msgstr "_Részletek megjelenítése" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Elég" @@ -1198,11 +1198,11 @@ msgid "_Preview" msgstr "_Előnézet" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1220,148 +1220,148 @@ msgid "LiVES: - Multitrack details" msgstr "Multitrack részletek" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formátum" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Képkocka mérete" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Fájl mérete"
View file
LiVES-2.4.3.tar.bz2/po/it.po -> LiVES-2.4.4.tar.bz2/po/it.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Italian <it@li.org>\n" @@ -305,11 +305,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "piccolo endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "grosso endian" @@ -505,7 +505,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : prova a risolvere dei crash\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Avviamento della GUI in corso..." @@ -709,23 +709,23 @@ msgstr "LiVES-%s: <Nessun File>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!rec %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Riproduci" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -733,35 +733,35 @@ "LiVES non è stato in grado di catturare questa immagine\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Chiuso il file %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Annulla" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Ripeti" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Audio Sinistro" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Audio Destro" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -776,7 +776,7 @@ "impostato su mplayer.\n" "Per piacere regola le opzioni di riproduzione in Preferenze e prova ancora.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Finestra Di Riproduzione" @@ -952,7 +952,7 @@ msgid "Use _mplayer2 audio player" msgstr "Utilizza il lettore audio _mplayer" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Successivo" @@ -1138,11 +1138,11 @@ "Se questo viene impostato, i fotogrammi verranno deinterlacciati appena " "vengono importati." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Anteprima" @@ -1159,7 +1159,7 @@ msgid "Click here to _Preview the video" msgstr "Clicca qui per vedere in A_nteprima il video" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES - Elaborazione in corso..." @@ -1177,8 +1177,8 @@ "\n" "Ricordati di disattivare gli effetti (ctrl-0) dopo !" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1190,7 +1190,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Abbastanza" @@ -1198,11 +1198,11 @@ msgid "_Preview" msgstr "_Anteprima" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1219,146 +1219,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formato" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Dimensione fotogramma" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Dimensione file"
View file
LiVES-2.4.3.tar.bz2/po/ja.po -> LiVES-2.4.4.tar.bz2/po/ja.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Japanese <ja@li.org>\n" @@ -305,11 +305,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "リトルエンディアン" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "ビッグエンディアン" @@ -506,7 +506,7 @@ msgstr "" "-debug : クラッシュのデバックを試みる (gdbのインストールが必要)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "GUIを開始..." @@ -715,23 +715,23 @@ msgstr "LiVES-%s: <ファイル未設定>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "記録 %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!記録 %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "再生" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -739,35 +739,35 @@ "LiVESはこの画像をキャプチャできませんでした\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "ファイル %s を閉じました\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "元に戻す(_U)" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "やり直す(_R)" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "ビデオ" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "左音声" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "右音声" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -782,7 +782,7 @@ "きません。\n" "「設定」の再生オプションを調整して、再度試してください。\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - 再生ウィンドウ" @@ -977,7 +977,7 @@ msgid "Use _mplayer2 audio player" msgstr "mplayerを使用する(_M)" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "次へ(_N)" @@ -1184,11 +1184,11 @@ "これを設定すると、フレームがインポートされたときにインターレースを解除しま" "す。" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "プレビュー" @@ -1204,7 +1204,7 @@ msgid "Click here to _Preview the video" msgstr "クリックで、映像をプレビュー(_P)" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - 処理中..." @@ -1222,8 +1222,8 @@ "\n" "忘れないよう後でエフェクトを停止(ctrl-0)させてください!" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1235,7 +1235,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "OK(_E)" @@ -1243,11 +1243,11 @@ msgid "_Preview" msgstr "プレビュー(_P)" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "一時停止(_E)" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "一時停止（_E）" @@ -1264,146 +1264,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "フォーマット" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "フレームサイズ" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "ファイルサイズ"
View file
LiVES-2.4.3.tar.bz2/po/lives.pot -> LiVES-2.4.4.tar.bz2/po/lives.pot
Changed
@@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lives 2.4.3\n" +"Project-Id-Version: lives 2.4.4\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -282,11 +282,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -465,7 +465,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "" @@ -636,57 +636,57 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -695,7 +695,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -841,7 +841,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1025,11 +1025,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "" @@ -1045,7 +1045,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1058,8 +1058,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1069,7 +1069,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "" @@ -1077,11 +1077,11 @@ msgid "_Preview" msgstr "" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1098,146 +1098,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size"
View file
LiVES-2.4.3.tar.bz2/po/nl_NL.po -> LiVES-2.4.4.tar.bz2/po/nl_NL.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LiVES 0.9.5cvs\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: \n" @@ -281,11 +281,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -464,7 +464,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "" @@ -635,57 +635,57 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -694,7 +694,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -840,7 +840,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1024,11 +1024,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "" @@ -1044,7 +1044,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1057,8 +1057,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1068,7 +1068,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "" @@ -1076,11 +1076,11 @@ msgid "_Preview" msgstr "" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1097,146 +1097,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/oc.po -> LiVES-2.4.4.tar.bz2/po/oc.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Occitan (post 1500) <oc@li.org>\n" @@ -293,11 +293,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -480,7 +480,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Aviada de l'interfàcia grafica..." @@ -651,57 +651,57 @@ msgstr "LiVES-%s: <Pas de Fichièr>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Legir" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Fichièr Tampat %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Anullar" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Restablir" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Vidèo" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Àudio Esquèrra" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Àudio Drecha" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -710,7 +710,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Fenèstra de Lectura" @@ -857,7 +857,7 @@ msgid "Use _mplayer2 audio player" msgstr "Utiliza lo lector audui _mplayer" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Seguent" @@ -1041,11 +1041,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Previsualizacion" @@ -1061,7 +1061,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Tractament..." @@ -1074,8 +1074,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1087,7 +1087,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Pro" @@ -1095,11 +1095,11 @@ msgid "_Preview" msgstr "_Previsualizacion" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Paus_a" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "Pausa/_Pro" @@ -1116,146 +1116,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formatar" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Talha de l'enquadrament" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Talha del fichièr" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/pl.po -> LiVES-2.4.4.tar.bz2/po/pl.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Polish <pl@li.org>\n" @@ -305,11 +305,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -490,7 +490,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "" @@ -661,57 +661,57 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Odtwarzaj" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Cofnij" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Powtórz" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Wideo" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -720,7 +720,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -869,7 +869,7 @@ msgid "Use _mplayer2 audio player" msgstr "Użyj _mplayer odtwarzacz audio" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1064,11 +1064,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Podgląd" @@ -1084,7 +1084,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1097,8 +1097,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1110,7 +1110,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Dość" @@ -1118,11 +1118,11 @@ msgid "_Preview" msgstr "_Podgląd" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1139,146 +1139,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Format" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Wielkość filmu" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Wielkość pliku" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/pms.po -> LiVES-2.4.4.tar.bz2/po/pms.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-11-09 23:22+0000\n" "Last-Translator: Simon Uslengh <simoneislanda@libero.it>\n" "Language-Team: Piemontese <pms@li.org>\n" @@ -311,11 +311,11 @@ msgid "Number of CPUs detected: %d " msgstr "Numer ëd CPU trovà: %d " -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "partisan cit" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "partisan gròss" @@ -511,7 +511,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "" @@ -682,57 +682,57 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -741,7 +741,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -887,7 +887,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1071,11 +1071,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "" @@ -1091,7 +1091,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1104,8 +1104,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1115,7 +1115,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "" @@ -1123,11 +1123,11 @@ msgid "_Preview" msgstr "" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1144,146 +1144,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/pt.po -> LiVES-2.4.4.tar.bz2/po/pt.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LiVES\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -299,11 +299,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -490,7 +490,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "A iniciar GUI..." @@ -694,23 +694,23 @@ msgstr "LiVES-%s: <Nenhum Arquivo>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "grv %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!grv %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Tocar" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -718,35 +718,35 @@ "LiVES não conseguiu capturar esta imagem\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Arquivo %s fechado\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "Desfazer [_U]" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Refazer" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Vídeo" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Áudio Esquerdo" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Áudio Direito" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -762,7 +762,7 @@ "Por favor ajuste as opções de execução em 'Preferências | Execução' e tente " "novamente.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Tocador" @@ -909,7 +909,7 @@ msgid "Use _mplayer2 audio player" msgstr "Usar o reprodutor de áudio _jack" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Próximo" @@ -1095,11 +1095,11 @@ "Se isso for selecionado, frames vão ser desinterlaçados enquanto forem " "importados." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Visualizar" @@ -1116,7 +1116,7 @@ msgid "Click here to _Preview the video" msgstr "Clique aqui para _Previsualizar o vídeo" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Processando..." @@ -1134,8 +1134,8 @@ "\n" "Lembre de desligar os efeitos (ctrl-0) depois!" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1147,7 +1147,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "Sufici_ente" @@ -1155,11 +1155,11 @@ msgid "_Preview" msgstr "_Pré-visualizar" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1176,146 +1176,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formato" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Tamanho do frame" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Tamanho do arquivo"
View file
LiVES-2.4.3.tar.bz2/po/pt_BR.po -> LiVES-2.4.4.tar.bz2/po/pt_BR.po
Changed
@@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LiVES\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: pixel <vjpixel@gmail.com>\n" @@ -302,11 +302,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "little endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "big endian" @@ -503,7 +503,7 @@ "-debug : tentativa de debug falhou (necessita do 'gdb' " "instalado)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Iniciando interface gráfica..." @@ -707,23 +707,23 @@ msgstr "LiVES-%s: <Nenhum Arquivo>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "grv %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!grv %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Tocar" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -731,35 +731,35 @@ "LiVES não conseguiu capturar esta imagem\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Arquivo %s fechado\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "Desfazer [_U]" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Refazer" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Vídeo" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Áudio Esquerdo" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Áudio Direito" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -775,7 +775,7 @@ "Por favor ajuste as opções de execução em 'Preferências | Execução' e tente " "novamente.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Tocador" @@ -945,7 +945,7 @@ msgid "Use _mplayer2 audio player" msgstr "Usar _mplayer audio player" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Próximo" @@ -1154,11 +1154,11 @@ "Se isso for selecionado, frames vão ser desinterlaçados enquanto forem " "importados." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Visualizar" @@ -1175,7 +1175,7 @@ msgid "Click here to _Preview the video" msgstr "Clique aqui para _Previsualizar o vídeo" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Processando..." @@ -1193,8 +1193,8 @@ "\n" "Lembre de desligar os efeitos (ctrl-0) depois!" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1206,7 +1206,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "Sufici_ente" @@ -1214,11 +1214,11 @@ msgid "_Preview" msgstr "_Visualizar" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Pausar" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "Pausa/Sufici_ente" @@ -1235,146 +1235,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formato" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Tamanho do frame" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Tamanho do arquivo"
View file
LiVES-2.4.3.tar.bz2/po/ro.po -> LiVES-2.4.4.tar.bz2/po/ro.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -306,11 +306,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -501,7 +501,7 @@ msgstr "" "-debug : încerca să se blochează de depanare (necesită 'gdb' instalat)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Incepand GUI ..." @@ -672,23 +672,23 @@ msgstr "LiVES-%s: <Nici un fişier>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Rulează" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -696,35 +696,35 @@ "LiVES nu a putut pentru a capta această imagine\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Închis de fişiere% s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "An_ulează ultima acțiune" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Refă ultima acțiune" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -733,7 +733,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -879,7 +879,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "Î_nainte" @@ -1063,11 +1063,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Previzionează" @@ -1083,7 +1083,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1101,8 +1101,8 @@ "\n" "Amintiţi-vă pentru a opri efectele (Ctrl-0) dupa aceea !" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1114,7 +1114,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Destul" @@ -1122,11 +1122,11 @@ msgid "_Preview" msgstr "_Previzualizează" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1143,146 +1143,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Format" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Dimensiune cadru" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Dimensiune fișier"
View file
LiVES-2.4.3.tar.bz2/po/ru.po -> LiVES-2.4.4.tar.bz2/po/ru.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2015-04-06 05:53+0000\n" "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n" "Language-Team: Russian <ru@li.org>\n" @@ -318,11 +318,11 @@ msgid "Number of CPUs detected: %d " msgstr "Количество обнаруженных ЦПУ: %d " -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -521,7 +521,7 @@ msgstr "" "-debug : использовать для отладки ошибок (требуется установленный 'gdb')\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Запуск графической оболочки..." @@ -760,23 +760,23 @@ msgstr "LiVES-%s: <Нет файла>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Воспроизвести" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -784,35 +784,35 @@ "LiVES не может загрузить это изображение\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Закрыть файл %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Отменить" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Вернуть" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Видео" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Левый звуковой канал" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Правый звуковой канал" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -827,7 +827,7 @@ "выбран mplayer.\n" "Измените параметры просмотра в меню Настройки и повторите ещё раз.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Окно проигрывателя" @@ -1024,7 +1024,7 @@ msgid "Use _mplayer2 audio player" msgstr "Использовать аудиоплеер _mplayer" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Далее" @@ -1234,11 +1234,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "Если включить, чересстрочная развёртка будет устранена при импорте." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Предпросмотр" @@ -1256,7 +1256,7 @@ msgid "Click here to _Preview the video" msgstr "Кликните сюда для _Предпросмотра видео" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Обработка..." @@ -1274,8 +1274,8 @@ "\n" "Не забудьте отключить эффекты (ctrl-0) позже!" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1287,7 +1287,7 @@ msgid "Show Details" msgstr "Показать сведения" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Достаточно" @@ -1295,11 +1295,11 @@ msgid "_Preview" msgstr "_Предпросмотр" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Прио_становить" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1316,146 +1316,146 @@ msgid "LiVES: - Multitrack details" msgstr "LiVES: - Сведения о нескольких дорожках" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Формат" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Размер кадра" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Размер файла"
View file
LiVES-2.4.3.tar.bz2/po/sk.po -> LiVES-2.4.4.tar.bz2/po/sk.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Slovak <sk@li.org>\n" @@ -310,11 +310,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "malý endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "veľký endian" @@ -503,7 +503,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : skúsiť ladenie zlyhania (vyžaduje nainštalovaný 'gdb' )\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Spúšťam GUI..." @@ -707,23 +707,23 @@ msgstr "LiVES-%s: <No File>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "rec %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!rec %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Prehrať" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -731,35 +731,35 @@ "LiVES nebol schopný zachytiť tento obrázok\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Zatvorený súbor %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Späť" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Znova" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Ľavý audio kanál" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Pravý audio kanál" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -774,7 +774,7 @@ "prehrávač je nastavený mplayer.\n" "Prosím upravte nastavenia prehrávania v Nastaveniach a skúste opäť.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Okno prehrávania" @@ -950,7 +950,7 @@ msgid "Use _mplayer2 audio player" msgstr "Použi _mplayer audio prehrávač" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Nasledujúci" @@ -1155,11 +1155,11 @@ "Ak je zapnuté, zo snímkov bude odstránené prekladanie tak, ako sú " "importované." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Náhľad" @@ -1176,7 +1176,7 @@ msgid "Click here to _Preview the video" msgstr "Kliknutím zobrazíte _ukážku vybraných video súborov" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: -Spracovávanie..." @@ -1194,8 +1194,8 @@ "\n" "Nezabudnite potom vypnúť efekty (ctrl-0) !" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1207,7 +1207,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Dostatočne" @@ -1215,11 +1215,11 @@ msgid "_Preview" msgstr "_Náhľad" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1236,146 +1236,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Formátovanie" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Veľkosť snímku" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Veľkosť súboru"
View file
LiVES-2.4.3.tar.bz2/po/te.po -> LiVES-2.4.4.tar.bz2/po/te.po
Changed
@@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n" @@ -285,11 +285,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -468,7 +468,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "" @@ -639,57 +639,57 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "ఆడించు" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "చేసింది రద్దు (_U)" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "మళ్ళీచేయి (_R)" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "వీడియో" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -698,7 +698,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -844,7 +844,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1028,11 +1028,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "మునుజూపు" @@ -1048,7 +1048,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1061,8 +1061,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1074,7 +1074,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "" @@ -1082,11 +1082,11 @@ msgid "_Preview" msgstr "మునుజూపు (_P)" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1103,146 +1103,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "ఫార్మేట్" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "ఫైల్ పరిమాణం" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/tr.po -> LiVES-2.4.4.tar.bz2/po/tr.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Turkish <tr@li.org>\n" @@ -306,11 +306,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -500,7 +500,7 @@ "-debug : Çöküş nedeni bulmak için ('gdb' kurulu olması " "gereklidir)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Grafiksel kullanıcı arayüzü başlıyor..." @@ -704,23 +704,23 @@ msgstr "LiVES-%s: <Dosya Yok>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "kayıt %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!kayıt %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Oynat" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -728,35 +728,35 @@ "LiVES görüntü yakalanamadı\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Dosya kapandı %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Geri Al" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Yinele" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Video" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Sol Ses" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Sağ ses" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -771,7 +771,7 @@ "arasında geçiş yapamazsınız.\n" "Lütfen Tercihlerden çalma seçeneklerini ayarlayın ve tekrar deneyin.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Oynatma Penceresi" @@ -944,7 +944,7 @@ msgid "Use _mplayer2 audio player" msgstr "_mplayer ses çalıcısı kullan" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Sonraki" @@ -1145,11 +1145,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Önizleme" @@ -1165,7 +1165,7 @@ msgid "Click here to _Preview the video" msgstr "video _önizleme için buraya tıklayın" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - İşleniyor..." @@ -1181,8 +1181,8 @@ "\n" "Lütfen Bekleyin" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1194,7 +1194,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Yeterli" @@ -1202,11 +1202,11 @@ msgid "_Preview" msgstr "_Önizleme" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Durakla_t" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "Duraklat/_Yeterli" @@ -1223,146 +1223,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Biçim" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Çerçeve boyutu" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Dosya boyutu"
View file
LiVES-2.4.3.tar.bz2/po/ug.po -> LiVES-2.4.4.tar.bz2/po/ug.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Uyghur <ug@li.org>\n" @@ -284,11 +284,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -467,7 +467,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "" @@ -638,57 +638,57 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "قوي" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "يېنىۋال(_U)" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "قايتىلا(_R)" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "سىن" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "سول ئۈن" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "ئوڭ ئۈن" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -697,7 +697,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -843,7 +843,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "كېيىنكى(_N)" @@ -1027,11 +1027,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "ئالدىن كۆزەت" @@ -1047,7 +1047,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1060,8 +1060,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1073,7 +1073,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "" @@ -1081,11 +1081,11 @@ msgid "_Preview" msgstr "ئالدىن كۆزەت(_P)" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1102,146 +1102,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "پىچىمى" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "كاندۇك چوڭلۇقى" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "ھۆججەت چوڭلۇقى" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/uk.po -> LiVES-2.4.4.tar.bz2/po/uk.po
Changed
@@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-12-13 17:20+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n" "Language-Team: Ukrainian <translation@linux.org.ua>\n" @@ -317,11 +317,11 @@ msgid "Number of CPUs detected: %d " msgstr "Кількість виявлених процесорів: %d " -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "little endian" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "big endian" @@ -538,7 +538,7 @@ "-debug : спробувати виконати діагностику аварії (доведеться " "встановити «gdb»)\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "Запуск графічного інтерфейсу..." @@ -782,23 +782,23 @@ msgstr "LiVES-%s: <файла не вказано>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "зап %9d/%d" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "!зап %9d/%d" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Пуск" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -806,35 +806,35 @@ "LiVES не вдалося захопити це зображення.\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "Закритий файл %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "В_ернути" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "Повт_орити" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Відео" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "Лівий канал звуку" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "Правий канал звуку" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -849,7 +849,7 @@ "визначено mplayer.\n" "Будь ласка, змініть налаштування у «Параметрах» і повторіть спробу.\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - Вікно відтворення" @@ -1046,7 +1046,7 @@ msgid "Use _mplayer2 audio player" msgstr "В_икористовувати звуковий програвач mplayer" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "_Далі" @@ -1265,11 +1265,11 @@ "Якщо позначити цей пункт, програма усуватиме черезрядковість з кадрів під " "час імпортування." -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Перегляд" @@ -1287,7 +1287,7 @@ msgid "Click here to _Preview the video" msgstr "Натисніть, щоб _переглянути відео" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - Обробка…" @@ -1305,8 +1305,8 @@ "\n" "Не забудьте потім вимкнути ефекти (ctrl-0)!" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1318,7 +1318,7 @@ msgid "Show Details" msgstr "Показати подробиці" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "_Досить" @@ -1326,11 +1326,11 @@ msgid "_Preview" msgstr "П_ереглянути" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "Приз_упинити" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "Призупинити/_Досить" @@ -1347,68 +1347,68 @@ msgid "LiVES: - Multitrack details" msgstr "LiVES: — Подробиці щодо набору доріжок" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Формат" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "Розміри кадру" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "Розмір файла"
View file
LiVES-2.4.3.tar.bz2/po/uz.po -> LiVES-2.4.4.tar.bz2/po/uz.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2013-03-14 12:31+0000\n" "Last-Translator: Launchpad Translations Administrators <Unknown>\n" "Language-Team: Uzbek <uz@li.org>\n" @@ -311,11 +311,11 @@ msgid "Number of CPUs detected: %d " msgstr "" -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "" @@ -494,7 +494,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "" @@ -665,57 +665,57 @@ msgstr "" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "Ўйнаш" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" msgstr "" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "_Бекор қилиш" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "_Қайтариш" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "Видео" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "" -#: src/main.c:6775 +#: src/main.c:6777 msgid "" "\n" "\n" @@ -724,7 +724,7 @@ "Please adjust the playback options in Preferences and try again.\n" msgstr "" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "" @@ -870,7 +870,7 @@ msgid "Use _mplayer2 audio player" msgstr "" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "" @@ -1054,11 +1054,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "Олдиндан кўриш" @@ -1074,7 +1074,7 @@ msgid "Click here to _Preview the video" msgstr "" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "" @@ -1087,8 +1087,8 @@ "Remember to switch off effects (ctrl-0) afterwards !" msgstr "" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1098,7 +1098,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "" @@ -1106,11 +1106,11 @@ msgid "_Preview" msgstr "_Олдиндан кўриш" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1127,146 +1127,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "Форматлаш" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "" -#: src/interface.c:409
View file
LiVES-2.4.3.tar.bz2/po/zh_CN.po -> LiVES-2.4.4.tar.bz2/po/zh_CN.po
Changed
@@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lives\n" "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n" -"POT-Creation-Date: 2015-11-15 09:43-0300\n" +"POT-Creation-Date: 2015-11-22 18:03-0300\n" "PO-Revision-Date: 2015-04-05 16:35+0000\n" "Last-Translator: Timothy Gu <timothy_gu@hotmail.com>\n" "Language-Team: Simplified Chinese <zh_CN@li.org>\n" @@ -309,11 +309,11 @@ msgid "Number of CPUs detected: %d " msgstr "检测到CPU个数：%d " -#: src/main.c:1878 src/multitrack.c:5099 +#: src/main.c:1878 src/multitrack.c:5102 msgid "little endian" msgstr "小端" -#: src/main.c:1879 src/multitrack.c:5098 +#: src/main.c:1879 src/multitrack.c:5101 msgid "big endian" msgstr "大端" @@ -505,7 +505,7 @@ msgid "-debug : try to debug crashes (requires 'gdb' installed)\n" msgstr "-debug : 尝试调试崩溃（需要安装 gdb）\n" -#: src/main.c:2481 src/gui.c:1128 +#: src/main.c:2481 src/gui.c:1131 msgid "Starting GUI..." msgstr "正在启动图形用户界面..." @@ -705,23 +705,23 @@ msgstr "LiVES-%s: <没有文件>" #. TRANSLATORS: rec(ord) -#: src/main.c:5354 +#: src/main.c:5356 #, c-format msgid "rec %9d/%d" msgstr "" #. TRANSLATORS: out of memory (rec(ord)) -#: src/main.c:5359 +#: src/main.c:5361 #, c-format msgid "!rec %9d/%d" msgstr "" -#: src/main.c:5653 src/main.c:5654 src/gui.c:2130 src/gui.c:3381 +#: src/main.c:5655 src/main.c:5656 src/gui.c:2133 src/gui.c:3384 #: src/saveplay.c:2317 msgid "Play" msgstr "播放" -#: src/main.c:6354 +#: src/main.c:6356 msgid "" "LiVES was unable to capture this image\n" "\n" @@ -729,35 +729,35 @@ "LiVES 无法捕获此图片\n" "\n" -#: src/main.c:6487 +#: src/main.c:6489 #, c-format msgid "Closed file %s\n" msgstr "已关闭文件 %s\n" -#: src/main.c:6684 src/gui.c:647 src/utils.c:4285 src/utils.c:4315 -#: src/saveplay.c:3508 src/multitrack.c:4709 src/multitrack.c:6485 +#: src/main.c:6686 src/gui.c:650 src/utils.c:4289 src/utils.c:4319 +#: src/saveplay.c:3508 src/multitrack.c:4712 src/multitrack.c:6488 msgid "_Undo" msgstr "撤消(_U)" -#: src/main.c:6685 src/gui.c:665 src/utils.c:4286 src/utils.c:4316 -#: src/saveplay.c:3509 src/multitrack.c:4729 src/multitrack.c:6510 +#: src/main.c:6687 src/gui.c:668 src/utils.c:4290 src/utils.c:4320 +#: src/saveplay.c:3509 src/multitrack.c:4732 src/multitrack.c:6513 msgid "_Redo" msgstr "重做(_R)" -#: src/main.c:6725 src/interface.c:461 src/gui.c:2347 src/preferences.c:2414 -#: src/resample.c:1488 +#: src/main.c:6727 src/interface.c:462 src/gui.c:2350 src/preferences.c:2416 +#: src/resample.c:1531 msgid "Video" msgstr "视频" -#: src/main.c:6726 src/interface.c:474 src/gui.c:2371 +#: src/main.c:6728 src/interface.c:475 src/gui.c:2374 msgid "Left Audio" msgstr "左声道" -#: src/main.c:6727 src/gui.c:2394 +#: src/main.c:6729 src/gui.c:2397 msgid "Right Audio" msgstr "右声道" -#: src/main.c:6775 +#: src/main.c:6777 #, fuzzy msgid "" "\n" @@ -771,7 +771,7 @@ "如果指定音频播放器为 mplayer，LiVES 无法在同时打开的片段见切换。\n" "请调整首选项中的回放设置并重试。\n" -#: src/main.c:7272 src/plugins.c:1468 +#: src/main.c:7282 src/plugins.c:1469 msgid "LiVES: - Play Window" msgstr "LiVES: - 播放窗口" @@ -944,7 +944,7 @@ msgid "Use _mplayer2 audio player" msgstr "音频播放器使用_mplayer" -#: src/startup.c:402 src/startup.c:575 src/interface.c:1404 +#: src/startup.c:402 src/startup.c:575 src/interface.c:1402 msgid "_Next" msgstr "下一步(_N)" @@ -1142,11 +1142,11 @@ msgid "If this is set, frames will be deinterlaced as they are imported." msgstr "如果设置此项，视频在导入时将被反交错化。" -#: src/interface.c:106 src/callbacks.c:9511 src/callbacks.c:9533 -#: src/callbacks.c:9534 src/gui.c:3383 src/gui.c:3998 src/saveplay.c:2319 +#: src/interface.c:106 src/callbacks.c:9515 src/callbacks.c:9537 +#: src/callbacks.c:9538 src/gui.c:3386 src/gui.c:4001 src/saveplay.c:2319 #: src/saveplay.c:3101 src/dialogs.c:1576 src/dialogs.c:1577 #: src/dialogs.c:1813 src/dialogs.c:1814 src/framedraw.c:236 -#: src/multitrack.c:8257 +#: src/multitrack.c:8260 msgid "Preview" msgstr "预览" @@ -1162,7 +1162,7 @@ msgid "Click here to _Preview the video" msgstr "点击此处预览（_P）视频" -#: src/interface.c:169 src/dialogs.c:2632 +#: src/interface.c:169 src/dialogs.c:2649 msgid "LiVES: - Processing..." msgstr "LiVES: - 正在处理..." @@ -1180,8 +1180,8 @@ "\n" "请不要忘记之后关闭效果（ctrl-0）！" -#: src/interface.c:210 src/callbacks.c:9252 src/callbacks.c:9301 -#: src/dialogs.c:2660 +#: src/interface.c:210 src/callbacks.c:9256 src/callbacks.c:9305 +#: src/dialogs.c:2677 msgid "" "\n" "Please Wait" @@ -1193,7 +1193,7 @@ msgid "Show Details" msgstr "" -#: src/interface.c:243 src/dialogs.c:2674 +#: src/interface.c:243 src/dialogs.c:2691 msgid "_Enough" msgstr "可以了（_E）" @@ -1201,11 +1201,11 @@ msgid "_Preview" msgstr "预览(_P)" -#: src/interface.c:246 src/callbacks.c:9251 src/callbacks.c:9299 +#: src/interface.c:246 src/callbacks.c:9255 src/callbacks.c:9303 msgid "Paus_e" msgstr "暂停(_E)" -#: src/interface.c:247 src/callbacks.c:9298 +#: src/interface.c:247 src/callbacks.c:9302 msgid "Pause/_Enough" msgstr "" @@ -1222,146 +1222,146 @@ msgid "LiVES: - Multitrack details" msgstr "" -#: src/interface.c:398 +#: src/interface.c:399 msgid "Format" msgstr "格式" -#: src/interface.c:403 +#: src/interface.c:404 msgid "Frame size" msgstr "帧尺寸" -#: src/interface.c:408 +#: src/interface.c:409 msgid "File size" msgstr "文件大小"
View file
LiVES-2.4.3.tar.bz2/smogrify -> LiVES-2.4.4.tar.bz2/smogrify
Changed
@@ -23,7 +23,7 @@ # Do not change these except for testing ! $background=1; -$version="2.4.3"; +$version="2.4.4"; #$dyneversion="LIVES-20091209"; ################################################################### @@ -673,9 +673,9 @@ $com="$smog_convert_command $img_prefix\"$curtmpdir/$name$img_ext\" \"$nfile\" >$nulfile 2>&1"; } else { if ($antialias eq "false") { - $com="$smog_convert_command +antialias $img_prefix\"$curtmpdir/$name$img_ext\" -scale $hsize"."!x"."$vsize! \"$nfile\" > $nulfile 2>&1"; + $com="$smog_convert_command +antialias $img_prefix\"$curtmpdir/$name$img_ext\" -scale $hsize"."x"."$vsize\\! \"$nfile\" > $nulfile 2>&1"; } else { - $com="$smog_convert_command -antialias $img_prefix\"$curtmpdir/$name$img_ext\" -resize $hsize"."!x"."$vsize! \"$nfile\" > $nulfile 2>&1"; + $com="$smog_convert_command -antialias $img_prefix\"$curtmpdir/$name$img_ext\" -resize $hsize"."x"."$vsize\\! \"$nfile\" > $nulfile 2>&1"; } } @@ -868,10 +868,10 @@ $name=&mkname(1); if ($antialias eq "false") { - smog_system("$smog_convert_command +antialias \"$file\" -scale $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1"); + smog_system("$smog_convert_command +antialias \"$file\" -scale $hsize"."x"."$vsize\\! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1"); } else { - smog_system("$smog_convert_command -antialias \"$file\" -resize $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1"); + smog_system("$smog_convert_command -antialias \"$file\" -resize $hsize"."x"."$vsize\\! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1"); } &sig_complete($hsize,$vsize); exit 0; @@ -2367,6 +2367,8 @@ $resize_ext=".mgk"; + $blankname="blank.jpg"; + my $letterbox=0; if (defined($ARGV[6]) && $ARGV[6]>0) { @@ -2388,11 +2390,11 @@ $bgcolour="#000000"; } - $com="$smog_convert_command -size $owidth!x$oheight! xc:$bgcolour blank.jpg >$nulfile 2>&1"; + $com="$smog_convert_command -size $owidthx$oheight\\! xc:$bgcolour $blankname >$nulfile 2>&1"; $smerr=smog_system($com); if ($smerr) { sig_system_error("$com",$smerr); - unlink "blank.jpg"; + unlink $blankname; unlink "$pidfile"; exit 1; } @@ -2407,7 +2409,7 @@ if ($panic) { if ($letterbox) { try_to_recover($start,$i-1); - unlink "blank.jpg"; + unlink $blankname; } if ($DEBUG_SMOGRIFY) { print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name$img_ext\",\"$curtmpdir/$name.bak\"\n"; @@ -2426,7 +2428,7 @@ if ($panic) { if ($letterbox) { try_to_recover($start,$i); - unlink "blank.jpg"; + unlink $blankname; } unlink "$pidfile"; exit 1; @@ -2439,7 +2441,7 @@ if ($panic) { if ($letterbox) { try_to_recover($start,$i); - unlink "blank.jpg"; + unlink $blankname; } unlink "$pidfile"; exit 1; @@ -2459,7 +2461,7 @@ } } else { - unlink "blank.jpg"; + unlink $blankname; } &sig_complete; @@ -2658,6 +2660,8 @@ &clean_old; } + $blankname="blank.jpg"; + if (defined(open IN,"< $event_file")) { $fcount=1; read IN,$val,4; @@ -2671,7 +2675,7 @@ $bgcolour="#000000"; } - $com="$smog_convert_command -size $owidth!x$oheight! xc:$bgcolour blank.jpg >$nulfile 2>&1"; + $com="$smog_convert_command -size $owidthx$oheight\\! xc:$bgcolour $blankname>$nulfile 2>&1"; $smerr=smog_system($com); if ($smerr) { sig_system_error("$com",$smerr); @@ -2695,7 +2699,7 @@ if ($panic) { if ($letterbox) { try_to_recover($start,$i-1); - unlink "blank.jpg"; + unlink $blankname; } unlink "$pidfile"; exit 1; @@ -2705,7 +2709,7 @@ if (!$smerr) { if ($letterbox) { try_to_recover($start,$i); - unlink "blank.jpg"; + unlink $blankname; } sig_system_error("Renaming \"$curtmpdir/$from$resize_ext\" to \"$curtmpdir/$to.mgk\"",$!); unlink "$pidfile"; @@ -2746,7 +2750,7 @@ if ($panic) { try_to_recover($start,$i-1); unlink "$pidfile"; - unlink "blank.jpg"; + unlink $blankname; exit 1; } # make $to.mgk $to.img_ext @@ -2755,7 +2759,7 @@ if ($panic) { try_to_recover($start,$i-1); unlink "$pidfile"; - unlink "blank.jpg"; + unlink $blankname; exit 1; } @@ -2772,7 +2776,7 @@ close IN; if ($letterbox&&!$leave_bak) { - unlink "blank.jpg"; + unlink $blankname; } } @@ -4712,7 +4716,7 @@ return if $panic; } else { if ($antialias eq "false") { - $com="$smog_convert_command +antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $width!x$height! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1"; + $com="$smog_convert_command +antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $widthx$height\\! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1"; $smerr=smog_system($com); if ($smerr) { sig_system_error("$com",$smerr); @@ -4720,7 +4724,7 @@ return; } } else { - $com="$smog_convert_command -antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $width!x$height! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1"; + $com="$smog_convert_command -antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $widthx$height\\! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1"; $smerr=smog_system($com); if ($smerr) { sig_system_error("$com",$smerr); @@ -4778,9 +4782,9 @@ # TODO **** !!! provide alternate if imagemagick is not available if ($antialias eq "false") { - $com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -scale $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1"; + $com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -scale $widthx$height\\! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1"; } else { - $com="$smog_convert_command -size $width"."x$height $input_prefix\"$name$input_ext\" -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1"; + $com="$smog_convert_command -size $width"."x$height $input_prefix\"$name$input_ext\" -resize $widthx$height\\! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1"; } $smerr=smog_system($com); if ($smerr) { @@ -4810,7 +4814,7 @@ #must unlink first in case $to is a symlink (when saving selection) unlink "$to"; - $com="$smog_composite_command -compose plus -dissolve 100 -geometry $iwidth!x$iheight!+$xstart!+$ystart! \"$from\" blank.jpg \"$to\" >$nulfile 2>&1"; + $com="$smog_composite_command -compose plus -dissolve 100 -geometry $iwidthx$iheight\\!+$xstart\\!+$ystart\\! \"$from\" $blankname \"$to\" >$nulfile 2>&1"; $smerr=smog_system($com); if ($smerr) { sig_system_error("$com",$smerr); @@ -4877,9 +4881,9 @@ my($nheight)=$bottom-$top+1; if ($antialias eq "false") { - $com="$smog_convert_command -antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$left!+$top! -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
View file
LiVES-2.4.3.tar.bz2/src/Makefile.in -> LiVES-2.4.4.tar.bz2/src/Makefile.in
Changed
@@ -1496,8 +1496,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@BUILD_LIBLIVES_FALSE@install-exec-local: @BUILD_LIBLIVES_FALSE@uninstall-local: +@BUILD_LIBLIVES_FALSE@install-exec-local: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
View file
LiVES-2.4.3.tar.bz2/src/callbacks.c -> LiVES-2.4.4.tar.bz2/src/callbacks.c
Changed
@@ -38,6 +38,10 @@ #include "videodev.h" #endif +#ifdef ENABLE_OSC +#include "osc.h" +#endif + static char file_name[PATH_MAX]; void lives_notify(int msgnumber,const char *msgstring) {
View file
LiVES-2.4.3.tar.bz2/src/dialogs.c -> LiVES-2.4.4.tar.bz2/src/dialogs.c
Changed
@@ -2561,6 +2561,23 @@ } +void do_lb_composite_error(void) { + do_blocking_error_dialog( + _("LiVES currently requires composite from ImageMagick to do letterboxing.\nPlease install 'imagemagick' and try again.")); +} + + +void do_lb_convert_error(void) { + do_blocking_error_dialog( + _("LiVES currently requires convert from ImageMagick to do letterboxing.\nPlease install 'imagemagick' and try again.")); +} + + +void do_ra_convert_error(void) { + do_blocking_error_dialog( + _("LiVES currently requires convert from ImageMagick resize frames.\nPlease install 'imagemagick' and try again.")); +} + void do_audrate_error_dialog(void) { do_error_dialog(_("\n\nAudio rate must be greater than 0.\n"));
View file
LiVES-2.4.3.tar.bz2/src/effects.c -> LiVES-2.4.4.tar.bz2/src/effects.c
Changed
@@ -23,6 +23,7 @@ #include "main.h" #include "effects.h" +#include "interface.h" #include "paramwindow.h" #include "support.h" #include "cvirtual.h"
View file
LiVES-2.4.3.tar.bz2/src/events.c -> LiVES-2.4.4.tar.bz2/src/events.c
Changed
@@ -23,6 +23,7 @@ #include "main.h" #include "effects.h" #include "support.h" +#include "interface.h" #include "callbacks.h" #include "resample.h" #include "paramwindow.h" // for DEF_BUTTON_WIDTH @@ -4748,6 +4749,10 @@ }; +static void rowexpand(LiVESWidget *tv, LiVESTreeIter *iter, LiVESTreePath *path, livespointer ud) { + lives_widget_queue_resize(tv); +} + LiVESWidget *create_event_list_dialog(weed_plant_t *event_list, weed_timecode_t start_tc, weed_timecode_t end_tc) { // TODO - some event properties should be editable, e.g. parameter values @@ -4818,7 +4823,7 @@ top_vbox=lives_dialog_get_content_area(LIVES_DIALOG(event_dialog)); - table = lives_table_new(rows, 6, TRUE); + table = lives_table_new(rows, 6, FALSE); lives_widget_show(table); while (event!=NULL) { @@ -5032,6 +5037,7 @@ // properties tree = lives_tree_view_new_with_model(LIVES_TREE_MODEL(treestore)); + if (palette->style&STYLE_1) { lives_widget_set_base_color(tree, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars); lives_widget_set_text_color(tree, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore); @@ -5064,6 +5070,12 @@ (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), 0, 0); + lives_signal_connect(LIVES_GUI_OBJECT(tree), LIVES_WIDGET_ROW_EXPANDED_SIGNAL, + LIVES_GUI_CALLBACK(rowexpand), + NULL); + + lives_widget_set_size_request(tree,-1,TREE_ROW_HEIGHT); + currow++; } event=get_next_event(event);
View file
LiVES-2.4.3.tar.bz2/src/gui.c -> LiVES-2.4.4.tar.bz2/src/gui.c
Changed
@@ -35,6 +35,9 @@ #include "videodev.h" #endif +#ifdef HAVE_LDVGRAB +#include "ldvgrab.h" +#endif // closures for keys for fade/unfade background static LiVESWidgetClosure *stop_closure;
View file
LiVES-2.4.3.tar.bz2/src/interface.c -> LiVES-2.4.4.tar.bz2/src/interface.c
Changed
@@ -388,6 +388,7 @@ table=lives_table_new(3,4,TRUE); + lives_table_set_column_homogeneous(LIVES_TABLE(table),FALSE); lives_table_set_col_spacings(LIVES_TABLE(table), widget_opts.packing_width*4); lives_table_set_row_spacings(LIVES_TABLE(table), widget_opts.packing_height); @@ -489,23 +490,23 @@ if (!is_mt) { label = lives_standard_label_new(_("Total time")); lives_table_attach(LIVES_TABLE(table), label, 0, 1, 0, 1, - (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions)(0), (LiVESAttachOptions)(0), 0, 0); filew->textview_ltime = aud_text_view_new(); lives_table_attach(LIVES_TABLE(table), filew->textview_ltime, 1, 2, 0, 1, - (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions)(0), (LiVESAttachOptions)(0), 0, 0); } label = lives_standard_label_new(_("Rate/size")); lives_table_attach(LIVES_TABLE(table), label, 2, 3, 0, 1, - (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions)(0), (LiVESAttachOptions)(0), 0, 0); filew->textview_lrate = aud_text_view_new(); lives_table_attach(LIVES_TABLE(table), filew->textview_lrate, 3, 4, 0, 1, - (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions)(0), (LiVESAttachOptions)(0), 0, 0); @@ -531,23 +532,23 @@ if (!is_mt) { label = lives_standard_label_new(_("Total time")); lives_table_attach(LIVES_TABLE(table), label, 0, 1, 0, 1, - (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions)(0), (LiVESAttachOptions)(0), 0, 0); filew->textview_rtime = aud_text_view_new(); lives_table_attach(LIVES_TABLE(table), filew->textview_rtime, 1, 2, 0, 1, - (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions)(0), (LiVESAttachOptions)(0), 0, 0); } label = lives_standard_label_new(_("Rate/size")); lives_table_attach(LIVES_TABLE(table), label, 2, 3, 0, 1, - (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions)(0), (LiVESAttachOptions)(0), 0, 0); filew->textview_rrate = aud_text_view_new(); lives_table_attach(LIVES_TABLE(table), filew->textview_rrate, 3, 4, 0, 1, - (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), + (LiVESAttachOptions)(0), (LiVESAttachOptions)(0), 0, 0); } @@ -641,10 +642,7 @@ if (text2!=NULL&&(mainw->fx1_bool||opt_resize)) { hbox = lives_hbox_new(FALSE, 0); - if (capable->has_composite&&capable->has_convert) { - // only offer this if we have "composite" and "convert" - for now... TODO **** - lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height); - } + lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height); checkbutton2 = lives_standard_check_button_new ((tmp=lives_strdup(_("Use _letterboxing to maintain aspect ratio (optional)"))),TRUE,LIVES_BOX(hbox),
View file
LiVES-2.4.3.tar.bz2/src/interface.h -> LiVES-2.4.4.tar.bz2/src/interface.h
Changed
@@ -115,9 +115,26 @@ #define LIVES_FILE_SELECTION_VIDEO_RANGE 4 + aud_dialog_t *create_audfade_dialog(int type); LiVESWidget *create_combo_dialog(int type, livespointer user_data); +xprocess *create_processing(const char *text); +void add_to_clipmenu(void); +void remove_from_clipmenu(void); +void make_play_window(void); +void resize_play_window(void); +void kill_play_window(void); +void make_preview_box(void); +void play_window_set_title(void); +void add_to_playframe(void); +LiVESWidget *create_cdtrack_dialog(int type, livespointer user_data); +LiVESTextView *create_output_textview(void); +char *choose_file(const char *dir, const char *fname, char **const filt, LiVESFileChooserAction act, const char *title, LiVESWidget *extra); +LiVESWidget *choose_file_with_preview(const char *dir, const char *title, int preview_type); +void add_suffix_check(LiVESBox *box, const char *ext); + + _commentsw *commentsw; _entryw *renamew; _entryw *locw;
View file
LiVES-2.4.3.tar.bz2/src/ldvgrab.h -> LiVES-2.4.4.tar.bz2/src/ldvgrab.h
Changed
@@ -11,6 +11,9 @@ #include <libavc1394/avc1394.h> #include <libavc1394/avc1394_vcr.h> +#define CAM_FORMAT_DV 0 +#define CAM_FORMAT_HDV 1 + typedef struct { raw1394handle_t handle; raw1394handle_t rec_handle; @@ -34,6 +37,8 @@ char *find_free_camfile(int format); +void on_open_fw_activate(LiVESMenuItem *menuitem, livespointer format); + struct _dvgrabw { LiVESWidget *dialog;
View file
LiVES-2.4.3.tar.bz2/src/liblives.hpp -> LiVES-2.4.4.tar.bz2/src/liblives.hpp
Changed
@@ -24,7 +24,7 @@ /** Version number micro */ -#define LIVES_VERSION_MICRO 3 +#define LIVES_VERSION_MICRO 4 /** Macro to check if livesApp version is >= major.minor.micro
View file
LiVES-2.4.3.tar.bz2/src/main.c -> LiVES-2.4.4.tar.bz2/src/main.c
Changed
@@ -3438,6 +3438,8 @@ lives_widget_set_sensitive(mainw->capture,TRUE); lives_widget_set_sensitive(mainw->vj_save_set, mainw->current_file>0); lives_widget_set_sensitive(mainw->vj_load_set, !mainw->was_set); + lives_widget_set_sensitive(mainw->midi_learn, TRUE); + lives_widget_set_sensitive(mainw->midi_save, TRUE); lives_widget_set_sensitive(mainw->toy_tv, TRUE); lives_widget_set_sensitive(mainw->toy_autolives, TRUE); lives_widget_set_sensitive(mainw->toy_random_frames, TRUE); @@ -6873,8 +6875,16 @@ if (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE) { reget_afilesize(mainw->current_file); + + /* if (cfile->afilesize>0&&cfile->achans==0) { + char *msgx=lives_strdup_printf("Audio file but no channels, %s",cfile->handle); + LIVES_WARN(msgx); + lives_free(msgx); + }*/ + } + if (!mainw->switch_during_pb) { // switch on/off loop video if we have/don't have audio if (cfile->achans==0) {
View file
LiVES-2.4.3.tar.bz2/src/main.h -> LiVES-2.4.4.tar.bz2/src/main.h
Changed
@@ -827,22 +827,6 @@ // some useful functions -// interface.c -xprocess *create_processing(const char *text); -void add_to_clipmenu(void); -void remove_from_clipmenu(void); -void make_play_window(void); -void resize_play_window(void); -void kill_play_window(void); -void make_preview_box(void); -void play_window_set_title(void); -void add_to_playframe(void); -LiVESWidget *create_cdtrack_dialog(int type, livespointer user_data); -LiVESTextView *create_output_textview(void); -char *choose_file(const char *dir, const char *fname, char **const filt, LiVESFileChooserAction act, const char *title, LiVESWidget *extra); -LiVESWidget *choose_file_with_preview(const char *dir, const char *title, int preview_type); -void add_suffix_check(LiVESBox *box, const char *ext); - // dialogs.c boolean do_progress_dialog(boolean visible, boolean cancellable, const char *text); @@ -917,6 +901,9 @@ void do_rendered_fx_dialog(void); void do_layout_scrap_file_error(void); void do_layout_ascrap_file_error(void); +void do_lb_composite_error(void); +void do_lb_convert_error(void); +void do_ra_convert_error(void); void do_set_load_lmap_error(void); boolean do_set_duplicate_warning(const char *new_set); boolean do_set_rename_old_layouts_warning(const char *new_set); @@ -1282,10 +1269,6 @@ lives_cancel_t check_for_bad_ffmpeg(void); -// plugins.c -LiVESList *get_external_window_hints(lives_rfx_t *rfx); -boolean check_encoder_restrictions(boolean get_extension, boolean user_audio, boolean save_all); - //callbacks.c void lives_exit(int signum); void lives_notify(int msgnumber,const char *msgstring); @@ -1304,33 +1287,9 @@ - -//preferences.c -void get_pref(const char *key, char *val, int maxlen); -void get_pref_utf8(const char *key, char *val, int maxlen); -void get_pref_default(const char *key, char *val, int maxlen); -boolean get_boolean_pref(const char *key); -double get_double_pref(const char *key); -int get_int_pref(const char *key); -LiVESList *get_list_pref(const char *key); -void set_pref(const char *key, const char *value); -void delete_pref(const char *key); -void set_boolean_pref(const char *key, boolean value); -void set_double_pref(const char *key, double value); -void set_int_pref(const char *key, int value); -void set_int64_pref(const char *key, int64_t value); -void set_list_pref(const char *key, LiVESList *values); -boolean apply_prefs(boolean skip_warnings); -void save_future_prefs(void); - -// multitrack.c -LiVESPixbuf *make_thumb(lives_mt *, int file, int width, int height, int frame, boolean noblanks); - // paramspecial.c LiVESPixbuf *mt_framedraw(lives_mt *, LiVESPixbuf *); -// rte_window.c -LiVESWidget *refresh_rte_window(void); // effects-weed.c livespointer _lives_malloc(size_t size); @@ -1353,26 +1312,7 @@ boolean save_sub_subtitles(lives_clip_t *sfile, double start_time, double end_time, double offset_time, const char *filename); boolean save_srt_subtitles(lives_clip_t *sfile, double start_time, double end_time, double offset_time, const char *filename); -// osc.c -#ifdef ENABLE_OSC -boolean lives_osc_init(uint32_t osc_udp_port); -boolean lives_osc_poll(livespointer data); -void lives_osc_end(void); -boolean lives_osc_notify(int msgtype, const char *msgstring); -boolean lives_osc_notify_success(const char *msg); -boolean lives_osc_notify_failure(void); -void lives_osc_notify_cancel(void); #include "osc_notify.h" -#endif - -// ldvgrab.c -#ifdef HAVE_LDVGRAB -void on_open_fw_activate(LiVESMenuItem *menuitem, livespointer format); - -#define CAM_FORMAT_DV 0 -#define CAM_FORMAT_HDV 1 - -#endif // inlines #define cfile mainw->files[mainw->current_file]
View file
LiVES-2.4.3.tar.bz2/src/mainwindow.h -> LiVES-2.4.4.tar.bz2/src/mainwindow.h
Changed
@@ -13,14 +13,14 @@ #include "effects-data.h" +#include "audio.h" + #ifdef ALSA_MIDI #include <alsa/asoundlib.h> #endif #ifdef HAVE_PULSE_AUDIO #include "pulse.h" -#else -#include "audio.h" #endif // hardware related prefs @@ -69,9 +69,12 @@ /// clip edit vid/aud bar height #define CE_VIDBAR_HEIGHT ((int)(10.*widget_opts.scale)) +/// (unexpanded) height of rows in treeviews +#define TREE_ROW_HEIGHT ((int)(60.*widget_opts.scale)) + // a few GUI specific settings -#define DEFAULT_FRAME_HSIZE 320 -#define DEFAULT_FRAME_VSIZE 200 +#define DEFAULT_FRAME_HSIZE ((int)(320.*widget_opts.scale)) +#define DEFAULT_FRAME_VSIZE ((int)(200.*widget_opts.scale)) #define MAIN_SPIN_SPACER ((int)52.*widget_opts.scale) ///< pixel spacing for start/end spins for clip and multitrack editors
View file
LiVES-2.4.3.tar.bz2/src/multitrack.c -> LiVES-2.4.4.tar.bz2/src/multitrack.c
Changed
@@ -62,6 +62,9 @@ #include "giw/giwtimeline.h" #endif +#ifdef HAVE_LDVGRAB +#include "ldvgrab.h" +#endif #if GTK_CHECK_VERSION(3,0,0) static boolean expose_timeline_reg_event(LiVESWidget *, lives_painter_t *cr, livespointer mt);
View file
LiVES-2.4.3.tar.bz2/src/multitrack.h -> LiVES-2.4.4.tar.bz2/src/multitrack.h
Changed
@@ -872,6 +872,9 @@ boolean set_new_set_name(lives_mt *); +LiVESPixbuf *make_thumb(lives_mt *, int file, int width, int height, int frame, boolean noblanks); + + // event_list utilities boolean compare_filter_maps(weed_plant_t *fm1, weed_plant_t *fm2,
View file
LiVES-2.4.3.tar.bz2/src/omc-learn.c -> LiVES-2.4.4.tar.bz2/src/omc-learn.c
Changed
@@ -633,6 +633,10 @@ } +static void rowexpand(LiVESWidget *tv, LiVESTreeIter *iter, LiVESTreePath *path, livespointer ud) { + lives_widget_queue_resize(tv); +} + static void omc_macro_row_add_params(lives_omc_match_node_t *mnode, int row, omclearn_w *omclw) { lives_omc_macro_t macro=omc_macros[mnode->macro]; @@ -728,15 +732,15 @@ lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev2), column); - - - - lives_widget_show(mnode->treev2); + lives_signal_connect(LIVES_GUI_OBJECT(mnode->treev2), LIVES_WIDGET_ROW_EXPANDED_SIGNAL, + LIVES_GUI_CALLBACK(rowexpand), + NULL); + lives_table_attach(LIVES_TABLE(omclw->table), mnode->treev2, 3, 4, row, row+1, (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), - (LiVESAttachOptions)(0), 0, 0); + (LiVESAttachOptions)(LIVES_EXPAND), 0, 0); @@ -979,7 +983,7 @@ register int i; omclw->tbl_rows++; - lives_table_resize(LIVES_TABLE(omclw->table),omclw->tbl_rows,6); + lives_table_resize(LIVES_TABLE(omclw->table),omclw->tbl_rows,4); mnode->gtkstore = lives_tree_store_new(NUM_COLUMNS, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_BOOLEAN, LIVES_COL_TYPE_STRING, @@ -1069,7 +1073,9 @@ if (labelt!=NULL) lives_free(labelt); + omclw->tbl_currow++; + lives_table_attach(LIVES_TABLE(omclw->table), label, 0, 1, omclw->tbl_currow, omclw->tbl_currow+1, (LiVESAttachOptions)(0), (LiVESAttachOptions)(0), 0, 0); @@ -1175,9 +1181,15 @@ lives_widget_show(mnode->treev1); + lives_widget_set_size_request(mnode->treev1,-1,TREE_ROW_HEIGHT); + lives_table_attach(LIVES_TABLE(omclw->table), mnode->treev1, 1, 2, omclw->tbl_currow, omclw->tbl_currow+1, (LiVESAttachOptions)(0), - (LiVESAttachOptions)(0), 0, 0); + (LiVESAttachOptions)(LIVES_EXPAND), 0, 0); + + lives_signal_connect(LIVES_GUI_OBJECT(mnode->treev1), LIVES_WIDGET_ROW_EXPANDED_SIGNAL, + LIVES_GUI_CALLBACK(rowexpand), + NULL); combo=create_omc_macro_combo(mnode,omclw->tbl_currow,omclw); @@ -1257,6 +1269,8 @@ lives_container_foreach(LIVES_CONTAINER(omclw->table),killit,NULL); + omclw->tbl_currow=-1; + remove_all_nodes(FALSE,omclw); show_existing(omclw); @@ -1784,9 +1798,13 @@ if (str_type==OMC_MIDI) { if (index>-1) srch_str=lives_strdup_printf("%d %d %s",str_type,index,(tmp=cut_string_elems(string,nfixed<0?-1:nfixed))); else srch_str=lives_strdup_printf("%d %s",str_type,(tmp=cut_string_elems(string,nfixed<0?-1:nfixed))); - lives_free(tmp); - } else srch_str=lives_strdup(string); + } else { + srch_str=lives_strdup_printf("%s",(tmp=cut_string_elems(string,nfixed<0?-1:nfixed))); + lives_free(tmp); + } + + //g_print("srch_str was %d %d .%s. %d\n",str_type,index,srch_str,nfixed); mnode->srch=srch_str; mnode->macro=-1;
View file
LiVES-2.4.3.tar.bz2/src/osc.h -> LiVES-2.4.4.tar.bz2/src/osc.h
Changed
@@ -77,6 +77,14 @@ boolean lives_osc_act(OSCbuf *msg); +boolean lives_osc_init(uint32_t osc_udp_port); +boolean lives_osc_poll(livespointer data); +void lives_osc_end(void); +boolean lives_osc_notify(int msgtype, const char *msgstring); +boolean lives_osc_notify_success(const char *msg); +boolean lives_osc_notify_failure(void); +void lives_osc_notify_cancel(void); + #endif //HAS_LIVES_OSC_H #endif //ENABLE_OSC
View file
LiVES-2.4.3.tar.bz2/src/paramspecial.h -> LiVES-2.4.4.tar.bz2/src/paramspecial.h
Changed
@@ -68,7 +68,6 @@ boolean is_perchannel_multi(lives_rfx_t *rfx, int pnum); - lives_special_mergealign_t mergealign;
View file
LiVES-2.4.3.tar.bz2/src/plugins.c -> LiVES-2.4.4.tar.bz2/src/plugins.c
Changed
@@ -26,6 +26,7 @@ #include "resample.h" #include "support.h" #include "effects.h" +#include "interface.h" #include "rfx-builder.h" #include "paramwindow.h" @@ -1967,13 +1968,6 @@ // if we have min or max size, make sure we fit within that - - - - - - - if (((width!=owidth||height!=oheight)&&width*height>0)||(best_fps_delta>0.)||(best_arate_delta>0&&best_arate>0)|| best_arate<0||asigned!=0||swap_endian) { boolean ofx1_bool=mainw->fx1_bool; @@ -1983,9 +1977,6 @@ if (allow_aspect_override) { width=owidth; height=oheight; - } else { - do_error_dialog(_("Unable to resize, please install imageMagick\n")); - return FALSE; } } }
View file
LiVES-2.4.3.tar.bz2/src/plugins.h -> LiVES-2.4.4.tar.bz2/src/plugins.h
Changed
@@ -588,6 +588,10 @@ _vppaw *on_vpp_advanced_clicked(LiVESButton *, livespointer); void on_decplug_advanced_clicked(LiVESButton *button, livespointer user_data); +LiVESList *get_external_window_hints(lives_rfx_t *rfx); +boolean check_encoder_restrictions(boolean get_extension, boolean user_audio, boolean save_all); + + /// for realtime effects, see effects-weed.h
View file
LiVES-2.4.3.tar.bz2/src/preferences.c -> LiVES-2.4.4.tar.bz2/src/preferences.c
Changed
@@ -7,6 +7,8 @@ // functions dealing with getting/setting user preferences // TODO - use atom type system for prefs +#include <dlfcn.h> + #ifdef HAVE_SYSTEM_WEED #include <weed/weed-palettes.h> #else @@ -19,7 +21,7 @@ #include "support.h" #include "resample.h" #include "plugins.h" -#include <dlfcn.h> +#include "rte_window.h" #ifdef ENABLE_OSC #include "omc-learn.h"
View file
LiVES-2.4.3.tar.bz2/src/preferences.h -> LiVES-2.4.4.tar.bz2/src/preferences.h
Changed
@@ -638,6 +638,23 @@ void pref_factory_bitmapped(int prefidx, int bitfield, boolean newval); +void get_pref(const char *key, char *val, int maxlen); +void get_pref_utf8(const char *key, char *val, int maxlen); +void get_pref_default(const char *key, char *val, int maxlen); +boolean get_boolean_pref(const char *key); +double get_double_pref(const char *key); +int get_int_pref(const char *key); +LiVESList *get_list_pref(const char *key); +void set_pref(const char *key, const char *value); +void delete_pref(const char *key); +void set_boolean_pref(const char *key, boolean value); +void set_double_pref(const char *key, double value); +void set_int_pref(const char *key, int value); +void set_int64_pref(const char *key, int64_t value); +void set_list_pref(const char *key, LiVESList *values); +boolean apply_prefs(boolean skip_warnings); +void save_future_prefs(void); + // permissions #define LIVES_PERM_OSC_PORTS 1
View file
LiVES-2.4.3.tar.bz2/src/pulse.h -> LiVES-2.4.4.tar.bz2/src/pulse.h
Changed
@@ -13,9 +13,6 @@ #include <pulse/proplist.h> #include <pulse/error.h> -#include "audio.h" - - #define PULSE_MAX_OUTPUT_CHANS PA_CHANNEL_POSITION_MAX #define LIVES_PA_BUFF_MAXLEN 16384
View file
LiVES-2.4.3.tar.bz2/src/resample.c -> LiVES-2.4.4.tar.bz2/src/resample.c
Changed
@@ -110,6 +110,11 @@ // FPS CHANGE... if ((width!=cfile->hsize||height!=cfile->vsize)&&width*height>0) { // CHANGING SIZE.. + + + // TODO: check if we have convert / composite installed + + if (fps>cfile->fps) { boolean rs_builtin; lives_rfx_t *resize_rfx; @@ -117,6 +122,25 @@ // we will have more frames... // ...do resize first if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1||prefs->enc_letterbox) { + + if (prefs->enc_letterbox&&LETTERBOX_NEEDS_COMPOSITE&&!capable->has_composite) { + do_lb_composite_error(); + on_undo_activate(NULL,NULL); + return FALSE; + } + + if (prefs->enc_letterbox&&LETTERBOX_NEEDS_CONVERT&&!capable->has_convert) { + do_lb_convert_error(); + on_undo_activate(NULL,NULL); + return FALSE; + } + + if (!prefs->enc_letterbox&&RESIZE_ALL_NEEDS_CONVERT&&!capable->has_convert) { + do_ra_convert_error(); + on_undo_activate(NULL,NULL); + return FALSE; + } + cfile->ohsize=cfile->hsize; cfile->ovsize=cfile->vsize; @@ -287,6 +311,7 @@ lives_rfx_t *resize_rfx; // NO FPS CHANGE if ((width!=cfile->hsize||height!=cfile->vsize)&&width*height>0) { + // no fps change - just a normal resize cfile->undo_start=1; cfile->undo_end=cfile->frames; @@ -294,6 +319,24 @@ if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1||prefs->enc_letterbox) { // use builtin resize + if (prefs->enc_letterbox&&LETTERBOX_NEEDS_COMPOSITE&&!capable->has_composite) { + do_lb_composite_error(); + on_undo_activate(NULL,NULL); + return FALSE; + } + + if (prefs->enc_letterbox&&LETTERBOX_NEEDS_CONVERT&&!capable->has_convert) { + do_lb_convert_error(); + on_undo_activate(NULL,NULL); + return FALSE; + } + + if (!prefs->enc_letterbox&&RESIZE_ALL_NEEDS_CONVERT&&!capable->has_convert) { + do_ra_convert_error(); + on_undo_activate(NULL,NULL); + return FALSE; + } + if (cfile->clip_type==CLIP_TYPE_FILE) { cfile->fx_frame_pump=1; } @@ -1970,6 +2013,19 @@ iheight=-iheight; } + else { + if (LETTERBOX_NEEDS_COMPOSITE&&!capable->has_composite) { + do_lb_composite_error(); + return -cur_frames; + } + + if (LETTERBOX_NEEDS_CONVERT&&!capable->has_convert) { + do_lb_convert_error(); + return -cur_frames; + } + + } + com=lives_strdup_printf("%s reorder \"%s\" \"%s\" %d %d %d %d %d %d %d",prefs->backend,cfile->handle, get_image_ext_for_type(cfile->img_type),!mainw->endian,rwidth,rheight, reorder_leave_back,cfile->frames,iwidth,iheight);
View file
LiVES-2.4.3.tar.bz2/src/resample.h -> LiVES-2.4.4.tar.bz2/src/resample.h
Changed
@@ -16,6 +16,11 @@ #include "../libweed/weed.h" #endif + +#define RESIZE_ALL_NEEDS_CONVERT 1 +#define LETTERBOX_NEEDS_COMPOSITE 1 +#define LETTERBOX_NEEDS_CONVERT 1 + /// resample audio window typedef struct __resaudw { LiVESWidget *dialog;
View file
LiVES-2.4.3.tar.bz2/src/rte_window.h -> LiVES-2.4.4.tar.bz2/src/rte_window.h
Changed
@@ -35,6 +35,8 @@ void on_clear_clicked(LiVESButton *button, livespointer user_data); +LiVESWidget *refresh_rte_window(void); + LiVESWidget *rte_window;
View file
LiVES-2.4.3.tar.bz2/src/stream.c -> LiVES-2.4.4.tar.bz2/src/stream.c
Changed
@@ -10,6 +10,7 @@ #include "stream.h" #include "htmsocket.h" #include "support.h" +#include "interface.h" #ifdef HAVE_SYSTEM_WEED #include <weed/weed.h>
View file
LiVES-2.4.3.tar.bz2/src/utils.c -> LiVES-2.4.4.tar.bz2/src/utils.c
Changed
@@ -21,6 +21,7 @@ #include "main.h" #include "support.h" +#include "interface.h" #include "audio.h" #include "resample.h" @@ -4085,6 +4086,9 @@ } } } + + //g_print("sfa = %d\n",sfile->achans); + lives_free(afile); }
View file
LiVES-2.4.3.tar.bz2/src/widget-helper-gtk.h -> LiVES-2.4.4.tar.bz2/src/widget-helper-gtk.h
Changed
@@ -349,6 +349,7 @@ #define LIVES_WIDGET_SWITCH_PAGE_SIGNAL "switch-page" #define LIVES_WIDGET_UNMAP_SIGNAL "unmap" #define LIVES_WIDGET_EDITED_SIGNAL "edited" +#define LIVES_WIDGET_ROW_EXPANDED_SIGNAL "row-expanded" #define LIVES_WIDGET_COLOR_SET_SIGNAL "color-set" #define LIVES_WIDGET_SET_FOCUS_CHILD_SIGNAL "set-focus-child"
View file
LiVES-2.4.3.tar.bz2/src/widget-helper.c -> LiVES-2.4.4.tar.bz2/src/widget-helper.c
Changed
@@ -6615,6 +6615,7 @@ } + LIVES_INLINE boolean lives_table_set_col_spacings(LiVESTable *table, uint32_t spacing) { #ifdef GUI_GTK #if LIVES_TABLE_IS_GRID // required for grid remove row @@ -6632,6 +6633,29 @@ } +LIVES_INLINE boolean lives_table_set_row_homogeneous(LiVESTable *table, boolean homogeneous) { +#ifdef GUI_GTK +#if LIVES_TABLE_IS_GRID + gtk_grid_set_row_homogeneous(table,homogeneous); + return TRUE; +#endif +#endif + return FALSE; +} + + +LIVES_INLINE boolean lives_table_set_column_homogeneous(LiVESTable *table, boolean homogeneous) { +#ifdef GUI_GTK +#if LIVES_TABLE_IS_GRID + gtk_grid_set_column_homogeneous(table,homogeneous); + return TRUE; +#endif +#endif + return FALSE; +} + + + LIVES_INLINE boolean lives_table_resize(LiVESTable *table, uint32_t rows, uint32_t cols) { #ifdef GUI_GTK #if LIVES_TABLE_IS_GRID // required for grid remove row
View file
LiVES-2.4.3.tar.bz2/src/widget-helper.h -> LiVES-2.4.4.tar.bz2/src/widget-helper.h
Changed
@@ -562,6 +562,10 @@ uint32_t top, uint32_t bottom, LiVESAttachOptions xoptions, LiVESAttachOptions yoptions, uint32_t xpad, uint32_t ypad); +boolean lives_table_set_column_homogeneous(LiVESTable *, boolean homogeneous); +boolean lives_table_set_row_homogeneous(LiVESTable *, boolean homogeneous); + + #if LIVES_TABLE_IS_GRID LiVESWidget *lives_grid_new(void); boolean lives_grid_set_row_spacing(LiVESGrid *, uint32_t spacing);
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.