From 1536c23e36666f89f9a03e2e8992c8917cced74d Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 7 Sep 2023 11:24:03 +0200 Subject: Fix gschema file translation fixes https://github.com/AyatanaIndicators/ayatana-indicator-datetime/issues/93 --- data/CMakeLists.txt | 9 +- data/org.ayatana.indicator.datetime.gschema.xml.in | 166 +++++++++++++++++++++ ...rg.ayatana.indicator.datetime.gschema.xml.in.in | 166 --------------------- po/POTFILES.in | 2 +- 4 files changed, 169 insertions(+), 174 deletions(-) create mode 100644 data/org.ayatana.indicator.datetime.gschema.xml.in delete mode 100644 data/org.ayatana.indicator.datetime.gschema.xml.in.in diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 2e1cdfa..726bcec 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -3,15 +3,10 @@ ## set (SCHEMA_NAME "org.ayatana.indicator.datetime.gschema.xml") -set (SCHEMA_FILE_IN_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in.in") -set (SCHEMA_FILE_IN "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}.in") +set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in") set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") # generate the .xml.in file so cmake constants are included -configure_file(${SCHEMA_FILE_IN_IN} ${SCHEMA_FILE_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) +configure_file(${SCHEMA_FILE_IN} ${SCHEMA_FILE}) # let GSettings do the rest find_package(GSettings REQUIRED) diff --git a/data/org.ayatana.indicator.datetime.gschema.xml.in b/data/org.ayatana.indicator.datetime.gschema.xml.in new file mode 100644 index 0000000..dd94598 --- /dev/null +++ b/data/org.ayatana.indicator.datetime.gschema.xml.in @@ -0,0 +1,166 @@ + + + + + + + + + + 'locale-default' + What the time format should be? + + Controls the time format that is displayed in the indicator. For almost + all users this should be the default for their locale. If you think the + setting is wrong for your locale please join or talk to the translation + team for your language. If you just want something different you can + adjust this to be either 12 or 24 time. Or, you can use a custom format + string and set the custom-time-format setting. + + + + "%l:%M %p" + The format string passed to strftime + + The format of the time and/or date that is visible on the panel when using + the indicator. For most users this will be a set of predefined values as + determined by the configuration utility, but advanced users can change it + to anything strftime can accept. Look at the man page on strftime for + more information. + + + + false + Show the number of seconds in the indicator + + Makes the datetime indicator show the number of seconds in the indicator. + It's important to note that this will cause additional battery drain as + the time will update 60 times as often, so it is not recommended. Also, + this setting will be ignored if the time-format value is set to custom. + + + + false + Show the day of the week in the indicator + + Puts the day of the week on the panel along with the time and/or date + depending on settings. This setting will be ignored if the time-format + value is set to custom. + + + + false + Show the month and date in the indicator + + Puts the month and the date in the panel along with the time and/or day + of the week depending on settings. This setting will be ignored if the + time-format value is set to custom. + + + + false + Show the year in the indicator + + Puts the year in the panel along with the month and the date. + This setting will be ignored if either the time-format value is set to custom + or if show-date is set to false. + + + + true + Show the monthly calendar in the indicator + + Puts the monthly calendar in indicator-datetime's menu. + + + + false + Show week numbers in calendar + + Shows the week numbers in the monthly calendar in indicator-datetime's menu. + + + + true + Show events in the indicator + + Shows events from Evolution in indicator-datetime's menu. + + + + false + Show the auto-detected location in the indicator + + Shows your current location (determined from geoclue and /etc/timezone) in indicator-datetime's menu. + + + + false + Show locations in the indicator + + Shows custom defined locations in indicator-datetime's menu. + + + + ['UTC'] + A List of locations + + Adds the list of locations the user has configured to display in the + indicator-datetime menu. + + + + '' + The name of the current timezone + + Some timezones can be known by many different cities or names. This setting describes how the current zone prefers to be named. Format is "TIMEZONE NAME" (e.g. "America/New_York Boston" to name the New_York zone Boston). + + + + 'pulse' + What kind of haptic feedback, if any, to trigger with an alarm. + + What kind of haptic feedback, if any, to trigger with an alarm. + Two modes are currently supported: 'pulse', 'none'. + + + + '@CALENDAR_DEFAULT_SOUND@' + The calendar's default sound file. + + If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound. + + + + '@ALARM_DEFAULT_SOUND@' + The alarm's default sound file. + + If an alarm doesn't specify its own sound file, this file will be used as the fallback sound. + + + + + 50 + The alarm's default volume level. + + The volume at which alarms will be played. + + + + + 10 + The alarm's duration. + + How long the alarm's sound will be looped if its snap decision is not dismissed by the user. + + + + + 5 + The snooze duration. + + How long to wait when the user hits the Snooze button. + + + + diff --git a/data/org.ayatana.indicator.datetime.gschema.xml.in.in b/data/org.ayatana.indicator.datetime.gschema.xml.in.in deleted file mode 100644 index e03db4b..0000000 --- a/data/org.ayatana.indicator.datetime.gschema.xml.in.in +++ /dev/null @@ -1,166 +0,0 @@ - - - - - - - - - - 'locale-default' - What the time format should be? - - Controls the time format that is displayed in the indicator. For almost - all users this should be the default for their locale. If you think the - setting is wrong for your locale please join or talk to the translation - team for your language. If you just want something different you can - adjust this to be either 12 or 24 time. Or, you can use a custom format - string and set the custom-time-format setting. - - - - "%l:%M %p" - The format string passed to strftime - - The format of the time and/or date that is visible on the panel when using - the indicator. For most users this will be a set of predefined values as - determined by the configuration utility, but advanced users can change it - to anything strftime can accept. Look at the man page on strftime for - more information. - - - - false - Show the number of seconds in the indicator - - Makes the datetime indicator show the number of seconds in the indicator. - It's important to note that this will cause additional battery drain as - the time will update 60 times as often, so it is not recommended. Also, - this setting will be ignored if the time-format value is set to custom. - - - - false - Show the day of the week in the indicator - - Puts the day of the week on the panel along with the time and/or date - depending on settings. This setting will be ignored if the time-format - value is set to custom. - - - - false - Show the month and date in the indicator - - Puts the month and the date in the panel along with the time and/or day - of the week depending on settings. This setting will be ignored if the - time-format value is set to custom. - - - - false - Show the year in the indicator - - Puts the year in the panel along with the month and the date. - This setting will be ignored if either the time-format value is set to custom - or if show-date is set to false. - - - - true - Show the monthly calendar in the indicator - - Puts the monthly calendar in indicator-datetime's menu. - - - - false - Show week numbers in calendar - - Shows the week numbers in the monthly calendar in indicator-datetime's menu. - - - - true - Show events in the indicator - - Shows events from Evolution in indicator-datetime's menu. - - - - false - Show the auto-detected location in the indicator - - Shows your current location (determined from geoclue and /etc/timezone) in indicator-datetime's menu. - - - - false - Show locations in the indicator - - Shows custom defined locations in indicator-datetime's menu. - - - - ['UTC'] - A List of locations - - Adds the list of locations the user has configured to display in the - indicator-datetime menu. - - - - '' - The name of the current timezone - - Some timezones can be known by many different cities or names. This setting describes how the current zone prefers to be named. Format is "TIMEZONE NAME" (e.g. "America/New_York Boston" to name the New_York zone Boston). - - - - 'pulse' - What kind of haptic feedback, if any, to trigger with an alarm. - - What kind of haptic feedback, if any, to trigger with an alarm. - Two modes are currently supported: 'pulse', 'none'. - - - - '@CALENDAR_DEFAULT_SOUND@' - <_summary>The calendar's default sound file. - <_description> - If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound. - - - - '@ALARM_DEFAULT_SOUND@' - The alarm's default sound file. - - If an alarm doesn't specify its own sound file, this file will be used as the fallback sound. - - - - - 50 - The alarm's default volume level. - - The volume at which alarms will be played. - - - - - 10 - The alarm's duration. - - How long the alarm's sound will be looped if its snap decision is not dismissed by the user. - - - - - 5 - The snooze duration. - - How long to wait when the user hits the Snooze button. - - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index fe5cde1..511daee 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ data/org.ayatana.indicator.datetime.AlarmProperties.xml -data/org.ayatana.indicator.datetime.gschema.xml.in.in +data/org.ayatana.indicator.datetime.gschema.xml.in src/actions.cpp src/actions-live.cpp src/alarm-queue-simple.cpp -- cgit v1.2.3