diff -Nru ayatana-indicator-session-0.9.0/AUTHORS ayatana-indicator-session-22.2.0/AUTHORS --- ayatana-indicator-session-0.9.0/AUTHORS 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/AUTHORS 2022-02-17 20:53:13.000000000 +0000 @@ -34,6 +34,7 @@ Elizabeth Sherrock Emiliano Gabriele Emmanuella Rumanti +Eric Evgeni Golov Federica Govoni Gabor Kelemen @@ -99,6 +100,7 @@ Oğuz Ersen Patrick Heijmann Pavel Borecki +phlostically Pierre Soubourou Quentin PAGÈS raimon ribal diff -Nru ayatana-indicator-session-0.9.0/.build.yml ayatana-indicator-session-22.2.0/.build.yml --- ayatana-indicator-session-0.9.0/.build.yml 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/.build.yml 2022-02-17 20:53:13.000000000 +0000 @@ -97,7 +97,11 @@ - git clone --depth 1 https://github.com/AyatanaIndicators/libayatana-common.git libayatana-common-build - fi - cd libayatana-common-build - - cmake . -DCMAKE_INSTALL_PREFIX=/usr + - if [ ${DISTRO_NAME} == "debian" ]; then + - cmake . -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_LOMIRI_FEATURES=ON + - else + - cmake . -DCMAKE_INSTALL_PREFIX=/usr + - fi - make - make install - cd - @@ -105,15 +109,14 @@ build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then - - export CFLAGS+=" -Wsign-compare -Wunused-parameter" - cppcheck --enable=warning,style,performance,portability,information,missingInclude . - fi - - if [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON - else - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON - fi - else - exit 1 diff -Nru ayatana-indicator-session-0.9.0/ChangeLog ayatana-indicator-session-22.2.0/ChangeLog --- ayatana-indicator-session-0.9.0/ChangeLog 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/ChangeLog 2022-02-17 20:53:13.000000000 +0000 @@ -1,6 +1,98 @@ +2022-02-17 Mike Gabriel + + * release 22.2.0 (HEAD -> main, tag: 22.2.0) + +2022-02-16 Mike Gabriel + + * Merge branch 'tari01-pr/drop-cmake-install-full-pkglibexecdir' + (76070b4c) + +2022-02-11 Robert Tari + + * Drop pkglibexecdir and use native CMake file configuration + (7276ec3b) + +2022-02-08 Robert Tari + + * .travis.yml: Run CI builds on Travis CI's Ubuntu focal base system + (3b04d065) + +2022-01-27 Mike Gabriel + + * Merge branch 'tari01-pr/fix-desktop-help-string' (9da96c4b) + +2022-01-27 Robert Tari + + * src/service.c: Fix the Desktop Help string (7ec9d3f0) + +2022-01-27 Mike Gabriel + + * Merge branch 'tari01-pr/add-phone-systemd-section' (aab117f6) + +2022-01-27 Robert Tari + + * data/org.ayatana.indicator.session: Add phone section (f101336d) + +2022-01-27 Mike Gabriel + + * Merge branch 'tari01-pr/fix-systemd-target' (da90e08e) + +2022-01-27 Robert Tari + + * data/ayatana-indicator-session.service.in: Fix sytemd unit target + (3a06cb9b) + +2022-01-27 Mike Gabriel + + * Merge branch 'tari01-pr/fix-gnome-screensaver-accelerator-key-type' + (50f9d850) + +2022-01-20 Robert Tari + + * Read org.gnome.settings-daemon.plugins.media-keys screensaver as a + list (838a9b3b) + +2022-01-27 Mike Gabriel + + * Merge branch 'tari01-pr/cleanup-compile-flags' (f62c629f) + +2021-12-17 Robert Tari + + * .build.yml: Drop extra compilation flags and build with -Werror + (c77322a1) + * Clean up compilation flags (d40de8a8) + * Fix code to build with -Werror (904438ac) + +2022-01-24 Eric + + * Translated using Weblate (Chinese (Simplified)) (1ea9f8bd) + +2021-12-15 Mike Gabriel + + * Merge branch + 'tari01-pr/build-libayatana-common-with-enable-lomiri-features' + (35d48d35) + +2021-12-06 Robert Tari + + * .build.yml: Build libayatana-common with ENABLE_LOMIRI_FEATURES + (8e481a71) + +2021-11-22 phlostically + + * Translated using Weblate (Esperanto) (3bf32659) + +2021-11-20 phlostically + + * Translated using Weblate (Esperanto) (918e5bdd) + +2021-11-18 phlostically + + * Translated using Weblate (Esperanto) (3f129aaa) + 2021-11-17 Mike Gabriel - * release 0.9.0 (HEAD -> main, tag: 0.9.0) + * release 0.9.0 (49265d28) (tag: 0.9.0) 2021-11-09 Joan CiberSheep diff -Nru ayatana-indicator-session-0.9.0/CMakeLists.txt ayatana-indicator-session-22.2.0/CMakeLists.txt --- ayatana-indicator-session-0.9.0/CMakeLists.txt 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/CMakeLists.txt 2022-02-17 20:53:13.000000000 +0000 @@ -7,7 +7,7 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -set (PROJECT_VERSION "0.9.0") +set (PROJECT_VERSION "22.2.0") set (PACKAGE ${CMAKE_PROJECT_NAME}) set (GETTEXT_PACKAGE "ayatana-indicator-session") @@ -24,17 +24,22 @@ endif() if(ENABLE_WERROR) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + add_definitions("-Werror") endif() +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + add_definitions("-Weverything") +else() + add_definitions("-Wall") +endif() + +add_definitions("-Wno-sign-compare") # Needed for GTest on Ubuntu + ## ## GNU standard installation directories ## -include (GNUInstallDirs) -set (CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") -set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}") +include (GNUInstallDirs) ## ## Check for prerequisites @@ -47,18 +52,6 @@ gio-unix-2.0>=2.36) include_directories (${SERVICE_INCLUDE_DIRS}) -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - - set(COMPILE_FLAGS "${COMPILE_FLAGS} -Weverything") - set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-c++98-compat -Wno-padded") - set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-documentation") - -else() - - set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wall") - -endif() - set (ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}) add_custom_target (dist COMMAND bzr export --root=${ARCHIVE_NAME} ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.gz diff -Nru ayatana-indicator-session-0.9.0/data/ayatana-indicator-session.desktop.in ayatana-indicator-session-22.2.0/data/ayatana-indicator-session.desktop.in --- ayatana-indicator-session-0.9.0/data/ayatana-indicator-session.desktop.in 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/data/ayatana-indicator-session.desktop.in 2022-02-17 20:53:13.000000000 +0000 @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Ayatana Indicator Session -Exec=@pkglibexecdir@/ayatana-indicator-session-service +Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-session/ayatana-indicator-session-service OnlyShowIn=Unity;MATE;XFCE;Budgie:GNOME; NoDisplay=true StartupNotify=false diff -Nru ayatana-indicator-session-0.9.0/data/ayatana-indicator-session.service.in ayatana-indicator-session-22.2.0/data/ayatana-indicator-session.service.in --- ayatana-indicator-session-0.9.0/data/ayatana-indicator-session.service.in 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/data/ayatana-indicator-session.service.in 2022-02-17 20:53:13.000000000 +0000 @@ -1,10 +1,10 @@ [Unit] Description=Ayatana Indicator Session Service PartOf=graphical-session.target -After=ayatana-indicators.target +PartOf=ayatana-indicators.target [Service] -ExecStart=@pkglibexecdir@/ayatana-indicator-session-service +ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/ayatana-indicator-session/ayatana-indicator-session-service Restart=on-failure [Install] diff -Nru ayatana-indicator-session-0.9.0/data/CMakeLists.txt ayatana-indicator-session-22.2.0/data/CMakeLists.txt --- ayatana-indicator-session-0.9.0/data/CMakeLists.txt 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/data/CMakeLists.txt 2022-02-17 20:53:13.000000000 +0000 @@ -30,7 +30,6 @@ set (SYSTEMD_USER_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEMD_USER_NAME}.in") # build it - set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}") # install it @@ -52,7 +51,6 @@ set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in") # build it -set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}") # install it diff -Nru ayatana-indicator-session-0.9.0/data/org.ayatana.indicator.session ayatana-indicator-session-22.2.0/data/org.ayatana.indicator.session --- ayatana-indicator-session-0.9.0/data/org.ayatana.indicator.session 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/data/org.ayatana.indicator.session 2022-02-17 20:53:13.000000000 +0000 @@ -3,6 +3,9 @@ ObjectPath=/org/ayatana/indicator/session Position=10 +[phone] +ObjectPath=/org/ayatana/indicator/session/desktop + [desktop] ObjectPath=/org/ayatana/indicator/session/desktop diff -Nru ayatana-indicator-session-0.9.0/debian/changelog ayatana-indicator-session-22.2.0/debian/changelog --- ayatana-indicator-session-0.9.0/debian/changelog 2021-11-18 13:55:47.000000000 +0000 +++ ayatana-indicator-session-22.2.0/debian/changelog 2022-02-18 10:31:23.000000000 +0000 @@ -1,3 +1,9 @@ +ayatana-indicator-session (22.2.0-1) unstable; urgency=medium + + * New upstream release. + + -- Mike Gabriel Fri, 18 Feb 2022 11:31:23 +0100 + ayatana-indicator-session (0.9.0-1) unstable; urgency=medium * New upstream release. diff -Nru ayatana-indicator-session-0.9.0/NEWS ayatana-indicator-session-22.2.0/NEWS --- ayatana-indicator-session-0.9.0/NEWS 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/NEWS 2022-02-17 20:53:13.000000000 +0000 @@ -1,3 +1,19 @@ +Overview of changes in ayatana-indicator-session 22.2.0 + + - Upstream version bump to new release versioning scheme: + .., where . will be + bumped in Ayatana Indicators bundle releases and + gets incremented with minor changeset releases. + - Drop pkglibexecdir and use native CMake file configuration. + - src/service.c: Fix the Desktop Help string. + - data/org.ayatana.indicator.session: Add phone section. + - data/ayatana-indicator-session.service.in: Fix sytemd unit target. + - Read org.gnome.settings-daemon.plugins.media-keys screensaver as a + list. + - Clean up compilation flags. + - Fix code to build with -Werror. + - Translation updates. + Overview of changes in ayatana-indicator-session 0.9.0 - tests: Use Ayatana as mock user diff -Nru ayatana-indicator-session-0.9.0/po/eo.po ayatana-indicator-session-22.2.0/po/eo.po --- ayatana-indicator-session-0.9.0/po/eo.po 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/po/eo.po 2022-02-17 20:53:13.000000000 +0000 @@ -8,55 +8,52 @@ "Project-Id-Version: indicator-session\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-28 20:19+0200\n" -"PO-Revision-Date: 2019-08-01 05:12+0000\n" -"Last-Translator: Pierre Soubourou \n" -"Language-Team: Esperanto \n" +"PO-Revision-Date: 2021-11-22 22:35+0000\n" +"Last-Translator: phlostically \n" +"Language-Team: Esperanto \n" "Language: eo\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.8-dev\n" +"X-Generator: Weblate 4.10-dev\n" "X-Launchpad-Export-Date: 2011-09-27 15:12+0000\n" #: ../data/org.ayatana.indicator.session.gschema.xml.in:1 msgid "Suppress the dialog to confirm logout, restart and shutdown action" -msgstr "Forigi la dialogon por konfirmi la elsaluton, restarton kaj elŝalton" +msgstr "Ne montri la dialogon por konfirmi adiaŭon, restarton aŭ elŝalton" #: ../data/org.ayatana.indicator.session.gschema.xml.in:2 msgid "" "Whether or not to show confirmation dialogs for logout, restart and shutdown " "actions." msgstr "" -"Ĉu montri aŭ ne la dialogojn pri la konfirmo de elŝalto, restarto aŭ " -"elsaluto." +"Ĉu montri aŭ ne la dialogojn pri la konfirmo de adiaŭo, restarto aŭ elŝalto." #: ../data/org.ayatana.indicator.session.gschema.xml.in:3 msgid "Remove the Log Out item from the session menu" -msgstr "Forigi la eron \"Elsaluti\" el la seancmenuo." +msgstr "Ne montri la menueron «Adiaŭi» en la seanca menuo" #: ../data/org.ayatana.indicator.session.gschema.xml.in:4 msgid "Makes it so that the logout button doesn’t show in the session menu." -msgstr "Fari tiel ke la elsaluta butono ne aperu en la seanca menuo." +msgstr "Kaŝi en la seanca menuo la butonon por adiaŭi." #: ../data/org.ayatana.indicator.session.gschema.xml.in:5 -#, fuzzy msgid "Remove the Restart item from the session menu." -msgstr "Forigi la eron \"Restarti\" el la seancmenuo." +msgstr "Ne montri la menueron «Restarti» en la seanca menuo." #: ../data/org.ayatana.indicator.session.gschema.xml.in:6 msgid "Makes it so that the restart button doesn’t show in the session menu." -msgstr "Faras tiel ke la elsaluta butono ne aperu en la seanca menuo." +msgstr "Kaŝi en la seanca menuo la butonon por restartigi." #: ../data/org.ayatana.indicator.session.gschema.xml.in:7 -#, fuzzy msgid "Remove the shutdown item from the session menu." -msgstr "Forigi la eron \"Elŝalti\" el la seancmenuo." +msgstr "Ne montri la menueron «Elŝalti» en la seanca menuo." #: ../data/org.ayatana.indicator.session.gschema.xml.in:8 msgid "Makes it so that the shutdown button doesn’t show in the session menu." -msgstr "Fari tiel ke la malŝalta butono ne aperu en la seanca menuo." +msgstr "Kaŝi en la seanca menuo la butonon por elŝalti." #. Translators: the name of the menu ("System"), then the user's name #: ../src/service.c:187 @@ -80,15 +77,15 @@ #: ../src/service.c:344 #, c-format msgid "%s Help" -msgstr "" +msgstr "Helpo pri %s" #: ../src/service.c:346 msgid "About This Computer" -msgstr "" +msgstr "Pri ĉi tiu komputilo" #: ../src/service.c:351 msgid "Report a Bug…" -msgstr "" +msgstr "Raporti cimon…" #: ../src/service.c:362 msgid "System Settings…" @@ -100,31 +97,27 @@ #: ../src/service.c:567 msgid "Start Screen Saver" -msgstr "" +msgstr "Lanĉi ekrankurtenon" #: ../src/service.c:575 ../src/service.c:591 -#, fuzzy msgid "Switch Account…" -msgstr "Ŝanĝi uzantkonton..." +msgstr "Ŝanĝi konton…" #: ../src/service.c:576 ../src/service.c:592 -#, fuzzy msgid "Switch Account" -msgstr "Ŝanĝi uzantkonton..." +msgstr "Ŝanĝi konton" #: ../src/service.c:588 -#, fuzzy msgid "Lock/Switch Account…" -msgstr "Ŝanĝi uzantkonton..." +msgstr "Ŝlosi/ŝanĝi konton…" #: ../src/service.c:589 -#, fuzzy msgid "Lock/Switch Account" -msgstr "Ŝanĝi uzantkonton..." +msgstr "Ŝlosi/ŝanĝi konton" #: ../src/service.c:595 msgid "Lock" -msgstr "" +msgstr "Ŝlosi" #: ../src/service.c:620 msgid "Guest Session" @@ -132,12 +125,12 @@ #: ../src/service.c:697 msgid "Log Out…" -msgstr "Elsaluti…" +msgstr "Adiaŭi…" #: ../src/service.c:697 ../src/backend-dbus/actions.c:895 #: ../src/backend-dbus/actions.c:897 msgid "Log Out" -msgstr "Elsaluti" +msgstr "Adiaŭi" #: ../src/service.c:715 msgid "Suspend" @@ -145,7 +138,7 @@ #: ../src/service.c:718 msgid "Hibernate" -msgstr "Pasivumigi" +msgstr "Letargiigi" #: ../src/service.c:723 msgid "Restart…" @@ -170,7 +163,7 @@ #: ../src/backend-dbus/actions.c:1114 ../src/backend-dbus/actions.c:1132 #: ../src/backend-dbus/actions.c:1154 msgid "Warning" -msgstr "" +msgstr "Averto" #: ../src/backend-dbus/actions.c:802 msgid "" @@ -180,18 +173,19 @@ "The Ayatana Session Indicator could not find any web\n" "browser on your computer." msgstr "" +"La cimspurilo de la mastruma sistemo postulas TTT-legilon.\n" +"\n" +"La Seanco-Indikilo Ayatana malsukcesis trovi TTT-legilon\n" +"en via komputilo." #: ../src/backend-dbus/actions.c:889 -#, fuzzy msgid "Are you sure you want to close all programs and log out?" -msgstr "Ĉu vi certe volas fermi ĉiujn programarojn kaj fini la seancon?" +msgstr "Ĉu vi certe volas fermi ĉiujn programojn kaj adiaŭi?" #: ../src/backend-dbus/actions.c:890 -#, fuzzy msgid "" "Some software updates won't be applied until the computer next restarts." -msgstr "" -"Kelkaj programaraj aktualigoj plenumos tiam, kiam la komputilo restartos." +msgstr "Kelkaj programoj ĝisdatiĝos tiam, kiam la komputilo restartiĝos." #: ../src/backend-dbus/actions.c:898 ../src/backend-dbus/actions.c:939 #: ../src/backend-dbus/actions.c:976 @@ -200,11 +194,11 @@ #: ../src/backend-dbus/actions.c:937 msgid "Are you sure you want to close all programs and restart the computer?" -msgstr "Ĉu vi certe volas fermi ĉiujn programarojn kaj restarti la komputilon?" +msgstr "Ĉu vi certe volas fermi ĉiujn programojn kaj restarti la komputilon?" #: ../src/backend-dbus/actions.c:974 msgid "Are you sure you want to close all programs and shut down the computer?" -msgstr "Ĉu vi certe volas fermi ĉiujn programarojn kaj elŝalti la komputilon?" +msgstr "Ĉu vi certe volas fermi ĉiujn programojn kaj elŝalti la komputilon?" #: ../src/backend-dbus/actions.c:1039 msgid "" @@ -214,6 +208,10 @@ "The Ayatana Session Indicator could not find any web\n" "browser on your computer." msgstr "" +"La manlibro de Xfce postulas TTT-legilon.\n" +"\n" +"La Seanco-Indikilo Ayatana malsukcesis trovi TTT-legilon\n" +"en via komputilo." #: ../src/backend-dbus/actions.c:1044 msgid "" @@ -223,6 +221,11 @@ "Please report this to the developers at:\n" "https://github.com/ArcticaProject/ayatana-indicator-session/issues" msgstr "" +"La Seanc-Indikilo Ayatana ankoraŭ ne povas montri\n" +"manlibron de la aktuala fasado.\n" +"\n" +"Bonvolu raporti tion al la programistoj ĉe:\n" +"https://github.com/ArcticaProject/ayatana-indicator-session/issues" #: ../src/backend-dbus/actions.c:1060 #, c-format @@ -233,6 +236,11 @@ "The Ayatana Session Indicator could not find any web\n" "browser on your computer." msgstr "" +"Montri informojn pri %s postulas\n" +"TTT-legilon.\n" +"\n" +"La Seanco-Indikilo Ayatana malsukcesis trovi TTT-legilon\n" +"en via komputilo." #: ../src/backend-dbus/actions.c:1115 msgid "" @@ -242,6 +250,11 @@ "Please report this to the developers at:\n" "https://github.com/ArcticaProject/ayatana-indicator-session/issues" msgstr "" +"La Seanc-Indikilo Ayatana ankoraŭ ne povas lanĉi\n" +"la sisteman agordilon de la fasado.\n" +"\n" +"Bonvolu raporti tion al la programistoj ĉe:\n" +"https://github.com/ArcticaProject/ayatana-indicator-session/issues" #: ../src/backend-dbus/actions.c:1133 msgid "" @@ -251,6 +264,11 @@ "Please report this to the developers at:\n" "https://github.com/ArcticaProject/ayatana-indicator-session/issues" msgstr "" +"La Seanc-Indikilo Ayatana ne subtenas ŝanĝi pasvortojn\n" +"por via fasado ankoraŭ.\n" +"\n" +"Bonvolu raporti tion al la programistoj ĉe:\n" +"https://github.com/ArcticaProject/ayatana-indicator-session/issues" #: ../src/backend-dbus/actions.c:1155 msgid "" @@ -260,6 +278,11 @@ "Please report this to the developers at:\n" "https://github.com/ArcticaProject/ayatana-indicator-session/issues" msgstr "" +"La Seanc-Indikilo Ayatana ankoraŭ ne povas montri\n" +"informojn pri la aktuala fasado.\n" +"\n" +"Bonvolu raporti tion al la programistoj ĉe:\n" +"https://github.com/ArcticaProject/ayatana-indicator-session/issues" #~ msgid "Classic Guest Session" #~ msgstr "Klasika gastseanco" diff -Nru ayatana-indicator-session-0.9.0/po/zh_CN.po ayatana-indicator-session-22.2.0/po/zh_CN.po --- ayatana-indicator-session-0.9.0/po/zh_CN.po 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/po/zh_CN.po 2022-02-17 20:53:13.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: indicator-session\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-28 20:20+0200\n" -"PO-Revision-Date: 2021-05-18 02:33+0000\n" -"Last-Translator: Boyuan Yang <073plan@gmail.com>\n" +"PO-Revision-Date: 2022-01-25 09:54+0000\n" +"Last-Translator: Eric \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_CN\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.7-dev\n" +"X-Generator: Weblate 4.11-dev\n" "X-Launchpad-Export-Date: 2011-09-27 15:12+0000\n" #: ../data/org.ayatana.indicator.session.gschema.xml.in:1 @@ -229,7 +229,7 @@ "https://github.com/ArcticaProject/ayatana-indicator-session/issues" #: ../src/backend-dbus/actions.c:1060 -#, c-format, fuzzy +#, c-format msgid "" "Displaying information on %s requires\n" "a web browser.\n" @@ -237,11 +237,11 @@ "The Ayatana Session Indicator could not find any web\n" "browser on your computer." msgstr "" -"在%s上显示信息需要\n" -"使用浏览器。\n" +"在 %s上显示信息需要\n" +"浏览器。\n" "\n" -"Ayatana菜单指示器无法检测到您电脑上的\n" -"任何浏览器。" +"Ayatana 会话指示器在你的计算机上\n" +"找不到任何的网络浏览器。" #: ../src/backend-dbus/actions.c:1115 msgid "" @@ -258,7 +258,6 @@ "https://github.com/ArcticaProject/ayatana-indicator-session/issues" #: ../src/backend-dbus/actions.c:1133 -#, fuzzy msgid "" "The Ayatana Session Indicator does not support password changes\n" "for your desktop environment, yet.\n" @@ -266,7 +265,7 @@ "Please report this to the developers at:\n" "https://github.com/ArcticaProject/ayatana-indicator-session/issues" msgstr "" -"Ayatana会话指示器暂不支持为您的桌面环境\n" +"Ayatana 会话指示器暂不支持为您的桌面环境\n" "修改密码。\n" "\n" "请将此问题反映给开发者：\n" diff -Nru ayatana-indicator-session-0.9.0/src/CMakeLists.txt ayatana-indicator-session-22.2.0/src/CMakeLists.txt --- ayatana-indicator-session-0.9.0/src/CMakeLists.txt 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/src/CMakeLists.txt 2022-02-17 20:53:13.000000000 +0000 @@ -23,4 +23,4 @@ LOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}") add_executable (${SERVICE_EXEC} main.c) target_link_libraries (${SERVICE_EXEC} libayatanaindicatorsessionservice backenddbus ${SERVICE_LIBRARIES}) -install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}) +install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}) diff -Nru ayatana-indicator-session-0.9.0/src/service.c ayatana-indicator-session-22.2.0/src/service.c --- ayatana-indicator-session-0.9.0/src/service.c 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/src/service.c 2022-02-17 20:53:13.000000000 +0000 @@ -349,7 +349,7 @@ static gboolean usage_mode_to_action_state(GValue *value, GVariant *variant, - gpointer unused) + __attribute__((unused)) gpointer unused) { const gchar* usage_mode = g_variant_get_string(variant, NULL); GVariant* ret_var = g_variant_new_boolean(g_strcmp0(usage_mode, "Windowed") == 0 ? TRUE : FALSE); @@ -359,8 +359,8 @@ static GVariant* action_state_to_usage_mode(const GValue *value, - const GVariantType * unused_expected_type, - gpointer unused) + __attribute__((unused)) const GVariantType * unused_expected_type, + __attribute__((unused)) gpointer unused) { GVariant* var = g_value_get_variant(value); GVariant* ret = g_variant_new_string(g_variant_get_boolean(var) == TRUE ? "Windowed" : "Staged"); @@ -378,7 +378,7 @@ { GMenu * menu; priv_t * p = self->priv; - gchar * desktop_help_label = g_strdup_printf(_("%s Desktop Help"), get_desktop_name()); + gchar * desktop_help_label = g_strdup_printf(_("%s Help"), get_desktop_name()); gchar * distro_help_label = g_strdup_printf(_("%s Help…"), get_distro_name()); menu = g_menu_new (); @@ -655,9 +655,22 @@ { if (want_accel) { - gchar * str = g_settings_get_string (p->keybinding_settings, "screensaver"); - g_menu_item_set_attribute (item, "accel", "s", str); - g_free (str); + if (ayatana_common_utils_is_mate()) + { + gchar * str = g_settings_get_string (p->keybinding_settings, "screensaver"); + g_menu_item_set_attribute (item, "accel", "s", str); + g_free (str); + } + else + { + gchar **lAccels = g_settings_get_strv(p->keybinding_settings, "screensaver"); + + if (lAccels != NULL) + { + g_menu_item_set_attribute(item, "accel", "s", lAccels[0]); + g_strfreev(lAccels); + } + } } g_menu_append_item (menu, item); diff -Nru ayatana-indicator-session-0.9.0/tests/backend-dbus/CMakeLists.txt ayatana-indicator-session-22.2.0/tests/backend-dbus/CMakeLists.txt --- ayatana-indicator-session-0.9.0/tests/backend-dbus/CMakeLists.txt 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/tests/backend-dbus/CMakeLists.txt 2022-02-17 20:53:13.000000000 +0000 @@ -1,5 +1,3 @@ -SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") - # build desktopmock add_library (desktopmock STATIC mock-accounts.cc diff -Nru ayatana-indicator-session-0.9.0/tests/CMakeLists.txt ayatana-indicator-session-22.2.0/tests/CMakeLists.txt --- ayatana-indicator-session-0.9.0/tests/CMakeLists.txt 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/tests/CMakeLists.txt 2022-02-17 20:53:13.000000000 +0000 @@ -50,7 +50,6 @@ add_executable (test-service test-service.cc) target_link_options(test-service PRIVATE -no-pie) -set_target_properties (test-service PROPERTIES COMPILE_FLAGS " -std=c++0x") add_test (test-service test-service) add_dependencies (test-service libayatanaindicatorsessionservice backendmock gschemas-compiled) target_link_libraries (test-service libayatanaindicatorsessionservice backendmock ${SERVICE_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES}) diff -Nru ayatana-indicator-session-0.9.0/.travis.yml ayatana-indicator-session-22.2.0/.travis.yml --- ayatana-indicator-session-0.9.0/.travis.yml 2021-11-17 14:23:05.000000000 +0000 +++ ayatana-indicator-session-22.2.0/.travis.yml 2022-02-17 20:53:13.000000000 +0000 @@ -1,5 +1,5 @@ # vim: set ts=2 sts=2 sw=2 expandtab : -dist: bionic +dist: focal language: shell os: linux