Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package alacarte for openSUSE:Factory checked in at 2022-06-20 15:38:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alacarte (Old) and /work/SRC/openSUSE:Factory/.alacarte.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alacarte" Mon Jun 20 15:38:48 2022 rev:72 rq:983912 version:3.44.2 Changes: -------- --- /work/SRC/openSUSE:Factory/alacarte/alacarte.changes 2022-03-24 23:00:28.344393714 +0100 +++ /work/SRC/openSUSE:Factory/.alacarte.new.1548/alacarte.changes 2022-06-20 15:39:28.123051947 +0200 @@ -1,0 +2,7 @@ +Mon Jun 20 08:23:16 UTC 2022 - Bj??rn Lie <bjorn....@gmail.com> + +- Update to version 3.44.2: + + Fix launcher saving. + + Updated translations. + +------------------------------------------------------------------- Old: ---- alacarte-3.44.1.tar.xz New: ---- alacarte-3.44.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alacarte.spec ++++++ --- /var/tmp/diff_new_pack.Y6bQB2/_old 2022-06-20 15:39:28.479052467 +0200 +++ /var/tmp/diff_new_pack.Y6bQB2/_new 2022-06-20 15:39:28.483052473 +0200 @@ -17,7 +17,7 @@ Name: alacarte -Version: 3.44.1 +Version: 3.44.2 Release: 0 Summary: Menu editor for GNOME License: LGPL-2.1-or-later ++++++ alacarte-3.44.1.tar.xz -> alacarte-3.44.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alacarte-3.44.1/Alacarte/ItemEditor.py new/alacarte-3.44.2/Alacarte/ItemEditor.py --- old/alacarte-3.44.1/Alacarte/ItemEditor.py 2022-03-21 12:10:59.000000000 +0100 +++ new/alacarte-3.44.2/Alacarte/ItemEditor.py 2022-06-18 15:30:15.000000000 +0200 @@ -114,6 +114,7 @@ chooser.destroy() class ItemEditor(GObject.GObject): + icon_file = None ui_file = None __gsignals__ = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alacarte-3.44.1/NEWS new/alacarte-3.44.2/NEWS --- old/alacarte-3.44.1/NEWS 2022-03-21 13:29:28.000000000 +0100 +++ new/alacarte-3.44.2/NEWS 2022-06-18 16:14:15.000000000 +0200 @@ -1,4 +1,15 @@ ============== +Version 3.44.2 +============== + +Changes: + * Fix launcher saving (#16, #17) + +Translation updates: + * Basque + * Dutch + +============== Version 3.44.1 ============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alacarte-3.44.1/configure new/alacarte-3.44.2/configure --- old/alacarte-3.44.1/configure 2022-03-21 13:30:13.000000000 +0100 +++ new/alacarte-3.44.2/configure 2022-06-18 16:15:00.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for alacarte 3.44.1. +# Generated by GNU Autoconf 2.71 for alacarte 3.44.2. # -# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte>. +# Report bugs to <https://gitlab.gnome.org/GNOME/alacarte/-/issues>. # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -268,11 +268,10 @@ printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else printf "%s\n" "$0: Please tell bug-autoc...@gnu.org and -$0: http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte -$0: about your system, including any error possibly output -$0: before this message. Then install a modern shell, or -$0: manually run the script under such a shell if you do -$0: have one." +$0: https://gitlab.gnome.org/GNOME/alacarte/-/issues about +$0: your system, including any error possibly output before +$0: this message. Then install a modern shell, or manually +$0: run the script under such a shell if you do have one." fi exit 1 fi @@ -612,9 +611,9 @@ # Identity of this package. PACKAGE_NAME='alacarte' PACKAGE_TARNAME='alacarte' -PACKAGE_VERSION='3.44.1' -PACKAGE_STRING='alacarte 3.44.1' -PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte' +PACKAGE_VERSION='3.44.2' +PACKAGE_STRING='alacarte 3.44.2' +PACKAGE_BUGREPORT='https://gitlab.gnome.org/GNOME/alacarte/-/issues' PACKAGE_URL='' ac_unique_file="alacarte.in" @@ -1338,7 +1337,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 alacarte 3.44.1 to adapt to many kinds of systems. +\`configure' configures alacarte 3.44.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1409,7 +1408,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of alacarte 3.44.1:";; + short | recursive ) echo "Configuration of alacarte 3.44.2:";; esac cat <<\_ACEOF @@ -1467,7 +1466,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte>. +Report bugs to <https://gitlab.gnome.org/GNOME/alacarte/-/issues>. _ACEOF ac_status=$? fi @@ -1531,7 +1530,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -alacarte configure 3.44.1 +alacarte configure 3.44.2 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1735,7 +1734,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by alacarte $as_me 3.44.1, which was +It was created by alacarte $as_me 3.44.2, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3001,7 +3000,7 @@ # Define the identity of the package. PACKAGE='alacarte' - VERSION='3.44.1' + VERSION='3.44.2' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -6942,13 +6941,13 @@ if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.3" >&5 -printf %s "checking whether $PYTHON version is >= 3.3... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.7" >&5 +printf %s "checking whether $PYTHON version is >= 3.7... " >&6; } prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.3'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.7'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -6970,8 +6969,8 @@ else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.3" >&5 -printf %s "checking for a Python interpreter with version >= 3.3... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.7" >&5 +printf %s "checking for a Python interpreter with version >= 3.7... " >&6; } if test ${am_cv_pathless_PYTHON+y} then : printf %s "(cached) " >&6 @@ -6983,7 +6982,7 @@ # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. # map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '3.3'.split('.'))) + [0, 0, 0] +minver = list(map(int, '3.7'.split('.'))) + [0, 0, 0] minverhex = 0 # xrange is not present in Python 3.0 and range returns an iterator for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] @@ -8168,7 +8167,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by alacarte $as_me 3.44.1, which was +This file was extended by alacarte $as_me 3.44.2, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8228,7 +8227,7 @@ Configuration commands: $config_commands -Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte>." +Report bugs to <https://gitlab.gnome.org/GNOME/alacarte/-/issues>." _ACEOF ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` @@ -8236,7 +8235,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -alacarte config.status 3.44.1 +alacarte config.status 3.44.2 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alacarte-3.44.1/configure.ac new/alacarte-3.44.2/configure.ac --- old/alacarte-3.44.1/configure.ac 2022-03-21 13:24:55.000000000 +0100 +++ new/alacarte-3.44.2/configure.ac 2022-06-18 16:14:19.000000000 +0200 @@ -1,7 +1,7 @@ dnl -*- Mode: autoconf -*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.53) -AC_INIT(alacarte, 3.44.1, http://bugzilla.gnome.org/enter_bug.cgi?product=alacarte) +AC_INIT(alacarte, 3.44.2, https://gitlab.gnome.org/GNOME/alacarte/-/issues) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_CONFIG_SRCDIR(alacarte.in) AC_CONFIG_HEADERS([config.h]) @@ -18,7 +18,7 @@ AC_SUBST([GETTEXT_PACKAGE]) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package]) -AM_PATH_PYTHON(3.3) +AM_PATH_PYTHON(3.7) PKG_CHECK_MODULES(ALACARTE, libgnome-menu-3.0 >= 3.5.3 pygobject-3.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alacarte-3.44.1/po/alacarte.pot new/alacarte-3.44.2/po/alacarte.pot --- old/alacarte-3.44.1/po/alacarte.pot 2022-03-21 13:30:17.000000000 +0100 +++ new/alacarte-3.44.2/po/alacarte.pot 2022-03-21 13:53:11.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: alacarte 3.44.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=alacarte\n" -"POT-Creation-Date: 2022-03-21 14:30+0200\n" +"POT-Creation-Date: 2022-03-21 14:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" Binary files old/alacarte-3.44.1/po/eu.gmo and new/alacarte-3.44.2/po/eu.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alacarte-3.44.1/po/eu.po new/alacarte-3.44.2/po/eu.po --- old/alacarte-3.44.1/po/eu.po 2022-03-21 12:10:59.000000000 +0100 +++ new/alacarte-3.44.2/po/eu.po 2022-03-29 12:16:52.000000000 +0200 @@ -3,80 +3,77 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # # I??aki Larra??aga Murgoitio <doo...@euskalgnu.org>, 2006, 2007. +# Asier Sarasua Garmendia <asiersara...@ni.eus>, 2022. +# msgid "" -msgstr "" -"Project-Id-Version: alacarte.HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-28 17:25+0100\n" -"PO-Revision-Date: 2007-12-27 22:19+0100\n" -"Last-Translator: \n" -"Language-Team: <e...@li.org>\n" +msgstr "Project-Id-Version: alacarte.HEAD\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/alacarte/issues\n" +"POT-Creation-Date: 2022-03-21 12:06+0000\n" +"PO-Revision-Date: 2022-03-26 10:00+0100\n" +"Last-Translator: Asier Sarasua Garmendia <asiersara...@ni.eus>\n" +"Language-Team: Basque <librez...@librezale.eus>\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../Alacarte/MainWindow.py:167 +#: ../Alacarte/MainWindow.py:156 msgid "Name" msgstr "Izena" -#: ../Alacarte/MainWindow.py:183 +#: ../Alacarte/MainWindow.py:169 msgid "Show" msgstr "Erakutsi" -#: ../Alacarte/MainWindow.py:191 +#: ../Alacarte/MainWindow.py:177 msgid "Item" msgstr "Elementua" -#: ../alacarte.desktop.in.in.h:1 -msgid "Change which applications are shown on the main menu" -msgstr "Aldatu zein aplikazio erakutsiko diren menu nagusian" - -#: ../alacarte.desktop.in.in.h:2 ../alacarte.glade.h:2 -msgid "Main Menu" -msgstr "Menu nagusia" - -#: ../alacarte.glade.h:1 -msgid "It_ems:" -msgstr "_Elementuak:" - -#: ../alacarte.glade.h:3 -msgid "Move Down" -msgstr "Eraman behera" - -#: ../alacarte.glade.h:4 -msgid "Move Up" -msgstr "Eraman gora" - -#: ../alacarte.glade.h:5 -msgid "Ne_w Item" -msgstr "_Elementu berria" - -#: ../alacarte.glade.h:6 -msgid "New _Separator" -msgstr "_Bereizle berria" - -#: ../alacarte.glade.h:7 -msgid "Restore the default menu layout" -msgstr "Berrezarri menuaren diseinu lehenetsia" - -#: ../alacarte.glade.h:8 -msgid "Revert Changes?" -msgstr "Leheneratu aldaketak?" - -#: ../alacarte.glade.h:9 -msgid "Revert all menus to original settings?" -msgstr "Leheneratu menu guztiak jatorrizko ezarpenetara?" - -#: ../alacarte.glade.h:10 -msgid "_Menus:" -msgstr "_Menuak:" - -#: ../alacarte.glade.h:11 -msgid "_New Menu" -msgstr "Menu _berria" - -#: ../alacarte.glade.h:12 -msgid "_Revert to Original" -msgstr "_Leheneratu jatorrizkora" +#: ../Alacarte/ItemEditor.py:107 +msgid "Choose an icon" +msgstr "Aukeratu ikono bat" + +#: ../Alacarte/ItemEditor.py:238 +msgid "Choose a command" +msgstr "Aukeratu komando bat" + +#~ msgid "Change which applications are shown on the main menu" +#~ msgstr "Aldatu zein aplikazio erakutsiko diren menu nagusian" + +#~ msgid "Main Menu" +#~ msgstr "Menu nagusia" + +#~ msgid "It_ems:" +#~ msgstr "_Elementuak:" + +#~ msgid "Move Down" +#~ msgstr "Eraman behera" + +#~ msgid "Move Up" +#~ msgstr "Eraman gora" + +#~ msgid "Ne_w Item" +#~ msgstr "_Elementu berria" + +#~ msgid "New _Separator" +#~ msgstr "_Bereizle berria" + +#~ msgid "Restore the default menu layout" +#~ msgstr "Berrezarri menuaren diseinu lehenetsia" + +#~ msgid "Revert Changes?" +#~ msgstr "Leheneratu aldaketak?" + +#~ msgid "Revert all menus to original settings?" +#~ msgstr "Leheneratu menu guztiak jatorrizko ezarpenetara?" + +#~ msgid "_Menus:" +#~ msgstr "_Menuak:" + +#~ msgid "_New Menu" +#~ msgstr "Menu _berria" + +#~ msgid "_Revert to Original" +#~ msgstr "_Leheneratu jatorrizkora" Binary files old/alacarte-3.44.1/po/nl.gmo and new/alacarte-3.44.2/po/nl.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/alacarte-3.44.1/po/nl.po new/alacarte-3.44.2/po/nl.po --- old/alacarte-3.44.1/po/nl.po 2022-03-21 12:10:59.000000000 +0100 +++ new/alacarte-3.44.2/po/nl.po 2022-03-29 12:16:52.000000000 +0200 @@ -3,85 +3,83 @@ # This file is distributed under the same license as the Alacarte package. # Niels Abspoel <niels.absp...@wanadoo.nl>, 2005. # Tino Meinen <a.t.mei...@chello.nl>, 2006, 2007. +# Nathan Follens <nfoll...@gnome.org>, 2022. # msgid "" msgstr "" "Project-Id-Version: Alacarte VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-12 04:30+0000\n" -"PO-Revision-Date: 2007-02-24 00:13+0100\n" -"Last-Translator: Tino Meinen <a.t.mei...@chello.nl>\n" -"Language-Team: Dutch <vertal...@vrijschrift.org>\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/alacarte/issues\n" +"POT-Creation-Date: 2022-03-21 12:06+0000\n" +"PO-Revision-Date: 2022-03-25 21:10+0100\n" +"Last-Translator: Nathan Follens <nfoll...@gnome.org>\n" +"Language-Team: Dutch <gnome-nl-l...@gnome.org>\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 3.0.1\n" -#: ../Alacarte/MainWindow.py:167 +#: ../Alacarte/MainWindow.py:156 msgid "Name" msgstr "Naam" -#: ../Alacarte/MainWindow.py:183 +#: ../Alacarte/MainWindow.py:169 msgid "Show" msgstr "Tonen" -#: ../Alacarte/MainWindow.py:191 +#: ../Alacarte/MainWindow.py:177 msgid "Item" msgstr "Item" +#: ../Alacarte/ItemEditor.py:107 +msgid "Choose an icon" +msgstr "Kies een pictogram" + +#: ../Alacarte/ItemEditor.py:238 +msgid "Choose a command" +msgstr "Kies een opdracht" + # instellen/wijzigen -#: ../alacarte.desktop.in.in.h:1 -msgid "Change which applications are shown on the main menu" -msgstr "Instellen welke toepassingen in het hoofdmenu getoond worden" - -#: ../alacarte.desktop.in.in.h:2 ../alacarte.glade.h:2 -msgid "Main Menu" -msgstr "Hoofdmenu" - -#: ../alacarte.glade.h:1 -msgid "It_ems:" -msgstr "It_ems:" - -#: ../alacarte.glade.h:3 -msgid "Move Down" -msgstr "Naar beneden" - -#: ../alacarte.glade.h:4 -msgid "Move Up" -msgstr "Naar boven" - -#: ../alacarte.glade.h:5 -msgid "Ne_w Item" -msgstr "_Nieuw item" - -#: ../alacarte.glade.h:6 -msgid "New _Separator" -msgstr "Nieuw _scheidingsteken" - -#: ../alacarte.glade.h:7 -msgid "Restore the default menu layout" -msgstr "De standaard menu-indeling herstellen" +#~ msgid "Change which applications are shown on the main menu" +#~ msgstr "Instellen welke toepassingen in het hoofdmenu getoond worden" + +#~ msgid "Main Menu" +#~ msgstr "Hoofdmenu" + +#~ msgid "It_ems:" +#~ msgstr "It_ems:" + +#~ msgid "Move Down" +#~ msgstr "Naar beneden" + +#~ msgid "Move Up" +#~ msgstr "Naar boven" + +#~ msgid "Ne_w Item" +#~ msgstr "_Nieuw item" + +#~ msgid "New _Separator" +#~ msgstr "Nieuw _scheidingsteken" + +#~ msgid "Restore the default menu layout" +#~ msgstr "De standaard menu-indeling herstellen" # wijzigingen/wijzigen -#: ../alacarte.glade.h:8 -msgid "Revert Changes?" -msgstr "Wijzigen ongedaan maken?" - -#: ../alacarte.glade.h:9 -msgid "Revert all menus to original settings?" -msgstr "Alle oorspronkelijke menu-instellingen terugzetten?" - -#: ../alacarte.glade.h:10 -msgid "_Menus:" -msgstr "_Menus:" +#~ msgid "Revert Changes?" +#~ msgstr "Wijzigen ongedaan maken?" + +#~ msgid "Revert all menus to original settings?" +#~ msgstr "Alle oorspronkelijke menu-instellingen terugzetten?" + +#~ msgid "_Menus:" +#~ msgstr "_Menus:" # waarom de _m en niet de _n hier? (tino) -#: ../alacarte.glade.h:11 -msgid "_New Menu" -msgstr "Nieuw _menu" - -#: ../alacarte.glade.h:12 -msgid "_Revert to Original" -msgstr "_Terugzetten" +#~ msgid "_New Menu" +#~ msgstr "Nieuw _menu" + +#~ msgid "_Revert to Original" +#~ msgstr "_Terugzetten" # vereisen/moeten hebben #~ msgid "New menu items need a name" @@ -94,9 +92,6 @@ #~ msgid "Choose a Program" #~ msgstr "Kies een programma" -#~ msgid "Choose an Icon" -#~ msgstr "Kies een pictogram" - # krijg je te zien als je geen naam invult voor een nieuw menu-item # (zou volgens HIG niet mogen verschijnen, als er niets is ingevuld # moet de OK-knop uitgegrijst zijn) @@ -169,9 +164,7 @@ #~ msgstr "Zichtbaar" #~ msgid "Simple freedesktop.org Compliant Menu Editor" -#~ msgstr "" -#~ "Eenvoudig programma om menu's te bewerken volgens de freedesktop.org " -#~ "standaard" +#~ msgstr "Eenvoudig programma om menu's te bewerken volgens de freedesktop.org standaard" #~ msgid "Entry Editor" #~ msgstr "Menu-item editor"