copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: copyleftie:leftie-their
Branches Tags
copyleftie:v1.1.3-plural
copyleftie:leftie
copyleftie:leftie-their
copyleftie:v1.1.2-plural
copyleftie:master
..
compare: copyleftie:v1.1.3-plural
Branches Tags
copyleftie:leftie
copyleftie:leftie-their
copyleftie:v1.1.2-plural
copyleftie:v1.1.3-plural
copyleftie:master

No commits in common. "leftie-their" and "v1.1.3-plural" have entirely different histories.
leftie-the ... v1.1.3-plu

2 changed files with 7 additions and 39 deletions
Show Stats Expand all files Collapse all files

32
gajim/command_system/implementation/standard.py
View File

@ -79,38 +79,6 @@ class StandardCommonCommands(CommandContainer):
def me(self, action): def me(self, action):
self.send("/me %s" % action) self.send("/me %s" % action)
@command('kiss', raw=True, empty=True)
@doc(_("Send kiss (in the third person) to the current chat"))
def kisses(self, action):
if action:
self.send("/me kisses %s" % action)
else:
self.send("/me kisses")
@command('cuddle', raw=True, empty=True)
@doc(_("Send cuddles (in the third person) to the current chat"))
def cuddles(self, action):
if action:
self.send("/me cuddles %s" % action)
else:
self.send("/me cuddles")
@command('nuzzle','nuzl', raw=True, empty=True)
@doc(_("Send nuzzles (in the third person) to the current chat"))
def nuzzles(self, action):
if action:
self.send("/me nuzzles %s" % action)
else:
self.send("/me nuzzles")
@command('hug', raw=True, empty=True)
@doc(_("Send hugs (in the third person) to the current chat"))
def hugs(self, action):
if action:
self.send("/me hugs %s" % action)
else:
self.send("/me hugs")
@command('lastlog', overlap=True) @command('lastlog', overlap=True)
@doc(_("Show logged messages which mention given text")) @doc(_("Show logged messages which mention given text"))
def grep(self, text, limit=None): def grep(self, text, limit=None):

12
po/en_GB.po
View File

@ -1531,8 +1531,8 @@ msgstr "Subscription request has been sent"
#: gajim/roster_window.py:2081 #: gajim/roster_window.py:2081
#, python-format #, python-format
msgid "If \"%s\" accepts this request you will know their status." msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "If \"%s\" accepts this request you will know their status." msgstr "If \"%s\" accepts this request you will know his or her status."
#: gajim/roster_window.py:2095 #: gajim/roster_window.py:2095
#, fuzzy #, fuzzy
@ -2620,7 +2620,7 @@ msgstr "Authorisation accepted"
#: gajim/gui_interface.py:530 #: gajim/gui_interface.py:530
#, fuzzy, python-format #, fuzzy, python-format
msgid "The contact \"%s\" has authorized you to see their status." msgid "The contact \"%s\" has authorized you to see their status."
msgstr "The contact \"%s\" has authorised you to see their status." msgstr "The contact \"%s\" has authorised you to see his or her status."
#: gajim/gui_interface.py:538 #: gajim/gui_interface.py:538
#, python-format #, python-format
@ -4259,7 +4259,7 @@ msgid ""
"changes their status and/or their status message." "changes their status and/or their status message."
msgstr "" msgstr ""
"If False, Gajim will no longer print status line in chats when a contact " "If False, Gajim will no longer print status line in chats when a contact "
"changes their status and/or status message." "changes his or her status and/or status message."
#: gajim/common/config.py:239 #: gajim/common/config.py:239
#, fuzzy #, fuzzy
@ -4271,8 +4271,8 @@ msgid ""
"chat." "chat."
msgstr "" msgstr ""
"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no " "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
"longer print status line in groupchats when a member changes their " "longer print status line in groupchats when a member changes his or her "
"status and/or their status message. If \"all\" Gajim will print all " "status and/or his or her status message. If \"all\" Gajim will print all "
"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves " "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
"group chat." "group chat."