diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-09-09 13:28:51 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-09-09 13:28:51 +0200 |
| commit | 18e9350ddf455cce186eb3d0a428364fc521fd5b (patch) | |
| tree | 45c2185504ee01a552512ffe72589f038db4560e | |
| parent | 0d2c8f74be593014099a61c0e3089d80399ef3dd (diff) | |
| parent | 1536c23e36666f89f9a03e2e8992c8917cced74d (diff) | |
| download | ayatana-indicator-datetime-18e9350ddf455cce186eb3d0a428364fc521fd5b.tar.gz ayatana-indicator-datetime-18e9350ddf455cce186eb3d0a428364fc521fd5b.tar.bz2 ayatana-indicator-datetime-18e9350ddf455cce186eb3d0a428364fc521fd5b.zip | |
Merge branch 'tari01-pr/fix-schema-translation'
Attributes GH PR #113: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/113
| -rw-r--r-- | data/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | data/org.ayatana.indicator.datetime.gschema.xml.in (renamed from data/org.ayatana.indicator.datetime.gschema.xml.in.in) | 6 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
3 files changed, 6 insertions, 11 deletions
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.in b/data/org.ayatana.indicator.datetime.gschema.xml.in index e03db4b..dd94598 100644 --- a/data/org.ayatana.indicator.datetime.gschema.xml.in.in +++ b/data/org.ayatana.indicator.datetime.gschema.xml.in @@ -126,10 +126,10 @@ </key> <key name="calendar-default-sound" type="s"> <default>'@CALENDAR_DEFAULT_SOUND@'</default> - <_summary>The calendar's default sound file.</_summary> - <_description> + <summary>The calendar's default sound file.</summary> + <description> If a calendar or reminder event doesn't specify its own sound file, this file will be used as the fallback sound. - </_description> + </description> </key> <key name="alarm-default-sound" type="s"> <default>'@ALARM_DEFAULT_SOUND@'</default> 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 |