diff --git a/data/activities/default/exercising/dancing.png b/data/activities/default/exercising/dancing.png new file mode 100644 index 000000000..38ac123ae Binary files /dev/null and b/data/activities/default/exercising/dancing.png differ diff --git a/data/activities/default/inactive/hiding.png b/data/activities/default/inactive/hiding.png new file mode 100644 index 000000000..80b204880 Binary files /dev/null and b/data/activities/default/inactive/hiding.png differ diff --git a/data/activities/default/inactive/praying.png b/data/activities/default/inactive/praying.png new file mode 100644 index 000000000..7b27307a6 Binary files /dev/null and b/data/activities/default/inactive/praying.png differ diff --git a/data/activities/default/inactive/thinking.png b/data/activities/default/inactive/thinking.png new file mode 100644 index 000000000..f57ba9fdb Binary files /dev/null and b/data/activities/default/inactive/thinking.png differ diff --git a/data/activities/default/relaxing/fishing.png b/data/activities/default/relaxing/fishing.png new file mode 100644 index 000000000..81ae46c4b Binary files /dev/null and b/data/activities/default/relaxing/fishing.png differ diff --git a/data/activities/default/relaxing/smoking.png b/data/activities/default/relaxing/smoking.png new file mode 100644 index 000000000..ba620a9dc Binary files /dev/null and b/data/activities/default/relaxing/smoking.png differ diff --git a/data/moods/default/afraid.png b/data/moods/default/afraid.png index baee3423d..9b2e2aa25 100644 Binary files a/data/moods/default/afraid.png and b/data/moods/default/afraid.png differ diff --git a/data/moods/default/amazed.png b/data/moods/default/amazed.png index eccfc3122..1ceaa603b 100644 Binary files a/data/moods/default/amazed.png and b/data/moods/default/amazed.png differ diff --git a/data/moods/default/amorous.png b/data/moods/default/amorous.png index a323d2932..742105e11 100644 Binary files a/data/moods/default/amorous.png and b/data/moods/default/amorous.png differ diff --git a/data/moods/default/angry.png b/data/moods/default/angry.png index beb5f3f5c..46c0e6dca 100644 Binary files a/data/moods/default/angry.png and b/data/moods/default/angry.png differ diff --git a/data/moods/default/annoyed.png b/data/moods/default/annoyed.png index 10bd65eb7..76616aec5 100644 Binary files a/data/moods/default/annoyed.png and b/data/moods/default/annoyed.png differ diff --git a/data/moods/default/anxious.png b/data/moods/default/anxious.png index 1c8ee3ad9..59a496071 100644 Binary files a/data/moods/default/anxious.png and b/data/moods/default/anxious.png differ diff --git a/data/moods/default/aroused.png b/data/moods/default/aroused.png index dbdfa05c6..1f022d783 100644 Binary files a/data/moods/default/aroused.png and b/data/moods/default/aroused.png differ diff --git a/data/moods/default/ashamed.png b/data/moods/default/ashamed.png index 2d4dd0d0b..9139a706f 100644 Binary files a/data/moods/default/ashamed.png and b/data/moods/default/ashamed.png differ diff --git a/data/moods/default/bored.png b/data/moods/default/bored.png index 1d5db2b85..b0b562abe 100644 Binary files a/data/moods/default/bored.png and b/data/moods/default/bored.png differ diff --git a/data/moods/default/brave.png b/data/moods/default/brave.png index 9af06f395..9351a2583 100644 Binary files a/data/moods/default/brave.png and b/data/moods/default/brave.png differ diff --git a/data/moods/default/calm.png b/data/moods/default/calm.png index ca5c0b8fe..4b5d0baa1 100644 Binary files a/data/moods/default/calm.png and b/data/moods/default/calm.png differ diff --git a/data/moods/default/cautious.png b/data/moods/default/cautious.png index 021a666e5..293fab7f0 100644 Binary files a/data/moods/default/cautious.png and b/data/moods/default/cautious.png differ diff --git a/data/moods/default/cold.png b/data/moods/default/cold.png index ceed517c2..c52f65dfb 100644 Binary files a/data/moods/default/cold.png and b/data/moods/default/cold.png differ diff --git a/data/moods/default/confident.png b/data/moods/default/confident.png index 924cd5c46..c0da5932d 100644 Binary files a/data/moods/default/confident.png and b/data/moods/default/confident.png differ diff --git a/data/moods/default/confused.png b/data/moods/default/confused.png index 4ec7c5c1f..4121aec4f 100644 Binary files a/data/moods/default/confused.png and b/data/moods/default/confused.png differ diff --git a/data/moods/default/contemplative.png b/data/moods/default/contemplative.png index a606ebada..f78b5e90e 100644 Binary files a/data/moods/default/contemplative.png and b/data/moods/default/contemplative.png differ diff --git a/data/moods/default/contented.png b/data/moods/default/contented.png index f92c6bda2..ad6ba86ec 100644 Binary files a/data/moods/default/contented.png and b/data/moods/default/contented.png differ diff --git a/data/moods/default/cranky.png b/data/moods/default/cranky.png index 6f463d820..08dccb7fd 100644 Binary files a/data/moods/default/cranky.png and b/data/moods/default/cranky.png differ diff --git a/data/moods/default/crazy.png b/data/moods/default/crazy.png index 7325bf2c9..6390d50f5 100644 Binary files a/data/moods/default/crazy.png and b/data/moods/default/crazy.png differ diff --git a/data/moods/default/creative.png b/data/moods/default/creative.png index 7b1f91949..321576d08 100644 Binary files a/data/moods/default/creative.png and b/data/moods/default/creative.png differ diff --git a/data/moods/default/curious.png b/data/moods/default/curious.png index 3cb1a21d6..2fc236394 100644 Binary files a/data/moods/default/curious.png and b/data/moods/default/curious.png differ diff --git a/data/moods/default/dejected.png b/data/moods/default/dejected.png index e24017836..987636b72 100644 Binary files a/data/moods/default/dejected.png and b/data/moods/default/dejected.png differ diff --git a/data/moods/default/depressed.png b/data/moods/default/depressed.png index 9fd869ea3..86f5dcd32 100644 Binary files a/data/moods/default/depressed.png and b/data/moods/default/depressed.png differ diff --git a/data/moods/default/disappointed.png b/data/moods/default/disappointed.png index ec9f7965b..bd7557def 100644 Binary files a/data/moods/default/disappointed.png and b/data/moods/default/disappointed.png differ diff --git a/data/moods/default/disgusted.png b/data/moods/default/disgusted.png index 575cf9682..14f426cb4 100644 Binary files a/data/moods/default/disgusted.png and b/data/moods/default/disgusted.png differ diff --git a/data/moods/default/dismayed.png b/data/moods/default/dismayed.png index 47b2dcc0f..bbd7eea64 100644 Binary files a/data/moods/default/dismayed.png and b/data/moods/default/dismayed.png differ diff --git a/data/moods/default/distracted.png b/data/moods/default/distracted.png index 7b009a568..9fc9586cd 100644 Binary files a/data/moods/default/distracted.png and b/data/moods/default/distracted.png differ diff --git a/data/moods/default/embarrassed.png b/data/moods/default/embarrassed.png index e230f147a..a44225140 100644 Binary files a/data/moods/default/embarrassed.png and b/data/moods/default/embarrassed.png differ diff --git a/data/moods/default/envious.png b/data/moods/default/envious.png index 9d3e17f57..456b71e6e 100644 Binary files a/data/moods/default/envious.png and b/data/moods/default/envious.png differ diff --git a/data/moods/default/excited.png b/data/moods/default/excited.png index ee4ca51b7..c7c0ba2ba 100644 Binary files a/data/moods/default/excited.png and b/data/moods/default/excited.png differ diff --git a/data/moods/default/flirtatious.png b/data/moods/default/flirtatious.png index f9f31db04..f4ecf1129 100644 Binary files a/data/moods/default/flirtatious.png and b/data/moods/default/flirtatious.png differ diff --git a/data/moods/default/frustrated.png b/data/moods/default/frustrated.png index 06b732e42..2d2b0b642 100644 Binary files a/data/moods/default/frustrated.png and b/data/moods/default/frustrated.png differ diff --git a/data/moods/default/grateful.png b/data/moods/default/grateful.png index c8b3e6675..902166cc9 100644 Binary files a/data/moods/default/grateful.png and b/data/moods/default/grateful.png differ diff --git a/data/moods/default/grieving.png b/data/moods/default/grieving.png index 1354a2252..097264877 100644 Binary files a/data/moods/default/grieving.png and b/data/moods/default/grieving.png differ diff --git a/data/moods/default/grumpy.png b/data/moods/default/grumpy.png index 17bdc7b70..3fec5d171 100644 Binary files a/data/moods/default/grumpy.png and b/data/moods/default/grumpy.png differ diff --git a/data/moods/default/guilty.png b/data/moods/default/guilty.png index aecf32eec..1c43b9470 100644 Binary files a/data/moods/default/guilty.png and b/data/moods/default/guilty.png differ diff --git a/data/moods/default/happy.png b/data/moods/default/happy.png index 5b7ecce5f..09e2d5265 100644 Binary files a/data/moods/default/happy.png and b/data/moods/default/happy.png differ diff --git a/data/moods/default/hopeful.png b/data/moods/default/hopeful.png index b443dcbf0..14ab9312e 100644 Binary files a/data/moods/default/hopeful.png and b/data/moods/default/hopeful.png differ diff --git a/data/moods/default/hot.png b/data/moods/default/hot.png index a5e06a5e9..121e9117c 100644 Binary files a/data/moods/default/hot.png and b/data/moods/default/hot.png differ diff --git a/data/moods/default/humbled.png b/data/moods/default/humbled.png index 2c59b7301..a519b3d8f 100644 Binary files a/data/moods/default/humbled.png and b/data/moods/default/humbled.png differ diff --git a/data/moods/default/humiliated.png b/data/moods/default/humiliated.png index 330b85067..e4476b9b3 100644 Binary files a/data/moods/default/humiliated.png and b/data/moods/default/humiliated.png differ diff --git a/data/moods/default/hungry.png b/data/moods/default/hungry.png index 34770d0a7..3546c7a28 100644 Binary files a/data/moods/default/hungry.png and b/data/moods/default/hungry.png differ diff --git a/data/moods/default/hurt.png b/data/moods/default/hurt.png index e4b185529..74ea88a5f 100644 Binary files a/data/moods/default/hurt.png and b/data/moods/default/hurt.png differ diff --git a/data/moods/default/impressed.png b/data/moods/default/impressed.png index f1916a1a6..9e89936d0 100644 Binary files a/data/moods/default/impressed.png and b/data/moods/default/impressed.png differ diff --git a/data/moods/default/in_awe.png b/data/moods/default/in_awe.png index 9824d515e..c67192f25 100644 Binary files a/data/moods/default/in_awe.png and b/data/moods/default/in_awe.png differ diff --git a/data/moods/default/in_love.png b/data/moods/default/in_love.png index 4eed1d7ed..ea6f4ac39 100644 Binary files a/data/moods/default/in_love.png and b/data/moods/default/in_love.png differ diff --git a/data/moods/default/indignant.png b/data/moods/default/indignant.png index 2cccf22ec..9b12cb202 100644 Binary files a/data/moods/default/indignant.png and b/data/moods/default/indignant.png differ diff --git a/data/moods/default/interested.png b/data/moods/default/interested.png index b4efbc4b5..e5ac625c9 100644 Binary files a/data/moods/default/interested.png and b/data/moods/default/interested.png differ diff --git a/data/moods/default/intoxicated.png b/data/moods/default/intoxicated.png index 5042ac7ba..89d6fe435 100644 Binary files a/data/moods/default/intoxicated.png and b/data/moods/default/intoxicated.png differ diff --git a/data/moods/default/invincible.png b/data/moods/default/invincible.png index 8f6be255d..59bc5b305 100644 Binary files a/data/moods/default/invincible.png and b/data/moods/default/invincible.png differ diff --git a/data/moods/default/jealous.png b/data/moods/default/jealous.png index ff3ec57a8..74bc20cc1 100644 Binary files a/data/moods/default/jealous.png and b/data/moods/default/jealous.png differ diff --git a/data/moods/default/lonely.png b/data/moods/default/lonely.png index 095044b9a..cfbd8c66b 100644 Binary files a/data/moods/default/lonely.png and b/data/moods/default/lonely.png differ diff --git a/data/moods/default/lost.png b/data/moods/default/lost.png index 533d2aa0e..54609d9f5 100644 Binary files a/data/moods/default/lost.png and b/data/moods/default/lost.png differ diff --git a/data/moods/default/lucky.png b/data/moods/default/lucky.png index eaac27e8a..8997947dc 100644 Binary files a/data/moods/default/lucky.png and b/data/moods/default/lucky.png differ diff --git a/data/moods/default/mean.png b/data/moods/default/mean.png index 00998b187..2bf5350ce 100644 Binary files a/data/moods/default/mean.png and b/data/moods/default/mean.png differ diff --git a/data/moods/default/moody.png b/data/moods/default/moody.png index 40df36c7e..8f4643177 100644 Binary files a/data/moods/default/moody.png and b/data/moods/default/moody.png differ diff --git a/data/moods/default/nervous.png b/data/moods/default/nervous.png index 1ed370826..70ff2f03f 100644 Binary files a/data/moods/default/nervous.png and b/data/moods/default/nervous.png differ diff --git a/data/moods/default/neutral.png b/data/moods/default/neutral.png index e5965336f..2892d4846 100644 Binary files a/data/moods/default/neutral.png and b/data/moods/default/neutral.png differ diff --git a/data/moods/default/offended.png b/data/moods/default/offended.png index d1d52dd91..0cb495046 100644 Binary files a/data/moods/default/offended.png and b/data/moods/default/offended.png differ diff --git a/data/moods/default/outraged.png b/data/moods/default/outraged.png index 75a203506..141380cb4 100644 Binary files a/data/moods/default/outraged.png and b/data/moods/default/outraged.png differ diff --git a/data/moods/default/playful.png b/data/moods/default/playful.png index 70459c27c..2c52f07f0 100644 Binary files a/data/moods/default/playful.png and b/data/moods/default/playful.png differ diff --git a/data/moods/default/proud.png b/data/moods/default/proud.png index 2e11ec6d7..788df04af 100644 Binary files a/data/moods/default/proud.png and b/data/moods/default/proud.png differ diff --git a/data/moods/default/relaxed.png b/data/moods/default/relaxed.png index 65093893e..1e596492a 100644 Binary files a/data/moods/default/relaxed.png and b/data/moods/default/relaxed.png differ diff --git a/data/moods/default/relieved.png b/data/moods/default/relieved.png index 05813ca03..9d0eb7884 100644 Binary files a/data/moods/default/relieved.png and b/data/moods/default/relieved.png differ diff --git a/data/moods/default/remorseful.png b/data/moods/default/remorseful.png index aba154338..b5d060453 100644 Binary files a/data/moods/default/remorseful.png and b/data/moods/default/remorseful.png differ diff --git a/data/moods/default/restless.png b/data/moods/default/restless.png index 4913c56ad..89276398f 100644 Binary files a/data/moods/default/restless.png and b/data/moods/default/restless.png differ diff --git a/data/moods/default/sad.png b/data/moods/default/sad.png index 439ade673..14006836c 100644 Binary files a/data/moods/default/sad.png and b/data/moods/default/sad.png differ diff --git a/data/moods/default/sarcastic.png b/data/moods/default/sarcastic.png index 4fd908209..5a28d210e 100644 Binary files a/data/moods/default/sarcastic.png and b/data/moods/default/sarcastic.png differ diff --git a/data/moods/default/satisfied.png b/data/moods/default/satisfied.png index 2083052b0..4ee971e44 100644 Binary files a/data/moods/default/satisfied.png and b/data/moods/default/satisfied.png differ diff --git a/data/moods/default/serious.png b/data/moods/default/serious.png index 76595f4c1..ae5fe589b 100644 Binary files a/data/moods/default/serious.png and b/data/moods/default/serious.png differ diff --git a/data/moods/default/shocked.png b/data/moods/default/shocked.png index 0b84ca9f0..3e335cffa 100644 Binary files a/data/moods/default/shocked.png and b/data/moods/default/shocked.png differ diff --git a/data/moods/default/shy.png b/data/moods/default/shy.png index ec350df98..9409f81df 100644 Binary files a/data/moods/default/shy.png and b/data/moods/default/shy.png differ diff --git a/data/moods/default/sick.png b/data/moods/default/sick.png index eac278a83..5e3b41ac9 100644 Binary files a/data/moods/default/sick.png and b/data/moods/default/sick.png differ diff --git a/data/moods/default/sleepy.png b/data/moods/default/sleepy.png index b5f274f77..47bed8847 100644 Binary files a/data/moods/default/sleepy.png and b/data/moods/default/sleepy.png differ diff --git a/data/moods/default/spontaneous.png b/data/moods/default/spontaneous.png index 0f441e279..75be43203 100644 Binary files a/data/moods/default/spontaneous.png and b/data/moods/default/spontaneous.png differ diff --git a/data/moods/default/stressed.png b/data/moods/default/stressed.png index 0f5bdda46..92b47782a 100644 Binary files a/data/moods/default/stressed.png and b/data/moods/default/stressed.png differ diff --git a/data/moods/default/strong.png b/data/moods/default/strong.png index 71dcbb901..044a1c83a 100644 Binary files a/data/moods/default/strong.png and b/data/moods/default/strong.png differ diff --git a/data/moods/default/surprised.png b/data/moods/default/surprised.png index 2edd5bafd..c1f5f1799 100644 Binary files a/data/moods/default/surprised.png and b/data/moods/default/surprised.png differ diff --git a/data/moods/default/thankful.png b/data/moods/default/thankful.png index 5a2c09eb1..e01ffe614 100644 Binary files a/data/moods/default/thankful.png and b/data/moods/default/thankful.png differ diff --git a/data/moods/default/thirsty.png b/data/moods/default/thirsty.png index c9ef23315..9b0fc962a 100644 Binary files a/data/moods/default/thirsty.png and b/data/moods/default/thirsty.png differ diff --git a/data/moods/default/tired.png b/data/moods/default/tired.png index fbcd77421..60bcc5b48 100644 Binary files a/data/moods/default/tired.png and b/data/moods/default/tired.png differ diff --git a/data/moods/default/undefined.png b/data/moods/default/undefined.png index 66666aaec..bc3d8b173 100644 Binary files a/data/moods/default/undefined.png and b/data/moods/default/undefined.png differ diff --git a/data/moods/default/weak.png b/data/moods/default/weak.png index 03f565a85..b353131a9 100644 Binary files a/data/moods/default/weak.png and b/data/moods/default/weak.png differ diff --git a/data/moods/default/worried.png b/data/moods/default/worried.png index ede0adc2f..5499458cc 100644 Binary files a/data/moods/default/worried.png and b/data/moods/default/worried.png differ diff --git a/src/common/pep.py b/src/common/pep.py index bc0d7198f..49698454b 100644 --- a/src/common/pep.py +++ b/src/common/pep.py @@ -133,6 +133,7 @@ ACTIVITIES = { 'having_lunch': _('Having Lunch')}, 'exercising': {'category': _('Exercising'), 'cycling': _('Cycling'), + 'dancing': _('Dancing'), 'hiking': _('Hiking'), 'jogging': _('Jogging'), 'playing_sports': _('Playing Sports'), @@ -151,16 +152,21 @@ ACTIVITIES = { 'inactive': {'category': _('Inactive'), 'day_off': _('Day Off'), 'hanging_out': _('Hanging out'), + 'hiding': _('Hiding'), 'on_vacation': _('On Vacation'), + 'praying': _('Praying'), 'scheduled_holiday': _('Scheduled Holiday'), - 'sleeping': _('Sleeping')}, + 'sleeping': _('Sleeping'), + 'thinking': _('Thinking')}, 'relaxing': {'category': _('Relaxing'), + 'fishing': _('Fishing'), 'gaming': _('Gaming'), 'going_out': _('Going out'), 'partying': _('Partying'), 'reading': _('Reading'), 'rehearsing': _('Rehearsing'), 'shopping': _('Shopping'), + 'smoking': _('Smoking'), 'socializing': _('Socializing'), 'sunbathing': _('Sunbathing'), 'watching_tv': _('Watching TV'),