Merge Irssi 0.8.16-rc1

[silc.git] / apps / irssi / src / fe-text / module-formats.c

diff --git a/apps/irssi/src/fe-text/module-formats.c b/apps/irssi/src/fe-text/module-formats.c
index 79e9dc2bb716e6f5a671cf14cb5676ce8f16eed0..1d9050950c34021a63b35fa858c0a32014c2259f 100644 (file)
--- a/apps/irssi/src/fe-text/module-formats.c
+++ b/apps/irssi/src/fe-text/module-formats.c
@@ -13,9 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "module.h"
@@ -65,12 +65,17 @@ FORMAT_REC gui_text_formats[] =
        { "statusbar_info_item_footer", "", 0 },
        { "statusbar_info_item_name",  "%#         : $[35]0 $[9]1 $2", 3, { 0, 1, 0 } },
        { "statusbar_not_found", "Statusbar doesn't exist: $0", 1, { 0 } },
-       { "statusbar_not_found", "Statusbar doesn't exist: $0", 1, { 0 } },
        { "statusbar_item_not_found", "Statusbar item doesn't exist: $0", 1, { 0 } },
        { "statusbar_unknown_command", "Unknown statusbar command: $0", 1, { 0 } },
        { "statusbar_unknown_type", "Statusbar type must be 'window' or 'root'", 1, { 0 } },
        { "statusbar_unknown_placement", "Statusbar placement must be 'top' or 'bottom'", 1, { 0 } },
        { "statusbar_unknown_visibility", "Statusbar visibility must be 'always', 'active' or 'inactive'", 1, { 0 } },
 
+       /* ---- */
+       { NULL, "Pasting", 0 },
+
+       { "paste_warning", "Pasting $0 lines to $1. Press Ctrl-K if you wish to do this or Ctrl-C to cancel.", 2, { 1, 0 } },
+       { "paste_prompt", "Hit Ctrl-K to paste, Ctrl-C to abort?", 0 },
+
        { NULL, NULL, 0 }
 };