diff options
author | karl-qdh <karl@qdh.org.uk> | 2011-03-31 09:33:33 +0100 |
---|---|---|
committer | karl-qdh <karl@qdh.org.uk> | 2011-03-31 09:33:33 +0100 |
commit | 54e0f63b2c419aa2555dfd514cbd273bd05260f6 (patch) | |
tree | 5665b0bf9bd408eec3c3329147497e6828894fe4 /src/settings-shared.h | |
parent | f8923be6312878885431503e0ee372b1e11676ea (diff) | |
parent | 51f85a5e06af1dec9fcbd25901b4a65ead6aa2cd (diff) | |
download | ayatana-indicator-datetime-54e0f63b2c419aa2555dfd514cbd273bd05260f6.tar.gz ayatana-indicator-datetime-54e0f63b2c419aa2555dfd514cbd273bd05260f6.tar.bz2 ayatana-indicator-datetime-54e0f63b2c419aa2555dfd514cbd273bd05260f6.zip |
Merged back with head
Diffstat (limited to 'src/settings-shared.h')
-rw-r--r-- | src/settings-shared.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/settings-shared.h b/src/settings-shared.h index cdbb063..da66205 100644 --- a/src/settings-shared.h +++ b/src/settings-shared.h @@ -34,6 +34,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define SETTINGS_SHOW_EVENTS_S "show-events" #define SETTINGS_SHOW_LOCATIONS_S "show-locations" #define SETTINGS_LOCATIONS_S "locations" +#define SETTINGS_TIMEZONE_NAME_S "timezone-name" enum { SETTINGS_TIME_LOCALE = 0, @@ -50,8 +51,8 @@ enum { a clock showing 24-hour time without seconds. */ #define DEFAULT_TIME_24_FORMAT N_("%H:%M") -#define DEFAULT_TIME_FORMAT DEFAULT_TIME_12_FORMAT -#define DEFAULT_TIME_FORMAT_WITH_DAY DEFAULT_TIME_12_FORMAT +#define DEFAULT_TIME_FORMAT DEFAULT_TIME_12_FORMAT +#define DEFAULT_TIME_FORMAT_WITH_DAY DEFAULT_TIME_12_FORMAT_WITH_DAY /* TRANSLATORS: A format string for the strftime function for a clock showing the day of the week and the time in 12-hour format without |