From 72be2c49e00207d35618e4d899f6a80d1195520e Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Tue, 6 Mar 2012 11:51:11 +0100
Subject: [PATCH] [Jeff Bailes] updated strings
---
src/command_system/implementation/standard.py | 2 +-
src/common/config.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/command_system/implementation/standard.py b/src/command_system/implementation/standard.py
index 04741c398..34a0e3fea 100644
--- a/src/command_system/implementation/standard.py
+++ b/src/command_system/implementation/standard.py
@@ -127,7 +127,7 @@ class StandardCommonCommands(CommandContainer):
@command(raw=True, empty=True)
@doc(_("""
- Set current the status
+ Set the current the status
Status can be given as one of the following values: online, away,
chat, xa, dnd.
diff --git a/src/common/config.py b/src/common/config.py
index e6acc4a78..335e22fd8 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -169,7 +169,7 @@ class Config:
'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')],
'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened.')],
'restore_timeout': [opt_int, 60, _('How many minutes should last lines from previous conversation last.')],
- 'muc_restore_lines': [opt_int, 20, _('How many lines to request to server when entering a groupchat. -1 means no limit')],
+ 'muc_restore_lines': [opt_int, 20, _('How many lines to request from server when entering a groupchat. -1 means no limit')],
'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when a entering a groupchat. -1 means no limit')],
'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')],
'muc_autorejoin_on_kick': [opt_bool, False, _('Should autorejoin be activated when we are being kicked from a conference?')],
--
GitLab