diff options
| -rw-r--r-- | data/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | data/org.ayatana.indicator.display.gschema.xml (renamed from data/org.ayatana.display.gschema.xml.in) | 10 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | po/ayatana-indicator-display.pot | 32 | ||||
| -rw-r--r-- | tests/unit/CMakeLists.txt | 4 |
5 files changed, 37 insertions, 18 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 17ddf23..b7a68dc 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -4,14 +4,8 @@ find_package(GSettings) ## GSettings schema ## -set (SCHEMA_NAME "org.ayatana.display.gschema.xml") +set (SCHEMA_NAME "org.ayatana.indicator.display.gschema.xml") set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") -set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in") - -# generate the .xml file using intltool -find_package(Intltool REQUIRED) -set (ENV{LC_ALL} "C") -intltool_merge_translations("${SCHEMA_FILE_IN}" "${SCHEMA_FILE}" ALL UTF8 STYLE "xml" NO_TRANSLATIONS) # let GSettings do the rest find_package(GSettings REQUIRED) diff --git a/data/org.ayatana.display.gschema.xml.in b/data/org.ayatana.indicator.display.gschema.xml index afcd996..9afa253 100644 --- a/data/org.ayatana.display.gschema.xml.in +++ b/data/org.ayatana.indicator.display.gschema.xml @@ -10,15 +10,15 @@ <schema id="org.ayatana.indicator.display" path="/org/ayatana/indicator/display/"> <key name="rotation-lock" type="b"> <default>false</default> - <_summary>Lock rotation</_summary> - <_description> + <summary>Lock rotation</summary> + <description> Lock automatic display rotation. - </_description> + </description> </key> <key name="orientation-lock" enum="org.ayatana.indicator.display.ScreenOrientation"> <default>"none"</default> - <_summary>Orientation lock</_summary> - <_description>Locks orientation to a specific value.</_description> + <summary>Orientation lock</summary> + <description>Locks orientation to a specific value.</description> </key> </schema> </schemalist> diff --git a/po/POTFILES.in b/po/POTFILES.in index 8d88dd5..1cb6f88 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,4 @@ +data/org.ayatana.indicator.display.gschema.xml src/adbd-client.cpp src/exporter.cpp src/greeter.cpp diff --git a/po/ayatana-indicator-display.pot b/po/ayatana-indicator-display.pot index 0664083..680b8a9 100644 --- a/po/ayatana-indicator-display.pot +++ b/po/ayatana-indicator-display.pot @@ -1,5 +1,5 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) YEAR Canonical Ltd. # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-28 08:50+0000\n" +"POT-Creation-Date: 2022-09-08 22:34+0200\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" @@ -17,14 +17,38 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/rotation-lock.cpp:125 +#: ../data/org.ayatana.indicator.display.gschema.xml:1 +msgid "Lock rotation" +msgstr "" + +#: ../data/org.ayatana.indicator.display.gschema.xml:2 +msgid "Lock automatic display rotation." +msgstr "" + +#: ../data/org.ayatana.indicator.display.gschema.xml:3 +msgid "Orientation lock" +msgstr "" + +#: ../data/org.ayatana.indicator.display.gschema.xml:4 +msgid "Locks orientation to a specific value." +msgstr "" + +#: ../src/rotation-lock.cpp:184 ../src/rotation-lock.cpp:202 msgid "Rotation Lock" msgstr "" -#: ../src/rotation-lock.cpp:136 +#: ../src/rotation-lock.cpp:215 msgid "Rotation" msgstr "" +#: ../src/rotation-lock.cpp:226 +msgid "Display" +msgstr "" + +#: ../src/rotation-lock.cpp:227 +msgid "Display settings and features" +msgstr "" + #: ../src/usb-snap.cpp:107 #, c-format msgid "The computer's RSA key fingerprint is: %s" diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 7d42693..930eb70 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -12,7 +12,7 @@ set_source_files_properties (gschemas.compiled GENERATED) # and help the tests to find that file by setting -DSCHEMA_DIR set (XDG_DATA_DIRS "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas") set (SCHEMA_DIR "${XDG_DATA_DIRS}/glib-2.0/schemas") -set (DISPLAY_SCHEMA ${CMAKE_BINARY_DIR}/data/org.ayatana.display.gschema.xml) +set (DISPLAY_SCHEMA ${CMAKE_BINARY_DIR}/data/org.ayatana.indicator.display.gschema.xml) add_definitions(-DSCHEMA_DIR="${SCHEMA_DIR}") execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas OUTPUT_VARIABLE COMPILE_SCHEMA_EXECUTABLE @@ -23,7 +23,7 @@ execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compil # https://discourse.cmake.org/t/race-condition-when-multi-add-custom-target-deps-on-same-file-generated-by-add-custom-command/2358 # https://bugs.debian.org/892091 (bug for ayatana-indicators-power, but applies here as well) add_custom_command (OUTPUT gschemas.compiled - DEPENDS ${CMAKE_BINARY_DIR}/data/org.ayatana.display.gschema.xml + DEPENDS ${CMAKE_BINARY_DIR}/data/org.ayatana.indicator.display.gschema.xml COMMAND mkdir -p ${SCHEMA_DIR} COMMAND cp -f ${DISPLAY_SCHEMA} ${SCHEMA_DIR} COMMAND ${COMPILE_SCHEMA_EXECUTABLE} ${SCHEMA_DIR}) |