diff -Nru abiword-2.6.2/abiword/abiword.desktop abiword-2.6.4/abiword/abiword.desktop
--- abiword-2.6.2/abiword/abiword.desktop 2008-07-18 04:24:34.000000000 +0100
+++ abiword-2.6.4/abiword/abiword.desktop 2008-07-13 14:11:02.000000000 +0100
@@ -1,17 +1,16 @@
[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=AbiWord
Exec=abiword
Icon=abiword_48
Terminal=false
Type=Application
Categories=Application;Office;WordProcessor;GNOME;GTK;X-Red-Hat-Base;
StartupNotify=true
+Encoding=UTF-8
X-Desktop-File-Install-Version=0.9
MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;application/x-crossmark;application/docbook+xml;application/x-t602;application/vnd.oasis.opendocument.text;application/vnd.sun.xml.writer;application/vnd.stardivision.writer;text/vnd.wap.wml;application/wordperfect6;application/wordperfect5.1;
+Name=AbiWord
GenericName=Word Processor
-Comment=AbiWord Word Processor
+Comment=Compose, edit, and view documents
Name[de]=Textverarbeitung
Comment[de]=AbiWord Textverarbeitung
Name[nb]=Tekstbehandling
@@ -34,4 +33,3 @@
Comment[pl]=Edytor tekstu AbiWord
Name[ja]=AbiWord ワードプロセッサ
Comment[ja]=AbiWord ワードプロセッサ
-GenericName[en_US]=Word Processor
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/configure /tmp/qY2gb79Nml/abiword-2.6.4/abiword/configure
--- abiword-2.6.2/abiword/configure 2008-04-06 22:26:22.000000000 +0100
+++ abiword-2.6.4/abiword/configure 2008-07-13 14:12:32.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for abiword 2.6.2.
+# Generated by GNU Autoconf 2.61 for abiword 2.6.4.
#
# Report bugs to .
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='abiword'
PACKAGE_TARNAME='abiword'
-PACKAGE_VERSION='2.6.2'
-PACKAGE_STRING='abiword 2.6.2'
+PACKAGE_VERSION='2.6.4'
+PACKAGE_STRING='abiword 2.6.4'
PACKAGE_BUGREPORT='http://www.abisource.com/'
ac_unique_file="src/af/ev/xp/ev_Menu.h"
@@ -1447,7 +1447,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures abiword 2.6.2 to adapt to many kinds of systems.
+\`configure' configures abiword 2.6.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1517,7 +1517,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of abiword 2.6.2:";;
+ short | recursive ) echo "Configuration of abiword 2.6.4:";;
esac
cat <<\_ACEOF
@@ -1724,7 +1724,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-abiword configure 2.6.2
+abiword configure 2.6.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1738,7 +1738,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by abiword $as_me 2.6.2, which was
+It was created by abiword $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2429,7 +2429,7 @@
# Define the identity of the package.
PACKAGE='abiword'
- VERSION='2.6.2'
+ VERSION='2.6.4'
cat >>confdefs.h <<_ACEOF
@@ -17417,7 +17417,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by abiword $as_me 2.6.2, which was
+This file was extended by abiword $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17464,7 +17464,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-abiword config.status 2.6.2
+abiword config.status 2.6.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/configure.ac /tmp/qY2gb79Nml/abiword-2.6.4/abiword/configure.ac
--- abiword-2.6.2/abiword/configure.ac 2008-04-06 22:22:51.000000000 +0100
+++ abiword-2.6.4/abiword/configure.ac 2008-07-13 14:11:02.000000000 +0100
@@ -24,7 +24,7 @@
m4_define([abiword_version_major], [2])
m4_define([abiword_version_minor], [6])
-m4_define([abiword_version_micro], [2])
+m4_define([abiword_version_micro], [4])
m4_define([abiword_series], [abiword_version_major.abiword_version_minor])
m4_define([abiword_version], [abiword_version_major.abiword_version_minor.abiword_version_micro])
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/Makefile /tmp/qY2gb79Nml/abiword-2.6.4/abiword/Makefile
--- abiword-2.6.2/abiword/Makefile 2008-04-06 16:59:28.000000000 +0100
+++ abiword-2.6.4/abiword/Makefile 2008-07-13 14:11:02.000000000 +0100
@@ -109,9 +109,15 @@
distribution: compile canonical
$(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src distribution
+toolsplugins:
+ $(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src toolsplugins
+
disttools:
$(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src disttools
+impexpplugins:
+ $(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src impexpplugins
+
distimpexp:
$(MAKE) ABI_ROOT=$(ABI_ROOT) prefix=$(prefix) -C src distimpexp
##################################################################
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/po/abiword.pot /tmp/qY2gb79Nml/abiword-2.6.4/abiword/po/abiword.pot
--- abiword-2.6.2/abiword/po/abiword.pot 2008-07-18 04:24:34.000000000 +0100
+++ abiword-2.6.4/abiword/po/abiword.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,8256 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-07 01:06+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#. MENU_LABEL__BOGUS1__
-#. MENU_LABEL__BOGUS2__
-#. MENU_STATUSLINE__BOGUS1__
-#. MENU_STATUSLINE__BOGUS2__
-#. MENU_STATUSLINE_OPEN_TEMPLATE
-#. MENU_STATUSLINE_FILE
-#. MENU_STATUSLINE_EDIT
-#. MENU_STATUSLINE_VIEW
-#. MENU_STATUSLINE_VIEW_TOOLBARS
-#. MENU_STATUSLINE_INSERT
-#. MENU_STATUSLINE_FORMAT
-#. MENU_STATUSLINE_FMT
-#. MENU_STATUSLINE_TOOLS
-#. MENU_STATUSLINE_TOOLS_SPELLING
-#. MENU_STATUSLINE_ALIGN
-#. MENU_STATUSLINE_WINDOW
-#. MENU_STATUSLINE_HELP
-#: po/tmp/ap_String_Id.h.h:23
-msgid " "
-msgstr ""
-
-#. DLG_Styles_ErrNotTitle2
-#: po/tmp/ap_String_Id.h.h:25
-msgid ""
-" - Reserved. \n"
-" You cannot use this name. Choose Another \n"
-msgstr ""
-
-#. DLG_WordCount_Auto_Update
-#: po/tmp/ap_String_Id.h.h:27
-msgid " Auto Update"
-msgstr ""
-
-#. DLG_PageSetup_Percent
-#: po/tmp/ap_String_Id.h.h:29
-#, c-format
-msgid "% of normal size"
-msgstr ""
-
-#. MENU_LABEL_SPELL_SUGGEST_1
-#. MENU_LABEL_SPELL_SUGGEST_2
-#. MENU_LABEL_SPELL_SUGGEST_3
-#. MENU_LABEL_SPELL_SUGGEST_4
-#. MENU_LABEL_SPELL_SUGGEST_5
-#. MENU_LABEL_SPELL_SUGGEST_6
-#. MENU_LABEL_SPELL_SUGGEST_7
-#. MENU_LABEL_SPELL_SUGGEST_8
-#. MENU_LABEL_SPELL_SUGGEST_9
-#: po/tmp/ap_String_Id.h.h:39
-#, c-format
-msgid "%s"
-msgstr ""
-
-#. MSG_DlgNotImp
-#: po/tmp/ap_String_Id.h.h:41
-#, c-format
-msgid ""
-"%s not implemented yet.\n"
-"\n"
-"If you are a programmer, feel free to add code in %s, line %d\n"
-"and mail patches to:\n"
-"\n"
-"\tabiword-dev@abisource.com\n"
-"\n"
-"Otherwise, please be patient."
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT_1
-#. MENU_LABEL_VIEW_TB_1
-#. MENU_LABEL_WINDOW_1
-#: po/tmp/ap_String_Id.h.h:45
-#, c-format
-msgid "&1 %s"
-msgstr ""
-
-#. DLG_Tab_Radio_None
-#: po/tmp/ap_String_Id.h.h:47
-msgid "&1 None"
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT_2
-#. MENU_LABEL_VIEW_TB_2
-#. MENU_LABEL_WINDOW_2
-#: po/tmp/ap_String_Id.h.h:51
-#, c-format
-msgid "&2 %s"
-msgstr ""
-
-#. DLG_Tab_Radio_Dot
-#: po/tmp/ap_String_Id.h.h:53
-msgid "&2 .........."
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT_3
-#. MENU_LABEL_VIEW_TB_3
-#. MENU_LABEL_WINDOW_3
-#: po/tmp/ap_String_Id.h.h:57
-#, c-format
-msgid "&3 %s"
-msgstr ""
-
-#. DLG_Tab_Radio_Dash
-#: po/tmp/ap_String_Id.h.h:59
-msgid "&3 ----------"
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT_4
-#. MENU_LABEL_VIEW_TB_4
-#. MENU_LABEL_WINDOW_4
-#: po/tmp/ap_String_Id.h.h:63
-#, c-format
-msgid "&4 %s"
-msgstr ""
-
-#. DLG_Tab_Radio_Underline
-#: po/tmp/ap_String_Id.h.h:65
-msgid "&4 __________"
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT_5
-#. MENU_LABEL_WINDOW_5
-#: po/tmp/ap_String_Id.h.h:68
-#, c-format
-msgid "&5 %s"
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT_6
-#. MENU_LABEL_WINDOW_6
-#: po/tmp/ap_String_Id.h.h:71
-#, c-format
-msgid "&6 %s"
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT_7
-#. MENU_LABEL_WINDOW_7
-#: po/tmp/ap_String_Id.h.h:74
-#, c-format
-msgid "&7 %s"
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT_8
-#. MENU_LABEL_WINDOW_8
-#: po/tmp/ap_String_Id.h.h:77
-#, c-format
-msgid "&8 %s"
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT_9
-#. MENU_LABEL_WINDOW_9
-#: po/tmp/ap_String_Id.h.h:80
-#, c-format
-msgid "&9 %s"
-msgstr ""
-
-#. MENU_LABEL_HELP_ABOUT
-#: po/tmp/ap_String_Id.h.h:82
-#, c-format
-msgid "&About %s"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION
-#: po/tmp/ap_String_Id.h.h:84
-msgid "&Accept revision"
-msgstr ""
-
-#. DLG_Spell_AddToDict
-#. MENU_LABEL_SPELL_ADD
-#: po/tmp/ap_String_Id.h.h:87
-msgid "&Add"
-msgstr ""
-
-#. DLG_PageSetup_Adjust
-#: po/tmp/ap_String_Id.h.h:89
-msgid "&Adjust to:"
-msgstr ""
-
-#. MENU_LABEL_ALIGN
-#: po/tmp/ap_String_Id.h.h:91
-msgid "&Align"
-msgstr ""
-
-#. DLG_Options_Label_ViewAll
-#: po/tmp/ap_String_Id.h.h:93
-msgid "&All"
-msgstr ""
-
-#. DLG_ApplyButton
-#: po/tmp/ap_String_Id.h.h:95
-msgid "&Apply"
-msgstr ""
-
-#. DLG_Para_LabelAt
-#: po/tmp/ap_String_Id.h.h:97
-msgid "&At:"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_AUTOSPELL
-#: po/tmp/ap_String_Id.h.h:99
-msgid "&Auto Spellcheck"
-msgstr ""
-
-#. MENU_LABEL_TABLE_AUTOFIT
-#: po/tmp/ap_String_Id.h.h:101
-msgid "&Autofit Table"
-msgstr ""
-
-#. DLG_Options_Label_PrefsAutoSave
-#: po/tmp/ap_String_Id.h.h:103
-msgid "&Automatically save this Scheme"
-msgstr ""
-
-#. DLG_DateTime_AvailableFormats
-#: po/tmp/ap_String_Id.h.h:105
-msgid "&Available formats:"
-msgstr ""
-
-#. DLG_Para_LabelBefore
-#: po/tmp/ap_String_Id.h.h:107
-msgid "&Before:"
-msgstr ""
-
-#. MENU_LABEL_FMT_BOLD
-#: po/tmp/ap_String_Id.h.h:109
-msgid "&Bold"
-msgstr ""
-
-#. DLG_PageSetup_Bottom
-#: po/tmp/ap_String_Id.h.h:111
-msgid "&Bottom:"
-msgstr ""
-
-#. MENU_LABEL_INSERT_BREAK
-#: po/tmp/ap_String_Id.h.h:113
-msgid "&Break"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SELECT_CELL
-#: po/tmp/ap_String_Id.h.h:115
-msgid "&Cell"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERT_CELLS
-#. MENU_LABEL_TABLE_DELETE_CELLS
-#: po/tmp/ap_String_Id.h.h:118
-msgid "&Cells"
-msgstr ""
-
-#. MENU_LABEL_ALIGN_CENTER
-#: po/tmp/ap_String_Id.h.h:120
-msgid "&Center"
-msgstr ""
-
-#. DLG_Spell_Change
-#: po/tmp/ap_String_Id.h.h:122
-msgid "&Change"
-msgstr ""
-
-#. MENU_LABEL_INSERT_CLIPART
-#: po/tmp/ap_String_Id.h.h:124
-msgid "&Clip Art"
-msgstr ""
-
-#. DLG_CloseButton
-#. MENU_LABEL_FILE_CLOSE
-#: po/tmp/ap_String_Id.h.h:127
-msgid "&Close"
-msgstr ""
-
-#. MENU_LABEL_TABLE_DELETE_COLUMNS
-#: po/tmp/ap_String_Id.h.h:129
-msgid "&Column"
-msgstr ""
-
-#. DLG_Break_ColumnBreak
-#: po/tmp/ap_String_Id.h.h:131
-msgid "&Column break"
-msgstr ""
-
-#. MENU_LABEL_FMT_COLUMNS
-#: po/tmp/ap_String_Id.h.h:133
-msgid "&Columns"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS
-#: po/tmp/ap_String_Id.h.h:135
-msgid "&Compare documents"
-msgstr ""
-
-#. MENU_LABEL_EDIT_COPY
-#: po/tmp/ap_String_Id.h.h:137
-msgid "&Copy"
-msgstr ""
-
-#. MENU_LABEL_FMT_STYLE_DEFINE
-#: po/tmp/ap_String_Id.h.h:139
-msgid "&Create and Modify Styles"
-msgstr ""
-
-#. DLG_Options_Label_PrefsCurrentScheme
-#: po/tmp/ap_String_Id.h.h:141
-msgid "&Current Preferences Scheme"
-msgstr ""
-
-#. MENU_LABEL_TABLE_DELETE
-#: po/tmp/ap_String_Id.h.h:143
-msgid "&Delete"
-msgstr ""
-
-#. MENU_LABEL_INSERT_DELETE_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:145
-msgid "&Delete hyperlink"
-msgstr ""
-
-#. DLG_Options_Btn_CustomDict
-#: po/tmp/ap_String_Id.h.h:147
-msgid "&Dictionary..."
-msgstr ""
-
-#. MENU_LABEL_INSERT_DIRECTIONMARKER
-#: po/tmp/ap_String_Id.h.h:149
-msgid "&Direction Marker"
-msgstr ""
-
-#. MENU_LABEL_FMT_DOCUMENT
-#: po/tmp/ap_String_Id.h.h:151
-msgid "&Document"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_HISTORY
-#: po/tmp/ap_String_Id.h.h:153
-msgid "&Document History"
-msgstr ""
-
-#. MENU_LABEL_WINDOW
-#: po/tmp/ap_String_Id.h.h:155
-msgid "&Documents"
-msgstr ""
-
-#. DLG_Para_PushNoHyphenate
-#: po/tmp/ap_String_Id.h.h:157
-msgid "&Don't hyphenate"
-msgstr ""
-
-#. DLG_Options_Btn_IgnoreEdit
-#. MENU_LABEL_EDIT
-#: po/tmp/ap_String_Id.h.h:160
-msgid "&Edit"
-msgstr ""
-
-#. MENU_LABEL_INSERT_EDIT_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:162
-msgid "&Edit hyperlink"
-msgstr ""
-
-#. DLG_Options_Label_SmartQuotesEnable
-#: po/tmp/ap_String_Id.h.h:164
-msgid "&Enable smart quotes"
-msgstr ""
-
-#. MENU_LABEL_INSERT_ENDNOTE
-#: po/tmp/ap_String_Id.h.h:166
-msgid "&Endnote"
-msgstr ""
-
-#. DLG_Break_EvenPage
-#: po/tmp/ap_String_Id.h.h:168
-msgid "&Even page"
-msgstr ""
-
-#. MENU_LABEL_INSERT_FIELD
-#: po/tmp/ap_String_Id.h.h:170
-msgid "&Field"
-msgstr ""
-
-#. DLG_Field_Fields_No_Colon
-#: po/tmp/ap_String_Id.h.h:172
-msgid "&Fields"
-msgstr ""
-
-#. DLG_Field_Fields
-#: po/tmp/ap_String_Id.h.h:174
-msgid "&Fields:"
-msgstr ""
-
-#. MENU_LABEL_FILE
-#: po/tmp/ap_String_Id.h.h:176
-msgid "&File"
-msgstr ""
-
-#. DLG_Options_Label_FileExtension
-#: po/tmp/ap_String_Id.h.h:178
-msgid "&File extension:"
-msgstr ""
-
-#. MENU_LABEL_EDIT_FIND
-#: po/tmp/ap_String_Id.h.h:180
-msgid "&Find"
-msgstr ""
-
-#. DLG_FR_FindNextButton
-#: po/tmp/ap_String_Id.h.h:182
-msgid "&Find Next"
-msgstr ""
-
-#. MENU_LABEL_FMT_FONT
-#: po/tmp/ap_String_Id.h.h:184
-msgid "&Font"
-msgstr ""
-
-#. DLG_PageSetup_Footer
-#: po/tmp/ap_String_Id.h.h:186
-msgid "&Footer:"
-msgstr ""
-
-#. MENU_LABEL_TABLE_FORMAT
-#: po/tmp/ap_String_Id.h.h:188
-msgid "&Format Table"
-msgstr ""
-
-#. MENU_LABEL_EDIT_GOTO
-#: po/tmp/ap_String_Id.h.h:190
-msgid "&Go To"
-msgstr ""
-
-#. DLG_FormatTOC_HasHeading
-#: po/tmp/ap_String_Id.h.h:192
-msgid "&Has Heading"
-msgstr ""
-
-#. MENU_LABEL_VIEW_HEADFOOT
-#: po/tmp/ap_String_Id.h.h:194
-msgid "&Header and Footer"
-msgstr ""
-
-#. DLG_PageSetup_Header
-#: po/tmp/ap_String_Id.h.h:196
-msgid "&Header:"
-msgstr ""
-
-#. DLG_PageSetup_Height
-#: po/tmp/ap_String_Id.h.h:198
-msgid "&Height:"
-msgstr ""
-
-#. DLG_HelpButton
-#. MENU_LABEL_HELP
-#: po/tmp/ap_String_Id.h.h:201
-msgid "&Help"
-msgstr ""
-
-#. DLG_Options_Label_ViewHiddenText
-#: po/tmp/ap_String_Id.h.h:203
-msgid "&Hidden Text"
-msgstr ""
-
-#. DLG_Options_Label_SpellHighlightMisspelledWords
-#: po/tmp/ap_String_Id.h.h:205
-msgid "&Highlight misspelled words"
-msgstr ""
-
-#. MENU_LABEL_INSERT_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:207
-msgid "&Hyperlink"
-msgstr ""
-
-#. DLG_Spell_Ignore
-#: po/tmp/ap_String_Id.h.h:209
-msgid "&Ignore"
-msgstr ""
-
-#. MENU_LABEL_SPELL_IGNOREALL
-#: po/tmp/ap_String_Id.h.h:211
-msgid "&Ignore All"
-msgstr ""
-
-#. MENU_LABEL_FMT_IMAGE
-#. MENU_LABEL_FMT_POSIMAGE
-#: po/tmp/ap_String_Id.h.h:214
-msgid "&Image"
-msgstr ""
-
-#. MENU_LABEL_FILE_IMPORTSTYLES
-#: po/tmp/ap_String_Id.h.h:216
-msgid "&Import Styles"
-msgstr ""
-
-#. MENU_LABEL_WEB_WEBPREVIEW
-#: po/tmp/ap_String_Id.h.h:218
-msgid "&In web browser"
-msgstr ""
-
-#. DLG_FormatTOC_InheritLabel
-#: po/tmp/ap_String_Id.h.h:220
-msgid "&Inherit label"
-msgstr ""
-
-#. DLG_InsertButton
-#. MENU_LABEL_INSERT
-#. MENU_LABEL_TABLE_INSERT
-#. DLG_Insert
-#: po/tmp/ap_String_Id.h.h:224 po/tmp/xap_String_Id.h.h:15
-msgid "&Insert"
-msgstr ""
-
-#. DLG_Options_Label_AutoSaveInterval
-#: po/tmp/ap_String_Id.h.h:226
-msgid "&Interval:"
-msgstr ""
-
-#. MENU_LABEL_FMT_ITALIC
-#: po/tmp/ap_String_Id.h.h:228
-msgid "&Italic"
-msgstr ""
-
-#. MENU_LABEL_INSERT_GOTO_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:230
-msgid "&Jump to hyperlink"
-msgstr ""
-
-#. MENU_LABEL_ALIGN_JUSTIFY
-#: po/tmp/ap_String_Id.h.h:232
-msgid "&Justify"
-msgstr ""
-
-#. DLG_Para_PushKeepLinesTogether
-#: po/tmp/ap_String_Id.h.h:234
-msgid "&Keep lines together"
-msgstr ""
-
-#. MENU_LABEL_INSERT_DIRECTIONMARKER_LRM
-#: po/tmp/ap_String_Id.h.h:236
-msgid "&LRM"
-msgstr ""
-
-#. DLG_PageSetup_Landscape
-#: po/tmp/ap_String_Id.h.h:238
-msgid "&Landscape"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_LANGUAGE
-#: po/tmp/ap_String_Id.h.h:240
-msgid "&Language"
-msgstr ""
-
-#. MENU_LABEL_ALIGN_LEFT
-#: po/tmp/ap_String_Id.h.h:242
-msgid "&Left"
-msgstr ""
-
-#. MENU_LABEL_FMT_DIRECTION_DO_LTR
-#: po/tmp/ap_String_Id.h.h:244
-msgid "&Left-to-right text"
-msgstr ""
-
-#. DLG_Para_LabelLeft
-#. DLG_PageSetup_Left
-#: po/tmp/ap_String_Id.h.h:247
-msgid "&Left:"
-msgstr ""
-
-#. MENU_LABEL_VIEW_LOCK_TB_LAYOUT
-#: po/tmp/ap_String_Id.h.h:249
-msgid "&Lock layout"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_MAILMERGE
-#: po/tmp/ap_String_Id.h.h:251
-msgid "&Mail Merge"
-msgstr ""
-
-#. MENU_LABEL_INSERT_MAILMERGE
-#: po/tmp/ap_String_Id.h.h:253
-msgid "&Mail Merge Field"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_AUTO
-#: po/tmp/ap_String_Id.h.h:255
-msgid "&Maintain Full History"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_MARK
-#: po/tmp/ap_String_Id.h.h:257
-msgid "&Mark revisions while typing"
-msgstr ""
-
-#. DLG_FR_MatchCase
-#: po/tmp/ap_String_Id.h.h:259
-msgid "&Match case"
-msgstr ""
-
-#. MENU_LABEL_TABLE_MERGE_CELLS
-#: po/tmp/ap_String_Id.h.h:261
-msgid "&Merge Cells"
-msgstr ""
-
-#. MENU_LABEL_WINDOW_MORE
-#: po/tmp/ap_String_Id.h.h:263
-msgid "&More Documents"
-msgstr ""
-
-#. DLG_Goto_Label_Name
-#: po/tmp/ap_String_Id.h.h:265
-msgid "&Name:"
-msgstr ""
-
-#. MENU_LABEL_FILE_NEW
-#: po/tmp/ap_String_Id.h.h:267
-msgid "&New"
-msgstr ""
-
-#. MENU_LABEL_WINDOW_NEW
-#: po/tmp/ap_String_Id.h.h:269
-msgid "&New Window"
-msgstr ""
-
-#. MENU_LABEL_FILE_NEW_USING_TEMPLATE
-#: po/tmp/ap_String_Id.h.h:271
-msgid "&New using Template"
-msgstr ""
-
-#. DLG_Break_NextPage
-#: po/tmp/ap_String_Id.h.h:273
-msgid "&Next page"
-msgstr ""
-
-#. MENU_LABEL_VIEW_NORMAL
-#: po/tmp/ap_String_Id.h.h:275
-msgid "&Normal Layout"
-msgstr ""
-
-#. DLG_Goto_Label_Number
-#: po/tmp/ap_String_Id.h.h:277
-msgid "&Number:"
-msgstr ""
-
-#. DLG_FormatTOC_NumberingType
-#: po/tmp/ap_String_Id.h.h:279
-msgid "&Numbering type:"
-msgstr ""
-
-#. DLG_Break_OddPage
-#: po/tmp/ap_String_Id.h.h:281
-msgid "&Odd page"
-msgstr ""
-
-#. MENU_LABEL_FILE_OPEN
-#: po/tmp/ap_String_Id.h.h:283
-msgid "&Open"
-msgstr ""
-
-#. DLG_MailMerge_OpenFile
-#: po/tmp/ap_String_Id.h.h:285
-msgid "&Open File"
-msgstr ""
-
-#. MENU_LABEL_FMT_OVERLINE
-#: po/tmp/ap_String_Id.h.h:287
-msgid "&Overline"
-msgstr ""
-
-#. MENU_LABEL_VIEW_ZOOM_WIDTH
-#: po/tmp/ap_String_Id.h.h:289
-msgid "&Page Width"
-msgstr ""
-
-#. DLG_Break_PageBreak
-#: po/tmp/ap_String_Id.h.h:291
-msgid "&Page break"
-msgstr ""
-
-#. DLG_FormatTOC_PageNumbering
-#: po/tmp/ap_String_Id.h.h:293
-msgid "&Page numbering:"
-msgstr ""
-
-#. MENU_LABEL_FMT_PARAGRAPH
-#: po/tmp/ap_String_Id.h.h:295
-msgid "&Paragraph"
-msgstr ""
-
-#. MENU_LABEL_EDIT_PASTE
-#: po/tmp/ap_String_Id.h.h:297
-msgid "&Paste"
-msgstr ""
-
-#. MENU_LABEL_INSERT_GRAPHIC
-#: po/tmp/ap_String_Id.h.h:299
-msgid "&Picture"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_PLUGINS
-#: po/tmp/ap_String_Id.h.h:301
-msgid "&Plugins"
-msgstr ""
-
-#. DLG_PageSetup_Portrait
-#: po/tmp/ap_String_Id.h.h:303
-msgid "&Portrait"
-msgstr ""
-
-#. MENU_LABEL_FILE_PRINT
-#: po/tmp/ap_String_Id.h.h:305
-msgid "&Print"
-msgstr ""
-
-#. MENU_LABEL_VIEW_PRINT
-#: po/tmp/ap_String_Id.h.h:307
-msgid "&Print Layout"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_HISTORY_PURGE
-#: po/tmp/ap_String_Id.h.h:309
-msgid "&Purge History"
-msgstr ""
-
-#. MENU_LABEL_FILE_EXIT
-#: po/tmp/ap_String_Id.h.h:311
-msgid "&Quit"
-msgstr ""
-
-#. MENU_LABEL_INSERT_DIRECTIONMARKER_RLM
-#: po/tmp/ap_String_Id.h.h:313
-msgid "&RLM"
-msgstr ""
-
-#. MENU_LABEL_EDIT_REDO
-#: po/tmp/ap_String_Id.h.h:315
-msgid "&Redo"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION
-#: po/tmp/ap_String_Id.h.h:317
-msgid "&Reject revision"
-msgstr ""
-
-#. DLG_FR_ReplaceButton
-#: po/tmp/ap_String_Id.h.h:319
-msgid "&Replace"
-msgstr ""
-
-#. DLG_Options_Btn_IgnoreReset
-#: po/tmp/ap_String_Id.h.h:321
-msgid "&Reset"
-msgstr ""
-
-#. MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT
-#: po/tmp/ap_String_Id.h.h:323
-msgid "&Reset to default layout"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS
-#: po/tmp/ap_String_Id.h.h:325
-msgid "&Revisions"
-msgstr ""
-
-#. MENU_LABEL_ALIGN_RIGHT
-#: po/tmp/ap_String_Id.h.h:327
-msgid "&Right"
-msgstr ""
-
-#. MENU_LABEL_FMT_DIRECTION_DO_RTL
-#: po/tmp/ap_String_Id.h.h:329
-msgid "&Right-to-left text"
-msgstr ""
-
-#. DLG_Para_LabelRight
-#. DLG_PageSetup_Right
-#: po/tmp/ap_String_Id.h.h:332
-msgid "&Right:"
-msgstr ""
-
-#. MENU_LABEL_TABLE_DELETE_ROWS
-#. MENU_LABEL_TABLE_SELECT_ROW
-#: po/tmp/ap_String_Id.h.h:335
-msgid "&Row"
-msgstr ""
-
-#. DLG_Options_Label_ViewRuler
-#: po/tmp/ap_String_Id.h.h:337
-msgid "&Ruler"
-msgstr ""
-
-#. MENU_LABEL_FILE_SAVE
-#: po/tmp/ap_String_Id.h.h:339
-msgid "&Save"
-msgstr ""
-
-#. MENU_LABEL_FILE_SAVEIMAGE
-#: po/tmp/ap_String_Id.h.h:341
-msgid "&Save Image As"
-msgstr ""
-
-#. MENU_LABEL_WEB_SAVEASWEB
-#: po/tmp/ap_String_Id.h.h:343
-msgid "&Save web page"
-msgstr ""
-
-#. MENU_LABEL_HELP_SEARCH
-#: po/tmp/ap_String_Id.h.h:345
-msgid "&Search for Help"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SELECT
-#: po/tmp/ap_String_Id.h.h:347
-msgid "&Select"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL
-#: po/tmp/ap_String_Id.h.h:349
-msgid "&Select revision"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_HISTORY_SHOW
-#: po/tmp/ap_String_Id.h.h:351
-msgid "&Show History"
-msgstr ""
-
-#. MENU_LABEL_VIEW_STATUSBAR
-#: po/tmp/ap_String_Id.h.h:353
-msgid "&Show Status Bar"
-msgstr ""
-
-#. DLG_Para_LabelSpecial
-#: po/tmp/ap_String_Id.h.h:355
-msgid "&Special:"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_SPELLING
-#: po/tmp/ap_String_Id.h.h:357
-msgid "&Spelling"
-msgstr ""
-
-#. DLG_FormatTOC_StartAt
-#: po/tmp/ap_String_Id.h.h:359
-msgid "&Start at:"
-msgstr ""
-
-#. DLG_Options_Label_ViewStatusBar
-#: po/tmp/ap_String_Id.h.h:361
-msgid "&Status bar"
-msgstr ""
-
-#. MENU_LABEL_FMT_SUBSCRIPT
-#: po/tmp/ap_String_Id.h.h:363
-msgid "&Subscript"
-msgstr ""
-
-#. DLG_Para_PushSuppressLineNumbers
-#: po/tmp/ap_String_Id.h.h:365
-msgid "&Suppress line numbers"
-msgstr ""
-
-#. DLG_FormatTOC_TabLeader
-#: po/tmp/ap_String_Id.h.h:367
-msgid "&Tab leader:"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERT_TABLE
-#. MENU_LABEL_TABLE_DELETE_TABLE
-#. MENU_LABEL_TABLE_SELECT_TABLE
-#: po/tmp/ap_String_Id.h.h:371
-msgid "&Table"
-msgstr ""
-
-#. MENU_LABEL_FMT_TABS
-#: po/tmp/ap_String_Id.h.h:373
-msgid "&Tabs"
-msgstr ""
-
-#. DLG_Para_ButtonTabs
-#: po/tmp/ap_String_Id.h.h:375
-msgid "&Tabs..."
-msgstr ""
-
-#. MENU_LABEL_VIEW_TOOLBARS
-#: po/tmp/ap_String_Id.h.h:377
-msgid "&Toolbars"
-msgstr ""
-
-#. MENU_LABEL_TOOLS
-#: po/tmp/ap_String_Id.h.h:379
-msgid "&Tools"
-msgstr ""
-
-#. DLG_PageSetup_Top
-#: po/tmp/ap_String_Id.h.h:381
-msgid "&Top:"
-msgstr ""
-
-#. DLG_Field_Types_No_Colon
-#: po/tmp/ap_String_Id.h.h:383
-msgid "&Types"
-msgstr ""
-
-#. DLG_Field_Types
-#: po/tmp/ap_String_Id.h.h:385
-msgid "&Types:"
-msgstr ""
-
-#. MENU_LABEL_FMT_UNDERLINE
-#: po/tmp/ap_String_Id.h.h:387
-msgid "&Underline"
-msgstr ""
-
-#. MENU_LABEL_EDIT_UNDO
-#: po/tmp/ap_String_Id.h.h:389
-msgid "&Undo"
-msgstr ""
-
-#. DLG_Options_Label_ViewUnits
-#. DLG_PageSetup_Units
-#: po/tmp/ap_String_Id.h.h:392
-msgid "&Units:"
-msgstr ""
-
-#. MENU_LABEL_VIEW
-#. DLG_MW_ViewButton
-#: po/tmp/ap_String_Id.h.h:394 po/tmp/xap_String_Id.h.h:21
-msgid "&View"
-msgstr ""
-
-#. MENU_LABEL_VIEW_WEB
-#: po/tmp/ap_String_Id.h.h:396
-msgid "&Web Layout"
-msgstr ""
-
-#. MENU_LABEL_VIEW_ZOOM_WHOLE
-#: po/tmp/ap_String_Id.h.h:398
-msgid "&Whole Page"
-msgstr ""
-
-#. DLG_FR_WholeWord
-#: po/tmp/ap_String_Id.h.h:400
-msgid "&Whole word"
-msgstr ""
-
-#. DLG_Para_PushWidowOrphanControl
-#: po/tmp/ap_String_Id.h.h:402
-msgid "&Widow/Orphan control"
-msgstr ""
-
-#. DLG_PageSetup_Width
-#: po/tmp/ap_String_Id.h.h:404
-msgid "&Width:"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_WORDCOUNT
-#: po/tmp/ap_String_Id.h.h:406
-msgid "&Word Count"
-msgstr ""
-
-#. MENU_LABEL_VIEW_ZOOM_MENU
-#. MENU_LABEL_VIEW_ZOOM
-#: po/tmp/ap_String_Id.h.h:409
-msgid "&Zoom"
-msgstr ""
-
-#. DLG_ListRevisions_LevelZero
-#: po/tmp/ap_String_Id.h.h:411
-msgid "(All revisions visible)"
-msgstr ""
-
-#. DLG_Spell_NoSuggestions
-#: po/tmp/ap_String_Id.h.h:413
-msgid "(no spelling suggestions)"
-msgstr ""
-
-#. DLG_Para_SpecialNone
-#: po/tmp/ap_String_Id.h.h:415
-msgid "(none)"
-msgstr ""
-
-#. TOOLBAR_LABEL_1COLUMN
-#. TOOLBAR_STATUSLINE_1COLUMN
-#. TOOLBAR_TOOLTIP_1COLUMN
-#: po/tmp/ap_String_Id.h.h:419
-msgid "1 Column"
-msgstr ""
-
-#. TOOLBAR_LABEL_MIDDLE_SPACE
-#: po/tmp/ap_String_Id.h.h:421
-msgid "1.5 Spacing"
-msgstr ""
-
-#. DLG_Para_SpacingHalf
-#: po/tmp/ap_String_Id.h.h:423
-msgid "1.5 lines"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_MIDDLE_SPACE
-#. TOOLBAR_TOOLTIP_MIDDLE_SPACE
-#: po/tmp/ap_String_Id.h.h:426
-msgid "1.5 spacing"
-msgstr ""
-
-#. TOOLBAR_LABEL_PARA_12BEFORE
-#: po/tmp/ap_String_Id.h.h:428
-msgid "12 pt before"
-msgstr ""
-
-#. TOOLBAR_LABEL_2COLUMN
-#. TOOLBAR_STATUSLINE_2COLUMN
-#. TOOLBAR_TOOLTIP_2COLUMN
-#: po/tmp/ap_String_Id.h.h:432
-msgid "2 Columns"
-msgstr ""
-
-#. TOOLBAR_LABEL_3COLUMN
-#. TOOLBAR_STATUSLINE_3COLUMN
-#. TOOLBAR_TOOLTIP_3COLUMN
-#: po/tmp/ap_String_Id.h.h:436
-msgid "3 Columns"
-msgstr ""
-
-#. DLG_Goto_Btn_Prev
-#: po/tmp/ap_String_Id.h.h:438
-msgid "<< Prev"
-msgstr ""
-
-#. MSG_Exception
-#: po/tmp/ap_String_Id.h.h:440
-msgid ""
-"A fatal error has just occurred. Abiword is going to shutdown.\n"
-"The current document has been saved to disc with a \".saved\" extension."
-msgstr ""
-
-#. DLG_Options_Label_SpellSuggest
-#: po/tmp/ap_String_Id.h.h:442
-msgid "A&lways suggest corrections"
-msgstr ""
-
-#. FIELD_DateTime_AMPM
-#: po/tmp/ap_String_Id.h.h:444
-msgid "AM/PM"
-msgstr ""
-
-#. MSG_IE_BogusDocument
-#: po/tmp/ap_String_Id.h.h:446
-#, c-format
-msgid "AbiWord cannot open %s. It appears to be an invalid document"
-msgstr ""
-
-#. MSG_SpellSelectionDone
-#: po/tmp/ap_String_Id.h.h:448
-msgid "AbiWord finished checking the selection."
-msgstr ""
-
-#. DLG_FR_FinishedReplace
-#: po/tmp/ap_String_Id.h.h:450
-#, c-format
-msgid ""
-"AbiWord has finished its search of the document and has made %d replacements."
-msgstr ""
-
-#. DLG_FR_FinishedFind
-#: po/tmp/ap_String_Id.h.h:452
-msgid "AbiWord has finished searching the document."
-msgstr ""
-
-#. WINDOWS_COMCTL_WARNING
-#: po/tmp/ap_String_Id.h.h:454
-msgid ""
-"AbiWord is designed for a newer version of the system file COMCTL32.DLL\n"
-"than the one currently on your system. (COMCTL32.DLL version 4.72 or newer)\n"
-"A solution to this problem is explained in the FAQ on the AbiSource web "
-"site\n"
-"\n"
-"\thttp://www.abisource.com\n"
-"\n"
-"You can use the program, but the toolbar may be missing."
-msgstr ""
-
-#. WINDOWS_NEED_UNICOWS
-#: po/tmp/ap_String_Id.h.h:456
-#, c-format
-msgid ""
-"AbiWord needs the file %s.dll\n"
-"Please download and install it from http://www.microsoft.com/msdownload/"
-"platformsdk/sdkupdate/psdkredist.htm"
-msgstr ""
-
-#. MENU_LABEL_HELP_ABOUT_GNOMEOFFICE
-#: po/tmp/ap_String_Id.h.h:458
-msgid "About G&NOME Office"
-msgstr ""
-
-#. MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE
-#: po/tmp/ap_String_Id.h.h:460
-msgid "About the GNOME Office project"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION
-#: po/tmp/ap_String_Id.h.h:462
-msgid "Accept the suggested change"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_ADD_COLUMN
-#. TOOLBAR_TOOLTIP_ADD_COLUMN
-#: po/tmp/ap_String_Id.h.h:465
-msgid "Add a column to this table after the current column"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_ADD_ROW
-#. TOOLBAR_TOOLTIP_ADD_ROW
-#: po/tmp/ap_String_Id.h.h:468
-msgid "Add a row to this table after the current row"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_BORDERS
-#: po/tmp/ap_String_Id.h.h:470
-msgid "Add borders and shading to the selection"
-msgstr ""
-
-#. TOOLBAR_LABEL_ADD_COLUMN
-#: po/tmp/ap_String_Id.h.h:472
-msgid "Add column after"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_BULLETS
-#: po/tmp/ap_String_Id.h.h:474
-msgid "Add or modify bullets and numbering for selected paragraphs"
-msgstr ""
-
-#. TOOLBAR_LABEL_ADD_ROW
-#: po/tmp/ap_String_Id.h.h:476
-msgid "Add row after"
-msgstr ""
-
-#. MENU_STATUSLINE_SPELL_ADD
-#: po/tmp/ap_String_Id.h.h:478
-msgid "Add this word to the custom dictionary"
-msgstr ""
-
-#. DLG_Styles_ModifyTemplate
-#: po/tmp/ap_String_Id.h.h:480
-msgid "Add to template"
-msgstr ""
-
-#. DLG_Para_LabelAfter
-#: po/tmp/ap_String_Id.h.h:482
-msgid "Aft&er:"
-msgstr ""
-
-#. DLG_Para_LabelAlignment
-#: po/tmp/ap_String_Id.h.h:484
-msgid "Ali&gnment:"
-msgstr ""
-
-#. DLG_Tab_Label_Alignment
-#. DLG_PageNumbers_Alignment_No_Colon
-#: po/tmp/ap_String_Id.h.h:487
-msgid "Alignment"
-msgstr ""
-
-#. DLG_PageNumbers_Alignment
-#: po/tmp/ap_String_Id.h.h:489
-msgid "Alignment:"
-msgstr ""
-
-#. DLG_Styles_LBL_All
-#. DLG_UP_All
-#: po/tmp/ap_String_Id.h.h:491 po/tmp/xap_String_Id.h.h:51
-msgid "All"
-msgstr ""
-
-#. DLG_Options_Label_CheckAllowCustomToolbars
-#: po/tmp/ap_String_Id.h.h:493
-msgid "Allow Custom Toolbars"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_LOCKSTYLES
-#: po/tmp/ap_String_Id.h.h:495
-msgid "Allow formatting using styles only"
-msgstr ""
-
-#. DLG_Options_Label_CheckWhiteForTransparent
-#: po/tmp/ap_String_Id.h.h:497
-msgid "Allow screen colors other than white"
-msgstr ""
-
-#. MENU_LABEL_INSERT_ANNOTATION
-#: po/tmp/ap_String_Id.h.h:499
-msgid "Annotation"
-msgstr ""
-
-#. FIELD_Application
-#: po/tmp/ap_String_Id.h.h:501
-msgid "Application"
-msgstr ""
-
-#. DLG_Options_Label_AppStartup
-#: po/tmp/ap_String_Id.h.h:503
-msgid "Application Startup"
-msgstr ""
-
-#. DLG_Options_Btn_Apply
-#. DLG_Apply
-#: po/tmp/ap_String_Id.h.h:505 po/tmp/xap_String_Id.h.h:63
-msgid "Apply"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_FMTPAINTER
-#. TOOLBAR_TOOLTIP_FMTPAINTER
-#: po/tmp/ap_String_Id.h.h:508
-msgid "Apply the previously copied paragraph formatting onto the selected text"
-msgstr ""
-
-#. DLG_Lists_Apply_Current
-#: po/tmp/ap_String_Id.h.h:510
-msgid "Apply to Current List"
-msgstr ""
-
-#. DLG_FormatTable_Apply_To
-#: po/tmp/ap_String_Id.h.h:512
-msgid "Apply to:"
-msgstr ""
-
-#. DLG_Lists_Arabic_List
-#: po/tmp/ap_String_Id.h.h:514
-msgid "Arabic List"
-msgstr ""
-
-#. MSG_AutoRevisionOffWarning
-#: po/tmp/ap_String_Id.h.h:516
-msgid ""
-"Are you sure you do not want to maintain full history record? If you "
-"proceed, you will not be able to restore earlier versions of this document."
-msgstr ""
-
-#. DLG_Para_SpacingAtLeast
-#: po/tmp/ap_String_Id.h.h:518
-msgid "At least"
-msgstr ""
-
-#. DLG_Lists_Resume
-#: po/tmp/ap_String_Id.h.h:520
-msgid "Attach to Previous List"
-msgstr ""
-
-#. DLG_MetaData_Author_LBL
-#. DLG_PLUGIN_MANAGER_AUTHOR
-#: po/tmp/ap_String_Id.h.h:522 po/tmp/xap_String_Id.h.h:85
-msgid "Author:"
-msgstr ""
-
-#. DLG_Options_Label_AutoSaveUnderline
-#: po/tmp/ap_String_Id.h.h:524
-msgid "Auto &Save"
-msgstr ""
-
-#. DLG_Options_Label_AutoSaveCurrent
-#: po/tmp/ap_String_Id.h.h:526
-msgid "Auto &save current file every"
-msgstr ""
-
-#. DLG_Options_Label_AutoSave
-#: po/tmp/ap_String_Id.h.h:528
-msgid "Auto Save"
-msgstr ""
-
-#. DLG_Options_Label_SpellAutoReplace
-#: po/tmp/ap_String_Id.h.h:530
-msgid "Auto replace misspelled words"
-msgstr ""
-
-#. DLG_InsertTable_AutoFit_Capital
-#: po/tmp/ap_String_Id.h.h:532
-msgid "AutoFit Behavior"
-msgstr ""
-
-#. DLG_InsertTable_AutoFit
-#: po/tmp/ap_String_Id.h.h:534
-msgid "AutoFit behavior"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_AUTOFIT
-#: po/tmp/ap_String_Id.h.h:536
-msgid "Autofit Table"
-msgstr ""
-
-#. DLG_Options_Label_Grammar
-#: po/tmp/ap_String_Id.h.h:538
-msgid "Automatic Grammar Checking"
-msgstr ""
-
-#. DLG_InsertTable_AutoColSize
-#: po/tmp/ap_String_Id.h.h:540
-msgid "Automatic column size"
-msgstr ""
-
-#. DLG_Options_Label_CheckAutoLoadPlugins
-#: po/tmp/ap_String_Id.h.h:542
-msgid "Automatically load all plugins found"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_AUTOSPELL
-#: po/tmp/ap_String_Id.h.h:544
-msgid "Automatically spell-check the document"
-msgstr ""
-
-#. DLG_Styles_ModifyAutomatic
-#: po/tmp/ap_String_Id.h.h:546
-msgid "Automatically update"
-msgstr ""
-
-#. MSG_AutoMerge
-#: po/tmp/ap_String_Id.h.h:548
-msgid "Automerge"
-msgstr ""
-
-#. DLG_MailMerge_AvailableFields
-#: po/tmp/ap_String_Id.h.h:550
-msgid "Available Fields"
-msgstr ""
-
-#. DLG_DateTime_AvailableFormats_Capital
-#: po/tmp/ap_String_Id.h.h:552
-msgid "Available Formats"
-msgstr ""
-
-#. DLG_Styles_Available
-#: po/tmp/ap_String_Id.h.h:554
-msgid "Available Styles"
-msgstr ""
-
-#. DLG_Para_LabelBy
-#: po/tmp/ap_String_Id.h.h:556
-msgid "B&y:"
-msgstr ""
-
-#. DLG_FormatFrame_Background
-#. DLG_FormatTable_Background
-#: po/tmp/ap_String_Id.h.h:559
-msgid "Background"
-msgstr ""
-
-#. DLG_FormatFrame_Background_Color
-#. DLG_FormatTable_Background_Color
-#: po/tmp/ap_String_Id.h.h:562
-msgid "Background color:"
-msgstr ""
-
-#. DLG_Tab_Radio_Bar
-#: po/tmp/ap_String_Id.h.h:564
-msgid "Bar"
-msgstr ""
-
-#. TabToggleBarTab
-#: po/tmp/ap_String_Id.h.h:566
-msgid "Bar Tab"
-msgstr ""
-
-#. DLG_Styles_ModifyBasedOn
-#: po/tmp/ap_String_Id.h.h:568
-msgid "Based On:"
-msgstr ""
-
-#. DLG_Options_Label_BiDiOptions
-#: po/tmp/ap_String_Id.h.h:570
-msgid "Bi-Directional Options"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_BOLD
-#. TOOLBAR_STATUSLINE_FMT_BOLD
-#. TOOLBAR_TOOLTIP_FMT_BOLD
-#. DLG_UFS_StyleBold
-#: po/tmp/ap_String_Id.h.h:574 po/tmp/xap_String_Id.h.h:119
-msgid "Bold"
-msgstr ""
-
-#. MENU_LABEL_INSERT_BOOKMARK
-#: po/tmp/ap_String_Id.h.h:576
-msgid "Boo&kmark"
-msgstr ""
-
-#. DLG_Goto_Target_Bookmark
-#: po/tmp/ap_String_Id.h.h:578
-msgid "Bookmark"
-msgstr ""
-
-#. MSG_BookmarkNotFound
-#: po/tmp/ap_String_Id.h.h:580
-#, c-format
-msgid "Bookmark \"%s\" was not found in this document."
-msgstr ""
-
-#. DLG_FormatFrame_Border_Color
-#. DLG_FormatTable_Border_Color
-#: po/tmp/ap_String_Id.h.h:583
-msgid "Border color:"
-msgstr ""
-
-#. DLG_FormatFrame_Borders
-#. DLG_FormatTable_Borders
-#: po/tmp/ap_String_Id.h.h:586
-msgid "Borders"
-msgstr ""
-
-#. MENU_LABEL_FMT_BORDERS
-#: po/tmp/ap_String_Id.h.h:588
-msgid "Borders and Shading"
-msgstr ""
-
-#. BottomMarginStatus
-#: po/tmp/ap_String_Id.h.h:590
-#, c-format
-msgid "Bottom Margin [%s]"
-msgstr ""
-
-#. MENU_LABEL_FMT_BOTTOMLINE
-#. TOOLBAR_LABEL_FMT_BOTTOMLINE
-#. TOOLBAR_STATUSLINE_FMT_BOTTOMLINE
-#. TOOLBAR_TOOLTIP_FMT_BOTTOMLINE
-#. DLG_UFS_BottomlineCheck
-#: po/tmp/ap_String_Id.h.h:595 po/tmp/xap_String_Id.h.h:123
-msgid "Bottomline"
-msgstr ""
-
-#. DLG_Lists_Box_List
-#. STYLE_BOXLIST
-#: po/tmp/ap_String_Id.h.h:597 po/tmp/xap_String_Id.h.h:125
-msgid "Box List"
-msgstr ""
-
-#. FIELD_Application_BuildId
-#: po/tmp/ap_String_Id.h.h:599
-msgid "Build Id."
-msgstr ""
-
-#. FIELD_Application_Options
-#: po/tmp/ap_String_Id.h.h:601
-msgid "Build Options"
-msgstr ""
-
-#. FIELD_Application_Target
-#: po/tmp/ap_String_Id.h.h:603
-msgid "Build Target"
-msgstr ""
-
-#. DLG_Lists_Type_bullet
-#: po/tmp/ap_String_Id.h.h:605
-msgid "Bullet"
-msgstr ""
-
-#. DLG_Lists_Bullet_List
-#. STYLE_BULLETLIST
-#: po/tmp/ap_String_Id.h.h:607 po/tmp/xap_String_Id.h.h:133
-msgid "Bullet List"
-msgstr ""
-
-#. TOOLBAR_LABEL_LISTS_BULLETS
-#. TOOLBAR_STATUSLINE_LISTS_BULLETS
-#. TOOLBAR_TOOLTIP_LISTS_BULLETS
-#: po/tmp/ap_String_Id.h.h:611
-msgid "Bullets"
-msgstr ""
-
-#. MENU_LABEL_FMT_BULLETS
-#: po/tmp/ap_String_Id.h.h:613
-msgid "Bullets and &Numbering"
-msgstr ""
-
-#. DLG_Options_Label_Look
-#: po/tmp/ap_String_Id.h.h:615
-msgid "Button Style"
-msgstr ""
-
-#. MENU_LABEL_FMT_TOGGLECASE
-#: po/tmp/ap_String_Id.h.h:617
-msgid "C&hange Case"
-msgstr ""
-
-#. MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION
-#: po/tmp/ap_String_Id.h.h:619
-msgid "C&opy hyperlink location"
-msgstr ""
-
-#. MENU_LABEL_HELP_CREDITS
-#: po/tmp/ap_String_Id.h.h:621
-msgid "C&redits"
-msgstr ""
-
-#. MSG_NoBreakInsideTable
-#: po/tmp/ap_String_Id.h.h:623
-msgid "Can not insert a Break inside a table"
-msgstr ""
-
-#. MSG_NoBreakInsideFrame
-#: po/tmp/ap_String_Id.h.h:625
-msgid "Can not insert a Break inside a text box"
-msgstr ""
-
-#. DLG_Styles_ErrStyleCantDelete
-#: po/tmp/ap_String_Id.h.h:627
-msgid "Cannot delete this style"
-msgstr ""
-
-#. DLG_Styles_ErrStyleBuiltin
-#: po/tmp/ap_String_Id.h.h:629
-msgid "Cannot modify a builtin style"
-msgstr ""
-
-#. PRINT_CANNOTSTARTPRINTJOB
-#: po/tmp/ap_String_Id.h.h:631
-msgid "Cannot start print job"
-msgstr ""
-
-#. DLG_MetaData_Category_LBL
-#: po/tmp/ap_String_Id.h.h:633
-msgid "Category:"
-msgstr ""
-
-#. DLG_Tab_Radio_Center
-#. DLG_PageNumbers_Center
-#. TOOLBAR_LABEL_ALIGN_CENTER
-#: po/tmp/ap_String_Id.h.h:637
-msgid "Center"
-msgstr ""
-
-#. TabToggleCenterTab
-#: po/tmp/ap_String_Id.h.h:639
-msgid "Center Tab"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_ALIGN_CENTER
-#. TOOLBAR_TOOLTIP_ALIGN_CENTER
-#: po/tmp/ap_String_Id.h.h:642
-msgid "Center alignment"
-msgstr ""
-
-#. MENU_STATUSLINE_ALIGN_CENTER
-#: po/tmp/ap_String_Id.h.h:644
-msgid "Center-align the paragraph"
-msgstr ""
-
-#. DLG_Para_AlignCentered
-#: po/tmp/ap_String_Id.h.h:646
-msgid "Centered"
-msgstr ""
-
-#. DLG_Spell_ChangeTo
-#: po/tmp/ap_String_Id.h.h:648
-msgid "Change &to:"
-msgstr ""
-
-#. DLG_Spell_ChangeAll
-#: po/tmp/ap_String_Id.h.h:650
-msgid "Change A&ll"
-msgstr ""
-
-#. DLG_Background_Title
-#: po/tmp/ap_String_Id.h.h:652
-msgid "Change Background Color"
-msgstr ""
-
-#. DLG_ToggleCase_Title
-#: po/tmp/ap_String_Id.h.h:654
-msgid "Change Case"
-msgstr ""
-
-#. DLG_Lists_Cur_Change_Start
-#: po/tmp/ap_String_Id.h.h:656
-msgid ""
-"Change Current \n"
-"List"
-msgstr ""
-
-#. DLG_Background_TitleHighlight
-#: po/tmp/ap_String_Id.h.h:658
-msgid "Change Highlight Color"
-msgstr ""
-
-#. DLG_FormatTOC_ChangeStyle
-#: po/tmp/ap_String_Id.h.h:660
-msgid "Change Style"
-msgstr ""
-
-#. DLG_Background_TitleFore
-#: po/tmp/ap_String_Id.h.h:662
-msgid "Change Text Color"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_DIRECTION
-#: po/tmp/ap_String_Id.h.h:664
-msgid "Change directional properties of text"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_FMT_DOM_DIRECTION
-#. TOOLBAR_TOOLTIP_FMT_DOM_DIRECTION
-#: po/tmp/ap_String_Id.h.h:667
-msgid "Change dominant direction of paragraph"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_TOGGLECASE
-#: po/tmp/ap_String_Id.h.h:669
-msgid "Change the case of the selected text"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_FONT
-#: po/tmp/ap_String_Id.h.h:671
-msgid "Change the font of the selected text"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_PARAGRAPH
-#: po/tmp/ap_String_Id.h.h:673
-msgid "Change the format of the selected paragraph"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_LANGUAGE
-#. MENU_STATUSLINE_TOOLS_LANGUAGE
-#: po/tmp/ap_String_Id.h.h:676
-msgid "Change the language of the selected text"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_COLUMNS
-#: po/tmp/ap_String_Id.h.h:678
-msgid "Change the number of columns"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_PAGESETUP
-#: po/tmp/ap_String_Id.h.h:680
-msgid "Change the printing options"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_FRAME
-#: po/tmp/ap_String_Id.h.h:682
-msgid "Change the properties of the Text Box"
-msgstr ""
-
-#. MENU_STATUSLINE_SPELL_SUGGEST_1
-#. MENU_STATUSLINE_SPELL_SUGGEST_2
-#. MENU_STATUSLINE_SPELL_SUGGEST_3
-#. MENU_STATUSLINE_SPELL_SUGGEST_4
-#. MENU_STATUSLINE_SPELL_SUGGEST_5
-#. MENU_STATUSLINE_SPELL_SUGGEST_6
-#. MENU_STATUSLINE_SPELL_SUGGEST_7
-#. MENU_STATUSLINE_SPELL_SUGGEST_8
-#. MENU_STATUSLINE_SPELL_SUGGEST_9
-#: po/tmp/ap_String_Id.h.h:692
-msgid "Change to this suggested spelling"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_BACKGROUND
-#: po/tmp/ap_String_Id.h.h:694
-msgid "Change your document's page background"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR
-#: po/tmp/ap_String_Id.h.h:696
-msgid "Change your document's page color"
-msgstr ""
-
-#. DLG_Styles_ModifyCharacter
-#: po/tmp/ap_String_Id.h.h:698
-msgid "Character"
-msgstr ""
-
-#. FIELD_Numbers_CharCount
-#: po/tmp/ap_String_Id.h.h:700
-msgid "Character Count"
-msgstr ""
-
-#. FIELD_Numbers_NbspCount
-#: po/tmp/ap_String_Id.h.h:702
-msgid "Character Count (w/o spaces)"
-msgstr ""
-
-#. DLG_Styles_CharPrev
-#: po/tmp/ap_String_Id.h.h:704
-msgid "Character Preview"
-msgstr ""
-
-#. DLG_WordCount_Characters_No
-#: po/tmp/ap_String_Id.h.h:706
-msgid "Characters (no spaces):"
-msgstr ""
-
-#. DLG_WordCount_Characters_Sp
-#: po/tmp/ap_String_Id.h.h:708
-msgid "Characters (with spaces):"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_SPELL
-#: po/tmp/ap_String_Id.h.h:710
-msgid "Check &Spelling"
-msgstr ""
-
-#. DLG_Options_Label_GrammarCheck
-#: po/tmp/ap_String_Id.h.h:712
-msgid "Check &grammar as you type"
-msgstr ""
-
-#. MENU_LABEL_HELP_CHECKVER
-#: po/tmp/ap_String_Id.h.h:714
-msgid "Check for &Updates"
-msgstr ""
-
-#. MENU_STATUSLINE_HELP_CHECKVER
-#: po/tmp/ap_String_Id.h.h:716
-msgid "Check online for newer versions of AbiWord"
-msgstr ""
-
-#. DLG_Options_Label_SpellCheckAsType
-#: po/tmp/ap_String_Id.h.h:718
-msgid "Check s&pelling as you type"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_SPELL
-#: po/tmp/ap_String_Id.h.h:720
-msgid "Check the document for incorrect spelling"
-msgstr ""
-
-#. DLG_NEW_Choose
-#: po/tmp/ap_String_Id.h.h:722
-msgid "Choose"
-msgstr ""
-
-#. DLG_Options_Label_ChooseForTransparent
-#: po/tmp/ap_String_Id.h.h:724
-msgid "Choose Screen Color"
-msgstr ""
-
-#. DLG_Options_Label_ColorChooserLabel
-#: po/tmp/ap_String_Id.h.h:726
-msgid "Choose screen color for AbiWord"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL
-#: po/tmp/ap_String_Id.h.h:728
-msgid "Choose which revision you wish to view"
-msgstr ""
-
-#. DLG_Goto_Label_Help
-#: po/tmp/ap_String_Id.h.h:730
-msgid ""
-"Choose your target in the left side.\n"
-"If you want to use the \"Go To\" button, just fill the Number Entry with the "
-"desired number. You can use + and - to perform relative movement.\tI.e., if "
-"you write \"+2\" and you select \"Line\", the \"Go To\" will go 2 lines "
-"below your current position."
-msgstr ""
-
-#. MENU_LABEL_EDIT_CLEAR
-#: po/tmp/ap_String_Id.h.h:732
-msgid "Cle&ar"
-msgstr ""
-
-#. DLG_Tab_Button_Clear
-#: po/tmp/ap_String_Id.h.h:734
-msgid "Clear"
-msgstr ""
-
-#. DLG_Tab_Button_ClearAll
-#: po/tmp/ap_String_Id.h.h:736
-msgid "Clear &All"
-msgstr ""
-
-#. DLG_Background_ClearClr
-#: po/tmp/ap_String_Id.h.h:738
-msgid "Clear Background Color"
-msgstr ""
-
-#. DLG_Background_ClearHighlight
-#: po/tmp/ap_String_Id.h.h:740
-msgid "Clear Highlight Color"
-msgstr ""
-
-#. MSG_QueryExit
-#: po/tmp/ap_String_Id.h.h:742
-msgid "Close all windows and exit?"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_EXIT
-#: po/tmp/ap_String_Id.h.h:744
-msgid "Close all windows in the application and exit"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_CLOSE
-#: po/tmp/ap_String_Id.h.h:746
-msgid "Close the document"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SELECT_COLUMN
-#: po/tmp/ap_String_Id.h.h:748
-msgid "Co&lumn"
-msgstr ""
-
-#. DLG_FormatFrame_Color
-#. DLG_FormatTable_Color
-#. DLG_UFS_ColorLabel
-#: po/tmp/ap_String_Id.h.h:751 po/tmp/xap_String_Id.h.h:191
-msgid "Color:"
-msgstr ""
-
-#. DLG_FormatTable_Apply_To_Column
-#: po/tmp/ap_String_Id.h.h:753
-msgid "Column"
-msgstr ""
-
-#. ColumnGapStatus
-#: po/tmp/ap_String_Id.h.h:755
-#, c-format
-msgid "Column Gap [%s]"
-msgstr ""
-
-#. ColumnStatus
-#: po/tmp/ap_String_Id.h.h:757
-#, c-format
-msgid "Column [%d]"
-msgstr ""
-
-#. DLG_Column_ColumnTitle
-#: po/tmp/ap_String_Id.h.h:759
-msgid "Columns"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERT_COLUMNS_BEFORE
-#: po/tmp/ap_String_Id.h.h:761
-msgid "Columns &Left"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERT_COLUMNS_AFTER
-#: po/tmp/ap_String_Id.h.h:763
-msgid "Columns &Right"
-msgstr ""
-
-#. DLG_ListRevisions_Column3Label
-#: po/tmp/ap_String_Id.h.h:765
-msgid "Comment"
-msgstr ""
-
-#. DLG_MarkRevisions_Comment2Label
-#: po/tmp/ap_String_Id.h.h:767
-msgid "Comment to be associated with the revision:"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS
-#: po/tmp/ap_String_Id.h.h:769
-msgid "Compare active document to another document"
-msgstr ""
-
-#. FIELD_Application_CompileDate
-#: po/tmp/ap_String_Id.h.h:771
-msgid "Compile Date"
-msgstr ""
-
-#. FIELD_Application_CompileTime
-#: po/tmp/ap_String_Id.h.h:773
-msgid "Compile Time"
-msgstr ""
-
-#. DLG_Break_Continuous
-#: po/tmp/ap_String_Id.h.h:775
-msgid "Con&tinuous"
-msgstr ""
-
-#. TOC_TocHeading
-#: po/tmp/ap_String_Id.h.h:777
-msgid "Contents"
-msgstr ""
-
-#. DLG_MarkRevisions_Check1Label
-#: po/tmp/ap_String_Id.h.h:779
-#, c-format
-msgid "Continue previous revision (number %d)"
-msgstr ""
-
-#. FIELD_Document_Contributor
-#: po/tmp/ap_String_Id.h.h:781
-msgid "Contributor"
-msgstr ""
-
-#. DLG_MetaData_CoAuthor_LBL
-#: po/tmp/ap_String_Id.h.h:783
-msgid "Contributor(s):"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_TEXTTOTABLE
-#: po/tmp/ap_String_Id.h.h:785
-msgid "Convert Selected Text to a Table"
-msgstr ""
-
-#. MENU_LABEL_TABLE_TABLETOTEXT
-#: po/tmp/ap_String_Id.h.h:787
-msgid "Convert Table to Text"
-msgstr ""
-
-#. MENU_LABEL_TABLE_TEXTTOTABLE
-#: po/tmp/ap_String_Id.h.h:789
-msgid "Convert Text to Table"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_TABLETOTEXT
-#: po/tmp/ap_String_Id.h.h:791
-msgid "Convert from a Table to Text"
-msgstr ""
-
-#. TOOLBAR_LABEL_EDIT_COPY
-#. TOOLBAR_STATUSLINE_EDIT_COPY
-#. TOOLBAR_TOOLTIP_EDIT_COPY
-#: po/tmp/ap_String_Id.h.h:795
-msgid "Copy"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_COPYEMBED
-#: po/tmp/ap_String_Id.h.h:797
-msgid "Copy Embedded Object"
-msgstr ""
-
-#. MENU_LABEL_EDIT_COPYIMAGE
-#: po/tmp/ap_String_Id.h.h:799
-msgid "Copy Image"
-msgstr ""
-
-#. MENU_LABEL_EDIT_COPYEMBED
-#: po/tmp/ap_String_Id.h.h:801
-msgid "Copy Object"
-msgstr ""
-
-#. MENU_LABEL_EDIT_COPY_FRAME
-#: po/tmp/ap_String_Id.h.h:803
-msgid "Copy Text Box"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION
-#: po/tmp/ap_String_Id.h.h:805
-msgid "Copy hyperlink location"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_COPY_FRAME
-#: po/tmp/ap_String_Id.h.h:807
-msgid "Copy the Text Box to the clipboard"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_CUT_FRAME
-#: po/tmp/ap_String_Id.h.h:809
-msgid "Copy the Text Box to the clipboard then remove it"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_COPY
-#: po/tmp/ap_String_Id.h.h:811
-msgid "Copy the selection and put it on the Clipboard"
-msgstr ""
-
-#. MSG_IE_CouldNotOpen
-#: po/tmp/ap_String_Id.h.h:813
-#, c-format
-msgid "Could not open file %s for writing"
-msgstr ""
-
-#. MSG_OpenFailed
-#: po/tmp/ap_String_Id.h.h:815
-#, c-format
-msgid "Could not open file %s."
-msgstr ""
-
-#. MSG_IE_CouldNotWrite
-#: po/tmp/ap_String_Id.h.h:817
-#, c-format
-msgid "Could not write to file %s"
-msgstr ""
-
-#. MSG_SaveFailed
-#: po/tmp/ap_String_Id.h.h:819
-#, c-format
-msgid "Could not write to the file %s."
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_WORDCOUNT
-#: po/tmp/ap_String_Id.h.h:821
-msgid "Count the number of words in the document"
-msgstr ""
-
-#. FIELD_Document_Coverage
-#: po/tmp/ap_String_Id.h.h:823
-msgid "Coverage"
-msgstr ""
-
-#. DLG_MetaData_Coverage_LBL
-#: po/tmp/ap_String_Id.h.h:825
-msgid "Coverage:"
-msgstr ""
-
-#. DLG_NEW_Tab1_FAX1
-#: po/tmp/ap_String_Id.h.h:827
-msgid "Create a fax"
-msgstr ""
-
-#. DLG_NEW_Tab1_WP1
-#: po/tmp/ap_String_Id.h.h:829
-msgid "Create a new blank document"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_NEW
-#. TOOLBAR_STATUSLINE_FILE_NEW
-#. TOOLBAR_TOOLTIP_FILE_NEW
-#: po/tmp/ap_String_Id.h.h:833
-msgid "Create a new document"
-msgstr ""
-
-#. DLG_NEW_Create
-#: po/tmp/ap_String_Id.h.h:835
-msgid "Create a new document from a template"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE
-#: po/tmp/ap_String_Id.h.h:837
-msgid "Create a new document using a template"
-msgstr ""
-
-#. DLG_NEW_StartEmpty
-#: po/tmp/ap_String_Id.h.h:839
-msgid "Create an empty document"
-msgstr ""
-
-#. FIELD_Document_Creator
-#: po/tmp/ap_String_Id.h.h:841
-msgid "Creator"
-msgstr ""
-
-#. MENU_LABEL_EDIT_CUT
-#: po/tmp/ap_String_Id.h.h:843
-msgid "Cu&t"
-msgstr ""
-
-#. FIELD_Datetime_CurrentDate
-#: po/tmp/ap_String_Id.h.h:845
-msgid "Current Date"
-msgstr ""
-
-#. DLG_Lists_Current_Font
-#: po/tmp/ap_String_Id.h.h:847
-msgid "Current Font"
-msgstr ""
-
-#. DLG_Lists_Current_List_Label
-#: po/tmp/ap_String_Id.h.h:849
-msgid "Current List Label"
-msgstr ""
-
-#. DLG_Lists_Current_List_Type
-#: po/tmp/ap_String_Id.h.h:851
-msgid "Current List Type"
-msgstr ""
-
-#. MSG_EmptySelection
-#: po/tmp/ap_String_Id.h.h:853
-msgid "Current Selection is Empty"
-msgstr ""
-
-#. DLG_Styles_DefCurrent
-#: po/tmp/ap_String_Id.h.h:855
-msgid "Current Settings"
-msgstr ""
-
-#. FIELD_Datetime_CurrentTime
-#: po/tmp/ap_String_Id.h.h:857
-msgid "Current Time"
-msgstr ""
-
-#. DLG_Options_Label_ViewCursorBlink
-#: po/tmp/ap_String_Id.h.h:859
-msgid "Cursor &blink"
-msgstr ""
-
-#. DLG_Options_Label_SpellCustomDict
-#: po/tmp/ap_String_Id.h.h:861
-msgid "Custom Dictionary:"
-msgstr ""
-
-#. FIELD_DateTime_Custom
-#: po/tmp/ap_String_Id.h.h:863
-msgid "Customizable date/time"
-msgstr ""
-
-#. DLG_Lists_Customize
-#: po/tmp/ap_String_Id.h.h:865
-msgid "Customized List"
-msgstr ""
-
-#. TOOLBAR_LABEL_EDIT_CUT
-#. TOOLBAR_STATUSLINE_EDIT_CUT
-#. TOOLBAR_TOOLTIP_EDIT_CUT
-#: po/tmp/ap_String_Id.h.h:869
-msgid "Cut"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_CUTEMBED
-#: po/tmp/ap_String_Id.h.h:871
-msgid "Cut Embedded Object"
-msgstr ""
-
-#. MENU_LABEL_EDIT_CUTIMAGE
-#: po/tmp/ap_String_Id.h.h:873
-msgid "Cut Image"
-msgstr ""
-
-#. MENU_LABEL_EDIT_CUTEMBED
-#: po/tmp/ap_String_Id.h.h:875
-msgid "Cut Object"
-msgstr ""
-
-#. MENU_LABEL_EDIT_CUT_FRAME
-#: po/tmp/ap_String_Id.h.h:877
-msgid "Cut Text Box"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_CUT
-#: po/tmp/ap_String_Id.h.h:879
-msgid "Cut the selection and put it on the Clipboard"
-msgstr ""
-
-#. MENU_LABEL_FMT_DIRECTION
-#: po/tmp/ap_String_Id.h.h:881
-msgid "D&irectional"
-msgstr ""
-
-#. DLG_Lists_Dashed_List
-#. STYLE_DASHEDLIST
-#: po/tmp/ap_String_Id.h.h:883 po/tmp/xap_String_Id.h.h:241
-msgid "Dashed List"
-msgstr ""
-
-#. FIELD_Document_Date
-#. DLG_ListRevisions_Column2Label
-#: po/tmp/ap_String_Id.h.h:886
-msgid "Date"
-msgstr ""
-
-#. MENU_LABEL_INSERT_DATETIME
-#: po/tmp/ap_String_Id.h.h:888
-msgid "Date and &Time"
-msgstr ""
-
-#. FIELD_Type_Datetime
-#: po/tmp/ap_String_Id.h.h:890
-msgid "Date and Time"
-msgstr ""
-
-#. FIELD_DateTime_DOY
-#: po/tmp/ap_String_Id.h.h:892
-msgid "Day # in the year"
-msgstr ""
-
-#. DLG_Options_Btn_Default
-#: po/tmp/ap_String_Id.h.h:894
-msgid "De&faults"
-msgstr ""
-
-#. DLG_Tab_Radio_Decimal
-#: po/tmp/ap_String_Id.h.h:896
-msgid "Decimal"
-msgstr ""
-
-#. TabToggleDecimalTab
-#: po/tmp/ap_String_Id.h.h:898
-msgid "Decimal Tab"
-msgstr ""
-
-#. TOOLBAR_LABEL_UNINDENT
-#. TOOLBAR_STATUSLINE_UNINDENT
-#. TOOLBAR_TOOLTIP_UNINDENT
-#: po/tmp/ap_String_Id.h.h:902
-msgid "Decrease indent"
-msgstr ""
-
-#. FIELD_DateTime_DefaultDateNoTime
-#: po/tmp/ap_String_Id.h.h:904
-msgid "Default date (w/o time)"
-msgstr ""
-
-#. FIELD_DateTime_DefaultDate
-#: po/tmp/ap_String_Id.h.h:906
-msgid "Default date representation"
-msgstr ""
-
-#. DLG_Options_Label_DefaultPageSize
-#: po/tmp/ap_String_Id.h.h:908
-msgid "Default page size"
-msgstr ""
-
-#. DLG_Tab_Label_DefaultTS
-#: po/tmp/ap_String_Id.h.h:910
-msgid "Default tab stops:"
-msgstr ""
-
-#. DLG_Options_Label_DirectionRtl
-#: po/tmp/ap_String_Id.h.h:912
-msgid "Default to right-to-left direction of text"
-msgstr ""
-
-#. DLG_FormatTOC_LevelDefs
-#: po/tmp/ap_String_Id.h.h:914
-msgid "Define Main Properties"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_STYLE
-#. MENU_STATUSLINE_FMT_STYLE_DEFINE
-#: po/tmp/ap_String_Id.h.h:917
-msgid "Define or apply style for the selection"
-msgstr ""
-
-#. DLG_Styles_Delete
-#. MENU_STATUSLINE_TABLE_DELETE
-#. DLG_Delete
-#: po/tmp/ap_String_Id.h.h:920 po/tmp/xap_String_Id.h.h:255
-msgid "Delete"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_DELETE_CELLS
-#: po/tmp/ap_String_Id.h.h:922
-msgid "Delete Cells"
-msgstr ""
-
-#. MENU_LABEL_TABLE_DELETECOLUMN
-#: po/tmp/ap_String_Id.h.h:924
-msgid "Delete Co&lumn"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_DELETE_COLUMNS
-#. MENU_STATUSLINE_TABLE_DELETECOLUMN
-#: po/tmp/ap_String_Id.h.h:927
-msgid "Delete Column"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_DELETEEMBED
-#: po/tmp/ap_String_Id.h.h:929
-msgid "Delete Embedded Object"
-msgstr ""
-
-#. MENU_LABEL_EDIT_DELETEIMAGE
-#: po/tmp/ap_String_Id.h.h:931
-msgid "Delete Image"
-msgstr ""
-
-#. MENU_LABEL_EDIT_DELETEEMBED
-#: po/tmp/ap_String_Id.h.h:933
-msgid "Delete Object"
-msgstr ""
-
-#. MENU_LABEL_TABLE_DELETEROW
-#: po/tmp/ap_String_Id.h.h:935
-msgid "Delete Ro&w"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_DELETE_ROWS
-#. MENU_STATUSLINE_TABLE_DELETEROW
-#: po/tmp/ap_String_Id.h.h:938
-msgid "Delete Row"
-msgstr ""
-
-#. MENU_LABEL_TABLE_DELETETABLE
-#: po/tmp/ap_String_Id.h.h:940
-msgid "Delete Tabl&e"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_DELETE_TABLE
-#. MENU_STATUSLINE_TABLE_DELETETABLE
-#: po/tmp/ap_String_Id.h.h:943
-msgid "Delete Table"
-msgstr ""
-
-#. MENU_LABEL_EDIT_DELETEFRAME
-#: po/tmp/ap_String_Id.h.h:945
-msgid "Delete Text Box"
-msgstr ""
-
-#. TOOLBAR_LABEL_DELETE_COLUMN
-#: po/tmp/ap_String_Id.h.h:947
-msgid "Delete column"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_DELETE_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:949
-msgid "Delete hyperlink"
-msgstr ""
-
-#. TOOLBAR_LABEL_DELETE_ROW
-#: po/tmp/ap_String_Id.h.h:951
-msgid "Delete row"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_CLEAR
-#: po/tmp/ap_String_Id.h.h:953
-msgid "Delete the selection"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_DELETE_COLUMN
-#. TOOLBAR_TOOLTIP_DELETE_COLUMN
-#: po/tmp/ap_String_Id.h.h:956
-msgid "Delete this column from its table"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_DELETE_ROW
-#. TOOLBAR_TOOLTIP_DELETE_ROW
-#: po/tmp/ap_String_Id.h.h:959
-msgid "Delete this row from its table"
-msgstr ""
-
-#. DLG_Styles_Description
-#. DLG_Styles_ModifyDescription
-#. FIELD_Document_Description
-#: po/tmp/ap_String_Id.h.h:963
-msgid "Description"
-msgstr ""
-
-#. DLG_MetaData_Description_LBL
-#. DLG_PLUGIN_MANAGER_DESC
-#. DLG_Image_LblDescription
-#: po/tmp/ap_String_Id.h.h:965 po/tmp/xap_String_Id.h.h:258
-msgid "Description:"
-msgstr ""
-
-#. DLG_Lists_Diamond_List
-#. STYLE_DIAMONLIST
-#: po/tmp/ap_String_Id.h.h:967 po/tmp/xap_String_Id.h.h:260
-msgid "Diamond List"
-msgstr ""
-
-#. DLG_Options_Label_SpellDictionaries
-#: po/tmp/ap_String_Id.h.h:969
-msgid "Dictionaries"
-msgstr ""
-
-#. DLG_HdrFtr_FooterEven
-#: po/tmp/ap_String_Id.h.h:971
-msgid "Different footer on facing pages"
-msgstr ""
-
-#. DLG_HdrFtr_FooterFirst
-#: po/tmp/ap_String_Id.h.h:973
-msgid "Different footer on first page"
-msgstr ""
-
-#. DLG_HdrFtr_FooterLast
-#: po/tmp/ap_String_Id.h.h:975
-msgid "Different footer on last page"
-msgstr ""
-
-#. DLG_HdrFtr_HeaderEven
-#: po/tmp/ap_String_Id.h.h:977
-msgid "Different header on facing pages"
-msgstr ""
-
-#. DLG_HdrFtr_HeaderFirst
-#: po/tmp/ap_String_Id.h.h:979
-msgid "Different header on first page"
-msgstr ""
-
-#. DLG_HdrFtr_HeaderLast
-#: po/tmp/ap_String_Id.h.h:981
-msgid "Different header on last page"
-msgstr ""
-
-#. DLG_Styles_StylesLocked
-#: po/tmp/ap_String_Id.h.h:983
-msgid "Disable all formatting commands, except styles"
-msgstr ""
-
-#. MENU_STATUSLINE_HELP_CREDITS
-#: po/tmp/ap_String_Id.h.h:985
-msgid "Display Credits"
-msgstr ""
-
-#. MENU_STATUSLINE_HELP_CONTENTS
-#: po/tmp/ap_String_Id.h.h:987
-msgid "Display Help Contents"
-msgstr ""
-
-#. MENU_STATUSLINE_HELP_INDEX
-#: po/tmp/ap_String_Id.h.h:989
-msgid "Display Help Index"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_SHOWPARA
-#: po/tmp/ap_String_Id.h.h:991
-msgid "Display non-printing characters"
-msgstr ""
-
-#. MENU_STATUSLINE_HELP_ABOUT
-#: po/tmp/ap_String_Id.h.h:993
-msgid "Display program information, version number, and copyright"
-msgstr ""
-
-#. DLG_FormatTOC_DispStyle
-#: po/tmp/ap_String_Id.h.h:995
-msgid "Display style:"
-msgstr ""
-
-#. DLG_Options_Prompt_IgnoreResetAll
-#: po/tmp/ap_String_Id.h.h:997
-msgid "Do you want to reset ignored words in all the documents?"
-msgstr ""
-
-#. DLG_Options_Prompt_IgnoreResetCurrent
-#: po/tmp/ap_String_Id.h.h:999
-msgid "Do you want to reset ignored words in the current document?"
-msgstr ""
-
-#. FIELD_Type_Document
-#: po/tmp/ap_String_Id.h.h:1001
-msgid "Document"
-msgstr ""
-
-#. DLG_MetaData_Title
-#: po/tmp/ap_String_Id.h.h:1003
-msgid "Document Properties"
-msgstr ""
-
-#. DLG_Options_Label_Documents
-#: po/tmp/ap_String_Id.h.h:1005
-msgid "Documents"
-msgstr ""
-
-#. DLG_FormatFootnotes_FootRestartNone
-#: po/tmp/ap_String_Id.h.h:1007
-msgid "Don't restart"
-msgstr ""
-
-#. DLG_Para_SpacingDouble
-#: po/tmp/ap_String_Id.h.h:1009
-msgid "Double"
-msgstr ""
-
-#. TOOLBAR_LABEL_DOUBLE_SPACE
-#: po/tmp/ap_String_Id.h.h:1011
-msgid "Double Spacing"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_DOUBLE_SPACE
-#. TOOLBAR_TOOLTIP_DOUBLE_SPACE
-#: po/tmp/ap_String_Id.h.h:1014
-msgid "Double spacing"
-msgstr ""
-
-#. MENU_LABEL_EDIT_LATEXEQUATION
-#: po/tmp/ap_String_Id.h.h:1016
-msgid "Edit Equation"
-msgstr ""
-
-#. MENU_LABEL_EDIT_EDITFOOTER
-#. TOOLBAR_LABEL_EDIT_FOOTER
-#. TOOLBAR_STATUSLINE_EDIT_FOOTER
-#. TOOLBAR_TOOLTIP_EDIT_FOOTER
-#: po/tmp/ap_String_Id.h.h:1021
-msgid "Edit Footer"
-msgstr ""
-
-#. MENU_LABEL_EDIT_EDITHEADER
-#. TOOLBAR_LABEL_EDIT_HEADER
-#. TOOLBAR_STATUSLINE_EDIT_HEADER
-#. TOOLBAR_TOOLTIP_EDIT_HEADER
-#: po/tmp/ap_String_Id.h.h:1026
-msgid "Edit Header"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_LATEXEQUATION
-#: po/tmp/ap_String_Id.h.h:1028
-msgid "Edit Latex Equation"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_EDIT_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:1030
-msgid "Edit hyperlink"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_HEADFOOT
-#: po/tmp/ap_String_Id.h.h:1032
-msgid "Edit text at the top or bottom of every page"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_EDITFOOTER
-#: po/tmp/ap_String_Id.h.h:1034
-msgid "Edit the Footer on the current page"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_EDITHEADER
-#: po/tmp/ap_String_Id.h.h:1036
-msgid "Edit the Header on the current page"
-msgstr ""
-
-#. TB_Embedded
-#: po/tmp/ap_String_Id.h.h:1038
-msgid "Embedded"
-msgstr ""
-
-#. MENU_LABEL_VIEW_LOCKSTYLES
-#: po/tmp/ap_String_Id.h.h:1040
-msgid "Enable F&ormatting Tools"
-msgstr ""
-
-#. DLG_Options_Label_CheckEnableSmoothScrolling
-#: po/tmp/ap_String_Id.h.h:1042
-msgid "Enable Smooth Scrolling"
-msgstr ""
-
-#. FIELD_Numbers_EndnoteAnchor
-#: po/tmp/ap_String_Id.h.h:1044
-msgid "Endnote anchor"
-msgstr ""
-
-#. FIELD_Numbers_EndnoteReference
-#: po/tmp/ap_String_Id.h.h:1046
-msgid "Endnote reference"
-msgstr ""
-
-#. DLG_FormatFootnotes_EndStyle
-#: po/tmp/ap_String_Id.h.h:1048
-msgid "Endnote style"
-msgstr ""
-
-#. MENU_LABEL_INSERT_EQUATION
-#: po/tmp/ap_String_Id.h.h:1050
-msgid "Equation"
-msgstr ""
-
-#. FIELD_Error
-#: po/tmp/ap_String_Id.h.h:1052
-msgid "Error calculating value!"
-msgstr ""
-
-#. SCRIPT_CANTRUN
-#: po/tmp/ap_String_Id.h.h:1054
-#, c-format
-msgid "Error executing script %s"
-msgstr ""
-
-#. MSG_ImportError
-#: po/tmp/ap_String_Id.h.h:1056
-#, c-format
-msgid "Error importing file %s."
-msgstr ""
-
-#. MSG_SaveFailedExport
-#: po/tmp/ap_String_Id.h.h:1058
-#, c-format
-msgid "Error while attempting to save %s: could not construct exporter"
-msgstr ""
-
-#. MSG_SaveFailedName
-#: po/tmp/ap_String_Id.h.h:1060
-#, c-format
-msgid "Error while attempting to save %s: invalid name"
-msgstr ""
-
-#. TOOLBAR_LABEL_SCRIPT_PLAY
-#: po/tmp/ap_String_Id.h.h:1062
-msgid "Ex. script"
-msgstr ""
-
-#. DLG_Para_SpacingExactly
-#: po/tmp/ap_String_Id.h.h:1064
-msgid "Exactly"
-msgstr ""
-
-#. DLG_Latex_Example
-#: po/tmp/ap_String_Id.h.h:1066
-msgid "Example:"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_SCRIPTS
-#: po/tmp/ap_String_Id.h.h:1068
-msgid "Execute helper scripts"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_SCRIPT_PLAY
-#. TOOLBAR_TOOLTIP_SCRIPT_PLAY
-#: po/tmp/ap_String_Id.h.h:1071
-msgid "Execute script"
-msgstr ""
-
-#. DLG_ListRevisions_Label1
-#: po/tmp/ap_String_Id.h.h:1073
-msgid "Existing revisions:"
-msgstr ""
-
-#. TB_Extra
-#: po/tmp/ap_String_Id.h.h:1075
-msgid "Extra"
-msgstr ""
-
-#. DLG_Field_Parameters_Capital
-#: po/tmp/ap_String_Id.h.h:1077
-msgid "Extra Parameters"
-msgstr ""
-
-#. DLG_Options_Label_ViewExtraTB
-#: po/tmp/ap_String_Id.h.h:1079
-msgid "Extra Toolbar"
-msgstr ""
-
-#. DLG_Field_Parameters
-#: po/tmp/ap_String_Id.h.h:1081
-msgid "Extra parameters:"
-msgstr ""
-
-#. MENU_LABEL_INSERT_FILE
-#: po/tmp/ap_String_Id.h.h:1083
-msgid "F&ile"
-msgstr ""
-
-#. MENU_LABEL_FORMAT
-#: po/tmp/ap_String_Id.h.h:1085
-msgid "F&ormat"
-msgstr ""
-
-#. MENU_LABEL_VIEW_FULLSCREEN
-#: po/tmp/ap_String_Id.h.h:1087
-msgid "F&ull Screen"
-msgstr ""
-
-#. DLG_FR_FindLabel
-#: po/tmp/ap_String_Id.h.h:1089
-msgid "Fi&nd what:"
-msgstr ""
-
-#. DLG_MailMerge_Insert_No_Colon
-#: po/tmp/ap_String_Id.h.h:1091
-msgid "Field Name"
-msgstr ""
-
-#. DLG_MailMerge_Insert
-#: po/tmp/ap_String_Id.h.h:1093
-msgid "Field Name:"
-msgstr ""
-
-#. MSG_IE_UnsupportedType
-#: po/tmp/ap_String_Id.h.h:1095
-#, c-format
-msgid "File %s is not of a currently supported file type"
-msgstr ""
-
-#. MSG_IE_FakeType
-#: po/tmp/ap_String_Id.h.h:1097
-#, c-format
-msgid "File %s is not of the type it claims to be"
-msgstr ""
-
-#. MSG_IE_UnknownType
-#: po/tmp/ap_String_Id.h.h:1099
-#, c-format
-msgid "File %s is of unknown type"
-msgstr ""
-
-#. MSG_IE_FileNotFound
-#: po/tmp/ap_String_Id.h.h:1101
-#, c-format
-msgid "File %s not found"
-msgstr ""
-
-#. FIELD_Application_Filename
-#: po/tmp/ap_String_Id.h.h:1103
-msgid "File Name"
-msgstr ""
-
-#. DLG_FormatTOC_FillStyle
-#: po/tmp/ap_String_Id.h.h:1105
-msgid "Fill style:"
-msgstr ""
-
-#. DLG_FR_FindTitle
-#: po/tmp/ap_String_Id.h.h:1107
-msgid "Find"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT
-#: po/tmp/ap_String_Id.h.h:1109
-msgid "Find &next revision"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_FIND_PREV
-#: po/tmp/ap_String_Id.h.h:1111
-msgid "Find &previous revision"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT
-#: po/tmp/ap_String_Id.h.h:1113
-msgid "Find next visible revision in the document"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV
-#: po/tmp/ap_String_Id.h.h:1115
-msgid "Find previous visible revision in the document"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_FIND
-#: po/tmp/ap_String_Id.h.h:1117
-msgid "Find the specified text"
-msgstr ""
-
-#. FirstLineIndentStatus
-#: po/tmp/ap_String_Id.h.h:1119
-#, c-format
-msgid "First Line Indent [%s]"
-msgstr ""
-
-#. DLG_Para_SpecialFirstLine
-#: po/tmp/ap_String_Id.h.h:1121
-msgid "First line"
-msgstr ""
-
-#. DLG_InsertTable_FixedColSize
-#: po/tmp/ap_String_Id.h.h:1123
-msgid "Fixed column size:"
-msgstr ""
-
-#. DLG_Lists_FoldingLevel1
-#: po/tmp/ap_String_Id.h.h:1125
-msgid "Fold below level 1"
-msgstr ""
-
-#. DLG_Lists_FoldingLevel2
-#: po/tmp/ap_String_Id.h.h:1127
-msgid "Fold below level 2"
-msgstr ""
-
-#. DLG_Lists_FoldingLevel3
-#: po/tmp/ap_String_Id.h.h:1129
-msgid "Fold below level 3"
-msgstr ""
-
-#. DLG_Lists_FoldingLevel4
-#: po/tmp/ap_String_Id.h.h:1131
-msgid "Fold below level 4"
-msgstr ""
-
-#. DLG_Para_PreviewFollowParagraph
-#: po/tmp/ap_String_Id.h.h:1133
-msgid ""
-"Following Paragraph Following Paragraph Following Paragraph Following "
-"Paragraph Following Paragraph Following Paragraph Following Paragraph"
-msgstr ""
-
-#. DLG_Styles_ModifyFont
-#. TOOLBAR_LABEL_FMT_FONT
-#. TOOLBAR_STATUSLINE_FMT_FONT
-#. TOOLBAR_TOOLTIP_FMT_FONT
-#. DLG_UFS_FontTitle
-#. DLG_UFS_FontTab
-#: po/tmp/ap_String_Id.h.h:1138 po/tmp/xap_String_Id.h.h:335
-msgid "Font"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_FMT_CHOOSE
-#: po/tmp/ap_String_Id.h.h:1140
-msgid "Font Choose"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_SIZE
-#. TOOLBAR_STATUSLINE_FMT_SIZE
-#. TOOLBAR_TOOLTIP_FMT_SIZE
-#: po/tmp/ap_String_Id.h.h:1144
-msgid "Font Size"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_CHOOSE
-#: po/tmp/ap_String_Id.h.h:1146
-msgid "Font choose"
-msgstr ""
-
-#. TOOLBAR_LABEL_COLOR_FORE
-#. TOOLBAR_STATUSLINE_COLOR_FORE
-#. TOOLBAR_TOOLTIP_COLOR_FORE
-#: po/tmp/ap_String_Id.h.h:1150
-msgid "Font color"
-msgstr ""
-
-#. DLG_Lists_ButtonFont
-#: po/tmp/ap_String_Id.h.h:1152
-msgid "Font..."
-msgstr ""
-
-#. DLG_Lists_Font
-#. DLG_UFS_FontLabel
-#: po/tmp/ap_String_Id.h.h:1154 po/tmp/xap_String_Id.h.h:337
-msgid "Font:"
-msgstr ""
-
-#. MENU_LABEL_INSERT_FOOTNOTE
-#: po/tmp/ap_String_Id.h.h:1156
-msgid "Foot¬e"
-msgstr ""
-
-#. DLG_PageNumbers_Footer
-#. MENU_LABEL_INSERT_FOOTER
-#: po/tmp/ap_String_Id.h.h:1159
-msgid "Footer"
-msgstr ""
-
-#. DLG_HdrFtr_FooterFrame
-#: po/tmp/ap_String_Id.h.h:1161
-msgid "Footer Properties"
-msgstr ""
-
-#. FooterStatus
-#: po/tmp/ap_String_Id.h.h:1163
-#, c-format
-msgid "Footer [%s]"
-msgstr ""
-
-#. FIELD_Numbers_FootnoteAnchor
-#: po/tmp/ap_String_Id.h.h:1165
-msgid "Footnote anchor"
-msgstr ""
-
-#. FIELD_Numbers_FootnoteReference
-#: po/tmp/ap_String_Id.h.h:1167
-msgid "Footnote reference"
-msgstr ""
-
-#. DLG_FormatFootnotes_FootStyle
-#: po/tmp/ap_String_Id.h.h:1169
-msgid "Footnote style"
-msgstr ""
-
-#. MENU_LABEL_FMT_FOOTNOTES
-#: po/tmp/ap_String_Id.h.h:1171
-msgid "Footnotes and Endnotes"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR
-#. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR
-#: po/tmp/ap_String_Id.h.h:1174
-msgid "Force LTR direction of text"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_RTL
-#. TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_RTL
-#: po/tmp/ap_String_Id.h.h:1177
-msgid "Force RTL direction of text"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_DIRECTION_DO_LTR
-#: po/tmp/ap_String_Id.h.h:1179
-msgid "Force left-to-right direction of text"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_DIRECTION_DO_RTL
-#: po/tmp/ap_String_Id.h.h:1181
-msgid "Force right-to-left direction of text"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_LTR
-#: po/tmp/ap_String_Id.h.h:1183
-msgid "Force text LTR"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_DIR_OVERRIDE_RTL
-#: po/tmp/ap_String_Id.h.h:1185
-msgid "Force text RTL"
-msgstr ""
-
-#. DLG_Styles_ModifyFormat
-#. TB_Format
-#: po/tmp/ap_String_Id.h.h:1188
-msgid "Format"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_EMBED
-#: po/tmp/ap_String_Id.h.h:1190
-msgid "Format Embedded Object"
-msgstr ""
-
-#. DLG_FormatFootnotes_Endnotes
-#: po/tmp/ap_String_Id.h.h:1192
-msgid "Format Endnotes"
-msgstr ""
-
-#. DLG_FormatFootnotes_Footnotes
-#: po/tmp/ap_String_Id.h.h:1194
-msgid "Format Footnotes"
-msgstr ""
-
-#. DLG_FormatFootnotes_Title
-#: po/tmp/ap_String_Id.h.h:1196
-msgid "Format Footnotes and Endnotes"
-msgstr ""
-
-#. DLG_HdrFtr_Title
-#: po/tmp/ap_String_Id.h.h:1198
-msgid "Format Header/Footers"
-msgstr ""
-
-#. MENU_LABEL_FMT_EMBED
-#: po/tmp/ap_String_Id.h.h:1200
-msgid "Format Object"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMTPAINTER
-#: po/tmp/ap_String_Id.h.h:1202
-msgid "Format Painter"
-msgstr ""
-
-#. DLG_FormatTableTitle
-#. MENU_STATUSLINE_TABLE_FORMAT
-#: po/tmp/ap_String_Id.h.h:1205
-msgid "Format Table"
-msgstr ""
-
-#. DLG_FormatTOC_Title
-#: po/tmp/ap_String_Id.h.h:1207
-msgid "Format Table of Contents"
-msgstr ""
-
-#. DLG_FormatFrameTitle
-#: po/tmp/ap_String_Id.h.h:1209
-msgid "Format Text Box"
-msgstr ""
-
-#. DLG_Options_Label_ViewFormatTB
-#: po/tmp/ap_String_Id.h.h:1211
-msgid "Format Toolbar"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_POSIMAGE
-#: po/tmp/ap_String_Id.h.h:1213
-msgid "Format this image"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_STYLIST
-#: po/tmp/ap_String_Id.h.h:1215
-msgid "Format your document using styles"
-msgstr ""
-
-#. DLG_Lists_Format
-#. DLG_DocComparison_Fmt
-#: po/tmp/ap_String_Id.h.h:1217 po/tmp/xap_String_Id.h.h:343
-msgid "Format:"
-msgstr ""
-
-#. MENU_LABEL_INSERT_EQUATION_FILE
-#: po/tmp/ap_String_Id.h.h:1219
-msgid "From File"
-msgstr ""
-
-#. MENU_LABEL_INSERT_EQUATION_LATEX
-#: po/tmp/ap_String_Id.h.h:1221
-msgid "From LaTeX"
-msgstr ""
-
-#. TOOLBAR_LABEL_VIEW_FULL_SCREEN
-#. TOOLBAR_STATUSLINE_VIEW_FULL_SCREEN
-#. TOOLBAR_TOOLTIP_VIEW_FULL_SCREEN
-#: po/tmp/ap_String_Id.h.h:1225
-msgid "Full Screen"
-msgstr ""
-
-#. DLG_FormatTOC_General
-#. DLG_Options_Label_General
-#. DLG_MetaData_TAB_General
-#: po/tmp/ap_String_Id.h.h:1229
-msgid "General"
-msgstr ""
-
-#. DLG_Goto_Btn_Goto
-#: po/tmp/ap_String_Id.h.h:1231
-msgid "Go To"
-msgstr ""
-
-#. DLG_Goto_Label_What
-#: po/tmp/ap_String_Id.h.h:1233
-msgid "Go To &What:"
-msgstr ""
-
-#. DLG_Goto_Title
-#: po/tmp/ap_String_Id.h.h:1235
-msgid "Go to..."
-msgstr ""
-
-#. DLG_FormatTOC_HasLabel
-#: po/tmp/ap_String_Id.h.h:1237
-msgid "H&as label"
-msgstr ""
-
-#. DLG_FormatTOC_HeadingText
-#: po/tmp/ap_String_Id.h.h:1239
-msgid "H&eading text:"
-msgstr ""
-
-#. DLG_Lists_Hand_List
-#. STYLE_HANDLIST
-#: po/tmp/ap_String_Id.h.h:1241 po/tmp/xap_String_Id.h.h:383
-msgid "Hand List"
-msgstr ""
-
-#. DLG_Para_SpecialHanging
-#: po/tmp/ap_String_Id.h.h:1243
-msgid "Hanging"
-msgstr ""
-
-#. DLG_PageNumbers_Header
-#. MENU_LABEL_INSERT_HEADER
-#: po/tmp/ap_String_Id.h.h:1246
-msgid "Header"
-msgstr ""
-
-#. DLG_HdrFtr_HeaderFrame
-#: po/tmp/ap_String_Id.h.h:1248
-msgid "Header Properties"
-msgstr ""
-
-#. HeaderStatus
-#: po/tmp/ap_String_Id.h.h:1250
-#, c-format
-msgid "Header [%s]"
-msgstr ""
-
-#. MENU_LABEL_FMT_HDRFTR
-#: po/tmp/ap_String_Id.h.h:1252
-msgid "Header/Footers"
-msgstr ""
-
-#. MSG_CHECK_PRINT_MODE
-#: po/tmp/ap_String_Id.h.h:1254
-msgid ""
-"Headers and Footers can only be created and edited while in Print View "
-"Mode. \n"
-" To enter this mode choose View then Print Layout from the Menus. \n"
-" Would you like to enter Print Layout mode right now?"
-msgstr ""
-
-#. DLG_Stylist_HeadingStyles
-#: po/tmp/ap_String_Id.h.h:1256
-msgid "Heading Styles"
-msgstr ""
-
-#. DLG_FormatTOC_HeadingStyle
-#: po/tmp/ap_String_Id.h.h:1258
-msgid "Heading style:"
-msgstr ""
-
-#. DLG_Lists_Heart_List
-#. STYLE_HEARTLIST
-#: po/tmp/ap_String_Id.h.h:1260 po/tmp/xap_String_Id.h.h:399
-msgid "Heart List"
-msgstr ""
-
-#. DLG_Lists_Hebrew_List
-#: po/tmp/ap_String_Id.h.h:1262
-msgid "Hebrew List"
-msgstr ""
-
-#. TOOLBAR_LABEL_HELP
-#. TOOLBAR_STATUSLINE_HELP
-#. TOOLBAR_TOOLTIP_HELP
-#: po/tmp/ap_String_Id.h.h:1266
-msgid "Help"
-msgstr ""
-
-#. MENU_LABEL_HELP_CONTENTS
-#: po/tmp/ap_String_Id.h.h:1268
-msgid "Help &Contents"
-msgstr ""
-
-#. MENU_LABEL_HELP_INDEX
-#: po/tmp/ap_String_Id.h.h:1270
-msgid "Help &Introduction"
-msgstr ""
-
-#. DLG_Options_Label_Hide
-#: po/tmp/ap_String_Id.h.h:1272
-msgid "Hide"
-msgstr ""
-
-#. DLG_Options_Label_SpellHideErrors
-#: po/tmp/ap_String_Id.h.h:1274
-msgid "Hide &spelling errors in the document"
-msgstr ""
-
-#. DLG_Lists_FoldingLevelexp
-#: po/tmp/ap_String_Id.h.h:1276
-msgid "Hide text below List Levels"
-msgstr ""
-
-#. TOOLBAR_LABEL_COLOR_BACK
-#. TOOLBAR_STATUSLINE_COLOR_BACK
-#. TOOLBAR_TOOLTIP_COLOR_BACK
-#: po/tmp/ap_String_Id.h.h:1280
-msgid "Highlight"
-msgstr ""
-
-#. DLG_Spell_IgnoreAll
-#: po/tmp/ap_String_Id.h.h:1282
-msgid "I&gnore All"
-msgstr ""
-
-#. DLG_FormatTOC_Indent
-#: po/tmp/ap_String_Id.h.h:1284
-msgid "I&ndent:"
-msgstr ""
-
-#. InsertModeFieldINS
-#: po/tmp/ap_String_Id.h.h:1286
-msgid "INS"
-msgstr ""
-
-#. DLG_Options_Label_Icons
-#: po/tmp/ap_String_Id.h.h:1288
-msgid "Icons"
-msgstr ""
-
-#. DLG_Options_Label_Ignore
-#: po/tmp/ap_String_Id.h.h:1290
-msgid "Ignore"
-msgstr ""
-
-#. DLG_Options_Label_SpellIgnoreWords
-#: po/tmp/ap_String_Id.h.h:1292
-msgid "Ignore Words"
-msgstr ""
-
-#. MENU_STATUSLINE_SPELL_IGNOREALL
-#: po/tmp/ap_String_Id.h.h:1294
-msgid "Ignore all occurrences of this word in the document"
-msgstr ""
-
-#. DLG_Options_Label_SpellIgnoredWord
-#: po/tmp/ap_String_Id.h.h:1296
-msgid "Ignored words:"
-msgstr ""
-
-#. DLG_FormatFrame_SetImageBackground
-#. DLG_FormatTable_SetImageBackground
-#: po/tmp/ap_String_Id.h.h:1299
-msgid "Image For Background"
-msgstr ""
-
-#. DLG_Lists_Implies_List
-#. STYLE_IMPLIES_LIST
-#: po/tmp/ap_String_Id.h.h:1301 po/tmp/xap_String_Id.h.h:433
-msgid "Implies List"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_IMPORTSTYLES
-#: po/tmp/ap_String_Id.h.h:1303
-msgid "Import style definitions from a document"
-msgstr ""
-
-#. DLG_Styles_LBL_InUse
-#: po/tmp/ap_String_Id.h.h:1305
-msgid "In Use"
-msgstr ""
-
-#. WORD_PassInvalid
-#: po/tmp/ap_String_Id.h.h:1307
-msgid "Incorrect Password"
-msgstr ""
-
-#. TOOLBAR_LABEL_INDENT
-#. TOOLBAR_STATUSLINE_INDENT
-#. TOOLBAR_TOOLTIP_INDENT
-#: po/tmp/ap_String_Id.h.h:1311
-msgid "Increase indent"
-msgstr ""
-
-#. DLG_Para_LabelIndentation
-#: po/tmp/ap_String_Id.h.h:1313
-msgid "Indentation"
-msgstr ""
-
-#. DLG_Para_TabLabelIndentsAndSpacing
-#: po/tmp/ap_String_Id.h.h:1315
-msgid "Indents and Spacing"
-msgstr ""
-
-#. DLG_ToggleCase_FirstUpperCase
-#: po/tmp/ap_String_Id.h.h:1317
-msgid "Initial Caps"
-msgstr ""
-
-#. DLG_FormatFootnotes_EndInitialVal
-#: po/tmp/ap_String_Id.h.h:1319
-msgid "Initial Endnote value"
-msgstr ""
-
-#. DLG_FormatFootnotes_FootInitialVal
-#: po/tmp/ap_String_Id.h.h:1321
-msgid "Initial Footnote value"
-msgstr ""
-
-#. DLG_Break_Insert
-#. MENU_STATUSLINE_TABLE_INSERT
-#. DLG_IP_Button_Label
-#: po/tmp/ap_String_Id.h.h:1324 po/tmp/xap_String_Id.h.h:443
-msgid "Insert"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERTCOLUMN
-#: po/tmp/ap_String_Id.h.h:1326
-msgid "Insert &Columns"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERTROW
-#: po/tmp/ap_String_Id.h.h:1328
-msgid "Insert &Rows"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERTTABLE
-#: po/tmp/ap_String_Id.h.h:1330
-msgid "Insert &Table"
-msgstr ""
-
-#. DLG_InsertBookmark_Title
-#. TOOLBAR_LABEL_FMT_BOOKMARK
-#: po/tmp/ap_String_Id.h.h:1333
-msgid "Insert Bookmark"
-msgstr ""
-
-#. DLG_Break_BreakTitle_Capital
-#: po/tmp/ap_String_Id.h.h:1335
-msgid "Insert Break"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_INSERT_CELLS
-#: po/tmp/ap_String_Id.h.h:1337
-msgid "Insert Cells"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_PASTE
-#: po/tmp/ap_String_Id.h.h:1339
-msgid "Insert Clipboard contents"
-msgstr ""
-
-#. DLG_DateTime_DateTimeTitle
-#: po/tmp/ap_String_Id.h.h:1341
-msgid "Insert Date and Time"
-msgstr ""
-
-#. MENU_LABEL_TOOLTIP_INSERT_EQUATION
-#: po/tmp/ap_String_Id.h.h:1343
-msgid "Insert Equation"
-msgstr ""
-
-#. MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX
-#: po/tmp/ap_String_Id.h.h:1345
-msgid "Insert Equation from a LaTeX expression"
-msgstr ""
-
-#. DLG_Field_FieldTitle_Capital
-#: po/tmp/ap_String_Id.h.h:1347
-msgid "Insert Field"
-msgstr ""
-
-#. DLG_InsertHyperlink_Title
-#. TOOLBAR_LABEL_FMT_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:1350
-msgid "Insert Hyperlink"
-msgstr ""
-
-#. TOOLBAR_LABEL_IMG
-#: po/tmp/ap_String_Id.h.h:1352
-msgid "Insert Image"
-msgstr ""
-
-#. DLG_MailMerge_MailMergeTitle
-#: po/tmp/ap_String_Id.h.h:1354
-msgid "Insert Mail Merge Field"
-msgstr ""
-
-#. MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE
-#: po/tmp/ap_String_Id.h.h:1356
-msgid "Insert MathML from a file"
-msgstr ""
-
-#. DLG_InsertTable_TableTitle
-#. MENU_STATUSLINE_TABLE_INSERT_TABLE
-#. MENU_STATUSLINE_TABLE_INSERTTABLE
-#: po/tmp/ap_String_Id.h.h:1360
-msgid "Insert Table"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_DIRECTIONMARKER
-#: po/tmp/ap_String_Id.h.h:1362
-msgid "Insert Unicode direction marker into the document"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_FOOTER
-#: po/tmp/ap_String_Id.h.h:1364
-msgid "Insert a Footer"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_HEADER
-#: po/tmp/ap_String_Id.h.h:1366
-msgid "Insert a Header"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_TABLEOFCONTENTS
-#: po/tmp/ap_String_Id.h.h:1368
-msgid "Insert a Table of Contents based on Headings"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_TEXTBOX
-#: po/tmp/ap_String_Id.h.h:1370
-msgid "Insert a Text Box"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_FMT_BOOKMARK
-#. TOOLBAR_TOOLTIP_FMT_BOOKMARK
-#: po/tmp/ap_String_Id.h.h:1373
-msgid "Insert a bookmark into the document"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_FIELD
-#: po/tmp/ap_String_Id.h.h:1375
-msgid "Insert a calculated field"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_BEFORE
-#: po/tmp/ap_String_Id.h.h:1377
-msgid "Insert a column to the left"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_INSERT_COLUMNS_AFTER
-#. MENU_STATUSLINE_TABLE_INSERTCOLUMN
-#: po/tmp/ap_String_Id.h.h:1380
-msgid "Insert a column to the right"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_FOOTNOTE
-#: po/tmp/ap_String_Id.h.h:1382
-msgid "Insert a footnote"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_FMT_HYPERLINK
-#. TOOLBAR_TOOLTIP_FMT_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:1385
-msgid "Insert a hyperlink into the document"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_MAILMERGE
-#: po/tmp/ap_String_Id.h.h:1387
-msgid "Insert a mail merge field"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_INSERT_TABLE
-#. TOOLBAR_TOOLTIP_INSERT_TABLE
-#: po/tmp/ap_String_Id.h.h:1390
-msgid "Insert a new table into your document"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_BREAK
-#: po/tmp/ap_String_Id.h.h:1392
-msgid "Insert a page, column, or section break"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_INSERT_ROWS_BEFORE
-#: po/tmp/ap_String_Id.h.h:1394
-msgid "Insert a row above"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_INSERT_ROWS_AFTER
-#. MENU_STATUSLINE_TABLE_INSERTROW
-#: po/tmp/ap_String_Id.h.h:1397
-msgid "Insert a row below"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_SYMBOL
-#: po/tmp/ap_String_Id.h.h:1399
-msgid "Insert a symbol or other special character"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_ANNOTATION
-#: po/tmp/ap_String_Id.h.h:1401
-msgid "Insert an Annotation"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_PAGENO
-#: po/tmp/ap_String_Id.h.h:1403
-msgid "Insert an automatically-updated page number"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_ENDNOTE
-#: po/tmp/ap_String_Id.h.h:1405
-msgid "Insert an endnote"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_GRAPHIC
-#: po/tmp/ap_String_Id.h.h:1407
-msgid "Insert an existing picture from another file"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_IMG
-#. TOOLBAR_TOOLTIP_IMG
-#: po/tmp/ap_String_Id.h.h:1410
-msgid "Insert an image into the document"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_BOOKMARK
-#: po/tmp/ap_String_Id.h.h:1412
-msgid "Insert bookmark"
-msgstr ""
-
-#. DLG_Break_BreakTitle
-#: po/tmp/ap_String_Id.h.h:1414
-msgid "Insert break"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_CLIPART
-#: po/tmp/ap_String_Id.h.h:1416
-msgid "Insert clipart"
-msgstr ""
-
-#. DLG_Field_FieldTitle
-#: po/tmp/ap_String_Id.h.h:1418
-msgid "Insert field"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:1420
-msgid "Insert hyperlink"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_LRM
-#: po/tmp/ap_String_Id.h.h:1422
-msgid "Insert left-to-right direction marker (LRM)"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_DIRECTIONMARKER_RLM
-#: po/tmp/ap_String_Id.h.h:1424
-msgid "Insert right-to-left direction marker (RLM)"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_INSERT_SYMBOL
-#. TOOLBAR_TOOLTIP_INSERT_SYMBOL
-#: po/tmp/ap_String_Id.h.h:1427
-msgid "Insert symbol"
-msgstr ""
-
-#. TOOLBAR_LABEL_INSERT_TABLE
-#: po/tmp/ap_String_Id.h.h:1429
-msgid "Insert table"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_INSERT_SUMROWS
-#: po/tmp/ap_String_Id.h.h:1431
-msgid "Insert the Sum of a Table Column"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_INSERT_SUMCOLS
-#: po/tmp/ap_String_Id.h.h:1433
-msgid "Insert the Sum of a Table Row"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_FILE
-#: po/tmp/ap_String_Id.h.h:1435
-msgid "Insert the contents of another file"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_DATETIME
-#: po/tmp/ap_String_Id.h.h:1437
-msgid "Insert the date and/or time"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_PASTE_SPECIAL
-#: po/tmp/ap_String_Id.h.h:1439
-msgid "Insert unformatted clipboard contents"
-msgstr ""
-
-#. DLG_Options_Label_ViewUnprintable
-#: po/tmp/ap_String_Id.h.h:1441
-msgid "Invisible &Layout Marks"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_ITALIC
-#. TOOLBAR_STATUSLINE_FMT_ITALIC
-#. TOOLBAR_TOOLTIP_FMT_ITALIC
-#. DLG_UFS_StyleItalic
-#: po/tmp/ap_String_Id.h.h:1445 po/tmp/xap_String_Id.h.h:473
-msgid "Italic"
-msgstr ""
-
-#. MENU_STATUSLINE_INSERT_GOTO_HYPERLINK
-#: po/tmp/ap_String_Id.h.h:1447
-msgid "Jump to hyperlink"
-msgstr ""
-
-#. DLG_Para_AlignJustified
-#: po/tmp/ap_String_Id.h.h:1449
-msgid "Justified"
-msgstr ""
-
-#. TOOLBAR_LABEL_ALIGN_JUSTIFY
-#: po/tmp/ap_String_Id.h.h:1451
-msgid "Justify"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_ALIGN_JUSTIFY
-#. TOOLBAR_TOOLTIP_ALIGN_JUSTIFY
-#: po/tmp/ap_String_Id.h.h:1454
-msgid "Justify paragraph"
-msgstr ""
-
-#. MENU_STATUSLINE_ALIGN_JUSTIFY
-#: po/tmp/ap_String_Id.h.h:1456
-msgid "Justify the paragraph"
-msgstr ""
-
-#. DLG_Para_PushKeepWithNext
-#: po/tmp/ap_String_Id.h.h:1458
-msgid "Keep with ne&xt"
-msgstr ""
-
-#. FIELD_PieceTable_Test
-#: po/tmp/ap_String_Id.h.h:1460
-msgid "Kevins Test"
-msgstr ""
-
-#. FIELD_Document_Keywords
-#: po/tmp/ap_String_Id.h.h:1462
-msgid "Keywords"
-msgstr ""
-
-#. DLG_MetaData_Keywords_LBL
-#: po/tmp/ap_String_Id.h.h:1464
-msgid "Keywords:"
-msgstr ""
-
-#. DLG_Latex_LatexTitle
-#. DLG_Latex_LatexEquation
-#: po/tmp/ap_String_Id.h.h:1467
-msgid "LaTeX Equation"
-msgstr ""
-
-#. DLG_Lists_Indent
-#: po/tmp/ap_String_Id.h.h:1469
-msgid "Label Align:"
-msgstr ""
-
-#. DLG_FormatTOC_DetailsTop
-#: po/tmp/ap_String_Id.h.h:1471
-msgid "Label Definitions"
-msgstr ""
-
-#. DLG_Styles_ModifyLanguage
-#. DLG_Options_Label_Language
-#. FIELD_Document_Language
-#: po/tmp/ap_String_Id.h.h:1475
-msgid "Language"
-msgstr ""
-
-#. DLG_Options_Label_LangSettings
-#: po/tmp/ap_String_Id.h.h:1477
-msgid "Language settings"
-msgstr ""
-
-#. DLG_MetaData_Languages_LBL
-#: po/tmp/ap_String_Id.h.h:1479
-msgid "Language(s):"
-msgstr ""
-
-#. DLG_Options_Label_Layout
-#: po/tmp/ap_String_Id.h.h:1481
-msgid "Layout"
-msgstr ""
-
-#. DLG_FormatTOC_LayoutDetails
-#: po/tmp/ap_String_Id.h.h:1483
-msgid "Layout Details"
-msgstr ""
-
-#. DLG_Tab_Label_Leader
-#: po/tmp/ap_String_Id.h.h:1485
-msgid "Leader"
-msgstr ""
-
-#. DLG_Para_AlignLeft
-#. DLG_Tab_Radio_Left
-#. DLG_PageNumbers_Left
-#. TOOLBAR_LABEL_ALIGN_LEFT
-#: po/tmp/ap_String_Id.h.h:1490
-msgid "Left"
-msgstr ""
-
-#. LeftIndentStatus
-#: po/tmp/ap_String_Id.h.h:1492
-#, c-format
-msgid "Left Indent [%s]"
-msgstr ""
-
-#. LeftIndentTextIndentStatus
-#: po/tmp/ap_String_Id.h.h:1494
-#, c-format
-msgid "Left Indent [%s] First Line Indent [%s]"
-msgstr ""
-
-#. LeftMarginStatus
-#: po/tmp/ap_String_Id.h.h:1496
-#, c-format
-msgid "Left Margin [%s]"
-msgstr ""
-
-#. TabToggleLeftTab
-#: po/tmp/ap_String_Id.h.h:1498
-msgid "Left Tab"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_ALIGN_LEFT
-#. TOOLBAR_TOOLTIP_ALIGN_LEFT
-#: po/tmp/ap_String_Id.h.h:1501
-msgid "Left alignment"
-msgstr ""
-
-#. MENU_STATUSLINE_ALIGN_LEFT
-#: po/tmp/ap_String_Id.h.h:1503
-msgid "Left-align the paragraph"
-msgstr ""
-
-#. DLG_FormatTOC_Level1
-#: po/tmp/ap_String_Id.h.h:1505
-msgid "Level 1"
-msgstr ""
-
-#. DLG_FormatTOC_Level2
-#: po/tmp/ap_String_Id.h.h:1507
-msgid "Level 2"
-msgstr ""
-
-#. DLG_FormatTOC_Level3
-#: po/tmp/ap_String_Id.h.h:1509
-msgid "Level 3"
-msgstr ""
-
-#. DLG_FormatTOC_Level4
-#: po/tmp/ap_String_Id.h.h:1511
-msgid "Level 4"
-msgstr ""
-
-#. DLG_Lists_DelimiterString
-#: po/tmp/ap_String_Id.h.h:1513
-msgid "Level Delimiter:"
-msgstr ""
-
-#. DLG_Lists_Level
-#: po/tmp/ap_String_Id.h.h:1515
-msgid "Level:"
-msgstr ""
-
-#. DLG_Para_LabelLineSpacing
-#: po/tmp/ap_String_Id.h.h:1517
-msgid "Li&ne spacing:"
-msgstr ""
-
-#. DLG_Goto_Target_Line
-#: po/tmp/ap_String_Id.h.h:1519
-msgid "Line"
-msgstr ""
-
-#. FIELD_Numbers_LineCount
-#: po/tmp/ap_String_Id.h.h:1521
-msgid "Line Count"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_TOPLINE
-#: po/tmp/ap_String_Id.h.h:1523
-msgid "Line above the selection (toggle)"
-msgstr ""
-
-#. DLG_Para_TabLabelLineAndPageBreaks
-#: po/tmp/ap_String_Id.h.h:1525
-msgid "Line and Page Breaks"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_BOTTOMLINE
-#: po/tmp/ap_String_Id.h.h:1527
-msgid "Line below the selection (toggle)"
-msgstr ""
-
-#. DLG_Column_Line_Between
-#: po/tmp/ap_String_Id.h.h:1529
-msgid "Line between"
-msgstr ""
-
-#. DLG_WordCount_Lines
-#: po/tmp/ap_String_Id.h.h:1531
-msgid "Lines:"
-msgstr ""
-
-#. DLG_Styles_List
-#: po/tmp/ap_String_Id.h.h:1533
-msgid "List"
-msgstr ""
-
-#. FIELD_Numbers_ListLabel
-#: po/tmp/ap_String_Id.h.h:1535
-msgid "List Label"
-msgstr ""
-
-#. DLG_Lists_PageProperties
-#: po/tmp/ap_String_Id.h.h:1537
-msgid "List Properties"
-msgstr ""
-
-#. DLG_Stylist_ListStyles
-#: po/tmp/ap_String_Id.h.h:1539
-msgid "List Styles"
-msgstr ""
-
-#. DLG_Lists_Title
-#: po/tmp/ap_String_Id.h.h:1541
-msgid "Lists for "
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT
-#: po/tmp/ap_String_Id.h.h:1543
-msgid "Lock the layout of the current toolbars"
-msgstr ""
-
-#. DLG_Lists_Lower_Case_List
-#. STYLE_LOWERCASELIST
-#: po/tmp/ap_String_Id.h.h:1545 po/tmp/xap_String_Id.h.h:512
-msgid "Lower Case List"
-msgstr ""
-
-#. DLG_Lists_Lower_Roman_List
-#. STYLE_LOWERROMANLIST
-#: po/tmp/ap_String_Id.h.h:1547 po/tmp/xap_String_Id.h.h:514
-msgid "Lower Roman List"
-msgstr ""
-
-#. FIELD_Application_MailMerge
-#. MENU_STATUSLINE_TOOLS_MAILMERGE
-#: po/tmp/ap_String_Id.h.h:1550
-msgid "Mail Merge"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_BOLD
-#: po/tmp/ap_String_Id.h.h:1552
-msgid "Make the selection bold (toggle)"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_ITALIC
-#: po/tmp/ap_String_Id.h.h:1554
-msgid "Make the selection italic (toggle)"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_SUBSCRIPT
-#: po/tmp/ap_String_Id.h.h:1556
-msgid "Make the selection subscript (toggle)"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_SUPERSCRIPT
-#: po/tmp/ap_String_Id.h.h:1558
-msgid "Make the selection superscript (toggle)"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS
-#: po/tmp/ap_String_Id.h.h:1560
-msgid "Manage changes in document"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_PLUGINS
-#: po/tmp/ap_String_Id.h.h:1562
-msgid "Manage plugins"
-msgstr ""
-
-#. DLG_PageSetup_Margin
-#: po/tmp/ap_String_Id.h.h:1564
-msgid "Margin"
-msgstr ""
-
-#. DLG_MarkRevisions_Title
-#: po/tmp/ap_String_Id.h.h:1566
-msgid "Mark Revisions"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_MARK
-#: po/tmp/ap_String_Id.h.h:1568
-msgid "Mark changes as you type"
-msgstr ""
-
-#. FIELD_PieceTable_MartinTest
-#: po/tmp/ap_String_Id.h.h:1570
-msgid "Martins Test"
-msgstr ""
-
-#. DLG_Column_Size
-#: po/tmp/ap_String_Id.h.h:1572
-msgid "Max Column size"
-msgstr ""
-
-#. TOOLBAR_LABEL_MENU
-#. TOOLBAR_STATUSLINE_MENU
-#. TOOLBAR_TOOLTIP_MENU
-#: po/tmp/ap_String_Id.h.h:1576
-msgid "Menu"
-msgstr ""
-
-#. DLG_MergeCells_Above
-#: po/tmp/ap_String_Id.h.h:1578
-msgid "Merge Above"
-msgstr ""
-
-#. DLG_MergeCells_Below
-#: po/tmp/ap_String_Id.h.h:1580
-msgid "Merge Below"
-msgstr ""
-
-#. DLG_MergeCellsTitle
-#. DLG_MergeCells_Frame
-#. MENU_STATUSLINE_TABLE_MERGE_CELLS
-#: po/tmp/ap_String_Id.h.h:1584
-msgid "Merge Cells"
-msgstr ""
-
-#. DLG_MergeCells_Left
-#: po/tmp/ap_String_Id.h.h:1586
-msgid "Merge Left"
-msgstr ""
-
-#. DLG_MergeCells_Right
-#: po/tmp/ap_String_Id.h.h:1588
-msgid "Merge Right"
-msgstr ""
-
-#. TOOLBAR_LABEL_MERGEABOVE
-#: po/tmp/ap_String_Id.h.h:1590
-msgid "Merge above"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS
-#: po/tmp/ap_String_Id.h.h:1592
-msgid "Merge another document into the active document using revision marks"
-msgstr ""
-
-#. TOOLBAR_LABEL_MERGEBELOW
-#: po/tmp/ap_String_Id.h.h:1594
-msgid "Merge below"
-msgstr ""
-
-#. TOOLBAR_LABEL_MERGE_CELLS
-#. TOOLBAR_STATUSLINE_MERGE_CELLS
-#. TOOLBAR_TOOLTIP_MERGE_CELLS
-#: po/tmp/ap_String_Id.h.h:1598
-msgid "Merge cells"
-msgstr ""
-
-#. TOOLBAR_LABEL_MERGELEFT
-#: po/tmp/ap_String_Id.h.h:1600
-msgid "Merge left"
-msgstr ""
-
-#. TOOLBAR_LABEL_MERGERIGHT
-#: po/tmp/ap_String_Id.h.h:1602
-msgid "Merge right"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_MERGEABOVE
-#. TOOLBAR_TOOLTIP_MERGEABOVE
-#: po/tmp/ap_String_Id.h.h:1605
-msgid "Merge with cell above"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_MERGEBELOW
-#. TOOLBAR_TOOLTIP_MERGEBELOW
-#: po/tmp/ap_String_Id.h.h:1608
-msgid "Merge with cell below"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_MERGELEFT
-#. TOOLBAR_TOOLTIP_MERGELEFT
-#: po/tmp/ap_String_Id.h.h:1611
-msgid "Merge with left cell"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_MERGERIGHT
-#. TOOLBAR_TOOLTIP_MERGERIGHT
-#: po/tmp/ap_String_Id.h.h:1614
-msgid "Merge with right cell"
-msgstr ""
-
-#. FIELD_DateTime_MilTime
-#: po/tmp/ap_String_Id.h.h:1616
-msgid "Military Time"
-msgstr ""
-
-#. DLG_Options_TabLabel_Misc
-#: po/tmp/ap_String_Id.h.h:1618
-msgid "Misc."
-msgstr ""
-
-#. DLG_Stylist_MiscStyles
-#: po/tmp/ap_String_Id.h.h:1620
-msgid "Miscellaneous Styles"
-msgstr ""
-
-#. DLG_Styles_ModifyTitle
-#: po/tmp/ap_String_Id.h.h:1622
-msgid "Modify Styles"
-msgstr ""
-
-#. DLG_Styles_Modify
-#: po/tmp/ap_String_Id.h.h:1624
-msgid "Modify..."
-msgstr ""
-
-#. FIELD_DateTime_MonthDayYear
-#: po/tmp/ap_String_Id.h.h:1626
-msgid "Month Day, Year"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_GOTO
-#: po/tmp/ap_String_Id.h.h:1628
-msgid "Move the insertion point to a specific location"
-msgstr ""
-
-#. FIELD_DateTime_MthDayYear
-#: po/tmp/ap_String_Id.h.h:1630
-msgid "Mth. Day, Year"
-msgstr ""
-
-#. DLG_Para_SpacingMultiple
-#: po/tmp/ap_String_Id.h.h:1632
-msgid "Multiple"
-msgstr ""
-
-#. TOOLBAR_LABEL_FILE_NEW
-#: po/tmp/ap_String_Id.h.h:1634
-msgid "New"
-msgstr ""
-
-#. DLG_NEW_Title
-#: po/tmp/ap_String_Id.h.h:1636
-msgid "New Document"
-msgstr ""
-
-#. DLG_Lists_New_List_Label
-#: po/tmp/ap_String_Id.h.h:1638
-msgid "New List Label"
-msgstr ""
-
-#. DLG_Lists_New_List_Type
-#: po/tmp/ap_String_Id.h.h:1640
-msgid ""
-"New List \n"
-"Type"
-msgstr ""
-
-#. DLG_Lists_Starting_Value
-#: po/tmp/ap_String_Id.h.h:1642
-msgid ""
-"New Starting \n"
-"Value"
-msgstr ""
-
-#. DLG_Styles_NewTitle
-#: po/tmp/ap_String_Id.h.h:1644
-msgid "New Style"
-msgstr ""
-
-#. DLG_Styles_New
-#: po/tmp/ap_String_Id.h.h:1646
-msgid "New..."
-msgstr ""
-
-#. DLG_Goto_Btn_Next
-#: po/tmp/ap_String_Id.h.h:1648
-msgid "Next >>"
-msgstr ""
-
-#. DLG_NEW_NoFile
-#: po/tmp/ap_String_Id.h.h:1650
-msgid "No File"
-msgstr ""
-
-#. DLG_Lists_FoldingLevel0
-#: po/tmp/ap_String_Id.h.h:1652
-msgid "No Folding"
-msgstr ""
-
-#. DLG_Styles_ErrNoStyle
-#: po/tmp/ap_String_Id.h.h:1654
-msgid ""
-"No Style selected \n"
-" so it cannot be modified"
-msgstr ""
-
-#. SCRIPT_NOSCRIPTS
-#: po/tmp/ap_String_Id.h.h:1656
-msgid "No scripts found"
-msgstr ""
-
-#. DLG_FormatTOC_None
-#. DLG_Styles_DefNone
-#. DLG_Tab_Radio_NoAlign
-#. DLG_Lists_Type_none
-#: po/tmp/ap_String_Id.h.h:1661
-msgid "None"
-msgstr ""
-
-#. TOOLBAR_LABEL_PARA_0BEFORE
-#: po/tmp/ap_String_Id.h.h:1663
-msgid "None before"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_NORMAL
-#: po/tmp/ap_String_Id.h.h:1665
-msgid "Normal View"
-msgstr ""
-
-#. DLG_Spell_UnknownWord
-#: po/tmp/ap_String_Id.h.h:1667
-msgid "Not in dictionary&:"
-msgstr ""
-
-#. DLG_Stylist_FootnoteStyles
-#: po/tmp/ap_String_Id.h.h:1669
-msgid "Note Styles"
-msgstr ""
-
-#. DLG_Column_Number_Cols
-#: po/tmp/ap_String_Id.h.h:1671
-msgid "Number of Columns"
-msgstr ""
-
-#. FIELD_Numbers_PagesCount
-#: po/tmp/ap_String_Id.h.h:1673
-msgid "Number of Pages"
-msgstr ""
-
-#. DLG_Column_Number
-#: po/tmp/ap_String_Id.h.h:1675
-msgid "Number of columns"
-msgstr ""
-
-#. DLG_InsertTable_NumCols
-#: po/tmp/ap_String_Id.h.h:1677
-msgid "Number of columns:"
-msgstr ""
-
-#. DLG_InsertTable_NumRows
-#: po/tmp/ap_String_Id.h.h:1679
-msgid "Number of rows:"
-msgstr ""
-
-#. DLG_Lists_Type_numbered
-#: po/tmp/ap_String_Id.h.h:1681
-msgid "Numbered"
-msgstr ""
-
-#. DLG_Lists_Numbered_List
-#. STYLE_NUMBER_LIST
-#: po/tmp/ap_String_Id.h.h:1683 po/tmp/xap_String_Id.h.h:558
-msgid "Numbered List"
-msgstr ""
-
-#. DLG_FormatFootnotes_FootnoteRestart
-#. DLG_Styles_ModifyNumbering
-#. TOOLBAR_LABEL_LISTS_NUMBERS
-#. TOOLBAR_STATUSLINE_LISTS_NUMBERS
-#. TOOLBAR_TOOLTIP_LISTS_NUMBERS
-#: po/tmp/ap_String_Id.h.h:1689
-msgid "Numbering"
-msgstr ""
-
-#. FIELD_Type_Numbers
-#: po/tmp/ap_String_Id.h.h:1691
-msgid "Numbers"
-msgstr ""
-
-#. InsertModeFieldOVR
-#: po/tmp/ap_String_Id.h.h:1693
-msgid "OVR"
-msgstr ""
-
-#. DLG_Column_One
-#: po/tmp/ap_String_Id.h.h:1695
-msgid "One"
-msgstr ""
-
-#. MENU_LABEL_FILE_IMPORT
-#: po/tmp/ap_String_Id.h.h:1697
-msgid "Op&en Copy"
-msgstr ""
-
-#. TOOLBAR_LABEL_FILE_OPEN
-#: po/tmp/ap_String_Id.h.h:1699
-msgid "Open"
-msgstr ""
-
-#. MENU_LABEL_OPEN_TEMPLATE
-#: po/tmp/ap_String_Id.h.h:1701
-msgid "Open Template"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_IMPORT
-#: po/tmp/ap_String_Id.h.h:1703
-msgid "Open a document by making a copy"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_RECENT
-#: po/tmp/ap_String_Id.h.h:1705
-msgid "Open a recently used document"
-msgstr ""
-
-#. DLG_NEW_Open
-#. MENU_STATUSLINE_FILE_OPEN
-#. TOOLBAR_STATUSLINE_FILE_OPEN
-#. TOOLBAR_TOOLTIP_FILE_OPEN
-#: po/tmp/ap_String_Id.h.h:1710
-msgid "Open an existing document"
-msgstr ""
-
-#. MENU_STATUSLINE_WINDOW_NEW
-#: po/tmp/ap_String_Id.h.h:1712
-msgid "Open another window for the document"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_RECENT_1
-#. MENU_STATUSLINE_FILE_RECENT_2
-#. MENU_STATUSLINE_FILE_RECENT_3
-#. MENU_STATUSLINE_FILE_RECENT_4
-#. MENU_STATUSLINE_FILE_RECENT_5
-#. MENU_STATUSLINE_FILE_RECENT_6
-#. MENU_STATUSLINE_FILE_RECENT_7
-#. MENU_STATUSLINE_FILE_RECENT_8
-#. MENU_STATUSLINE_FILE_RECENT_9
-#: po/tmp/ap_String_Id.h.h:1722
-msgid "Open this document"
-msgstr ""
-
-#. DLG_PageSetup_Orient
-#: po/tmp/ap_String_Id.h.h:1724
-msgid "Orientation..."
-msgstr ""
-
-#. DLG_Options_TabLabel_Other
-#: po/tmp/ap_String_Id.h.h:1726
-msgid "Other"
-msgstr ""
-
-#. MSG_IE_NoMemory
-#: po/tmp/ap_String_Id.h.h:1728
-#, c-format
-msgid "Out of memory attempting to open %s"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_OVERLINE
-#. TOOLBAR_STATUSLINE_FMT_OVERLINE
-#. TOOLBAR_TOOLTIP_FMT_OVERLINE
-#. DLG_UFS_OverlineCheck
-#: po/tmp/ap_String_Id.h.h:1732 po/tmp/xap_String_Id.h.h:572
-msgid "Overline"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_OVERLINE
-#: po/tmp/ap_String_Id.h.h:1734
-msgid "Overline the selection (toggle)"
-msgstr ""
-
-#. MENU_LABEL_FILE_PROPERTIES
-#: po/tmp/ap_String_Id.h.h:1736
-msgid "P&roperties"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_PURGE
-#: po/tmp/ap_String_Id.h.h:1738
-msgid "P&urge revisions"
-msgstr ""
-
-#. MENU_LABEL_EDIT_PASTE_SPECIAL
-#: po/tmp/ap_String_Id.h.h:1740
-msgid "Pa&ste Unformatted"
-msgstr ""
-
-#. DLG_Goto_Target_Page
-#. DLG_PageSetup_Page
-#: po/tmp/ap_String_Id.h.h:1743
-msgid "Page"
-msgstr ""
-
-#. DLG_Para_PushPageBreakBefore
-#: po/tmp/ap_String_Id.h.h:1745
-msgid "Page &break before"
-msgstr ""
-
-#. MENU_LABEL_FMT_BACKGROUND
-#: po/tmp/ap_String_Id.h.h:1747
-msgid "Page Background"
-msgstr ""
-
-#. MENU_LABEL_FMT_BACKGROUND_PAGE_COLOR
-#: po/tmp/ap_String_Id.h.h:1749
-msgid "Page C&olor"
-msgstr ""
-
-#. MENU_LABEL_FMT_BACKGROUND_PAGE_IMAGE
-#: po/tmp/ap_String_Id.h.h:1751
-msgid "Page Image"
-msgstr ""
-
-#. MENU_LABEL_INSERT_PAGENO
-#: po/tmp/ap_String_Id.h.h:1753
-msgid "Page N&umbers"
-msgstr ""
-
-#. FIELD_Numbers_PageNumber
-#: po/tmp/ap_String_Id.h.h:1755
-msgid "Page Number"
-msgstr ""
-
-#. DLG_HdrFtr_PageNumberProperties
-#: po/tmp/ap_String_Id.h.h:1757
-msgid "Page Number Properties"
-msgstr ""
-
-#. DLG_PageNumbers_Title
-#: po/tmp/ap_String_Id.h.h:1759
-msgid "Page Numbers"
-msgstr ""
-
-#. FIELD_Numbers_PageReference
-#: po/tmp/ap_String_Id.h.h:1761
-msgid "Page Reference"
-msgstr ""
-
-#. MENU_LABEL_FILE_PAGESETUP
-#: po/tmp/ap_String_Id.h.h:1763
-msgid "Page Set&up"
-msgstr ""
-
-#. DLG_PageSetup_Title
-#: po/tmp/ap_String_Id.h.h:1765
-msgid "Page Setup"
-msgstr ""
-
-#. PageInfoField
-#: po/tmp/ap_String_Id.h.h:1767
-#, c-format
-msgid "Page: %d/%d"
-msgstr ""
-
-#. DLG_WordCount_Pages
-#: po/tmp/ap_String_Id.h.h:1769
-msgid "Pages:"
-msgstr ""
-
-#. DLG_Para_LabelPagination
-#: po/tmp/ap_String_Id.h.h:1771
-msgid "Pagination"
-msgstr ""
-
-#. DLG_PageSetup_Paper_Size
-#: po/tmp/ap_String_Id.h.h:1773
-msgid "Paper Si&ze:"
-msgstr ""
-
-#. DLG_PageSetup_Paper
-#: po/tmp/ap_String_Id.h.h:1775
-msgid "Paper..."
-msgstr ""
-
-#. DLG_Styles_ModifyParagraph
-#. DLG_Para_ParaTitle
-#: po/tmp/ap_String_Id.h.h:1778
-msgid "Paragraph"
-msgstr ""
-
-#. FIELD_Numbers_ParaCount
-#: po/tmp/ap_String_Id.h.h:1780
-msgid "Paragraph Count"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_DOM_DIRECTION
-#: po/tmp/ap_String_Id.h.h:1782
-msgid "Paragraph Direction"
-msgstr ""
-
-#. DLG_Styles_ParaPrev
-#: po/tmp/ap_String_Id.h.h:1784
-msgid "Paragraph Preview"
-msgstr ""
-
-#. DLG_WordCount_Paragraphs
-#: po/tmp/ap_String_Id.h.h:1786
-msgid "Paragraphs:"
-msgstr ""
-
-#. WORD_PassRequired
-#: po/tmp/ap_String_Id.h.h:1788
-msgid "Password required, this is an encrypted document"
-msgstr ""
-
-#. TOOLBAR_LABEL_EDIT_PASTE
-#. TOOLBAR_STATUSLINE_EDIT_PASTE
-#. TOOLBAR_TOOLTIP_EDIT_PASTE
-#: po/tmp/ap_String_Id.h.h:1792
-msgid "Paste"
-msgstr ""
-
-#. DLG_MetaData_TAB_Permission
-#: po/tmp/ap_String_Id.h.h:1794
-msgid "Permissions"
-msgstr ""
-
-#. DLG_Goto_Target_Picture
-#: po/tmp/ap_String_Id.h.h:1796
-msgid "Picture"
-msgstr ""
-
-#. FIELD_Type_PieceTable
-#: po/tmp/ap_String_Id.h.h:1798
-msgid "Piece Table"
-msgstr ""
-
-#. DLG_FormatFootnotes_EndPlaceEndDoc
-#: po/tmp/ap_String_Id.h.h:1800
-msgid "Place at end of document"
-msgstr ""
-
-#. DLG_FormatFootnotes_EndPlaceEndSec
-#: po/tmp/ap_String_Id.h.h:1802
-msgid "Place at end of section"
-msgstr ""
-
-#. DLG_FormatFootnotes_EndPlacement
-#: po/tmp/ap_String_Id.h.h:1804
-msgid "Placement"
-msgstr ""
-
-#. DLG_Tab_Label_Position
-#. DLG_PageNumbers_Position_No_Colon
-#: po/tmp/ap_String_Id.h.h:1807
-msgid "Position"
-msgstr ""
-
-#. DLG_FormatFrame_PositionTo
-#: po/tmp/ap_String_Id.h.h:1809
-msgid "Position Text Box"
-msgstr ""
-
-#. DLG_FormatFrame_SetToColumn
-#: po/tmp/ap_String_Id.h.h:1811
-msgid "Position to Column"
-msgstr ""
-
-#. DLG_FormatFrame_SetToPage
-#: po/tmp/ap_String_Id.h.h:1813
-msgid "Position to Page"
-msgstr ""
-
-#. DLG_FormatFrame_SetToParagraph
-#: po/tmp/ap_String_Id.h.h:1815
-msgid "Position to Paragraph"
-msgstr ""
-
-#. DLG_PageNumbers_Position
-#: po/tmp/ap_String_Id.h.h:1817
-msgid "Position:"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_OPTIONS
-#: po/tmp/ap_String_Id.h.h:1819
-msgid "Pr&eferences"
-msgstr ""
-
-#. DLG_Options_TabLabel_Preferences
-#. DLG_Options_Label_Schemes
-#: po/tmp/ap_String_Id.h.h:1822
-msgid "Preference Schemes"
-msgstr ""
-
-#. DLG_Options_OptionsTitle
-#: po/tmp/ap_String_Id.h.h:1824
-msgid "Preferences"
-msgstr ""
-
-#. DLG_Styles_ModifyPreview
-#. DLG_Para_LabelPreview
-#. DLG_Column_Preview
-#. DLG_FormatFrame_Preview
-#. DLG_FormatTable_Preview
-#. DLG_Lists_Preview
-#. DLG_PageNumbers_Preview
-#. DLG_Zoom_PreviewFrame
-#: po/tmp/ap_String_Id.h.h:1832 po/tmp/xap_String_Id.h.h:604
-msgid "Preview"
-msgstr ""
-
-#. MENU_STATUSLINE_WEB_WEBPREVIEW
-#. MENU_STATUSLINE_WEB_SAVEASWEB
-#: po/tmp/ap_String_Id.h.h:1835
-msgid "Preview the document as a web page"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_PRINT_PREVIEW
-#. TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW
-#. TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW
-#: po/tmp/ap_String_Id.h.h:1839
-msgid "Preview the document before printing"
-msgstr ""
-
-#. DLG_Para_PreviewPrevParagraph
-#: po/tmp/ap_String_Id.h.h:1841
-msgid ""
-"Previous Paragraph Previous Paragraph Previous Paragraph Previous Paragraph "
-"Previous Paragraph Previous Paragraph Previous Paragraph"
-msgstr ""
-
-#. TOOLBAR_LABEL_FILE_PRINT
-#. DLG_UP_PrintTitle
-#. DLG_UP_PrintButton
-#: po/tmp/ap_String_Id.h.h:1843 po/tmp/xap_String_Id.h.h:609
-msgid "Print"
-msgstr ""
-
-#. MENU_LABEL_FILE_PRINT_DIRECTLY
-#: po/tmp/ap_String_Id.h.h:1845
-msgid "Print &directly"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_PRINT
-#: po/tmp/ap_String_Id.h.h:1847
-msgid "Print Layout"
-msgstr ""
-
-#. MENU_LABEL_FILE_PRINT_PREVIEW
-#: po/tmp/ap_String_Id.h.h:1849
-msgid "Print P&review"
-msgstr ""
-
-#. TOOLBAR_LABEL_FILE_PRINT_PREVIEW
-#: po/tmp/ap_String_Id.h.h:1851
-msgid "Print Preview"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_PRINT
-#: po/tmp/ap_String_Id.h.h:1853
-msgid "Print all or part of the document"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_FILE_PRINT
-#. TOOLBAR_TOOLTIP_FILE_PRINT
-#: po/tmp/ap_String_Id.h.h:1856
-msgid "Print the document"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_PRINT_DIRECTLY
-#: po/tmp/ap_String_Id.h.h:1858
-msgid "Print using the internal PS driver"
-msgstr ""
-
-#. MSG_PrintingDoc
-#: po/tmp/ap_String_Id.h.h:1860
-msgid "Printing Document.."
-msgstr ""
-
-#. MSG_PrintStatus
-#: po/tmp/ap_String_Id.h.h:1862
-#, c-format
-msgid "Printing page %d of %d"
-msgstr ""
-
-#. FIELD_Document_Publisher
-#: po/tmp/ap_String_Id.h.h:1864
-msgid "Publisher"
-msgstr ""
-
-#. DLG_MetaData_Publisher_LBL
-#: po/tmp/ap_String_Id.h.h:1866
-msgid "Publisher:"
-msgstr ""
-
-#. MENU_LABEL_EDIT_REPLACE
-#: po/tmp/ap_String_Id.h.h:1868
-msgid "R&eplace"
-msgstr ""
-
-#. MENU_LABEL_FMT_DIRECTION_DOCD_RTL
-#: po/tmp/ap_String_Id.h.h:1870
-msgid "RTL &Document"
-msgstr ""
-
-#. MENU_LABEL_FMT_DIRECTION_DD_RTL
-#: po/tmp/ap_String_Id.h.h:1872
-msgid "RTL &Paragraph"
-msgstr ""
-
-#. MENU_LABEL_FMT_DIRECTION_SD_RTL
-#: po/tmp/ap_String_Id.h.h:1874
-msgid "RTL &Section"
-msgstr ""
-
-#. DLG_FR_ReplaceWithLabel
-#: po/tmp/ap_String_Id.h.h:1876
-msgid "Re&place with:"
-msgstr ""
-
-#. DLG_FR_ReverseFind
-#: po/tmp/ap_String_Id.h.h:1878
-msgid "Re&verse find"
-msgstr ""
-
-#. MENU_LABEL_FILE_REVERT
-#: po/tmp/ap_String_Id.h.h:1880
-msgid "Re&vert"
-msgstr ""
-
-#. MENU_LABEL_FILE_RECENT
-#: po/tmp/ap_String_Id.h.h:1882
-msgid "Recent &Files"
-msgstr ""
-
-#. TOOLBAR_LABEL_EDIT_REDO
-#: po/tmp/ap_String_Id.h.h:1884
-msgid "Redo"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_EDIT_REDO
-#. TOOLBAR_TOOLTIP_EDIT_REDO
-#: po/tmp/ap_String_Id.h.h:1887
-msgid "Redo editing"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_REDO
-#: po/tmp/ap_String_Id.h.h:1889
-msgid "Redo previously undone editing"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_ZOOM_MENU
-#. MENU_STATUSLINE_VIEW_ZOOM
-#: po/tmp/ap_String_Id.h.h:1892
-msgid "Reduce or enlarge the document display"
-msgstr ""
-
-#. DLG_MetaData_Relation_LBL
-#: po/tmp/ap_String_Id.h.h:1894
-msgid "Relation:"
-msgstr ""
-
-#. DLG_Styles_RemoveButton
-#: po/tmp/ap_String_Id.h.h:1896
-msgid "Remove"
-msgstr ""
-
-#. MENU_LABEL_EDIT_REMOVEFOOTER
-#. TOOLBAR_LABEL_EDIT_REMOVEFOOTER
-#. TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER
-#. TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER
-#: po/tmp/ap_String_Id.h.h:1901
-msgid "Remove Footer"
-msgstr ""
-
-#. MENU_LABEL_EDIT_REMOVEHEADER
-#. TOOLBAR_LABEL_EDIT_REMOVEHEADER
-#. TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER
-#. TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER
-#: po/tmp/ap_String_Id.h.h:1906
-msgid "Remove Header"
-msgstr ""
-
-#. DLG_Styles_RemoveLab
-#: po/tmp/ap_String_Id.h.h:1908
-msgid "Remove Property from Style"
-msgstr ""
-
-#. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE
-#: po/tmp/ap_String_Id.h.h:1910
-msgid "Remove Row as Heading"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE
-#: po/tmp/ap_String_Id.h.h:1912
-msgid "Remove Row as the page Heading"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_PURGE
-#: po/tmp/ap_String_Id.h.h:1914
-msgid "Remove all revision information from the document"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_HISTORY_PURGE
-#: po/tmp/ap_String_Id.h.h:1916
-msgid "Remove full document history from the document"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_REMOVEFOOTER
-#: po/tmp/ap_String_Id.h.h:1918
-msgid "Remove the Footer on this page from the Document"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_REMOVEHEADER
-#: po/tmp/ap_String_Id.h.h:1920
-msgid "Remove the Header on this page from the Document"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_CUTIMAGE
-#: po/tmp/ap_String_Id.h.h:1922
-msgid "Remove the Image and save a copy on the clipboard"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_DELETEIMAGE
-#: po/tmp/ap_String_Id.h.h:1924
-msgid "Remove the Image from the Document"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_DELETEFRAME
-#: po/tmp/ap_String_Id.h.h:1926
-msgid "Remove the Text Box from the Document"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION
-#: po/tmp/ap_String_Id.h.h:1928
-msgid "Remove the suggested change"
-msgstr ""
-
-#. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT
-#: po/tmp/ap_String_Id.h.h:1930
-msgid "Repeat Row as Heading"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT
-#: po/tmp/ap_String_Id.h.h:1932
-msgid "Repeat Row as Heading on each new page"
-msgstr ""
-
-#. DLG_FR_ReplaceTitle
-#: po/tmp/ap_String_Id.h.h:1934
-msgid "Replace"
-msgstr ""
-
-#. DLG_FR_ReplaceAllButton
-#: po/tmp/ap_String_Id.h.h:1936
-msgid "Replace &All"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_REPLACE
-#: po/tmp/ap_String_Id.h.h:1938
-msgid "Replace the specified text with different text"
-msgstr ""
-
-#. MENU_LABEL_HELP_REPORT_BUG
-#: po/tmp/ap_String_Id.h.h:1940
-msgid "Report a &Bug"
-msgstr ""
-
-#. MENU_STATUSLINE_HELP_REPORT_BUG
-#: po/tmp/ap_String_Id.h.h:1942
-msgid "Report a bug and help AbiWord become a better product"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT
-#: po/tmp/ap_String_Id.h.h:1944
-msgid "Reset the current toolbar layout to its defaults"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_IMAGE
-#: po/tmp/ap_String_Id.h.h:1946
-msgid "Resize this image"
-msgstr ""
-
-#. DLG_HdrFtr_RestartNumbers
-#: po/tmp/ap_String_Id.h.h:1948
-msgid "Restart numbering at:"
-msgstr ""
-
-#. DLG_FormatFootnotes_FootRestartPage
-#: po/tmp/ap_String_Id.h.h:1950
-msgid "Restart on each page"
-msgstr ""
-
-#. DLG_FormatFootnotes_FootRestartSec
-#. DLG_FormatFootnotes_EndRestartSec
-#: po/tmp/ap_String_Id.h.h:1953
-msgid "Restart on each section"
-msgstr ""
-
-#. DLG_HdrFtr_RestartCheck
-#: po/tmp/ap_String_Id.h.h:1955
-msgid "Restart page numbers on new sections"
-msgstr ""
-
-#. DLG_Lists_Resume_Previous_List
-#: po/tmp/ap_String_Id.h.h:1957
-msgid "Resume Previous List"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_AUTO
-#: po/tmp/ap_String_Id.h.h:1959
-msgid "Retain all document changes"
-msgstr ""
-
-#. MSG_RevertFile
-#: po/tmp/ap_String_Id.h.h:1961
-msgid "Revert file to last saved state?"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_REVERT
-#: po/tmp/ap_String_Id.h.h:1963
-msgid "Revert the document to the last saved state"
-msgstr ""
-
-#. MSG_RevertBuffer
-#: po/tmp/ap_String_Id.h.h:1965
-#, c-format
-msgid "Revert to saved copy of %s?"
-msgstr ""
-
-#. DLG_ListRevisions_Column1Label
-#: po/tmp/ap_String_Id.h.h:1967
-msgid "Revision ID"
-msgstr ""
-
-#. DLG_Para_AlignRight
-#. DLG_Tab_Radio_Right
-#. DLG_PageNumbers_Right
-#. TOOLBAR_LABEL_ALIGN_RIGHT
-#: po/tmp/ap_String_Id.h.h:1972
-msgid "Right"
-msgstr ""
-
-#. RightIndentStatus
-#: po/tmp/ap_String_Id.h.h:1974
-#, c-format
-msgid "Right Indent [%s]"
-msgstr ""
-
-#. RightMarginStatus
-#: po/tmp/ap_String_Id.h.h:1976
-#, c-format
-msgid "Right Margin [%s]"
-msgstr ""
-
-#. TabToggleRightTab
-#: po/tmp/ap_String_Id.h.h:1978
-msgid "Right Tab"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_ALIGN_RIGHT
-#. TOOLBAR_TOOLTIP_ALIGN_RIGHT
-#: po/tmp/ap_String_Id.h.h:1981
-msgid "Right alignment"
-msgstr ""
-
-#. MENU_STATUSLINE_ALIGN_RIGHT
-#: po/tmp/ap_String_Id.h.h:1983
-msgid "Right-align the paragraph"
-msgstr ""
-
-#. DLG_Para_DomDirection
-#: po/tmp/ap_String_Id.h.h:1985
-msgid "Right-to-left &dominant"
-msgstr ""
-
-#. FIELD_Document_Rights
-#: po/tmp/ap_String_Id.h.h:1987
-msgid "Rights"
-msgstr ""
-
-#. DLG_MetaData_Rights_LBL
-#: po/tmp/ap_String_Id.h.h:1989
-msgid "Rights:"
-msgstr ""
-
-#. DLG_FormatTable_Apply_To_Row
-#: po/tmp/ap_String_Id.h.h:1991
-msgid "Row"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERT_ROWS_BEFORE
-#: po/tmp/ap_String_Id.h.h:1993
-msgid "Rows &Above"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERT_ROWS_AFTER
-#: po/tmp/ap_String_Id.h.h:1995
-msgid "Rows &Below"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_SCRIPTS
-#: po/tmp/ap_String_Id.h.h:1997
-msgid "S&cripts"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_SHOW
-#: po/tmp/ap_String_Id.h.h:1999
-msgid "S&how revisions"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SPLIT_CELLS
-#: po/tmp/ap_String_Id.h.h:2001
-msgid "S&plit Cells"
-msgstr ""
-
-#. DLG_Options_Btn_Save
-#: po/tmp/ap_String_Id.h.h:2003
-msgid "Sa&ve"
-msgstr ""
-
-#. MENU_LABEL_FILE_EXPORT
-#: po/tmp/ap_String_Id.h.h:2005
-msgid "Sav&e Copy"
-msgstr ""
-
-#. TOOLBAR_LABEL_FILE_SAVE
-#: po/tmp/ap_String_Id.h.h:2007
-msgid "Save"
-msgstr ""
-
-#. MENU_LABEL_FILE_SAVEAS
-#: po/tmp/ap_String_Id.h.h:2009
-msgid "Save &As"
-msgstr ""
-
-#. MENU_LABEL_FILE_SAVE_TEMPLATE
-#: po/tmp/ap_String_Id.h.h:2011
-msgid "Save &Template"
-msgstr ""
-
-#. TOOLBAR_LABEL_FILE_SAVEAS
-#: po/tmp/ap_String_Id.h.h:2013
-msgid "Save As"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_COPYIMAGE
-#: po/tmp/ap_String_Id.h.h:2015
-msgid "Save a copy of the image on the clipboard"
-msgstr ""
-
-#. MSG_ConfirmSave
-#: po/tmp/ap_String_Id.h.h:2017
-#, c-format
-msgid "Save changes to document %s before closing?"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_SAVEEMBED
-#: po/tmp/ap_String_Id.h.h:2019
-msgid "Save the Embedded Object"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_SAVE
-#. TOOLBAR_STATUSLINE_FILE_SAVE
-#. TOOLBAR_TOOLTIP_FILE_SAVE
-#: po/tmp/ap_String_Id.h.h:2023
-msgid "Save the document"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_SAVE_TEMPLATE
-#: po/tmp/ap_String_Id.h.h:2025
-msgid "Save the document as a template"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_SAVEAS
-#. TOOLBAR_STATUSLINE_FILE_SAVEAS
-#. TOOLBAR_TOOLTIP_FILE_SAVEAS
-#: po/tmp/ap_String_Id.h.h:2029
-msgid "Save the document under a different name"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_EXPORT
-#: po/tmp/ap_String_Id.h.h:2031
-msgid "Save the document without changing the current name"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_SAVEIMAGE
-#: po/tmp/ap_String_Id.h.h:2033
-msgid "Save the selected image to a file"
-msgstr ""
-
-#. MENU_LABEL_FILE_SAVEEMBED
-#: po/tmp/ap_String_Id.h.h:2035
-msgid "Save to file"
-msgstr ""
-
-#. DLG_PageSetup_Scale
-#: po/tmp/ap_String_Id.h.h:2037
-msgid "Scale..."
-msgstr ""
-
-#. MENU_STATUSLINE_HELP_SEARCH
-#: po/tmp/ap_String_Id.h.h:2039
-msgid "Search for help about..."
-msgstr ""
-
-#. DLG_WordCount_Update_Rate
-#: po/tmp/ap_String_Id.h.h:2041
-msgid "Seconds between updates"
-msgstr ""
-
-#. FIELD_DateTime_Epoch
-#: po/tmp/ap_String_Id.h.h:2043
-msgid "Seconds since the epoch"
-msgstr ""
-
-#. DLG_Break_SectionBreaks_Capital
-#: po/tmp/ap_String_Id.h.h:2045
-msgid "Section Breaks"
-msgstr ""
-
-#. DLG_Break_SectionBreaks
-#: po/tmp/ap_String_Id.h.h:2047
-msgid "Section breaks"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_HISTORY
-#: po/tmp/ap_String_Id.h.h:2049
-msgid "See history of the current document"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SELECT
-#. DLG_Select
-#: po/tmp/ap_String_Id.h.h:2051 po/tmp/xap_String_Id.h.h:667
-msgid "Select"
-msgstr ""
-
-#. MENU_LABEL_EDIT_SELECTALL
-#: po/tmp/ap_String_Id.h.h:2053
-msgid "Select A&ll"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SELECT_CELL
-#: po/tmp/ap_String_Id.h.h:2055
-msgid "Select Cell"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SELECT_COLUMN
-#: po/tmp/ap_String_Id.h.h:2057
-msgid "Select Column"
-msgstr ""
-
-#. TOOLBAR_TOOLTIP_FMT_CHOOSE
-#: po/tmp/ap_String_Id.h.h:2059
-msgid "Select Font"
-msgstr ""
-
-#. DLG_ListRevisions_Title
-#: po/tmp/ap_String_Id.h.h:2061
-msgid "Select Revision"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SELECT_ROW
-#: po/tmp/ap_String_Id.h.h:2063
-msgid "Select Row"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SELECT_TABLE
-#: po/tmp/ap_String_Id.h.h:2065
-msgid "Select Table"
-msgstr ""
-
-#. MENU_LABEL_EDIT_SELECT_FRAME
-#: po/tmp/ap_String_Id.h.h:2067
-msgid "Select Text Box"
-msgstr ""
-
-#. DLG_InsertHyperlink_Msg
-#: po/tmp/ap_String_Id.h.h:2069
-msgid "Select a target bookmark from the list."
-msgstr ""
-
-#. DLG_FormatFrame_SelectImage
-#. DLG_FormatTable_SelectImage
-#: po/tmp/ap_String_Id.h.h:2072
-msgid "Select image from File"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_SELECT_FRAME
-#: po/tmp/ap_String_Id.h.h:2074
-msgid "Select the Text Box"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_SELECTALL
-#: po/tmp/ap_String_Id.h.h:2076
-msgid "Select the entire document"
-msgstr ""
-
-#. DLG_FormatTable_Apply_To_Selection
-#. DLG_UP_Selection
-#: po/tmp/ap_String_Id.h.h:2078 po/tmp/xap_String_Id.h.h:675
-msgid "Selection"
-msgstr ""
-
-#. DLG_ToggleCase_SentenceCase
-#: po/tmp/ap_String_Id.h.h:2080
-msgid "Sentence case"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS
-#: po/tmp/ap_String_Id.h.h:2082
-msgid "Separate table items with commas"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS
-#: po/tmp/ap_String_Id.h.h:2084
-msgid "Separate table items with commas and tabs"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_TABLETOTEXTTABS
-#: po/tmp/ap_String_Id.h.h:2086
-msgid "Separate table items with tabs"
-msgstr ""
-
-#. MENU_LABEL_TABLE_TABLETOTEXTCOMMAS
-#: po/tmp/ap_String_Id.h.h:2088
-msgid "Separate with commas"
-msgstr ""
-
-#. MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS
-#: po/tmp/ap_String_Id.h.h:2090
-msgid "Separate with commas and tabs"
-msgstr ""
-
-#. MENU_LABEL_TABLE_TABLETOTEXTTABS
-#: po/tmp/ap_String_Id.h.h:2092
-msgid "Separate with tabs"
-msgstr ""
-
-#. DLG_Tab_Button_Set
-#: po/tmp/ap_String_Id.h.h:2094
-msgid "Set"
-msgstr ""
-
-#. MENU_LABEL_FMT_LANGUAGE
-#: po/tmp/ap_String_Id.h.h:2096
-msgid "Set &Language"
-msgstr ""
-
-#. DLG_Lists_SetDefault
-#: po/tmp/ap_String_Id.h.h:2098
-msgid "Set Default Values"
-msgstr ""
-
-#. DLG_FormatFrame_SetImage
-#. DLG_FormatTable_SetImage
-#: po/tmp/ap_String_Id.h.h:2101
-msgid "Set Image"
-msgstr ""
-
-#. MENU_LABEL_FMT_SETPOSIMAGE
-#: po/tmp/ap_String_Id.h.h:2103
-msgid "Set Positioned Image"
-msgstr ""
-
-#. DLG_FormatFrame_SetTextWrapping
-#: po/tmp/ap_String_Id.h.h:2105
-msgid "Set Text Wrapping"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE
-#: po/tmp/ap_String_Id.h.h:2107
-msgid "Set an image as a background for your page"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL
-#: po/tmp/ap_String_Id.h.h:2109
-msgid "Set dominant direction of document to RTL"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_DIRECTION_DD_RTL
-#: po/tmp/ap_String_Id.h.h:2111
-msgid "Set dominant direction of paragraph to RTL"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_DIRECTION_SD_RTL
-#: po/tmp/ap_String_Id.h.h:2113
-msgid "Set dominant direction of section to RTL"
-msgstr ""
-
-#. MENU_STATUSLINE_FILE_PROPERTIES
-#: po/tmp/ap_String_Id.h.h:2115
-msgid "Set meta-data properties"
-msgstr ""
-
-#. DLG_Tab_Label_New
-#: po/tmp/ap_String_Id.h.h:2117
-msgid "Set new Tab"
-msgstr ""
-
-#. DLG_FormatFrame_NoImageBackground
-#. DLG_FormatTable_NoImageBackground
-#: po/tmp/ap_String_Id.h.h:2120
-msgid "Set no image"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_OPTIONS
-#: po/tmp/ap_String_Id.h.h:2122
-msgid "Set preferences"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_TABS
-#: po/tmp/ap_String_Id.h.h:2124
-msgid "Set tab stops"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_TABLEOFCONTENTS
-#: po/tmp/ap_String_Id.h.h:2126
-msgid "Set the type and styles of the Table of Contents"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_FOOTNOTES
-#: po/tmp/ap_String_Id.h.h:2128
-msgid "Set the types of Footnotes and Endnotes"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_HDRFTR
-#: po/tmp/ap_String_Id.h.h:2130
-msgid "Set the types of Headers and Footers"
-msgstr ""
-
-#. MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS
-#: po/tmp/ap_String_Id.h.h:2132
-msgid "Set this Row as Heading"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS
-#: po/tmp/ap_String_Id.h.h:2134
-msgid "Set this Row as the Heading on each page"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_SETPOSIMAGE
-#: po/tmp/ap_String_Id.h.h:2136
-msgid "Set this image to be positioned"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_SPELLPREFS
-#: po/tmp/ap_String_Id.h.h:2138
-msgid "Set your spelling preferences"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_DOCUMENT
-#: po/tmp/ap_String_Id.h.h:2140
-msgid "Setup your document's page properties such as page size and margins"
-msgstr ""
-
-#. DLG_Styles_ModifyShortCut
-#: po/tmp/ap_String_Id.h.h:2142
-msgid "Shortcut Key"
-msgstr ""
-
-#. DLG_Options_Label_Show
-#. DLG_Show
-#: po/tmp/ap_String_Id.h.h:2144 po/tmp/xap_String_Id.h.h:687
-msgid "Show"
-msgstr ""
-
-#. MENU_LABEL_VIEW_RULER
-#: po/tmp/ap_String_Id.h.h:2146
-msgid "Show &Ruler"
-msgstr ""
-
-#. TOOLBAR_LABEL_VIEW_SHOWPARA
-#: po/tmp/ap_String_Id.h.h:2148
-msgid "Show All"
-msgstr ""
-
-#. MENU_LABEL_VIEW_SHOWPARA
-#: po/tmp/ap_String_Id.h.h:2150
-msgid "Show For&matting Marks"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_SHOW_BEFORE
-#: po/tmp/ap_String_Id.h.h:2152
-msgid "Show document &before revisions"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER
-#: po/tmp/ap_String_Id.h.h:2154
-msgid "Show document a&fter revisions"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV
-#: po/tmp/ap_String_Id.h.h:2156
-msgid "Show document after &previous revisions"
-msgstr ""
-
-#. MENU_STATUSLINE_WINDOW_MORE
-#: po/tmp/ap_String_Id.h.h:2158
-msgid "Show full list of documents"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_RULER
-#: po/tmp/ap_String_Id.h.h:2160
-msgid "Show or hide the rulers"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_STATUSBAR
-#: po/tmp/ap_String_Id.h.h:2162
-msgid "Show or hide the status bar"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_TB_1
-#. MENU_STATUSLINE_VIEW_TB_2
-#. MENU_STATUSLINE_VIEW_TB_3
-#. MENU_STATUSLINE_VIEW_TB_4
-#: po/tmp/ap_String_Id.h.h:2167
-msgid "Show or hide the toolbar"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW
-#: po/tmp/ap_String_Id.h.h:2169
-msgid "Show revisions that are present in document"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTERPREV
-#: po/tmp/ap_String_Id.h.h:2171
-msgid "Show what the document looks like after previous revisions"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER
-#: po/tmp/ap_String_Id.h.h:2173
-msgid "Show what the document looks like after revisions"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE
-#: po/tmp/ap_String_Id.h.h:2175
-msgid "Show what the document looks like before revisions"
-msgstr ""
-
-#. DLG_Options_Label_ViewShowHide
-#: po/tmp/ap_String_Id.h.h:2177
-msgid "Show..."
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_VIEW_SHOWPARA
-#. TOOLBAR_TOOLTIP_VIEW_SHOWPARA
-#: po/tmp/ap_String_Id.h.h:2180
-msgid "Show/hide formatting marks"
-msgstr ""
-
-#. TB_Simple
-#: po/tmp/ap_String_Id.h.h:2182
-msgid "Simple"
-msgstr ""
-
-#. DLG_Options_Label_ViewSimpleTB
-#: po/tmp/ap_String_Id.h.h:2184
-msgid "Simple Toolbar"
-msgstr ""
-
-#. DLG_Para_SpacingSingle
-#: po/tmp/ap_String_Id.h.h:2186
-msgid "Single"
-msgstr ""
-
-#. TOOLBAR_LABEL_SINGLE_SPACE
-#: po/tmp/ap_String_Id.h.h:2188
-msgid "Single Spacing"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_SINGLE_SPACE
-#. TOOLBAR_TOOLTIP_SINGLE_SPACE
-#: po/tmp/ap_String_Id.h.h:2191
-msgid "Single spacing"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SORT
-#: po/tmp/ap_String_Id.h.h:2193
-msgid "So&rt Table"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SORTCOLSASCEND
-#: po/tmp/ap_String_Id.h.h:2195
-msgid "Sort Columns in Ascending Order"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SORTCOLSASCEND
-#: po/tmp/ap_String_Id.h.h:2197
-msgid "Sort Columns in Ascending Order based on Selected Row"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SORTCOLSDESCEND
-#: po/tmp/ap_String_Id.h.h:2199
-msgid "Sort Columns in Descending Order"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SORTCOLSDESCEND
-#: po/tmp/ap_String_Id.h.h:2201
-msgid "Sort Columns in Descending Order based on Selected Row"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SORTROWSASCEND
-#: po/tmp/ap_String_Id.h.h:2203
-msgid "Sort Rows in Ascending Order"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SORTROWSASCEND
-#: po/tmp/ap_String_Id.h.h:2205
-msgid "Sort Rows in Ascending Order based on selected Column"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SORTROWSDESCEND
-#: po/tmp/ap_String_Id.h.h:2207
-msgid "Sort Rows in Descending Order"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SORTROWSDESCEND
-#: po/tmp/ap_String_Id.h.h:2209
-msgid "Sort Rows in Descending Order based on Selected Column"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SORT
-#: po/tmp/ap_String_Id.h.h:2211
-msgid "Sort Table"
-msgstr ""
-
-#. DLG_MetaData_Source_LBL
-#: po/tmp/ap_String_Id.h.h:2213
-msgid "Source:"
-msgstr ""
-
-#. DLG_Column_Space_After
-#: po/tmp/ap_String_Id.h.h:2215
-msgid "Space after Column"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_PARA_12BEFORE
-#. TOOLBAR_TOOLTIP_PARA_12BEFORE
-#: po/tmp/ap_String_Id.h.h:2218
-msgid "Space before: 12 pt"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_PARA_0BEFORE
-#. TOOLBAR_TOOLTIP_PARA_0BEFORE
-#: po/tmp/ap_String_Id.h.h:2221
-msgid "Space before: None"
-msgstr ""
-
-#. DLG_Para_LabelSpacing
-#: po/tmp/ap_String_Id.h.h:2223
-msgid "Spacing"
-msgstr ""
-
-#. DLG_Options_SpellCheckingTitle
-#: po/tmp/ap_String_Id.h.h:2225
-msgid "Spell Checking"
-msgstr ""
-
-#. TOOLBAR_LABEL_SPELLCHECK
-#: po/tmp/ap_String_Id.h.h:2227
-msgid "Spellcheck"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_SPELLCHECK
-#. TOOLBAR_TOOLTIP_SPELLCHECK
-#: po/tmp/ap_String_Id.h.h:2230
-msgid "Spellcheck the document"
-msgstr ""
-
-#. DLG_Spell_SpellTitle
-#. DLG_Options_TabLabel_Spelling
-#: po/tmp/ap_String_Id.h.h:2233
-msgid "Spelling"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_SPELLPREFS
-#: po/tmp/ap_String_Id.h.h:2235
-msgid "Spelling &Options"
-msgstr ""
-
-#. MENU_LABEL_TABLE_SPLIT_TABLE
-#: po/tmp/ap_String_Id.h.h:2237
-msgid "Spli&t Table"
-msgstr ""
-
-#. DLG_SplitCellsTitle
-#. DLG_SplitCells_Frame
-#. MENU_STATUSLINE_TABLE_SPLIT_CELLS
-#: po/tmp/ap_String_Id.h.h:2241
-msgid "Split Cells"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_SPLIT_TABLE
-#: po/tmp/ap_String_Id.h.h:2243
-msgid "Split Table"
-msgstr ""
-
-#. TOOLBAR_LABEL_SPLIT_CELLS
-#: po/tmp/ap_String_Id.h.h:2245
-msgid "Split cells"
-msgstr ""
-
-#. DLG_SplitCells_HoriMid
-#. DLG_SplitCells_VertMid
-#: po/tmp/ap_String_Id.h.h:2248
-msgid "Split in Middle"
-msgstr ""
-
-#. DLG_SplitCells_Below
-#: po/tmp/ap_String_Id.h.h:2250
-msgid "Split on Bottom Side"
-msgstr ""
-
-#. DLG_SplitCells_Left
-#: po/tmp/ap_String_Id.h.h:2252
-msgid "Split on Left Side"
-msgstr ""
-
-#. DLG_SplitCells_Right
-#: po/tmp/ap_String_Id.h.h:2254
-msgid "Split on Right Side"
-msgstr ""
-
-#. DLG_SplitCells_Above
-#: po/tmp/ap_String_Id.h.h:2256
-msgid "Split on Top Side"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES
-#: po/tmp/ap_String_Id.h.h:2258
-msgid "Split on all delimiters except spaces"
-msgstr ""
-
-#. MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL
-#: po/tmp/ap_String_Id.h.h:2260
-msgid "Split on all word delimiters including spaces"
-msgstr ""
-
-#. MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES
-#: po/tmp/ap_String_Id.h.h:2262
-msgid "Split text at commas or tabs"
-msgstr ""
-
-#. MENU_LABEL_TABLE_TEXTTOTABLE_ALL
-#: po/tmp/ap_String_Id.h.h:2264
-msgid "Split text at spaces, commas, or tabs"
-msgstr ""
-
-#. TOOLBAR_STATUSLINE_SPLIT_CELLS
-#. TOOLBAR_TOOLTIP_SPLIT_CELLS
-#: po/tmp/ap_String_Id.h.h:2267
-msgid "Split this cell"
-msgstr ""
-
-#. DLG_Lists_Square_List
-#. STYLE_SQUARELIST
-#: po/tmp/ap_String_Id.h.h:2269 po/tmp/xap_String_Id.h.h:699
-msgid "Square List"
-msgstr ""
-
-#. MENU_LABEL_FMT_STYLE
-#: po/tmp/ap_String_Id.h.h:2271
-msgid "St&yle"
-msgstr ""
-
-#. TB_Standard
-#: po/tmp/ap_String_Id.h.h:2273
-msgid "Standard"
-msgstr ""
-
-#. DLG_Options_Label_ViewStandardTB
-#: po/tmp/ap_String_Id.h.h:2275
-msgid "Standard Toolbar"
-msgstr ""
-
-#. DLG_Lists_Star_List
-#. STYLE_STARLIST
-#: po/tmp/ap_String_Id.h.h:2277 po/tmp/xap_String_Id.h.h:703
-msgid "Star List"
-msgstr ""
-
-#. DLG_Lists_Start
-#: po/tmp/ap_String_Id.h.h:2279
-msgid "Start At:"
-msgstr ""
-
-#. DLG_Lists_Start_New_List
-#. DLG_Lists_Start_New
-#: po/tmp/ap_String_Id.h.h:2282
-msgid "Start New List"
-msgstr ""
-
-#. DLG_Lists_Start_Sub
-#: po/tmp/ap_String_Id.h.h:2284
-msgid "Start Sublist"
-msgstr ""
-
-#. DLG_MarkRevisions_Check2Label
-#: po/tmp/ap_String_Id.h.h:2286
-msgid "Start a new revision"
-msgstr ""
-
-#. MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION
-#: po/tmp/ap_String_Id.h.h:2288
-msgid "Start ne&w revision"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION
-#: po/tmp/ap_String_Id.h.h:2290
-msgid "Start revision distinct from the current one"
-msgstr ""
-
-#. DLG_WordCount_Statistics
-#: po/tmp/ap_String_Id.h.h:2292
-msgid "Statistics:"
-msgstr ""
-
-#. DLG_Lists_Stop_Current_List
-#: po/tmp/ap_String_Id.h.h:2294
-msgid "Stop Current List"
-msgstr ""
-
-#. MENU_LABEL_FMT_STRIKE
-#: po/tmp/ap_String_Id.h.h:2296
-msgid "Stri&ke"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_STRIKE
-#. TOOLBAR_STATUSLINE_FMT_STRIKE
-#. TOOLBAR_TOOLTIP_FMT_STRIKE
-#. DLG_UFS_StrikeoutCheck
-#: po/tmp/ap_String_Id.h.h:2300 po/tmp/xap_String_Id.h.h:705
-msgid "Strike"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_STRIKE
-#: po/tmp/ap_String_Id.h.h:2302
-msgid "Strikeout the selection (toggle)"
-msgstr ""
-
-#. MENU_LABEL_FMT_STYLIST
-#: po/tmp/ap_String_Id.h.h:2304
-msgid "Sty&list"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_STYLE
-#. TOOLBAR_STATUSLINE_FMT_STYLE
-#. TOOLBAR_TOOLTIP_FMT_STYLE
-#: po/tmp/ap_String_Id.h.h:2308
-msgid "Style"
-msgstr ""
-
-#. DLG_Styles_ErrNotTitle1
-#: po/tmp/ap_String_Id.h.h:2310
-msgid "Style Name - "
-msgstr ""
-
-#. DLG_Styles_ModifyName
-#: po/tmp/ap_String_Id.h.h:2312
-msgid "Style Name:"
-msgstr ""
-
-#. DLG_Styles_ModifyType
-#: po/tmp/ap_String_Id.h.h:2314
-msgid "Style Type"
-msgstr ""
-
-#. DLG_Styles_ModifyFollowing
-#: po/tmp/ap_String_Id.h.h:2316
-msgid "Style for following paragraph"
-msgstr ""
-
-#. DLG_Styles_ErrBlankName
-#: po/tmp/ap_String_Id.h.h:2318
-msgid "Style name cannot be left blank"
-msgstr ""
-
-#. DLG_Lists_Style
-#. DLG_UFS_StyleLabel
-#: po/tmp/ap_String_Id.h.h:2320 po/tmp/xap_String_Id.h.h:707
-msgid "Style:"
-msgstr ""
-
-#. DLG_Styles_StylesTitle
-#. DLG_Stylist_Styles
-#: po/tmp/ap_String_Id.h.h:2323
-msgid "Styles"
-msgstr ""
-
-#. DLG_Stylist_Title
-#: po/tmp/ap_String_Id.h.h:2325
-msgid "Stylist"
-msgstr ""
-
-#. FIELD_Document_Subject
-#: po/tmp/ap_String_Id.h.h:2327
-msgid "Subject"
-msgstr ""
-
-#. DLG_MetaData_Subject_LBL
-#: po/tmp/ap_String_Id.h.h:2329
-msgid "Subject:"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_SUBSCRIPT
-#. TOOLBAR_STATUSLINE_FMT_SUBSCRIPT
-#. TOOLBAR_TOOLTIP_FMT_SUBSCRIPT
-#. DLG_UFS_SubScript
-#: po/tmp/ap_String_Id.h.h:2333 po/tmp/xap_String_Id.h.h:711
-msgid "Subscript"
-msgstr ""
-
-#. DLG_Spell_Suggestions
-#: po/tmp/ap_String_Id.h.h:2335
-msgid "Sugg&estions:"
-msgstr ""
-
-#. DLG_Options_Label_SpellMainOnly
-#: po/tmp/ap_String_Id.h.h:2337
-msgid "Suggest from &main dictionary only"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERT_SUMROWS
-#: po/tmp/ap_String_Id.h.h:2339
-msgid "Sum a Column"
-msgstr ""
-
-#. MENU_LABEL_TABLE_INSERT_SUMCOLS
-#: po/tmp/ap_String_Id.h.h:2341
-msgid "Sum a Row"
-msgstr ""
-
-#. FIELD_Numbers_TableSumRows
-#: po/tmp/ap_String_Id.h.h:2343
-msgid "Sum a Table Column"
-msgstr ""
-
-#. FIELD_Numbers_TableSumCols
-#: po/tmp/ap_String_Id.h.h:2345
-msgid "Sum a Table Row"
-msgstr ""
-
-#. DLG_MetaData_TAB_Summary
-#: po/tmp/ap_String_Id.h.h:2347
-msgid "Summary"
-msgstr ""
-
-#. MENU_LABEL_FMT_SUPERSCRIPT
-#: po/tmp/ap_String_Id.h.h:2349
-msgid "Supe&rscript"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_SUPERSCRIPT
-#. TOOLBAR_STATUSLINE_FMT_SUPERSCRIPT
-#. TOOLBAR_TOOLTIP_FMT_SUPERSCRIPT
-#. DLG_UFS_SuperScript
-#: po/tmp/ap_String_Id.h.h:2353 po/tmp/xap_String_Id.h.h:713
-msgid "Superscript"
-msgstr ""
-
-#. MENU_LABEL_INSERT_SYMBOL
-#: po/tmp/ap_String_Id.h.h:2355
-msgid "Sy&mbol"
-msgstr ""
-
-#. TOOLBAR_LABEL_INSERT_SYMBOL
-#: po/tmp/ap_String_Id.h.h:2357
-msgid "Symbol"
-msgstr ""
-
-#. MENU_LABEL_TABLE
-#: po/tmp/ap_String_Id.h.h:2359
-msgid "T&able"
-msgstr ""
-
-#. TabStopStatus
-#: po/tmp/ap_String_Id.h.h:2361
-#, c-format
-msgid "Tab Stop [%s]"
-msgstr ""
-
-#. DLG_Tab_Label_TabPosition
-#: po/tmp/ap_String_Id.h.h:2363
-msgid "Tab stop position:"
-msgstr ""
-
-#. DLG_Tab_Label_TabToClear
-#: po/tmp/ap_String_Id.h.h:2365
-msgid "Tab stops to be cleared:"
-msgstr ""
-
-#. DLG_FormatTable_Apply_To_Table
-#. MENU_STATUSLINE_TABLE
-#. TB_Table
-#: po/tmp/ap_String_Id.h.h:2369 po/tmp/xap_String_Id.h.h:723
-msgid "Table"
-msgstr ""
-
-#. DLG_InsertTable_TableSize_Capital
-#: po/tmp/ap_String_Id.h.h:2371
-msgid "Table Size"
-msgstr ""
-
-#. DLG_Options_Label_ViewTableTB
-#: po/tmp/ap_String_Id.h.h:2373
-msgid "Table Toolbar"
-msgstr ""
-
-#. MENU_LABEL_INSERT_TABLEOFCONTENTS
-#. MENU_LABEL_FMT_TABLEOFCONTENTS
-#: po/tmp/ap_String_Id.h.h:2376
-msgid "Table of Contents"
-msgstr ""
-
-#. FIELD_Numbers_TOCListLabel
-#: po/tmp/ap_String_Id.h.h:2378
-msgid "Table of Contents List Label"
-msgstr ""
-
-#. FIELD_Numbers_TOCPageNumber
-#: po/tmp/ap_String_Id.h.h:2380
-msgid "Table of Contents Page"
-msgstr ""
-
-#. DLG_InsertTable_TableSize
-#: po/tmp/ap_String_Id.h.h:2382
-msgid "Table size"
-msgstr ""
-
-#. DLG_Styles_ModifyTabs
-#. DLG_Tab_TabTitle
-#: po/tmp/ap_String_Id.h.h:2385
-msgid "Tabs"
-msgstr ""
-
-#. DLG_FormatTOC_DetailsTabPage
-#: po/tmp/ap_String_Id.h.h:2387
-msgid "Tabs and Page Numbering"
-msgstr ""
-
-#. MENU_LABEL_FMT
-#: po/tmp/ap_String_Id.h.h:2389
-msgid "Te&xt Formatting"
-msgstr ""
-
-#. DLG_Options_Label_Text
-#: po/tmp/ap_String_Id.h.h:2391
-msgid "Text"
-msgstr ""
-
-#. DLG_FormatTOC_TextAfter
-#: po/tmp/ap_String_Id.h.h:2393
-msgid "Text &after:"
-msgstr ""
-
-#. DLG_FormatTOC_TextBefore
-#: po/tmp/ap_String_Id.h.h:2395
-msgid "Text &before:"
-msgstr ""
-
-#. DLG_Lists_Align
-#: po/tmp/ap_String_Id.h.h:2397
-msgid "Text Align:"
-msgstr ""
-
-#. MENU_LABEL_INSERT_TEXTBOX
-#. MENU_LABEL_FMT_FRAME
-#: po/tmp/ap_String_Id.h.h:2400
-msgid "Text Box"
-msgstr ""
-
-#. DLG_Lists_PageFolding
-#: po/tmp/ap_String_Id.h.h:2402
-msgid "Text Folding"
-msgstr ""
-
-#. DLG_FormatFrame_TextWrapping
-#: po/tmp/ap_String_Id.h.h:2404
-msgid "Text Wrapping"
-msgstr ""
-
-#. DLG_Options_Label_Both
-#: po/tmp/ap_String_Id.h.h:2406
-msgid "Text and Icon"
-msgstr ""
-
-#. DLG_PageSetup_ErrBigMargins
-#: po/tmp/ap_String_Id.h.h:2408
-msgid "The margins selected are too large to fit on the page."
-msgstr ""
-
-#. DLG_Options_Prompt_YouMustRestart
-#: po/tmp/ap_String_Id.h.h:2410
-msgid ""
-"The new user interface language will take effect the next time that you "
-"start the application"
-msgstr ""
-
-#. MSG_SpellDone
-#: po/tmp/ap_String_Id.h.h:2412
-msgid "The spelling check is complete."
-msgstr ""
-
-#. MSG_HyperlinkCrossesBoundaries
-#: po/tmp/ap_String_Id.h.h:2414
-msgid ""
-"The text to which the hyperlink is to be attached must be within a single "
-"paragraph."
-msgstr ""
-
-#. FIELD_DateTime_Wkday
-#: po/tmp/ap_String_Id.h.h:2416
-msgid "The weekday"
-msgstr ""
-
-#. DLG_FormatTable_Thickness
-#: po/tmp/ap_String_Id.h.h:2418
-msgid "Thickness:"
-msgstr ""
-
-#. MSG_AfterRestartNew
-#: po/tmp/ap_String_Id.h.h:2420
-msgid ""
-"This change will only take effect when you restart AbiWord or create a new "
-"document."
-msgstr ""
-
-#. MSG_HiddenRevisions
-#: po/tmp/ap_String_Id.h.h:2422
-msgid ""
-"This document contains revisions which are currently hidden from view. "
-"Please see AbiWord documentation for information on working with revisions."
-msgstr ""
-
-#. DLG_Para_PreviewSampleFallback
-#: po/tmp/ap_String_Id.h.h:2424
-msgid ""
-"This paragraph represents words as they might appear in your document. To "
-"see text from your document used in this preview, position your cursor in a "
-"document paragraph with some text in it and open this dialog."
-msgstr ""
-
-#. DLG_Styles_ErrStyleNot
-#: po/tmp/ap_String_Id.h.h:2426
-msgid ""
-"This style does not exist \n"
-" so it cannot be modified"
-msgstr ""
-
-#. DLG_Column_Three
-#: po/tmp/ap_String_Id.h.h:2428
-msgid "Three"
-msgstr ""
-
-#. DLG_Lists_Tick_List
-#. STYLE_TICKLIST
-#: po/tmp/ap_String_Id.h.h:2430 po/tmp/xap_String_Id.h.h:757
-msgid "Tick List"
-msgstr ""
-
-#. FIELD_DateTime_TimeZone
-#: po/tmp/ap_String_Id.h.h:2432
-msgid "Time Zone"
-msgstr ""
-
-#. FIELD_Document_Title
-#: po/tmp/ap_String_Id.h.h:2434
-msgid "Title"
-msgstr ""
-
-#. DLG_ToggleCase_TitleCase
-#: po/tmp/ap_String_Id.h.h:2436
-msgid "Title Case"
-msgstr ""
-
-#. DLG_MetaData_Title_LBL
-#. DLG_Image_LblTitle
-#: po/tmp/ap_String_Id.h.h:2438 po/tmp/xap_String_Id.h.h:761
-msgid "Title:"
-msgstr ""
-
-#. DLG_Options_Label_Toolbars
-#: po/tmp/ap_String_Id.h.h:2440
-msgid "Toolbars"
-msgstr ""
-
-#. TopMarginStatus
-#: po/tmp/ap_String_Id.h.h:2442
-#, c-format
-msgid "Top Margin [%s]"
-msgstr ""
-
-#. MENU_LABEL_FMT_TOPLINE
-#. TOOLBAR_LABEL_FMT_TOPLINE
-#. TOOLBAR_STATUSLINE_FMT_TOPLINE
-#. TOOLBAR_TOOLTIP_FMT_TOPLINE
-#. DLG_UFS_ToplineCheck
-#: po/tmp/ap_String_Id.h.h:2447 po/tmp/xap_String_Id.h.h:767
-msgid "Topline"
-msgstr ""
-
-#. DLG_Lists_Triangle_List
-#. STYLE_TRIANGLELIST
-#: po/tmp/ap_String_Id.h.h:2449 po/tmp/xap_String_Id.h.h:769
-msgid "Triangle List"
-msgstr ""
-
-#. DLG_Column_Two
-#: po/tmp/ap_String_Id.h.h:2451
-msgid "Two"
-msgstr ""
-
-#. FIELD_Document_Type
-#: po/tmp/ap_String_Id.h.h:2453
-msgid "Type"
-msgstr ""
-
-#. DLG_InsertBookmark_Msg
-#: po/tmp/ap_String_Id.h.h:2455
-msgid "Type a name for the bookmark, or select an existing from the list."
-msgstr ""
-
-#. DLG_Lists_Type
-#: po/tmp/ap_String_Id.h.h:2457
-msgid "Type:"
-msgstr ""
-
-#. DLG_ToggleCase_UpperCase
-#: po/tmp/ap_String_Id.h.h:2459
-msgid "UPPERCASE"
-msgstr ""
-
-#. TOOLBAR_LABEL_FMT_UNDERLINE
-#. TOOLBAR_STATUSLINE_FMT_UNDERLINE
-#. TOOLBAR_TOOLTIP_FMT_UNDERLINE
-#. DLG_UFS_UnderlineCheck
-#: po/tmp/ap_String_Id.h.h:2463 po/tmp/xap_String_Id.h.h:789
-msgid "Underline"
-msgstr ""
-
-#. MENU_STATUSLINE_FMT_UNDERLINE
-#: po/tmp/ap_String_Id.h.h:2465
-msgid "Underline the selection (toggle)"
-msgstr ""
-
-#. TOOLBAR_LABEL_EDIT_UNDO
-#: po/tmp/ap_String_Id.h.h:2467
-msgid "Undo"
-msgstr ""
-
-#. MENU_STATUSLINE_EDIT_UNDO
-#. TOOLBAR_STATUSLINE_EDIT_UNDO
-#. TOOLBAR_TOOLTIP_EDIT_UNDO
-#: po/tmp/ap_String_Id.h.h:2471
-msgid "Undo editing"
-msgstr ""
-
-#. DLG_Lists_Upper_Case_List
-#. STYLE_UPPERCASTELIST
-#: po/tmp/ap_String_Id.h.h:2473 po/tmp/xap_String_Id.h.h:823
-msgid "Upper Case List"
-msgstr ""
-
-#. DLG_Lists_Upper_Roman_List
-#. STYLE_UPPERROMANLIST
-#: po/tmp/ap_String_Id.h.h:2475 po/tmp/xap_String_Id.h.h:825
-msgid "Upper Roman List"
-msgstr ""
-
-#. DLG_Column_RtlOrder
-#: po/tmp/ap_String_Id.h.h:2477
-msgid "Use RTL Order"
-msgstr ""
-
-#. DLG_Options_Label_HebrewContextGlyphs
-#: po/tmp/ap_String_Id.h.h:2479
-msgid "Use glyph shaping for Hebrew"
-msgstr ""
-
-#. DLG_Options_Label_UI
-#: po/tmp/ap_String_Id.h.h:2481
-msgid "User Interface"
-msgstr ""
-
-#. DLG_Options_Label_UILang
-#: po/tmp/ap_String_Id.h.h:2483
-msgid "User Interface Language"
-msgstr ""
-
-#. DLG_Stylist_UserStyles
-#: po/tmp/ap_String_Id.h.h:2485
-msgid "User defined Styles"
-msgstr ""
-
-#. DLG_Tab_Label_Existing
-#: po/tmp/ap_String_Id.h.h:2487
-msgid "User-defined Tabs"
-msgstr ""
-
-#. DLG_Styles_LBL_UserDefined
-#: po/tmp/ap_String_Id.h.h:2489
-msgid "User-defined styles"
-msgstr ""
-
-#. FIELD_Application_Version
-#. DLG_History_Version_Version
-#: po/tmp/ap_String_Id.h.h:2491 po/tmp/xap_String_Id.h.h:833
-msgid "Version"
-msgstr ""
-
-#. DLG_Options_TabLabel_View
-#: po/tmp/ap_String_Id.h.h:2493
-msgid "View"
-msgstr ""
-
-#. MENU_STATUSLINE_TOOLS_HISTORY_SHOW
-#: po/tmp/ap_String_Id.h.h:2495
-msgid "View document history"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_FULLSCREEN
-#: po/tmp/ap_String_Id.h.h:2497
-msgid "View the document in full screen mode"
-msgstr ""
-
-#. MENU_STATUSLINE_WINDOW_1
-#. MENU_STATUSLINE_WINDOW_2
-#. MENU_STATUSLINE_WINDOW_3
-#. MENU_STATUSLINE_WINDOW_4
-#. MENU_STATUSLINE_WINDOW_5
-#. MENU_STATUSLINE_WINDOW_6
-#. MENU_STATUSLINE_WINDOW_7
-#. MENU_STATUSLINE_WINDOW_8
-#. MENU_STATUSLINE_WINDOW_9
-#: po/tmp/ap_String_Id.h.h:2507
-msgid "View this document"
-msgstr ""
-
-#. DLG_Options_Label_ViewTooltips
-#: po/tmp/ap_String_Id.h.h:2509
-msgid "View tooltips"
-msgstr ""
-
-#. DLG_Options_Label_ViewViewFrame
-#: po/tmp/ap_String_Id.h.h:2511
-msgid "View..."
-msgstr ""
-
-#. DLG_Options_Label_Visible
-#: po/tmp/ap_String_Id.h.h:2513
-msgid "Visible"
-msgstr ""
-
-#. MSG_HyperlinkNoBookmark
-#: po/tmp/ap_String_Id.h.h:2515
-#, c-format
-msgid "Warning: the bookmark you provided [%s] does not exist."
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_WEB
-#: po/tmp/ap_String_Id.h.h:2517
-msgid "Web Layout"
-msgstr ""
-
-#. DLG_Styles_LBL_TxtMsg
-#: po/tmp/ap_String_Id.h.h:2519
-msgid "What Hath God Wrought"
-msgstr ""
-
-#. DLG_Options_Label_WithExtension
-#: po/tmp/ap_String_Id.h.h:2521
-msgid "With extension:"
-msgstr ""
-
-#. DLG_WordCount_WordCountTitle
-#. FIELD_Numbers_WordCount
-#: po/tmp/ap_String_Id.h.h:2524
-msgid "Word Count"
-msgstr ""
-
-#. DLG_NEW_Tab1
-#: po/tmp/ap_String_Id.h.h:2526
-msgid "Wordprocessing"
-msgstr ""
-
-#. DLG_WordCount_Words_No_Notes
-#: po/tmp/ap_String_Id.h.h:2528
-msgid "Words (no footnotes/endnotes):"
-msgstr ""
-
-#. DLG_Options_Label_SpellUppercase
-#: po/tmp/ap_String_Id.h.h:2530
-msgid "Words in &UPPERCASE"
-msgstr ""
-
-#. DLG_Options_Label_SpellNumbers
-#: po/tmp/ap_String_Id.h.h:2532
-msgid "Words with num&bers"
-msgstr ""
-
-#. DLG_WordCount_Words
-#: po/tmp/ap_String_Id.h.h:2534
-msgid "Words:"
-msgstr ""
-
-#. MSG_SaveFailedWrite
-#: po/tmp/ap_String_Id.h.h:2536
-#, c-format
-msgid "Writing error when attempting to save %s"
-msgstr ""
-
-#. MSG_DefaultDirectionChg
-#: po/tmp/ap_String_Id.h.h:2538
-msgid "You have changed the default direction."
-msgstr ""
-
-#. MSG_DirectionModeChg
-#: po/tmp/ap_String_Id.h.h:2540
-msgid "You have changed the direction mode."
-msgstr ""
-
-#. MSG_HyperlinkNoSelection
-#: po/tmp/ap_String_Id.h.h:2542
-msgid "You must select a portion of the document before inserting a hyperlink."
-msgstr ""
-
-#. DLG_Options_Label_InvalidRangeForAutoSave
-#: po/tmp/ap_String_Id.h.h:2544
-msgid "You should choose a range from 1 to 120 for the auto save frequency"
-msgstr ""
-
-#. MSG_ConfirmSaveSecondary
-#: po/tmp/ap_String_Id.h.h:2546
-msgid "Your changes will be lost if you don't save them."
-msgstr ""
-
-#. TOOLBAR_LABEL_ZOOM
-#. TOOLBAR_STATUSLINE_ZOOM
-#. TOOLBAR_TOOLTIP_ZOOM
-#. DLG_Zoom_ZoomTitle
-#: po/tmp/ap_String_Id.h.h:2550 po/tmp/xap_String_Id.h.h:882
-msgid "Zoom"
-msgstr ""
-
-#. MENU_LABEL_VIEW_ZOOM_100
-#: po/tmp/ap_String_Id.h.h:2552
-msgid "Zoom to &100%"
-msgstr ""
-
-#. MENU_LABEL_VIEW_ZOOM_200
-#: po/tmp/ap_String_Id.h.h:2554
-msgid "Zoom to &200%"
-msgstr ""
-
-#. MENU_LABEL_VIEW_ZOOM_50
-#: po/tmp/ap_String_Id.h.h:2556
-msgid "Zoom to &50%"
-msgstr ""
-
-#. MENU_LABEL_VIEW_ZOOM_75
-#: po/tmp/ap_String_Id.h.h:2558
-msgid "Zoom to &75%"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_ZOOM_100
-#: po/tmp/ap_String_Id.h.h:2560
-msgid "Zoom to 100%"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_ZOOM_200
-#: po/tmp/ap_String_Id.h.h:2562
-msgid "Zoom to 200%"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_ZOOM_50
-#: po/tmp/ap_String_Id.h.h:2564
-msgid "Zoom to 50%"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_ZOOM_75
-#: po/tmp/ap_String_Id.h.h:2566
-msgid "Zoom to 75%"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_ZOOM_WIDTH
-#: po/tmp/ap_String_Id.h.h:2568
-msgid "Zoom to page width"
-msgstr ""
-
-#. MENU_STATUSLINE_VIEW_ZOOM_WHOLE
-#: po/tmp/ap_String_Id.h.h:2570
-msgid "Zoom to whole page"
-msgstr ""
-
-#. DLG_Options_Label_CustomDict
-#: po/tmp/ap_String_Id.h.h:2572
-msgid "custom.dic"
-msgstr ""
-
-#. FIELD_DateTime_DDMMYY
-#: po/tmp/ap_String_Id.h.h:2574
-msgid "dd/mm/yy"
-msgstr ""
-
-#. DLG_ToggleCase_LowerCase
-#: po/tmp/ap_String_Id.h.h:2576
-msgid "lowercase"
-msgstr ""
-
-#. DLG_Options_Label_Minutes
-#: po/tmp/ap_String_Id.h.h:2578
-msgid "minutes"
-msgstr ""
-
-#. FIELD_DateTime_MMDDYY
-#: po/tmp/ap_String_Id.h.h:2580
-msgid "mm/dd/yy"
-msgstr ""
-
-#. DLG_ToggleCase_ToggleCase
-#: po/tmp/ap_String_Id.h.h:2582
-msgid "tOGGLE cASE"
-msgstr ""
-
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * DO NOT compile this file as part of your application.
-#.
-#. DLG_UP_To
-#: po/tmp/xap_String_Id.h.h:7
-msgid " to "
-msgstr ""
-
-#. DLG_Zoom_100
-#: po/tmp/xap_String_Id.h.h:9
-msgid "&100%"
-msgstr ""
-
-#. DLG_Zoom_200
-#: po/tmp/xap_String_Id.h.h:11
-msgid "&200%"
-msgstr ""
-
-#. DLG_Zoom_75
-#: po/tmp/xap_String_Id.h.h:13
-msgid "&75%"
-msgstr ""
-
-#. DLG_Zoom_PageWidth
-#: po/tmp/xap_String_Id.h.h:17
-msgid "&Page width"
-msgstr ""
-
-#. DLG_ULANG_SetLangButton
-#: po/tmp/xap_String_Id.h.h:19
-msgid "&Set Language"
-msgstr ""
-
-#. DLG_Zoom_WholePage
-#: po/tmp/xap_String_Id.h.h:23
-msgid "&Whole page"
-msgstr ""
-
-#. LANG_0
-#: po/tmp/xap_String_Id.h.h:25
-msgid "(no proofing)"
-msgstr ""
-
-#. DLG_DocComparison_TestSkipped
-#: po/tmp/xap_String_Id.h.h:27
-msgid "(test skipped)"
-msgstr ""
-
-#. DLG_NoSaveFile_DirNotExist
-#: po/tmp/xap_String_Id.h.h:29
-msgid "A directory in the given pathname does not exist."
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_TITLE
-#: po/tmp/xap_String_Id.h.h:31
-msgid "AbiWord Plugin Manager"
-msgstr ""
-
-#. SPELL_CANTLOAD_DLL
-#: po/tmp/xap_String_Id.h.h:33
-#, c-format
-msgid ""
-"AbiWord cannot find the spelling file %s.dll\n"
-"Please download and install Aspell from http://aspell.net/win32/"
-msgstr ""
-
-#. MSG_HistoryPartRestore1
-#: po/tmp/xap_String_Id.h.h:35
-#, c-format
-msgid ""
-"AbiWord cannot fully restore version %d of the document because the version "
-"information is incomplete."
-msgstr ""
-
-#. MSG_HistoryNoRestore
-#: po/tmp/xap_String_Id.h.h:37
-#, c-format
-msgid ""
-"AbiWord cannot restore version %d of the document because the version "
-"information is missing."
-msgstr ""
-
-#. DLG_UP_PrintPreviewTitle
-#: po/tmp/xap_String_Id.h.h:39
-msgid "AbiWord: Print Preview"
-msgstr ""
-
-#. DLG_ABOUT_Title
-#: po/tmp/xap_String_Id.h.h:41
-#, c-format
-msgid "About %s"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_ACTIVE
-#: po/tmp/xap_String_Id.h.h:43
-msgid "Active Plugins"
-msgstr ""
-
-#. LANG_AF_ZA
-#: po/tmp/xap_String_Id.h.h:45
-msgid "Afrikaans"
-msgstr ""
-
-#. LANG_AK_GH
-#: po/tmp/xap_String_Id.h.h:47
-msgid "Akan"
-msgstr ""
-
-#. LANG_SQ_AL
-#: po/tmp/xap_String_Id.h.h:49
-msgid "Albanian"
-msgstr ""
-
-#. DLG_FOSA_ALL
-#: po/tmp/xap_String_Id.h.h:53
-msgid "All (*.*)"
-msgstr ""
-
-#. DLG_FOSA_ALLDOCS
-#: po/tmp/xap_String_Id.h.h:55
-msgid "All Documents"
-msgstr ""
-
-#. DLG_FOSA_ALLIMAGES
-#: po/tmp/xap_String_Id.h.h:57
-msgid "All Image Files"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpAllowAWML
-#: po/tmp/xap_String_Id.h.h:59
-msgid "Allow extra markup in AWML namespace"
-msgstr ""
-
-#. LANG_AM_ET
-#: po/tmp/xap_String_Id.h.h:61
-msgid "Amharic (Ethiopia)"
-msgstr ""
-
-#. LANG_AR
-#: po/tmp/xap_String_Id.h.h:65
-msgid "Arabic"
-msgstr ""
-
-#. LANG_AR_EG
-#: po/tmp/xap_String_Id.h.h:67
-msgid "Arabic (Egypt)"
-msgstr ""
-
-#. LANG_AR_SA
-#: po/tmp/xap_String_Id.h.h:69
-msgid "Arabic (Saudi Arabia)"
-msgstr ""
-
-#. ENC_ARAB_ISO
-#: po/tmp/xap_String_Id.h.h:71
-msgid "Arabic, ISO-8859-6"
-msgstr ""
-
-#. ENC_ARAB_MAC
-#: po/tmp/xap_String_Id.h.h:73
-msgid "Arabic, Macintosh"
-msgstr ""
-
-#. ENC_ARAB_WIN
-#: po/tmp/xap_String_Id.h.h:75
-msgid "Arabic, Windows Code Page 1256"
-msgstr ""
-
-#. LANG_HY_AM
-#: po/tmp/xap_String_Id.h.h:77
-msgid "Armenian"
-msgstr ""
-
-#. ENC_ARME_ARMSCII
-#: po/tmp/xap_String_Id.h.h:79
-msgid "Armenian, ARMSCII-8"
-msgstr ""
-
-#. LANG_AS_IN
-#: po/tmp/xap_String_Id.h.h:81
-msgid "Assamese"
-msgstr ""
-
-#. LANG_AST_ES
-#: po/tmp/xap_String_Id.h.h:83
-msgid "Asturian (Spain)"
-msgstr ""
-
-#. DLG_Options_Label_DirMarkerAfterClosingParenthesis
-#: po/tmp/xap_String_Id.h.h:87
-msgid "Auto-insert direction markers"
-msgstr ""
-
-#. DLG_History_Version_AutoRevisioned
-#: po/tmp/xap_String_Id.h.h:89
-msgid "Auto-revision"
-msgstr ""
-
-#. DLG_FOSA_FileTypeAutoDetect
-#: po/tmp/xap_String_Id.h.h:91
-msgid "Automatically Detected"
-msgstr ""
-
-#. MSG_AutoRevision
-#: po/tmp/xap_String_Id.h.h:93
-msgid "Autorevision"
-msgstr ""
-
-#. DLG_MW_AvailableDocuments
-#: po/tmp/xap_String_Id.h.h:95
-msgid "Available Documents"
-msgstr ""
-
-#. DLG_ULANG_AvailableLanguages
-#: po/tmp/xap_String_Id.h.h:97
-msgid "Available Languages"
-msgstr ""
-
-#. LANG_AYM_BO
-#: po/tmp/xap_String_Id.h.h:99
-msgid "Aymara (La Paz)"
-msgstr ""
-
-#. LANG_AYC_BO
-#: po/tmp/xap_String_Id.h.h:101
-msgid "Aymara (Oruro)"
-msgstr ""
-
-#. ENC_BALT_ISO
-#: po/tmp/xap_String_Id.h.h:103
-msgid "Baltic, ISO-8859-4"
-msgstr ""
-
-#. ENC_BALT_WIN
-#: po/tmp/xap_String_Id.h.h:105
-msgid "Baltic, Windows Code Page 1257"
-msgstr ""
-
-#. LANG_EU_ES
-#: po/tmp/xap_String_Id.h.h:107
-msgid "Basque"
-msgstr ""
-
-#. LANG_BE_BY
-#: po/tmp/xap_String_Id.h.h:109
-msgid "Belarusian"
-msgstr ""
-
-#. LANG_BE_LATIN
-#: po/tmp/xap_String_Id.h.h:111
-msgid "Belarusian, Latin"
-msgstr ""
-
-#. LANG_BN_IN
-#: po/tmp/xap_String_Id.h.h:113
-msgid "Bengali"
-msgstr ""
-
-#. DLG_UP_BlackWhite
-#: po/tmp/xap_String_Id.h.h:115
-msgid "Black & White"
-msgstr ""
-
-#. STYLE_BLOCKTEXT
-#: po/tmp/xap_String_Id.h.h:117
-msgid "Block Text"
-msgstr ""
-
-#. DLG_UFS_StyleBoldItalic
-#: po/tmp/xap_String_Id.h.h:121
-msgid "Bold Italic"
-msgstr ""
-
-#. LANG_BR_FR
-#: po/tmp/xap_String_Id.h.h:127
-msgid "Breton"
-msgstr ""
-
-#. MSG_BuildingDoc
-#: po/tmp/xap_String_Id.h.h:129
-msgid "Building Document:"
-msgstr ""
-
-#. LANG_BG_BG
-#: po/tmp/xap_String_Id.h.h:131
-msgid "Bulgarian"
-msgstr ""
-
-#. DLG_Cancel
-#: po/tmp/xap_String_Id.h.h:135
-msgid "Cancel"
-msgstr ""
-
-#. LANG_CA_ES
-#: po/tmp/xap_String_Id.h.h:137
-msgid "Catalan"
-msgstr ""
-
-#. LANG_AYR
-#: po/tmp/xap_String_Id.h.h:139
-msgid "Central Aymara"
-msgstr ""
-
-#. ENC_CENT_ISO
-#: po/tmp/xap_String_Id.h.h:141
-msgid "Central European, ISO-8859-2"
-msgstr ""
-
-#. ENC_CENT_MAC
-#: po/tmp/xap_String_Id.h.h:143
-msgid "Central European, Macintosh"
-msgstr ""
-
-#. ENC_CENT_WIN
-#: po/tmp/xap_String_Id.h.h:145
-msgid "Central European, Windows Code Page 1250"
-msgstr ""
-
-#. DLG_Options_Label_LangWithKeyboard
-#: po/tmp/xap_String_Id.h.h:147
-msgid "Change Language when changing keyboard"
-msgstr ""
-
-#. STYLE_CHAPHEADING
-#: po/tmp/xap_String_Id.h.h:149
-msgid "Chapter Heading"
-msgstr ""
-
-#. LANG_ZH_HK
-#: po/tmp/xap_String_Id.h.h:151
-msgid "Chinese (Hong Kong)"
-msgstr ""
-
-#. LANG_ZH_CN
-#: po/tmp/xap_String_Id.h.h:153
-msgid "Chinese (PRC)"
-msgstr ""
-
-#. LANG_ZH_SG
-#: po/tmp/xap_String_Id.h.h:155
-msgid "Chinese (Singapore)"
-msgstr ""
-
-#. LANG_ZH_TW
-#: po/tmp/xap_String_Id.h.h:157
-msgid "Chinese (Taiwan)"
-msgstr ""
-
-#. ENC_CHSI_EUC
-#: po/tmp/xap_String_Id.h.h:159
-msgid "Chinese Simplified, EUC-CN (GB2312)"
-msgstr ""
-
-#. ENC_CHSI_GB
-#: po/tmp/xap_String_Id.h.h:161
-msgid "Chinese Simplified, GB_2312-80"
-msgstr ""
-
-#. ENC_CHSI_HZ
-#: po/tmp/xap_String_Id.h.h:163
-msgid "Chinese Simplified, HZ"
-msgstr ""
-
-#. ENC_CHSI_WIN
-#: po/tmp/xap_String_Id.h.h:165
-msgid "Chinese Simplified, Windows Code Page 936"
-msgstr ""
-
-#. ENC_CHTR_BIG5
-#: po/tmp/xap_String_Id.h.h:167
-msgid "Chinese Traditional, BIG5"
-msgstr ""
-
-#. ENC_CHTR_BIG5HKSCS
-#: po/tmp/xap_String_Id.h.h:169
-msgid "Chinese Traditional, BIG5-HKSCS"
-msgstr ""
-
-#. ENC_CHTR_EUC
-#: po/tmp/xap_String_Id.h.h:171
-msgid "Chinese Traditional, EUC-TW"
-msgstr ""
-
-#. ENC_CHTR_WIN
-#: po/tmp/xap_String_Id.h.h:173
-msgid "Chinese Traditional, Windows Code Page 950"
-msgstr ""
-
-#. DLG_LISTDOCS_Heading1
-#: po/tmp/xap_String_Id.h.h:175
-msgid "Choose document from the list:"
-msgstr ""
-
-#. TB_ClearBackground
-#: po/tmp/xap_String_Id.h.h:177
-msgid "Clear Background"
-msgstr ""
-
-#. DLG_CLIPART_Title
-#: po/tmp/xap_String_Id.h.h:179
-msgid "Clip Art"
-msgstr ""
-
-#. DLG_CLIPART_Error
-#: po/tmp/xap_String_Id.h.h:181
-msgid "Clip Art could not be loaded"
-msgstr ""
-
-#. DLG_Close
-#: po/tmp/xap_String_Id.h.h:183
-msgid "Close"
-msgstr ""
-
-#. DLG_Exit_CloseWithoutSaving
-#: po/tmp/xap_String_Id.h.h:185
-msgid "Close &Without Saving"
-msgstr ""
-
-#. DLG_UP_Collate
-#: po/tmp/xap_String_Id.h.h:187
-msgid "Collate"
-msgstr ""
-
-#. DLG_UP_Color
-#: po/tmp/xap_String_Id.h.h:189
-msgid "Color"
-msgstr ""
-
-#. DLG_Compare
-#: po/tmp/xap_String_Id.h.h:193
-msgid "Compare"
-msgstr ""
-
-#. DLG_DocComparison_Content
-#: po/tmp/xap_String_Id.h.h:195
-msgid "Content:"
-msgstr ""
-
-#. STYLE_TOCHEADING1
-#: po/tmp/xap_String_Id.h.h:197
-msgid "Contents 1"
-msgstr ""
-
-#. STYLE_TOCHEADING2
-#: po/tmp/xap_String_Id.h.h:199
-msgid "Contents 2"
-msgstr ""
-
-#. STYLE_TOCHEADING3
-#: po/tmp/xap_String_Id.h.h:201
-msgid "Contents 3"
-msgstr ""
-
-#. STYLE_TOCHEADING4
-#: po/tmp/xap_String_Id.h.h:203
-msgid "Contents 4"
-msgstr ""
-
-#. STYLE_TOCHEADING
-#: po/tmp/xap_String_Id.h.h:205
-msgid "Contents Header"
-msgstr ""
-
-#. DLG_UP_Copies
-#: po/tmp/xap_String_Id.h.h:207
-msgid "Copies: "
-msgstr ""
-
-#. LANG_COP_EG
-#: po/tmp/xap_String_Id.h.h:209
-msgid "Coptic"
-msgstr ""
-
-#. LANG_KW_GB
-#: po/tmp/xap_String_Id.h.h:211
-msgid "Cornish"
-msgstr ""
-
-#. LANG_CO_FR
-#: po/tmp/xap_String_Id.h.h:213
-msgid "Corsican"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_COULDNT_LOAD
-#: po/tmp/xap_String_Id.h.h:215
-msgid "Could not activate/load plugin"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_COULDNT_UNLOAD
-#: po/tmp/xap_String_Id.h.h:217
-msgid "Could not deactivate plugin"
-msgstr ""
-
-#. SPELL_CANTLOAD_DICT
-#: po/tmp/xap_String_Id.h.h:219
-#, c-format
-msgid "Could not load the dictionary for the %s language"
-msgstr ""
-
-#. DLG_History_Version_Started
-#: po/tmp/xap_String_Id.h.h:221
-msgid "Created"
-msgstr ""
-
-#. DLG_History_Created
-#: po/tmp/xap_String_Id.h.h:223
-msgid "Created:"
-msgstr ""
-
-#. LANG_HR_HR
-#: po/tmp/xap_String_Id.h.h:225
-msgid "Croatian"
-msgstr ""
-
-#. ENC_CROA_MAC
-#: po/tmp/xap_String_Id.h.h:227
-msgid "Croatian, Macintosh"
-msgstr ""
-
-#. ENC_CYRL_ISO
-#: po/tmp/xap_String_Id.h.h:229
-msgid "Cyrillic, ISO-8859-5"
-msgstr ""
-
-#. ENC_CYRL_KOI
-#: po/tmp/xap_String_Id.h.h:231
-msgid "Cyrillic, KOI8-R"
-msgstr ""
-
-#. ENC_CYRL_MAC
-#: po/tmp/xap_String_Id.h.h:233
-msgid "Cyrillic, Macintosh"
-msgstr ""
-
-#. ENC_CYRL_WIN
-#: po/tmp/xap_String_Id.h.h:235
-msgid "Cyrillic, Windows Code Page 1251"
-msgstr ""
-
-#. LANG_CS_CZ
-#: po/tmp/xap_String_Id.h.h:237
-msgid "Czech"
-msgstr ""
-
-#. LANG_DA_DK
-#: po/tmp/xap_String_Id.h.h:239
-msgid "Danish"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_DEACTIVATE_ALL
-#: po/tmp/xap_String_Id.h.h:243
-msgid "Deactivate all plugins"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_DEACTIVATE
-#: po/tmp/xap_String_Id.h.h:245
-msgid "Deactivate plugin"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpDeclareXML
-#: po/tmp/xap_String_Id.h.h:247
-msgid "Declare as XML (version 1.0)"
-msgstr ""
-
-#. DLG_ULANG_DefaultLangLabel
-#: po/tmp/xap_String_Id.h.h:249
-msgid "Default language: "
-msgstr ""
-
-#. DLG_Image_Placement
-#: po/tmp/xap_String_Id.h.h:251
-msgid "Define Image Placement"
-msgstr ""
-
-#. DLG_Image_TextWrapping
-#: po/tmp/xap_String_Id.h.h:253
-msgid "Define Text Wrapping"
-msgstr ""
-
-#. DLG_Remove_Icon
-#: po/tmp/xap_String_Id.h.h:262
-msgid "Do you want to remove this icon from the toolbar?"
-msgstr ""
-
-#. DLG_DocComparison_WindowLabel
-#: po/tmp/xap_String_Id.h.h:264
-msgid "Document Comparison"
-msgstr ""
-
-#. DLG_History_DocumentDetails
-#: po/tmp/xap_String_Id.h.h:266
-msgid "Document Details"
-msgstr ""
-
-#. DLG_History_WindowLabel
-#: po/tmp/xap_String_Id.h.h:268
-msgid "Document History"
-msgstr ""
-
-#. DLG_History_Path
-#: po/tmp/xap_String_Id.h.h:270
-msgid "Document name:"
-msgstr ""
-
-#. DLG_DocComparison_DocsCompared
-#: po/tmp/xap_String_Id.h.h:272
-msgid "Documents compared"
-msgstr ""
-
-#. LANG_NL_NL
-#: po/tmp/xap_String_Id.h.h:274
-msgid "Dutch (Netherlands)"
-msgstr ""
-
-#. DLG_History_EditTime
-#: po/tmp/xap_String_Id.h.h:276
-msgid "Editing time:"
-msgstr ""
-
-#. DLG_UFS_EffectsFrameLabel
-#: po/tmp/xap_String_Id.h.h:278
-msgid "Effects"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpEmbedCSS
-#: po/tmp/xap_String_Id.h.h:280
-msgid "Embed (CSS) style sheet"
-msgstr ""
-
-#. DLG_UP_EmbedFonts
-#: po/tmp/xap_String_Id.h.h:282
-msgid "Embed Fonts"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpEmbedImages
-#: po/tmp/xap_String_Id.h.h:284
-msgid "Embed images in URLs (Base64-encoded)"
-msgstr ""
-
-#. DLG_UENC_EncTitle
-#: po/tmp/xap_String_Id.h.h:286
-msgid "Encoding"
-msgstr ""
-
-#. DLG_UFS_EncodingLabel
-#: po/tmp/xap_String_Id.h.h:288
-msgid "Encoding:"
-msgstr ""
-
-#. STYLE_ENDREFERENCE
-#: po/tmp/xap_String_Id.h.h:290
-msgid "Endnote Reference"
-msgstr ""
-
-#. STYLE_ENDTEXT
-#: po/tmp/xap_String_Id.h.h:292
-msgid "Endnote Text"
-msgstr ""
-
-#. LANG_EN_AU
-#: po/tmp/xap_String_Id.h.h:294
-msgid "English (Australia)"
-msgstr ""
-
-#. LANG_EN_CA
-#: po/tmp/xap_String_Id.h.h:296
-msgid "English (Canada)"
-msgstr ""
-
-#. LANG_EN_IE
-#: po/tmp/xap_String_Id.h.h:298
-msgid "English (Ireland)"
-msgstr ""
-
-#. LANG_EN_NZ
-#: po/tmp/xap_String_Id.h.h:300
-msgid "English (New Zealand)"
-msgstr ""
-
-#. LANG_EN_ZA
-#: po/tmp/xap_String_Id.h.h:302
-msgid "English (South Africa)"
-msgstr ""
-
-#. LANG_EN_GB
-#: po/tmp/xap_String_Id.h.h:304
-msgid "English (UK)"
-msgstr ""
-
-#. LANG_EN_US
-#: po/tmp/xap_String_Id.h.h:306
-msgid "English (US)"
-msgstr ""
-
-#. DLG_Password_Title
-#: po/tmp/xap_String_Id.h.h:308
-msgid "Enter Password"
-msgstr ""
-
-#. LANG_EO
-#: po/tmp/xap_String_Id.h.h:310
-msgid "Esperanto"
-msgstr ""
-
-#. LANG_ET
-#: po/tmp/xap_String_Id.h.h:312
-msgid "Estonian"
-msgstr ""
-
-#. DLG_FOSA_ExportTitle
-#: po/tmp/xap_String_Id.h.h:314
-msgid "Export File"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpIs4
-#: po/tmp/xap_String_Id.h.h:316
-msgid "Export as HTML 4.01"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpAbiWebDoc
-#: po/tmp/xap_String_Id.h.h:318
-msgid "Export with PHP instructions"
-msgstr ""
-
-#. LANG_FA_IR
-#: po/tmp/xap_String_Id.h.h:320
-msgid "Farsi"
-msgstr ""
-
-#. DLG_UP_File
-#: po/tmp/xap_String_Id.h.h:322
-msgid "File"
-msgstr ""
-
-#. DLG_OverwriteFile
-#: po/tmp/xap_String_Id.h.h:324
-#, c-format
-msgid "File already exists. Overwrite file '%s'?"
-msgstr ""
-
-#. DLG_FOSA_RecordToFileLabel
-#: po/tmp/xap_String_Id.h.h:326
-msgid "File to record editing:"
-msgstr ""
-
-#. DLG_FOSA_ReplayFromFileLabel
-#: po/tmp/xap_String_Id.h.h:328
-msgid "File to replay editing:"
-msgstr ""
-
-#. LANG_FI_FI
-#: po/tmp/xap_String_Id.h.h:330
-msgid "Finnish"
-msgstr ""
-
-#. LANG_NL_BE
-#: po/tmp/xap_String_Id.h.h:332
-msgid "Flemish (Belgium)"
-msgstr ""
-
-#. STYLE_FOOTREFERENCE
-#: po/tmp/xap_String_Id.h.h:339
-msgid "Footnote Reference"
-msgstr ""
-
-#. STYLE_FOOTTEXT
-#: po/tmp/xap_String_Id.h.h:341
-msgid "Footnote Text"
-msgstr ""
-
-#. LANG_FR_BE
-#: po/tmp/xap_String_Id.h.h:345
-msgid "French (Belgium)"
-msgstr ""
-
-#. LANG_FR_CA
-#: po/tmp/xap_String_Id.h.h:347
-msgid "French (Canada)"
-msgstr ""
-
-#. LANG_FR_FR
-#: po/tmp/xap_String_Id.h.h:349
-msgid "French (France)"
-msgstr ""
-
-#. LANG_FR_CH
-#: po/tmp/xap_String_Id.h.h:351
-msgid "French (Switzerland)"
-msgstr ""
-
-#. LANG_FY_NL
-#: po/tmp/xap_String_Id.h.h:353
-msgid "Frisian"
-msgstr ""
-
-#. DLG_UP_From
-#: po/tmp/xap_String_Id.h.h:355
-msgid "From: "
-msgstr ""
-
-#. LANG_GL
-#: po/tmp/xap_String_Id.h.h:357
-msgid "Galician (Galego)"
-msgstr ""
-
-#. LANG_KA_GE
-#: po/tmp/xap_String_Id.h.h:359
-msgid "Georgian"
-msgstr ""
-
-#. ENC_GEOR_ACADEMY
-#: po/tmp/xap_String_Id.h.h:361
-msgid "Georgian, Academy"
-msgstr ""
-
-#. ENC_GEOR_PS
-#: po/tmp/xap_String_Id.h.h:363
-msgid "Georgian, PS"
-msgstr ""
-
-#. LANG_DE_AT
-#: po/tmp/xap_String_Id.h.h:365
-msgid "German (Austria)"
-msgstr ""
-
-#. LANG_DE_DE
-#: po/tmp/xap_String_Id.h.h:367
-msgid "German (Germany)"
-msgstr ""
-
-#. LANG_DE_CH
-#: po/tmp/xap_String_Id.h.h:369
-msgid "German (Switzerland)"
-msgstr ""
-
-#. DLG_UP_Grayscale
-#: po/tmp/xap_String_Id.h.h:371
-msgid "Grayscale"
-msgstr ""
-
-#. LANG_EL_GR
-#: po/tmp/xap_String_Id.h.h:373
-msgid "Greek"
-msgstr ""
-
-#. ENC_GREE_ISO
-#: po/tmp/xap_String_Id.h.h:375
-msgid "Greek, ISO-8859-7"
-msgstr ""
-
-#. ENC_GREE_MAC
-#: po/tmp/xap_String_Id.h.h:377
-msgid "Greek, Macintosh"
-msgstr ""
-
-#. ENC_GREE_WIN
-#: po/tmp/xap_String_Id.h.h:379
-msgid "Greek, Windows Code Page 1253"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpTitle
-#: po/tmp/xap_String_Id.h.h:381
-msgid "HTML Export Options"
-msgstr ""
-
-#. LANG_HA_NE
-#: po/tmp/xap_String_Id.h.h:385
-msgid "Hausa (Niger)"
-msgstr ""
-
-#. LANG_HA_NG
-#: po/tmp/xap_String_Id.h.h:387
-msgid "Hausa (Nigeria)"
-msgstr ""
-
-#. LANG_HAW_US
-#: po/tmp/xap_String_Id.h.h:389
-msgid "Hawaiian"
-msgstr ""
-
-#. STYLE_HEADING1
-#: po/tmp/xap_String_Id.h.h:391
-msgid "Heading 1"
-msgstr ""
-
-#. STYLE_HEADING2
-#: po/tmp/xap_String_Id.h.h:393
-msgid "Heading 2"
-msgstr ""
-
-#. STYLE_HEADING3
-#: po/tmp/xap_String_Id.h.h:395
-msgid "Heading 3"
-msgstr ""
-
-#. STYLE_HEADING4
-#: po/tmp/xap_String_Id.h.h:397
-msgid "Heading 4"
-msgstr ""
-
-#. LANG_HE_IL
-#: po/tmp/xap_String_Id.h.h:401
-msgid "Hebrew"
-msgstr ""
-
-#. ENC_HEBR_ISO
-#: po/tmp/xap_String_Id.h.h:403
-msgid "Hebrew, ISO-8859-8"
-msgstr ""
-
-#. ENC_HEBR_MAC
-#: po/tmp/xap_String_Id.h.h:405
-msgid "Hebrew, Macintosh"
-msgstr ""
-
-#. ENC_HEBR_WIN
-#: po/tmp/xap_String_Id.h.h:407
-msgid "Hebrew, Windows Code Page 1255"
-msgstr ""
-
-#. DLG_Image_Height
-#: po/tmp/xap_String_Id.h.h:409
-msgid "Height:"
-msgstr ""
-
-#. DLG_IP_Height_Label
-#: po/tmp/xap_String_Id.h.h:411
-msgid "Height: "
-msgstr ""
-
-#. DLG_UFS_HiddenCheck
-#: po/tmp/xap_String_Id.h.h:413
-msgid "Hidden"
-msgstr ""
-
-#. DLG_UFS_BGColorTab
-#: po/tmp/xap_String_Id.h.h:415
-msgid "HighLight Color"
-msgstr ""
-
-#. LANG_HI_IN
-#: po/tmp/xap_String_Id.h.h:417
-msgid "Hindi"
-msgstr ""
-
-#. LANG_HU_HU
-#: po/tmp/xap_String_Id.h.h:419
-msgid "Hungarian"
-msgstr ""
-
-#. LANG_IS_IS
-#: po/tmp/xap_String_Id.h.h:421
-msgid "Icelandic"
-msgstr ""
-
-#. ENC_ICEL_MAC
-#: po/tmp/xap_String_Id.h.h:423
-msgid "Icelandic, Macintosh"
-msgstr ""
-
-#. DLG_History_Id
-#: po/tmp/xap_String_Id.h.h:425
-msgid "Identifier:"
-msgstr ""
-
-#. DLG_Image_Title
-#: po/tmp/xap_String_Id.h.h:427
-msgid "Image Properties"
-msgstr ""
-
-#. DLG_Image_WrappedNone
-#: po/tmp/xap_String_Id.h.h:429
-msgid "Image floats above text"
-msgstr ""
-
-#. DLG_Image_InLine
-#: po/tmp/xap_String_Id.h.h:431
-msgid "Image placed in-line (no text wrapping)"
-msgstr ""
-
-#. DLG_FOSA_ImportTitle
-#: po/tmp/xap_String_Id.h.h:435
-msgid "Import File"
-msgstr ""
-
-#. MSG_ImportingDoc
-#: po/tmp/xap_String_Id.h.h:437
-msgid "Importing Document..."
-msgstr ""
-
-#. LANG_ID_ID
-#: po/tmp/xap_String_Id.h.h:439
-msgid "Indonesian"
-msgstr ""
-
-#. XIM_Methods
-#: po/tmp/xap_String_Id.h.h:441
-msgid "Input Methods"
-msgstr ""
-
-#. DLG_FOSA_InsertObject
-#: po/tmp/xap_String_Id.h.h:445
-msgid "Insert Embeddable Object"
-msgstr ""
-
-#. DLG_FOSA_FileInsertObject
-#: po/tmp/xap_String_Id.h.h:447
-msgid "Insert Embeddable Object file:"
-msgstr ""
-
-#. DLG_FOSA_InsertTitle
-#: po/tmp/xap_String_Id.h.h:449
-msgid "Insert File"
-msgstr ""
-
-#. DLG_FOSA_InsertMath
-#: po/tmp/xap_String_Id.h.h:451
-msgid "Insert Math File"
-msgstr ""
-
-#. DLG_FOSA_FileInsertMath
-#: po/tmp/xap_String_Id.h.h:453
-msgid "Insert MathML file:"
-msgstr ""
-
-#. TB_InsertNewTable
-#: po/tmp/xap_String_Id.h.h:455
-msgid "Insert New Table"
-msgstr ""
-
-#. DLG_IP_Title
-#: po/tmp/xap_String_Id.h.h:457
-msgid "Insert Picture"
-msgstr ""
-
-#. DLG_Insert_SymbolTitle
-#: po/tmp/xap_String_Id.h.h:459
-msgid "Insert Symbol"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_INSTALL
-#: po/tmp/xap_String_Id.h.h:461
-msgid "Install new plugin"
-msgstr ""
-
-#. LANG_IA
-#: po/tmp/xap_String_Id.h.h:463
-msgid "Interlingua"
-msgstr ""
-
-#. LANG_IU_CA
-#: po/tmp/xap_String_Id.h.h:465
-msgid "Inuktitut"
-msgstr ""
-
-#. DLG_InvalidPathname
-#: po/tmp/xap_String_Id.h.h:467
-msgid "Invalid pathname."
-msgstr ""
-
-#. LANG_GA_IE
-#: po/tmp/xap_String_Id.h.h:469
-msgid "Irish"
-msgstr ""
-
-#. LANG_IT_IT
-#: po/tmp/xap_String_Id.h.h:471
-msgid "Italian (Italy)"
-msgstr ""
-
-#. LANG_JA_JP
-#: po/tmp/xap_String_Id.h.h:475
-msgid "Japanese"
-msgstr ""
-
-#. ENC_JAPN_EUC
-#: po/tmp/xap_String_Id.h.h:477
-msgid "Japanese, EUC-JP"
-msgstr ""
-
-#. ENC_JAPN_ISO
-#: po/tmp/xap_String_Id.h.h:479
-msgid "Japanese, ISO-2022-JP"
-msgstr ""
-
-#. ENC_JAPN_SJIS
-#: po/tmp/xap_String_Id.h.h:481
-msgid "Japanese, Shift-JIS"
-msgstr ""
-
-#. ENC_JAPN_WIN
-#: po/tmp/xap_String_Id.h.h:483
-msgid "Japanese, Windows Code Page 932"
-msgstr ""
-
-#. LANG_KN_IN
-#: po/tmp/xap_String_Id.h.h:485
-msgid "Kannada"
-msgstr ""
-
-#. LANG_KO_KR
-#. LANG_KO
-#: po/tmp/xap_String_Id.h.h:488
-msgid "Korean"
-msgstr ""
-
-#. ENC_KORE_EUC
-#: po/tmp/xap_String_Id.h.h:490
-msgid "Korean, EUC-KR"
-msgstr ""
-
-#. ENC_KORE_JOHAB
-#: po/tmp/xap_String_Id.h.h:492
-msgid "Korean, Johab"
-msgstr ""
-
-#. ENC_KORE_KSC
-#: po/tmp/xap_String_Id.h.h:494
-msgid "Korean, KSC_5601"
-msgstr ""
-
-#. ENC_KORE_WIN
-#: po/tmp/xap_String_Id.h.h:496
-msgid "Korean, Windows Code Page 949"
-msgstr ""
-
-#. LANG_KU
-#: po/tmp/xap_String_Id.h.h:498
-msgid "Kurdish"
-msgstr ""
-
-#. LANG_LO_LA
-#: po/tmp/xap_String_Id.h.h:500
-msgid "Lao"
-msgstr ""
-
-#. DLG_History_LastSaved
-#: po/tmp/xap_String_Id.h.h:502
-msgid "Last saved:"
-msgstr ""
-
-#. LANG_LA_IT
-#: po/tmp/xap_String_Id.h.h:504
-msgid "Latin (Renaissance)"
-msgstr ""
-
-#. LANG_LV_LV
-#: po/tmp/xap_String_Id.h.h:506
-msgid "Latvian"
-msgstr ""
-
-#. LANG_LT_LT
-#: po/tmp/xap_String_Id.h.h:508
-msgid "Lithuanian"
-msgstr ""
-
-#. DLG_CLIPART_Loading
-#: po/tmp/xap_String_Id.h.h:510
-msgid "Loading Clip Art"
-msgstr ""
-
-#. LANG_MK
-#: po/tmp/xap_String_Id.h.h:516
-msgid "Macedonian"
-msgstr ""
-
-#. DLG_ULANG_DefaultLangChkbox
-#: po/tmp/xap_String_Id.h.h:518
-msgid "Make default for document"
-msgstr ""
-
-#. LANG_MS_MY
-#: po/tmp/xap_String_Id.h.h:520
-msgid "Malay"
-msgstr ""
-
-#. LANG_MI_NZ
-#: po/tmp/xap_String_Id.h.h:522
-msgid "Maori"
-msgstr ""
-
-#. LANG_MR_IN
-#: po/tmp/xap_String_Id.h.h:524
-msgid "Marathi"
-msgstr ""
-
-#. LANG_MH_MH
-#: po/tmp/xap_String_Id.h.h:526
-msgid "Marshallese (Marshall Islands)"
-msgstr ""
-
-#. LANG_MH_NR
-#: po/tmp/xap_String_Id.h.h:528
-msgid "Marshallese (Nauru)"
-msgstr ""
-
-#. DLG_Merge
-#: po/tmp/xap_String_Id.h.h:530
-msgid "Merge"
-msgstr ""
-
-#. LANG_MN_MN
-#: po/tmp/xap_String_Id.h.h:532
-msgid "Mongolian"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_NAME
-#: po/tmp/xap_String_Id.h.h:534
-msgid "Name:"
-msgstr ""
-
-#. LANG_NE_NP
-#: po/tmp/xap_String_Id.h.h:536
-msgid "Nepali (Nepal)"
-msgstr ""
-
-#. DLG_QNXMB_No
-#: po/tmp/xap_String_Id.h.h:538
-msgid "No"
-msgstr ""
-
-#. DLG_IP_No_Picture_Label
-#: po/tmp/xap_String_Id.h.h:540
-msgid "No Picture"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_NONE_SELECTED
-#: po/tmp/xap_String_Id.h.h:542
-msgid "No plugin selected"
-msgstr ""
-
-#. STYLE_NORMAL
-#: po/tmp/xap_String_Id.h.h:544
-msgid "Normal"
-msgstr ""
-
-#. LANG_NB_NO
-#: po/tmp/xap_String_Id.h.h:546
-msgid "Norwegian Bokmal"
-msgstr ""
-
-#. LANG_NN_NO
-#: po/tmp/xap_String_Id.h.h:548
-msgid "Norwegian Nynorsk"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_NOT_AVAILABLE
-#: po/tmp/xap_String_Id.h.h:550
-msgid "Not available"
-msgstr ""
-
-#. STYLE_NUMHEAD1
-#: po/tmp/xap_String_Id.h.h:552
-msgid "Numbered Heading 1"
-msgstr ""
-
-#. STYLE_NUMHEAD2
-#: po/tmp/xap_String_Id.h.h:554
-msgid "Numbered Heading 2"
-msgstr ""
-
-#. STYLE_NUMHEAD3
-#: po/tmp/xap_String_Id.h.h:556
-msgid "Numbered Heading 3"
-msgstr ""
-
-#. DLG_OK
-#: po/tmp/xap_String_Id.h.h:560
-msgid "OK"
-msgstr ""
-
-#. LANG_OC_FR
-#: po/tmp/xap_String_Id.h.h:562
-msgid "Occitan"
-msgstr ""
-
-#. DLG_FOSA_OpenTitle
-#: po/tmp/xap_String_Id.h.h:564
-msgid "Open File"
-msgstr ""
-
-#. DLG_FOSA_FileOpenTypeLabel
-#: po/tmp/xap_String_Id.h.h:566
-msgid "Open file as type:"
-msgstr ""
-
-#. DLG_LISTDOCS_Title
-#: po/tmp/xap_String_Id.h.h:568
-msgid "Opened Documents"
-msgstr ""
-
-#. TB_Zoom_Percent
-#: po/tmp/xap_String_Id.h.h:570
-msgid "Other..."
-msgstr ""
-
-#. DLG_Zoom_Percent
-#: po/tmp/xap_String_Id.h.h:574
-msgid "P&ercent:"
-msgstr ""
-
-#. TB_Zoom_PageWidth
-#: po/tmp/xap_String_Id.h.h:576
-msgid "Page Width"
-msgstr ""
-
-#. DLG_UP_PageRanges
-#: po/tmp/xap_String_Id.h.h:578
-msgid "Page ranges:"
-msgstr ""
-
-#. LANG_PS
-#: po/tmp/xap_String_Id.h.h:580
-msgid "Pashto"
-msgstr ""
-
-#. DLG_Password_Password
-#: po/tmp/xap_String_Id.h.h:582
-msgid "Password:"
-msgstr ""
-
-#. STYLE_PLAIN_TEXT
-#: po/tmp/xap_String_Id.h.h:584
-msgid "Plain Text"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_DETAILS
-#: po/tmp/xap_String_Id.h.h:586
-msgid "Plugin Details:"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_LIST
-#: po/tmp/xap_String_Id.h.h:588
-msgid "Plugin List"
-msgstr ""
-
-#. LANG_PL_PL
-#: po/tmp/xap_String_Id.h.h:590
-msgid "Polish"
-msgstr ""
-
-#. LANG_PT_BR
-#: po/tmp/xap_String_Id.h.h:592
-msgid "Portuguese (Brazil)"
-msgstr ""
-
-#. LANG_PT_PT
-#: po/tmp/xap_String_Id.h.h:594
-msgid "Portuguese (Portugal)"
-msgstr ""
-
-#. DLG_Image_PlaceColumn
-#: po/tmp/xap_String_Id.h.h:596
-msgid "Position relative to its Column"
-msgstr ""
-
-#. DLG_Image_PlacePage
-#: po/tmp/xap_String_Id.h.h:598
-msgid "Position relative to its Page"
-msgstr ""
-
-#. DLG_Image_PlaceParagraph
-#: po/tmp/xap_String_Id.h.h:600
-msgid "Position relative to nearest paragraph"
-msgstr ""
-
-#. DLG_Image_Aspect
-#: po/tmp/xap_String_Id.h.h:602
-msgid "Preserve aspect ratio"
-msgstr ""
-
-#. DLG_IP_Activate_Label
-#: po/tmp/xap_String_Id.h.h:606
-msgid "Preview Picture"
-msgstr ""
-
-#. DLG_FOSA_PrintToFileTitle
-#: po/tmp/xap_String_Id.h.h:611
-msgid "Print To File"
-msgstr ""
-
-#. DLG_FOSA_FilePrintTypeLabel
-#: po/tmp/xap_String_Id.h.h:613
-msgid "Print file as type:"
-msgstr ""
-
-#. DLG_UP_PrintIn
-#: po/tmp/xap_String_Id.h.h:615
-msgid "Print in: "
-msgstr ""
-
-#. DLG_UP_PrintTo
-#: po/tmp/xap_String_Id.h.h:617
-msgid "Print to: "
-msgstr ""
-
-#. DLG_UP_Printer
-#: po/tmp/xap_String_Id.h.h:619
-msgid "Printer"
-msgstr ""
-
-#. DLG_UP_PrinterCommand
-#: po/tmp/xap_String_Id.h.h:621
-msgid "Printer command: "
-msgstr ""
-
-#. LANG_PA_IN
-#: po/tmp/xap_String_Id.h.h:623
-msgid "Punjabi (Gurmukhi)"
-msgstr ""
-
-#. LANG_PA_PK
-#: po/tmp/xap_String_Id.h.h:625
-msgid "Punjabi (Shahmukhi)"
-msgstr ""
-
-#. LANG_QU_BO
-#: po/tmp/xap_String_Id.h.h:627
-msgid "Quechua"
-msgstr ""
-
-#. LANG_QUH_BO
-#: po/tmp/xap_String_Id.h.h:629
-msgid "Quechua (3 vowels)"
-msgstr ""
-
-#. LANG_QUL_BO
-#: po/tmp/xap_String_Id.h.h:631
-msgid "Quechua (5 vowels)"
-msgstr ""
-
-#. DLG_FOSA_RecordToFileTitle
-#: po/tmp/xap_String_Id.h.h:633
-msgid "Record Editing to File"
-msgstr ""
-
-#. DLG_UFS_StyleRegular
-#: po/tmp/xap_String_Id.h.h:635
-msgid "Regular"
-msgstr ""
-
-#. DLG_DocComparison_Relationship
-#: po/tmp/xap_String_Id.h.h:637
-msgid "Relationship:"
-msgstr ""
-
-#. DLG_FOSA_ReplayFromFileTitle
-#: po/tmp/xap_String_Id.h.h:639
-msgid "Replay Editing from File"
-msgstr ""
-
-#. DLG_Restore
-#: po/tmp/xap_String_Id.h.h:641
-msgid "Restore"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpRestore
-#: po/tmp/xap_String_Id.h.h:643
-msgid "Restore Settings"
-msgstr ""
-
-#. DLG_DocComparison_Results
-#: po/tmp/xap_String_Id.h.h:645
-msgid "Results"
-msgstr ""
-
-#. LANG_RO_RO
-#: po/tmp/xap_String_Id.h.h:647
-msgid "Romanian"
-msgstr ""
-
-#. ENC_ROMA_MAC
-#: po/tmp/xap_String_Id.h.h:649
-msgid "Romanian, Macintosh"
-msgstr ""
-
-#. LANG_RU_RU
-#: po/tmp/xap_String_Id.h.h:651
-msgid "Russian (Russia)"
-msgstr ""
-
-#. DLG_UFS_SampleFrameLabel
-#: po/tmp/xap_String_Id.h.h:653
-msgid "Sample"
-msgstr ""
-
-#. LANG_SC_IT
-#: po/tmp/xap_String_Id.h.h:655
-msgid "Sardinian"
-msgstr ""
-
-#. DLG_FOSA_SaveAsTitle
-#: po/tmp/xap_String_Id.h.h:657
-msgid "Save File As"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpSave
-#: po/tmp/xap_String_Id.h.h:659
-msgid "Save Settings"
-msgstr ""
-
-#. DLG_FOSA_FileSaveTypeLabel
-#: po/tmp/xap_String_Id.h.h:661
-msgid "Save file as type:"
-msgstr ""
-
-#. DLG_UFS_ScriptLabel
-#: po/tmp/xap_String_Id.h.h:663
-msgid "Script:"
-msgstr ""
-
-#. STYLE_SECTHEADING
-#: po/tmp/xap_String_Id.h.h:665
-msgid "Section Heading"
-msgstr ""
-
-#. DLG_UENC_EncLabel
-#: po/tmp/xap_String_Id.h.h:669
-msgid "Select Encoding:"
-msgstr ""
-
-#. DLG_HTMLOPT_ExpLabel
-#: po/tmp/xap_String_Id.h.h:671
-msgid "Select HTML export options:"
-msgstr ""
-
-#. DLG_ULANG_LangLabel
-#: po/tmp/xap_String_Id.h.h:673
-msgid "Select Language:"
-msgstr ""
-
-#. LANG_SR
-#: po/tmp/xap_String_Id.h.h:677
-msgid "Serbian"
-msgstr ""
-
-#. DLG_Image_ImageDesc
-#: po/tmp/xap_String_Id.h.h:679
-msgid "Set Image Name"
-msgstr ""
-
-#. DLG_Image_ImageSize
-#: po/tmp/xap_String_Id.h.h:681
-msgid "Set Image Size"
-msgstr ""
-
-#. DLG_ULANG_LangTitle
-#: po/tmp/xap_String_Id.h.h:683
-msgid "Set Language"
-msgstr ""
-
-#. DLG_UFS_TransparencyCheck
-#: po/tmp/xap_String_Id.h.h:685
-msgid "Set no Highlight Color"
-msgstr ""
-
-#. DLG_UFS_SizeLabel
-#: po/tmp/xap_String_Id.h.h:689
-msgid "Size:"
-msgstr ""
-
-#. LANG_SK_SK
-#: po/tmp/xap_String_Id.h.h:691
-msgid "Slovak"
-msgstr ""
-
-#. LANG_SL_SI
-#: po/tmp/xap_String_Id.h.h:693
-msgid "Slovenian"
-msgstr ""
-
-#. LANG_ES_MX
-#: po/tmp/xap_String_Id.h.h:695
-msgid "Spanish (Mexico)"
-msgstr ""
-
-#. LANG_ES_ES
-#: po/tmp/xap_String_Id.h.h:697
-msgid "Spanish (Spain)"
-msgstr ""
-
-#. DLG_Image_SquareWrap
-#: po/tmp/xap_String_Id.h.h:701
-msgid "Square text wrapping"
-msgstr ""
-
-#. DLG_DocComparison_Styles
-#: po/tmp/xap_String_Id.h.h:709
-msgid "Styles:"
-msgstr ""
-
-#. LANG_SW
-#: po/tmp/xap_String_Id.h.h:715
-msgid "Swahili"
-msgstr ""
-
-#. LANG_SV_SE
-#: po/tmp/xap_String_Id.h.h:717
-msgid "Swedish"
-msgstr ""
-
-#. TB_Font_Symbol
-#: po/tmp/xap_String_Id.h.h:719
-msgid "Symbols"
-msgstr ""
-
-#. LANG_SYR
-#: po/tmp/xap_String_Id.h.h:721
-msgid "Syriac"
-msgstr ""
-
-#. LANG_TL_PH
-#: po/tmp/xap_String_Id.h.h:725
-msgid "Tagalog"
-msgstr ""
-
-#. LANG_TA_IN
-#: po/tmp/xap_String_Id.h.h:727
-msgid "Tamil"
-msgstr ""
-
-#. LANG_TE_IN
-#: po/tmp/xap_String_Id.h.h:729
-msgid "Telugu"
-msgstr ""
-
-#. DLG_UFS_ColorTab
-#: po/tmp/xap_String_Id.h.h:731
-msgid "Text Color"
-msgstr ""
-
-#. DLG_Image_WrappedBoth
-#: po/tmp/xap_String_Id.h.h:733
-msgid "Text wrapped on both sides of the Image"
-msgstr ""
-
-#. DLG_Image_WrappedLeft
-#: po/tmp/xap_String_Id.h.h:735
-msgid "Text wrapped to the Left of the Image"
-msgstr ""
-
-#. DLG_Image_WrappedRight
-#: po/tmp/xap_String_Id.h.h:737
-msgid "Text wrapped to the Right of the Image"
-msgstr ""
-
-#. LANG_TH_TH
-#: po/tmp/xap_String_Id.h.h:739
-msgid "Thai"
-msgstr ""
-
-#. ENC_THAI_MAC
-#: po/tmp/xap_String_Id.h.h:741
-msgid "Thai, Macintosh"
-msgstr ""
-
-#. ENC_THAI_TIS
-#: po/tmp/xap_String_Id.h.h:743
-msgid "Thai, TIS-620"
-msgstr ""
-
-#. ENC_THAI_WIN
-#: po/tmp/xap_String_Id.h.h:745
-msgid "Thai, Windows Code Page 874"
-msgstr ""
-
-#. DLG_NoSaveFile_DirNotWriteable
-#: po/tmp/xap_String_Id.h.h:747
-#, c-format
-msgid "The directory '%s' is write-protected."
-msgstr ""
-
-#. DLG_FOSA_ExtensionDoesNotMatch
-#: po/tmp/xap_String_Id.h.h:749
-msgid ""
-"The given file extension does not match the chosen file type. Do you want to "
-"use this name anyway?"
-msgstr ""
-
-#. MSG_HistoryPartRestore2
-#: po/tmp/xap_String_Id.h.h:751
-#, c-format
-msgid ""
-"The nearest version that can be restored fully is %d. Would you like to "
-"restore this version instead? To partially restore version %d press No."
-msgstr ""
-
-#. DLG_UP_InvalidPrintString
-#: po/tmp/xap_String_Id.h.h:753
-msgid "The print command string is not valid."
-msgstr ""
-
-#. MSG_NoUndo
-#: po/tmp/xap_String_Id.h.h:755
-msgid "This operation cannot be undone. Are you sure you want to proceed?"
-msgstr ""
-
-#. DLG_Image_TightWrap
-#: po/tmp/xap_String_Id.h.h:759
-msgid "Tight text wrapping"
-msgstr ""
-
-#. MSG_HistoryPartRestore3
-#: po/tmp/xap_String_Id.h.h:763
-msgid "To continue anyway, press OK."
-msgstr ""
-
-#. MSG_HistoryPartRestore4
-#: po/tmp/xap_String_Id.h.h:765
-msgid "To quit the restoration attempt, press Cancel."
-msgstr ""
-
-#. LANG_TR_TR
-#: po/tmp/xap_String_Id.h.h:771
-msgid "Turkish"
-msgstr ""
-
-#. ENC_TURK_ISO
-#: po/tmp/xap_String_Id.h.h:773
-msgid "Turkish, ISO-8859-9"
-msgstr ""
-
-#. ENC_TURK_MAC
-#: po/tmp/xap_String_Id.h.h:775
-msgid "Turkish, Macintosh"
-msgstr ""
-
-#. ENC_TURK_WIN
-#: po/tmp/xap_String_Id.h.h:777
-msgid "Turkish, Windows Code Page 1254"
-msgstr ""
-
-#. DLG_Image_WrapType
-#: po/tmp/xap_String_Id.h.h:779
-msgid "Type of text wrapping"
-msgstr ""
-
-#. ENC_WEST_ASCII
-#: po/tmp/xap_String_Id.h.h:781
-msgid "US-ASCII"
-msgstr ""
-
-#. LANG_UK_UA
-#: po/tmp/xap_String_Id.h.h:783
-msgid "Ukrainian"
-msgstr ""
-
-#. ENC_UKRA_KOI
-#: po/tmp/xap_String_Id.h.h:785
-msgid "Ukrainian, KOI8-U"
-msgstr ""
-
-#. ENC_UKRA_MAC
-#: po/tmp/xap_String_Id.h.h:787
-msgid "Ukrainian, Macintosh"
-msgstr ""
-
-#. ENC_UNIC_UCS2
-#: po/tmp/xap_String_Id.h.h:791
-msgid "Unicode UCS-2"
-msgstr ""
-
-#. ENC_UNIC_UCS_2BE
-#: po/tmp/xap_String_Id.h.h:793
-msgid "Unicode UCS-2 Big Endian"
-msgstr ""
-
-#. ENC_UNIC_UCS_2LE
-#: po/tmp/xap_String_Id.h.h:795
-msgid "Unicode UCS-2 Little Endian"
-msgstr ""
-
-#. ENC_UNIC_UCS4
-#: po/tmp/xap_String_Id.h.h:797
-msgid "Unicode UCS-4"
-msgstr ""
-
-#. ENC_UNIC_UCS_4BE
-#: po/tmp/xap_String_Id.h.h:799
-msgid "Unicode UCS-4 Big Endian"
-msgstr ""
-
-#. ENC_UNIC_UCS_4LE
-#: po/tmp/xap_String_Id.h.h:801
-msgid "Unicode UCS-4 Little Endian"
-msgstr ""
-
-#. ENC_UNIC_UTF_16
-#: po/tmp/xap_String_Id.h.h:803
-msgid "Unicode UTF-16"
-msgstr ""
-
-#. ENC_UNIC_UTF_16BE
-#: po/tmp/xap_String_Id.h.h:805
-msgid "Unicode UTF-16 Big Endian"
-msgstr ""
-
-#. ENC_UNIC_UTF_16LE
-#: po/tmp/xap_String_Id.h.h:807
-msgid "Unicode UTF-16 Little Endian"
-msgstr ""
-
-#. ENC_UNIC_UTF_32
-#: po/tmp/xap_String_Id.h.h:809
-msgid "Unicode UTF-32"
-msgstr ""
-
-#. ENC_UNIC_UTF_32BE
-#: po/tmp/xap_String_Id.h.h:811
-msgid "Unicode UTF-32 Big Endian"
-msgstr ""
-
-#. ENC_UNIC_UTF_32LE
-#: po/tmp/xap_String_Id.h.h:813
-msgid "Unicode UTF-32 Little Endian"
-msgstr ""
-
-#. ENC_UNIC_UTF_7
-#: po/tmp/xap_String_Id.h.h:815
-msgid "Unicode UTF-7"
-msgstr ""
-
-#. ENC_UNIC_UTF_8
-#: po/tmp/xap_String_Id.h.h:817
-msgid "Unicode UTF-8"
-msgstr ""
-
-#. UntitledDocument
-#: po/tmp/xap_String_Id.h.h:819
-#, c-format
-msgid "Untitled%d"
-msgstr ""
-
-#. DLG_Update
-#: po/tmp/xap_String_Id.h.h:821
-msgid "Update"
-msgstr ""
-
-#. LANG_UR
-#: po/tmp/xap_String_Id.h.h:827
-msgid "Urdu"
-msgstr ""
-
-#. LANG_UR_PK
-#: po/tmp/xap_String_Id.h.h:829
-msgid "Urdu (Pakistan)"
-msgstr ""
-
-#. LANG_UZ_UZ
-#: po/tmp/xap_String_Id.h.h:831
-msgid "Uzbek"
-msgstr ""
-
-#. DLG_History_List_Title
-#: po/tmp/xap_String_Id.h.h:835
-msgid "Version history"
-msgstr ""
-
-#. DLG_PLUGIN_MANAGER_VERSION
-#. DLG_History_Version
-#: po/tmp/xap_String_Id.h.h:838
-msgid "Version:"
-msgstr ""
-
-#. LANG_VI_VN
-#: po/tmp/xap_String_Id.h.h:840
-msgid "Vietnamese"
-msgstr ""
-
-#. ENC_VIET_TCVN
-#: po/tmp/xap_String_Id.h.h:842
-msgid "Vietnamese, TCVN"
-msgstr ""
-
-#. ENC_VIET_VISCII
-#: po/tmp/xap_String_Id.h.h:844
-msgid "Vietnamese, VISCII"
-msgstr ""
-
-#. ENC_VIET_WIN
-#: po/tmp/xap_String_Id.h.h:846
-msgid "Vietnamese, Windows Code Page 1258"
-msgstr ""
-
-#. DLG_MW_MoreWindows
-#: po/tmp/xap_String_Id.h.h:848
-msgid "View Document"
-msgstr ""
-
-#. DLG_MW_Activate
-#: po/tmp/xap_String_Id.h.h:850
-msgid "View:"
-msgstr ""
-
-#. LANG_CY_GB
-#: po/tmp/xap_String_Id.h.h:852
-msgid "Welsh"
-msgstr ""
-
-#. ENC_US_DOS
-#: po/tmp/xap_String_Id.h.h:854
-msgid "Western European, DOS/Windows Code Page 437"
-msgstr ""
-
-#. ENC_MLNG_DOS
-#: po/tmp/xap_String_Id.h.h:856
-msgid "Western European, DOS/Windows Code Page 850"
-msgstr ""
-
-#. ENC_WEST_HP
-#: po/tmp/xap_String_Id.h.h:858
-msgid "Western European, HP"
-msgstr ""
-
-#. ENC_WEST_ISO
-#: po/tmp/xap_String_Id.h.h:860
-msgid "Western European, ISO-8859-1"
-msgstr ""
-
-#. ENC_WEST_MAC
-#: po/tmp/xap_String_Id.h.h:862
-msgid "Western European, Macintosh"
-msgstr ""
-
-#. ENC_WEST_NXT
-#: po/tmp/xap_String_Id.h.h:864
-msgid "Western European, NeXT"
-msgstr ""
-
-#. ENC_WEST_WIN
-#: po/tmp/xap_String_Id.h.h:866
-msgid "Western European, Windows Code Page 1252"
-msgstr ""
-
-#. TB_Zoom_WholePage
-#: po/tmp/xap_String_Id.h.h:868
-msgid "Whole Page"
-msgstr ""
-
-#. DLG_Image_Width
-#: po/tmp/xap_String_Id.h.h:870
-msgid "Width:"
-msgstr ""
-
-#. DLG_IP_Width_Label
-#: po/tmp/xap_String_Id.h.h:872
-msgid "Width: "
-msgstr ""
-
-#. LANG_WO_SN
-#: po/tmp/xap_String_Id.h.h:874
-msgid "Wolof (Senegal)"
-msgstr ""
-
-#. DLG_QNXMB_Yes
-#: po/tmp/xap_String_Id.h.h:876
-msgid "Yes"
-msgstr ""
-
-#. LANG_YI
-#: po/tmp/xap_String_Id.h.h:878
-msgid "Yiddish"
-msgstr ""
-
-#. MSG_HistoryConfirmSave
-#: po/tmp/xap_String_Id.h.h:880
-#, c-format
-msgid "You have to save changes to document %s before proceeding. Save now?"
-msgstr ""
-
-#. DLG_Zoom_RadioFrameCaption
-#: po/tmp/xap_String_Id.h.h:884
-msgid "Zoom to"
-msgstr ""
-
-#. DLG_UnixMB_No
-#: po/tmp/xap_String_Id.h.h:886
-msgid "_No"
-msgstr ""
-
-#. DLG_UnixMB_Yes
-#: po/tmp/xap_String_Id.h.h:888
-msgid "_Yes"
-msgstr ""
-
-#. DLG_Unit_cm
-#: po/tmp/xap_String_Id.h.h:890
-msgid "cm"
-msgstr ""
-
-#. DLG_DocComparison_Different
-#: po/tmp/xap_String_Id.h.h:892
-msgid "different"
-msgstr ""
-
-#. DLG_DocComparison_DivergingPos
-#: po/tmp/xap_String_Id.h.h:894
-#, c-format
-msgid "diverging after document position %d"
-msgstr ""
-
-#. DLG_DocComparison_Diverging
-#: po/tmp/xap_String_Id.h.h:896
-#, c-format
-msgid "diverging after version %d of %s"
-msgstr ""
-
-#. DLG_DocComparison_Identical
-#: po/tmp/xap_String_Id.h.h:898
-msgid "identical"
-msgstr ""
-
-#. DLG_Unit_inch
-#: po/tmp/xap_String_Id.h.h:900
-msgid "inch"
-msgstr ""
-
-#. DLG_Unit_mm
-#: po/tmp/xap_String_Id.h.h:902
-msgid "mm"
-msgstr ""
-
-#. DLG_Unit_pica
-#: po/tmp/xap_String_Id.h.h:904
-msgid "pica"
-msgstr ""
-
-#. DLG_Unit_points
-#: po/tmp/xap_String_Id.h.h:906
-msgid "points"
-msgstr ""
-
-#. DLG_DocComparison_Siblings
-#: po/tmp/xap_String_Id.h.h:908
-msgid "siblings"
-msgstr ""
-
-#. DLG_DocComparison_Unrelated
-#: po/tmp/xap_String_Id.h.h:910
-msgid "unrelated"
-msgstr ""
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/po/pt-BR.po /tmp/qY2gb79Nml/abiword-2.6.4/abiword/po/pt-BR.po
--- abiword-2.6.2/abiword/po/pt-BR.po 2008-04-06 17:00:52.000000000 +0100
+++ abiword-2.6.4/abiword/po/pt-BR.po 2008-07-13 14:10:52.000000000 +0100
@@ -1,5 +1,4 @@
-# translation of pt-BR.po to Portugus do Brasil
-# Translation of Abiword to Brazilian Portuguese
+# Translation of Abiword to Brazilian Portuguese.
# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
# Nelson Ferraz , 2004.
#
@@ -39,7 +38,7 @@
#. MENU_STATUSLINE_HELP
#: po/tmp/ap_String_Id.h.h:23
msgid " "
-msgstr "Fechar documento"
+msgstr " "
#. DLG_Styles_ErrNotTitle2
#: po/tmp/ap_String_Id.h.h:25
@@ -47,7 +46,7 @@
" - Reserved. \n"
" You cannot use this name. Choose Another \n"
msgstr ""
-"Reservado. \n"
+" - Reservado. \n"
" No pode usar este nome. Escolha outro \n"
#. DLG_WordCount_Auto_Update
@@ -327,7 +326,7 @@
#. MENU_LABEL_FMT_STYLE_DEFINE
#: po/tmp/ap_String_Id.h.h:139
msgid "&Create and Modify Styles"
-msgstr "&Criar e Modificar"
+msgstr "&Criar e Modificar Estilos"
#. DLG_Options_Label_PrefsCurrentScheme
#: po/tmp/ap_String_Id.h.h:141
@@ -2148,9 +2147,8 @@
#. MENU_LABEL_EDIT_CUTEMBED
#: po/tmp/ap_String_Id.h.h:873
-#, fuzzy
msgid "Cut Object"
-msgstr "Definir"
+msgstr "Remover Objeto"
#. MENU_LABEL_EDIT_CUT_FRAME
#: po/tmp/ap_String_Id.h.h:875
@@ -2287,9 +2285,8 @@
#. MENU_LABEL_EDIT_DELETEEMBED
#: po/tmp/ap_String_Id.h.h:931
-#, fuzzy
msgid "Delete Object"
-msgstr "Apagar &Tabela"
+msgstr "Apagar Objeto"
#. MENU_LABEL_TABLE_DELETEROW
#: po/tmp/ap_String_Id.h.h:933
@@ -2926,9 +2923,8 @@
#. MENU_LABEL_FMT_EMBED
#: po/tmp/ap_String_Id.h.h:1192
-#, fuzzy
msgid "Format Object"
-msgstr "Formatar Tabela"
+msgstr "Formatar Objeto"
#. TOOLBAR_LABEL_FMTPAINTER
#: po/tmp/ap_String_Id.h.h:1194
Binary files /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/po/zh-CN.po and /tmp/qY2gb79Nml/abiword-2.6.4/abiword/po/zh-CN.po differ
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixMenu.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/unix/ev_UnixMenu.cpp
--- abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixMenu.cpp 2008-04-06 17:00:00.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/unix/ev_UnixMenu.cpp 2008-07-13 14:09:48.000000000 +0100
@@ -85,7 +85,7 @@
// map the user_data into an object and dispatch the event.
_wd * wd = static_cast<_wd *>(callback_data);
- UT_ASSERT(wd);
+ UT_return_if_fail(wd);
wd->m_pUnixMenu->menuEvent(wd->m_id);
}
@@ -95,11 +95,11 @@
UT_ASSERT(widget && data);
_wd * wd = static_cast<_wd *>(data);
- UT_ASSERT(wd && wd->m_pUnixMenu);
+ UT_return_if_fail(wd && wd->m_pUnixMenu);
// WL_REFACTOR: redundant code
XAP_Frame * pFrame = wd->m_pUnixMenu->getFrame();
- UT_ASSERT(pFrame);
+ UT_return_if_fail(pFrame);
EV_Menu_Label * pLabel = wd->m_pUnixMenu->getLabelSet()->getLabel(wd->m_id);
if (!pLabel)
{
@@ -118,10 +118,10 @@
UT_ASSERT(widget && data);
_wd * wd = static_cast<_wd *>(data);
- UT_ASSERT(wd && wd->m_pUnixMenu);
+ UT_return_if_fail(wd && wd->m_pUnixMenu);
XAP_Frame * pFrame = wd->m_pUnixMenu->getFrame();
- UT_ASSERT(pFrame);
+ UT_return_if_fail(pFrame);
pFrame->setStatusMessage(NULL);
}
@@ -129,19 +129,19 @@
static void s_onInitMenu(GtkMenuItem * menuItem, gpointer callback_data)
{
_wd * wd = static_cast<_wd *>(callback_data);
- UT_ASSERT(wd);
+ UT_return_if_fail(wd);
wd->m_pUnixMenu->refreshMenu(wd->m_pUnixMenu->getFrame()->getCurrentView());
}
static void s_onDestroyMenu(GtkMenuItem * menuItem, gpointer callback_data)
{
_wd * wd = static_cast<_wd *>(callback_data);
- UT_ASSERT(wd);
+ UT_return_if_fail(wd);
// we always clear the status bar when a menu goes away, so we don't
// leave a message behind
XAP_Frame * pFrame = wd->m_pUnixMenu->getFrame();
- UT_ASSERT(pFrame);
+ UT_return_if_fail(pFrame);
pFrame->setStatusMessage(NULL);
}
@@ -315,17 +315,17 @@
// return true if handled.
const EV_Menu_ActionSet * pMenuActionSet = m_pUnixApp->getMenuActionSet();
- UT_ASSERT(pMenuActionSet);
+ UT_return_val_if_fail(pMenuActionSet, false);
const EV_Menu_Action * pAction = pMenuActionSet->getAction(id);
- UT_ASSERT(pAction);
+ UT_return_val_if_fail(pAction, false);
const char * szMethodName = pAction->getMethodName();
if (!szMethodName)
return false;
const EV_EditMethodContainer * pEMC = m_pUnixApp->getEditMethodContainer();
- UT_ASSERT(pEMC);
+ UT_return_val_if_fail(pEMC, false);
EV_EditMethod * pEM = pEMC->findEditMethodByName(szMethodName);
UT_ASSERT(pEM); // make sure it's bound to something
@@ -420,7 +420,7 @@
for (UT_uint32 k = 0; (k < nrLabelItemsInLayout); k++)
{
EV_Menu_LayoutItem * pLayoutItem = m_pMenuLayout->getLayoutItem(k);
- UT_ASSERT(pLayoutItem);
+ UT_continue_if_fail(pLayoutItem);
XAP_Menu_Id id = pLayoutItem->getMenuId();
// VERY BAD HACK! It will be here until I fix the const correctness of all the functions
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixToolbar.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/unix/ev_UnixToolbar.cpp
--- abiword-2.6.2/abiword/src/af/ev/unix/ev_UnixToolbar.cpp 2008-04-06 17:00:00.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/unix/ev_UnixToolbar.cpp 2008-07-13 14:09:48.000000000 +0100
@@ -332,7 +332,7 @@
// map the user_data into an object and dispatch the event.
_wd * wd = static_cast<_wd *>(user_data);
- UT_ASSERT(wd);
+ UT_return_if_fail(wd);
GdkEvent * event = gtk_get_current_event();
wd->m_pUnixToolbar->setCurrentEvent(event);
if (!wd->m_blockSignal)
@@ -347,7 +347,7 @@
// map the user_data into an object and dispatch the event.
_wd * wd = reinterpret_cast<_wd *>(user_data);
- UT_ASSERT(wd);
+ UT_return_if_fail(wd);
GdkEvent * event = gtk_get_current_event();
wd->m_pUnixToolbar->setCurrentEvent(event);
if (!wd->m_blockSignal && (rows > 0) && (cols > 0))
@@ -456,7 +456,7 @@
static void s_combo_changed(GtkComboBox * combo, _wd * wd)
{
- UT_ASSERT(wd);
+ UT_return_if_fail(wd);
// only act if the widget has been shown and embedded in the toolbar
if (!wd->m_widget || wd->m_blockSignal) {
@@ -555,7 +555,7 @@
const gchar * editMethod = gtk_action_get_name(action);
XAP_UnixApp * pUnixApp = wd->m_pUnixToolbar->getApp();
const EV_EditMethodContainer * pEMC = pUnixApp->getEditMethodContainer();
- UT_ASSERT(pEMC);
+ UT_return_if_fail(pEMC);
EV_EditMethod * pEM = NULL;
AV_View * pView = wd->m_pUnixToolbar->getFrame()->getCurrentView();
@@ -605,7 +605,7 @@
XAP_Toolbar_Id id = wd->m_id;
const EV_Toolbar_ActionSet * pToolbarActionSet = m_pUnixApp->getToolbarActionSet();
- UT_ASSERT(pToolbarActionSet);
+ UT_return_val_if_fail(pToolbarActionSet, false);
const EV_Toolbar_Action * pAction = pToolbarActionSet->getAction(id);
UT_ASSERT(pAction);
@@ -642,7 +642,7 @@
return false;
const EV_EditMethodContainer * pEMC = m_pUnixApp->getEditMethodContainer();
- UT_ASSERT(pEMC);
+ UT_return_val_if_fail(pEMC, false);
EV_EditMethod * pEM = pEMC->findEditMethodByName(szMethodName);
UT_ASSERT(pEM); // make sure it's bound to something
@@ -802,7 +802,7 @@
for (UT_uint32 k=0; (k < nrLabelItemsInLayout); k++)
{
EV_Toolbar_LayoutItem * pLayoutItem = m_pToolbarLayout->getLayoutItem(k);
- UT_ASSERT(pLayoutItem);
+ UT_continue_if_fail(pLayoutItem);
XAP_Toolbar_Id id = pLayoutItem->getToolbarId();
EV_Toolbar_Action * pAction = pToolbarActionSet->getAction(id);
@@ -1204,11 +1204,11 @@
for (UT_uint32 k=0; (k < nrLabelItemsInLayout); k++)
{
EV_Toolbar_LayoutItem * pLayoutItem = m_pToolbarLayout->getLayoutItem(k);
- UT_ASSERT(pLayoutItem);
+ UT_continue_if_fail(pLayoutItem);
XAP_Toolbar_Id id = pLayoutItem->getToolbarId();
EV_Toolbar_Action * pAction = pToolbarActionSet->getAction(id);
- UT_ASSERT(pAction);
+ UT_continue_if_fail(pAction);
AV_ChangeMask maskOfInterest = pAction->getChangeMaskOfInterest();
if ((maskOfInterest & mask) == 0) // if this item doesn't care about
@@ -1436,7 +1436,7 @@
//
UT_ASSERT(wd->m_id == AP_TOOLBAR_ID_FMT_STYLE);
XAP_Toolbar_ControlFactory * pFactory = m_pUnixApp->getControlFactory();
- UT_ASSERT(pFactory);
+ UT_return_val_if_fail(pFactory, false);
EV_Toolbar_Control * pControl = pFactory->getControl(this, id);
AP_UnixToolbar_StyleCombo * pStyleC = static_cast(pControl);
pStyleC->repopulate();
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Keyboard.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Keyboard.h
--- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Keyboard.h 2008-04-06 17:00:04.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Keyboard.h 2008-07-13 14:09:50.000000000 +0100
@@ -27,7 +27,7 @@
class AV_View;
-class ev_Win32Keyboard : public EV_Keyboard
+class ABI_EXPORT ev_Win32Keyboard : public EV_Keyboard
{
public:
ev_Win32Keyboard(EV_EditEventMapper * pEEM);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Menu.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Menu.h
--- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Menu.h 2008-04-06 17:00:04.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Menu.h 2008-07-13 14:09:50.000000000 +0100
@@ -42,7 +42,7 @@
} EV_Menu_Bitmap;
-class EV_Win32Menu : public EV_Menu
+class ABI_EXPORT EV_Win32Menu : public EV_Menu
{
public:
EV_Win32Menu(XAP_Win32App * pWin32App,
@@ -98,7 +98,7 @@
/*****************************************************************/
-class EV_Win32MenuBar : public EV_Win32Menu
+class ABI_EXPORT EV_Win32MenuBar : public EV_Win32Menu
{
public:
EV_Win32MenuBar(XAP_Win32App * pWin32App,
@@ -112,7 +112,7 @@
/*****************************************************************/
-class EV_Win32MenuPopup : public EV_Win32Menu
+class ABI_EXPORT EV_Win32MenuPopup : public EV_Win32Menu
{
public:
EV_Win32MenuPopup(XAP_Win32App * pWin32App,
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Mouse.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Mouse.h
--- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Mouse.h 2008-04-06 17:00:04.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Mouse.h 2008-07-13 14:09:50.000000000 +0100
@@ -34,7 +34,7 @@
class AV_View;
-class EV_Win32Mouse : public EV_Mouse
+class ABI_EXPORT EV_Win32Mouse : public EV_Mouse
{
public:
EV_Win32Mouse(EV_EditEventMapper * pEEM);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Toolbar.cpp
--- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar.cpp 2008-04-06 17:00:03.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Toolbar.cpp 2008-07-13 14:09:50.000000000 +0100
@@ -74,7 +74,7 @@
// This one should really be in the anonymous namespace in this translation
// unit, but since we don't use namespaces...
//
-class foo_Bitmap_container
+class ABI_EXPORT foo_Bitmap_container
{
public: // d'tor needs to be public due to buggy MSVC compilers
~foo_Bitmap_container();
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Toolbar.h
--- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar.h 2008-04-06 17:00:04.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Toolbar.h 2008-07-13 14:09:50.000000000 +0100
@@ -45,7 +45,7 @@
#define _ev_MENU_OFFSET 1000
#endif
-class EV_Win32Toolbar : public EV_Toolbar
+class ABI_EXPORT EV_Win32Toolbar : public EV_Toolbar
{
public:
EV_Win32Toolbar(XAP_Win32App * pWin32App, XAP_Frame * pFrame,
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar_ViewListener.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Toolbar_ViewListener.h
--- abiword-2.6.2/abiword/src/af/ev/win/ev_Win32Toolbar_ViewListener.h 2008-04-06 17:00:04.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/win/ev_Win32Toolbar_ViewListener.h 2008-07-13 14:09:50.000000000 +0100
@@ -25,7 +25,7 @@
class AV_View;
-class EV_Win32Toolbar_ViewListener : public AV_Listener
+class ABI_EXPORT EV_Win32Toolbar_ViewListener : public AV_Listener
{
public:
EV_Win32Toolbar_ViewListener(EV_Win32Toolbar * pWin32Toolbar,
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/xp/ev_EditBinding.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/xp/ev_EditBinding.cpp
--- abiword-2.6.2/abiword/src/af/ev/xp/ev_EditBinding.cpp 2008-04-06 17:00:02.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/xp/ev_EditBinding.cpp 2008-07-13 14:09:50.000000000 +0100
@@ -63,7 +63,7 @@
/*****************************************************************/
/*****************************************************************/
-class ev_EB_MouseTable
+class ABI_EXPORT ev_EB_MouseTable
{
public:
ev_EB_MouseTable()
@@ -88,7 +88,7 @@
EV_EditBinding * m_peb[EV_COUNT_EMO][EV_COUNT_EMS][EV_COUNT_EMC];
};
-class ev_EB_NVK_Table
+class ABI_EXPORT ev_EB_NVK_Table
{
public:
ev_EB_NVK_Table()
@@ -110,7 +110,7 @@
EV_EditBinding * m_peb[EV_COUNT_NVK][EV_COUNT_EMS];
};
-class ev_EB_Char_Table
+class ABI_EXPORT ev_EB_Char_Table
{
public:
ev_EB_Char_Table()
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/xp/ev_EditMethod.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/xp/ev_EditMethod.cpp
--- abiword-2.6.2/abiword/src/af/ev/xp/ev_EditMethod.cpp 2008-04-06 17:00:02.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/xp/ev_EditMethod.cpp 2008-07-13 14:09:50.000000000 +0100
@@ -282,9 +282,7 @@
return pEM->Fn(pView, pData);
}
pView = pFrame->getCurrentView() ;
- UT_ASSERT(pView);
- if (!pView)
- return false;
+ UT_return_val_if_fail(pView, false);
// return whatever the method says to based on the data at hand
return pEM->Fn(pView, pData);
@@ -314,17 +312,13 @@
bool ev_EditMethod_invoke (const char * methodName, const char * data)
{
- UT_ASSERT(data);
- if(!data)
- return false;
+ UT_return_val_if_fail(data, false);
return ev_EditMethod_invoke ( methodName, UT_String(data) ) ;
}
bool ev_EditMethod_invoke (const char * methodName, const UT_UCSChar * data)
{
- UT_ASSERT(data);
- if(!data)
- return false;
+ UT_return_val_if_fail(data, false);
return ev_EditMethod_invoke ( methodName, UT_UCS4String(data) ) ;
}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/xp/ev_Menu.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/xp/ev_Menu.cpp
--- abiword-2.6.2/abiword/src/af/ev/xp/ev_Menu.cpp 2008-04-06 17:00:02.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/xp/ev_Menu.cpp 2008-07-13 14:09:50.000000000 +0100
@@ -150,7 +150,7 @@
UT_uint32 dataLength)
{
UT_ASSERT(pView);
- UT_ASSERT(pEM);
+ UT_return_val_if_fail(pEM, false);
//UT_DEBUGMSG(("invokeMenuMethod: %s\n",pEM->getName()));
@@ -221,13 +221,13 @@
if (szMethodName)
{
const EV_EditMethodContainer * pEMC = pApp->getEditMethodContainer();
- UT_ASSERT(pEMC);
+ UT_return_val_if_fail(pEMC, NULL);
EV_EditMethod * pEM = pEMC->findEditMethodByName(szMethodName);
UT_ASSERT(pEM); // make sure it's bound to something
const EV_EditEventMapper * pEEM = getApp()->getEditEventMapper();
- UT_ASSERT(pEEM);
+ UT_return_val_if_fail(pEEM, NULL);
const char * string = pEEM->getShortcutFor(pEM);
if (string && *string)
@@ -266,7 +266,7 @@
const UT_GenericVector * labels_table = labels->getAllLabels();
const EV_Menu_Label *l = 0;
- UT_ASSERT(labels_table);
+ UT_return_val_if_fail(labels_table, 0);
UT_uint32 size_labels = labels_table->size();
XAP_Menu_Id id = 0;
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/ev/xp/ev_Toolbar.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/ev/xp/ev_Toolbar.cpp
--- abiword-2.6.2/abiword/src/af/ev/xp/ev_Toolbar.cpp 2008-04-06 17:00:03.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/ev/xp/ev_Toolbar.cpp 2008-07-13 14:09:50.000000000 +0100
@@ -74,7 +74,7 @@
UT_uint32 dataLength)
{
UT_ASSERT(pView);
- UT_ASSERT(pEM);
+ UT_return_val_if_fail(pEM, false);
//UT_DEBUGMSG(("invokeToolbarMethod: %s\n",pEM->getName()));
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixImage.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixImage.h
--- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixImage.h 2008-04-06 16:59:45.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixImage.h 2008-07-13 14:09:30.000000000 +0100
@@ -24,7 +24,7 @@
#include "gr_Image.h"
-class GR_UnixImage : public GR_RasterImage
+class ABI_EXPORT GR_UnixImage : public GR_RasterImage
{
friend class GR_UnixPangoGraphics;
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixNullGraphics.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixNullGraphics.h
--- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixNullGraphics.h 2008-04-06 16:59:45.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixNullGraphics.h 2008-07-13 14:09:31.000000000 +0100
@@ -29,7 +29,7 @@
/*****************************************************************/
/*****************************************************************/
-class GR_UnixNullGraphicsAllocInfo : public GR_AllocInfo
+class ABI_EXPORT GR_UnixNullGraphicsAllocInfo : public GR_AllocInfo
{
public:
GR_UnixNullGraphicsAllocInfo()
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp
--- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp 2008-04-06 16:59:45.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixPangoGraphics.cpp 2008-07-13 14:09:30.000000000 +0100
@@ -137,6 +137,7 @@
GR_UnixPangoRenderInfo(GR_ScriptType t):
GR_RenderInfo(t),
m_pGlyphs(NULL),
+ m_pScaledGlyphs(NULL),
m_pLogOffsets(NULL),
m_pJustify(NULL),
m_iZoom(0),
@@ -153,6 +154,8 @@
delete [] m_pJustify; delete [] m_pLogOffsets;
if(m_pGlyphs)
pango_glyph_string_free(m_pGlyphs);
+ if(m_pScaledGlyphs)
+ pango_glyph_string_free(m_pScaledGlyphs);
s_iInstanceCount--;
if(!s_iInstanceCount)
@@ -187,6 +190,7 @@
}
PangoGlyphString* m_pGlyphs;
+ PangoGlyphString* m_pScaledGlyphs;
int * m_pLogOffsets;
int * m_pJustify;
UT_uint32 m_iZoom;
@@ -237,10 +241,13 @@
:
m_pFontMap(NULL),
m_pContext(NULL),
+ m_pLayoutFontMap(NULL),
+ m_pLayoutContext(NULL),
m_bOwnsFontMap(false),
m_pPFont(NULL),
m_pPFontGUI(NULL),
m_pAdjustedPangoFont(NULL),
+ m_pAdjustedLayoutPangoFont(NULL),
m_pAdjustedPangoFontSource(NULL),
m_iAdjustedPangoFontZoom (0),
m_iDeviceResolution(96),
@@ -262,10 +269,13 @@
:
m_pFontMap(NULL),
m_pContext(NULL),
+ m_pLayoutFontMap(NULL),
+ m_pLayoutContext(NULL),
m_bOwnsFontMap(false),
m_pPFont(NULL),
m_pPFontGUI(NULL),
m_pAdjustedPangoFont(NULL),
+ m_pAdjustedLayoutPangoFont(NULL),
m_pAdjustedPangoFontSource(NULL),
m_iAdjustedPangoFontZoom (0),
m_iDeviceResolution(96),
@@ -289,6 +299,10 @@
{
g_object_unref(m_pAdjustedPangoFont);
}
+ if(m_pAdjustedLayoutPangoFont!= NULL)
+ {
+ g_object_unref(m_pAdjustedLayoutPangoFont);
+ }
if (m_pContext != NULL)
{
g_object_unref(m_pContext);
@@ -299,6 +313,8 @@
_destroyFonts();
delete m_pPFontGUI;
+ g_object_unref(m_pLayoutFontMap);
+ g_object_unref(m_pLayoutContext);
if (m_pXftDraw)
g_free(m_pXftDraw);
@@ -455,7 +471,7 @@
#ifdef HAVE_PANGOFT2
else
{
- m_iDeviceResolution = 72;
+ m_iDeviceResolution = 72.;
m_pFontMap = pango_ft2_font_map_new ();
pango_ft2_font_map_set_resolution(reinterpret_cast(m_pFontMap),
m_iDeviceResolution,
@@ -463,6 +479,11 @@
m_pContext = pango_ft2_font_map_create_context(reinterpret_cast(m_pFontMap));
m_bOwnsFontMap = true;
}
+ m_pLayoutFontMap = pango_ft2_font_map_new ();
+ pango_ft2_font_map_set_resolution(reinterpret_cast(m_pLayoutFontMap),
+ getResolution(),
+ getResolution());
+ m_pLayoutContext = pango_ft2_font_map_create_context(reinterpret_cast(m_pLayoutFontMap));
#endif
}
@@ -1057,7 +1078,14 @@
RI->m_pGlyphs = NULL;
}
+ if(RI->m_pScaledGlyphs)
+ {
+ pango_glyph_string_free(RI->m_pScaledGlyphs);
+ RI->m_pScaledGlyphs = NULL;
+ }
+
RI->m_pGlyphs = pango_glyph_string_new();
+ RI->m_pScaledGlyphs = pango_glyph_string_new();
/*
* We want to do the shaping on a font at it's actual point size, so we
@@ -1094,7 +1122,7 @@
}
UT_return_val_if_fail(pfd, false);
- PangoFont * pf = pango_context_load_font(getContext(), pfd);
+ PangoFont * pf = pango_context_load_font(getLayoutContext(), pfd);
pango_font_description_free(pfd);
pItem->m_pi->analysis.font = pf;
@@ -1104,6 +1132,8 @@
pango_shape(utf8.utf8_str(), utf8.byteLength(),
&(pItem->m_pi->analysis), RI->m_pGlyphs);
+ pango_shape(utf8.utf8_str(), utf8.byteLength(),
+ &(pItem->m_pi->analysis), RI->m_pScaledGlyphs);
if (pPangoFontOrig)
pItem->m_pi->analysis.font = pPangoFontOrig;
@@ -1147,7 +1177,13 @@
GR_UnixPangoFont * pFont = (GR_UnixPangoFont *) RI.m_pFont;
UT_return_val_if_fail( pFont, 0 );
- PangoFont * pf = _adjustedPangoFont(pFont, pItem->m_pi->analysis.font);
+ //
+ // Actually want the layout font here
+ //
+ PangoFont * pf = _adjustedLayoutPangoFont(pFont, pItem->m_pi->analysis.font);
+ PangoFont * pfa = _adjustedPangoFont(pFont, pItem->m_pi->analysis.font);
+
+ xxx_UT_DEBUGMSG(("Adjusted Layout font %x Adjusted font %x \n",pf,pfa));
UT_return_val_if_fail( pf, 0 );
UT_sint32 iStart = RI.m_iOffset;
@@ -1233,7 +1269,11 @@
}
UT_ASSERT_HARMLESS( iOffsetStart >= 0 );
-
+
+ PangoFontDescription * pfd = pango_font_describe (pf);
+ int isize = pango_font_description_get_size(pfd);
+ xxx_UT_DEBUGMSG(("Font size in _measureExtents %d \n",isize));
+
if(iOffsetEnd < 0 && iDir == UT_BIDI_LTR)
{
// to the end
@@ -1258,7 +1298,7 @@
xxx_UT_DEBUGMSG(("::getTextWidth start %d, end %d, w %d, x %d\n",
iOffsetStart, iOffsetEnd, LR.width, LR.x));
- return ptlu(LR.width + LR.x);
+ return ptlunz(LR.width + LR.x);
}
@@ -1283,7 +1323,7 @@
}
/*
- * This is used to get PangoFont that is correct for present zoom level.
+ * This is used to get device zoomed PangoFont that is correct for present zoom level.
* pFont is the font that we are supposed to be using (the user-selected font)
* pf is the PangoFont that we are actually using (possibly a different,
* substituted font).
@@ -1310,23 +1350,87 @@
PangoFontDescription * pfd = pango_font_describe (pf);
double dSize = pFont->getPointSize ();
+
+ /* We cache this font to avoid all this huha if we can */
+ if (m_pAdjustedLayoutPangoFont)
+ {
+ g_object_unref(m_pAdjustedLayoutPangoFont);
+ }
+ if (m_pAdjustedPangoFont)
+ {
+ g_object_unref(m_pAdjustedPangoFont);
+ }
+ pango_font_description_set_size (pfd, (gint)dSize * PANGO_SCALE);
+ m_pAdjustedLayoutPangoFont = pango_context_load_font(getLayoutContext(), pfd);
+ m_pAdjustedPangoFontSource = pFont;
+
dSize =
(gint)(dSize*(double)PANGO_SCALE *(double)getZoomPercentage() / 100.0);
+ pango_font_description_set_size (pfd, (gint)dSize);
+ m_pAdjustedPangoFont = pango_context_load_font(getContext(), pfd);
+ m_iAdjustedPangoFontZoom = getZoomPercentage();
+
+ pango_font_description_free(pfd);
+
+ return m_pAdjustedPangoFont;
+}
+
+
+/*
+ * This is used to get Layout PangoFont that is correct for present zoom level.
+ * pFont is the font that we are supposed to be using (the user-selected font)
+ * pf is the PangoFont that we are actually using (possibly a different,
+ * substituted font).
+ */
+PangoFont * GR_UnixPangoGraphics::_adjustedLayoutPangoFont (GR_UnixPangoFont * pFont, PangoFont * pf)
+{
+ UT_return_val_if_fail(pFont, NULL);
+ if (!pf)
+ {
+ xxx_UT_DEBUGMSG(("Getting Layout font \n"));
+ return pFont->getPangoLayoutFont();
+ }
+ /* See if this is not the font we have currently cached */
+ if (pFont == m_pAdjustedPangoFontSource &&
+ m_iAdjustedPangoFontZoom == getZoomPercentage())
+ {
+ return m_pAdjustedLayoutPangoFont;
+ }
+
+ /*
+ * When Pango is doing font substitution for us, the substitute font
+ * we are getting always has size 12pt, so we have to use the size of
+ * our own font to fix this.
+ */
+ PangoFontDescription * pfd = pango_font_describe (pf);
+
+ double dSize = pFont->getPointSize()*(double)PANGO_SCALE;
+
+ xxx_UT_DEBUGMSG(("Setting adjustedLayout point size %f \n",dSize));
pango_font_description_set_size (pfd, (gint)dSize);
/* We cache this font to avoid all this huha if we can */
- if (m_pAdjustedPangoFont)
+ if (m_pAdjustedLayoutPangoFont)
+ {
+ g_object_unref(m_pAdjustedLayoutPangoFont);
+ }
+ if (m_pAdjustedPangoFont )
{
g_object_unref(m_pAdjustedPangoFont);
}
- m_pAdjustedPangoFont = pango_context_load_font(getContext(), pfd);
+ m_pAdjustedLayoutPangoFont = pango_context_load_font(getLayoutContext(), pfd);
m_pAdjustedPangoFontSource = pFont;
+
+ dSize =
+ (gint)(dSize* (double)getZoomPercentage() / 100.0);
+ pango_font_description_set_size (pfd, (gint)dSize);
+ m_pAdjustedPangoFont = pango_context_load_font(getContext(), pfd);
m_iAdjustedPangoFontZoom = getZoomPercentage();
pango_font_description_free(pfd);
- return m_pAdjustedPangoFont;
+ return m_pAdjustedLayoutPangoFont;
}
@@ -1346,6 +1450,9 @@
if(RI.m_iLength == 0)
return;
+ //
+ // Actually want the zoomed device font here
+ //
PangoFont * pf = _adjustedPangoFont(pFont, pItem->m_pi->analysis.font);
xxx_UT_DEBUGMSG(("Pango renderChars: xoff %d yoff %d\n",
@@ -1354,14 +1461,15 @@
UT_sint32 xoff = _tduX(RI.m_xoff);
UT_sint32 yoff = _tduY(RI.m_yoff + getFontAscent(pFont));
- UT_return_if_fail(m_pXftDraw && RI.m_pGlyphs);
+ UT_return_if_fail(m_pXftDraw && RI.m_pScaledGlyphs);
// TODO -- test here for the endpoint as well
if(RI.m_iOffset == 0 &&
(RI.m_iLength == (UT_sint32)RI.m_iCharCount || !RI.m_iCharCount))
{
+ xxx_UT_DEBUGMSG(("Doing XFT Render now.\n"));
pango_xft_render(m_pXftDraw, &m_XftColor, pf,
- RI.m_pGlyphs, xoff, yoff);
+ RI.m_pScaledGlyphs, xoff, yoff);
}
else
{
@@ -1386,7 +1494,7 @@
{
// it seems the iterator run out on us
// this should probably not happen
- UT_DEBUGMSG(("gr_UnixPangoGraphics::renderChars: iterator too short\n"));
+ xxx_UT_DEBUGMSG(("gr_UnixPangoGraphics::renderChars: iterator too short\n"));
return;
}
@@ -1415,12 +1523,12 @@
UT_sint32 iGlyphsEnd = -1;
i = 0;
- while(i < (UT_uint32)RI.m_pGlyphs->num_glyphs)
+ while(i < (UT_uint32)RI.m_pScaledGlyphs->num_glyphs)
{
- if(iGlyphsStart < 0 && RI.m_pGlyphs->log_clusters[i] == iOffsetStart)
+ if(iGlyphsStart < 0 && RI.m_pScaledGlyphs->log_clusters[i] == iOffsetStart)
iGlyphsStart = i;
- if(RI.m_pGlyphs->log_clusters[i] == iOffsetEnd)
+ if(RI.m_pScaledGlyphs->log_clusters[i] == iOffsetEnd)
{
iGlyphsEnd = i;
break;
@@ -1436,7 +1544,7 @@
iOffsetStart, iOffsetEnd));
gs.num_glyphs = iGlyphsEnd - iGlyphsStart + 1; // including the last glyph
- gs.glyphs = RI.m_pGlyphs->glyphs + iGlyphsStart;
+ gs.glyphs = RI.m_pScaledGlyphs->glyphs + iGlyphsStart;
gs.log_clusters = RI.m_pGlyphs->log_clusters + iGlyphsStart;
pango_xft_render(m_pXftDraw, &m_XftColor, pf,
@@ -1448,39 +1556,26 @@
void GR_UnixPangoGraphics::_scaleCharacterMetrics(GR_UnixPangoRenderInfo & RI)
{
UT_uint32 iZoom = getZoomPercentage();
- if(RI.m_iZoom == iZoom)
- return;
+ xxx_UT_DEBUGMSG(("_scaleCharacterMetrics... \n"));
for(int i = 0; i < RI.m_pGlyphs->num_glyphs; ++i)
{
- RI.m_pGlyphs->glyphs[i].geometry.x_offset =
- (int)((double)RI.m_pGlyphs->glyphs[i].geometry.x_offset *
- (double)iZoom / (double)RI.m_iZoom + 0.5) ;
+ RI.m_pScaledGlyphs->glyphs[i].geometry.x_offset =
+ _tduX(RI.m_pGlyphs->glyphs[i].geometry.x_offset);
- RI.m_pGlyphs->glyphs[i].geometry.y_offset =
- (int)((double)RI.m_pGlyphs->glyphs[i].geometry.y_offset *
- (double)iZoom / (double)RI.m_iZoom + 0.5);
- RI.m_pGlyphs->glyphs[i].geometry.width =
- (int)((double)RI.m_pGlyphs->glyphs[i].geometry.width *
- (double)iZoom / (double)RI.m_iZoom + 0.5);
- }
+ RI.m_pScaledGlyphs->glyphs[i].geometry.y_offset = _tduY(RI.m_pGlyphs->glyphs[i].geometry.y_offset);
+ RI.m_pScaledGlyphs->glyphs[i].geometry.width =_tduX(RI.m_pGlyphs->glyphs[i].geometry.width );
+ }
RI.m_iZoom = iZoom;
}
void GR_UnixPangoGraphics::_scaleJustification(GR_UnixPangoRenderInfo & RI)
{
- UT_uint32 iZoom = getZoomPercentage();
- if(RI.m_iZoom == iZoom)
- return;
-
- for(int i = 0; i < RI.m_pGlyphs->num_glyphs; ++i)
- {
- RI.m_pJustify[i] =
- (int)((double)RI.m_pJustify[i] * (double)iZoom / (double)RI.m_iZoom + 0.5) ;
- }
+ RI.m_iZoom = getZoomPercentage();
+ return;
}
@@ -1683,7 +1778,10 @@
// but in both cases we will let the delete proceed as is
}
-
+/*!
+ * I believe this code clears all the justification points. MES June 2008
+ * It returns the total space assigned to justify the text in layout units.
+ */
UT_sint32 GR_UnixPangoGraphics::resetJustification(GR_RenderInfo & ri,
bool bPermanent)
{
@@ -1693,8 +1791,6 @@
if(!RI.m_pJustify)
return 0;
- if(RI.m_iZoom != getZoomPercentage())
- _scaleCharacterMetrics(RI);
UT_sint32 iWidth2 = 0;
for(UT_sint32 i = 0; i < RI.m_pGlyphs->num_glyphs; ++i)
@@ -1704,6 +1800,10 @@
// TODO here we need to substract the amount from pango metrics
RI.m_pGlyphs->glyphs[i].geometry.width -= RI.m_pJustify[i];
}
+ //
+ // This sets the glyphs that will be displayed on screen.
+ //
+ _scaleCharacterMetrics(RI);
if(bPermanent)
{
@@ -1715,7 +1815,9 @@
memset(RI.m_pJustify, 0, RI.m_pGlyphs->num_glyphs * sizeof(int));
}
- return ptlu(-iWidth2);
+ // Justification in pango units. Convert to layout units.
+
+ return -ptlunz(iWidth2);
}
@@ -1766,6 +1868,10 @@
We take the same approach as with Uniscribe; we store the justification
amount in a separate array of the ri and add it to the offsets before we
draw. We will probably need some static buffers to speed things up
+
+It requires as input RI.m_iJustificationAmount and RI.m_iJustificationPoints.
+These are determined in fp_TextRun using calculations in layout units
+
*/
void GR_UnixPangoGraphics::justify(GR_RenderInfo & ri)
{
@@ -1776,8 +1882,9 @@
return;
// make sure that we are not adding apples to oranges
- if(RI.m_iZoom != getZoomPercentage())
- _scaleCharacterMetrics(RI);
+ // We don't need this now.
+ // if(RI.m_iZoom != getZoomPercentage())
+ // _scaleCharacterMetrics(RI);
if(!RI.m_pJustify)
RI.m_pJustify = new int[RI.m_pGlyphs->num_glyphs];
@@ -1788,6 +1895,9 @@
UT_uint32 iExtraSpace = RI.m_iJustificationAmount;
UT_uint32 iPoints = RI.m_iJustificationPoints;
+ xxx_UT_DEBUGMSG(("::Justify Extra justification space %d \n",iExtraSpace));
+ xxx_UT_DEBUGMSG(("::Justify Number of justification points %d \n",iPoints));
+
UT_return_if_fail(RI.m_pText);
UT_TextIterator & text = *RI.m_pText;
@@ -1801,6 +1911,8 @@
UT_sint32 i; // glyph index
UT_sint32 j; // text index
+
+ UT_uint32 iSpace = iExtraSpace/iPoints;
if (iDir == UT_BIDI_LTR)
{
@@ -1816,13 +1928,16 @@
if(c == UCS_SPACE)
{
- UT_uint32 iSpace = iExtraSpace/iPoints;
- iExtraSpace -= iSpace;
+
+ // iSpace is in layout units. Convert to pango units
+
+ RI.m_pJustify[i] = ltpunz(iSpace);
+
iPoints--;
- RI.m_pJustify[i] = ltpu(iSpace);
+ // add this amount the pango units
+ xxx_UT_DEBUGMSG(("Justify-1 Prev geom width %d additional %d \n",RI.m_pGlyphs->glyphs[i].geometry.width,RI.m_pJustify[i]));
- // add this amount the pango metrics
RI.m_pGlyphs->glyphs[i].geometry.width += RI.m_pJustify[i];
if(!iPoints)
@@ -1863,13 +1978,15 @@
if(c == UCS_SPACE)
{
- UT_uint32 iSpace = iExtraSpace/iPoints;
- iExtraSpace -= iSpace;
iPoints--;
- RI.m_pJustify[i] = ltpu(iSpace);
+ // iSpace is in layout units. Convert to pango units
+
+ RI.m_pJustify[i] = ltpunz(iSpace);
// add this amount the pango metrics
+
+ xxx_UT_DEBUGMSG(("Justify-2 Prev geom width %d additional %d \n",RI.m_pGlyphs->glyphs[i].geometry.width,RI.m_pJustify[i]));
RI.m_pGlyphs->glyphs[i].geometry.width += RI.m_pJustify[i];
if(!iPoints)
@@ -1896,10 +2013,16 @@
j += iDiff;
}
}
-
- UT_ASSERT_HARMLESS( !iExtraSpace );
+ //
+ // Now scale the metrics for the drawing glyphs
+ //
+ _scaleCharacterMetrics(RI);
}
+/*!
+ * This function takes (x,y) in layout units and determines the location in the
+ * pango string.
+ */
UT_uint32 GR_UnixPangoGraphics::XYToPosition(const GR_RenderInfo & ri, UT_sint32 x, UT_sint32 y) const
{
UT_return_val_if_fail(ri.getType() == GRRI_UNIX_PANGO, 0);
@@ -1917,7 +2040,10 @@
utf8 += RI.m_pText->getChar();
}
- int x_pos = ltpu(x);
+ // Since the glyphs are measured in pango units
+ // we need to convert from layout units
+
+ int x_pos = ltpunz(x);
int len = utf8.byteLength();
int iPos = len;
int iTrailing;
@@ -1949,6 +2075,9 @@
return i;
}
+/*!
+ * Return a location in layout units (x,y) of a pango glyph.
+ */
void GR_UnixPangoGraphics::positionToXY(const GR_RenderInfo & ri,
UT_sint32& x, UT_sint32& y,
UT_sint32& x2, UT_sint32& y2,
@@ -2017,7 +2146,10 @@
bTrailing,
&x);
- x = ptlu(x);
+ //
+ // Since the glyphs are measured in pango units we need to convert to layout
+ //
+ x = ptlunz(x);
x2 = x;
}
@@ -2083,6 +2215,14 @@
pItem->length,
&(pItem->analysis),
pGstring);
+ if(pCharWidth)
+ {
+ for(int j=0; jnum_glyphs; j++)
+ {
+
+ pGstring->glyphs[j].geometry.width = _tduX(pCharWidth[j]*PANGO_SCALE);
+ }
+ }
pango_xft_render(m_pXftDraw, &m_XftColor, pf, pGstring, xoffD, yoffD);
// now advance xoff
@@ -2127,14 +2267,14 @@
}
// this function expect indexes in bytes !!! (stupid)
- GList * pItems = pango_itemize(getContext(),
+ GList * pItems = pango_itemize(getLayoutContext(),
utf8.utf8_str(),
0, utf8.byteLength(),
NULL, NULL);
PangoGlyphString * pGstring = pango_glyph_string_new();
- PangoFont * pf = m_pPFont->getPangoFont();
+ PangoFont * pf = m_pPFont->getPangoLayoutFont();
PangoRectangle LR;
UT_uint32 iOffset = 0;
GList * l = pItems;
@@ -2163,8 +2303,9 @@
pGstring);
pango_glyph_string_extents(pGstring, pf, NULL, &LR);
- iWidth += ptlu(LR.width + LR.x);
- UT_uint32 h = ptlu(LR.height);
+ iWidth += ((double) LR.width + (double)LR.x)/PANGO_SCALE;
+ UT_uint32 h = LR.height/PANGO_SCALE;
+ xxx_UT_DEBUGMSG(("measure string iWidth %d height %d \n",iWidth,h));
if (height && *height < h)
*height = h;
@@ -3173,12 +3314,23 @@
*/
inline int GR_UnixPangoGraphics::ptlu(int p) const
{
- double d = (double)p * 100.0 * (double) getResolution()/
+ double d = (double)p * (double) getResolution() * 100.0 /
((double)getDeviceResolution()*(double)getZoomPercentage()*(double) PANGO_SCALE) + .5;
return (int) d;
}
+
+/*!
+ Convert pango units to layout units without zoom
+*/
+inline int GR_UnixPangoGraphics::ptlunz(int p) const
+{
+ double d = ((double)p / ((double) PANGO_SCALE)) + .5; //getDeviceResolution
+
+ return (int) d;
+}
+
/*!
Convert layout units to pango units
*/
@@ -3186,7 +3338,18 @@
{
double d = (double)l *
(double)getDeviceResolution() * (double)PANGO_SCALE * (double)getZoomPercentage()/
- ((double)getResolution() * 100.0) + .5;
+ (100.0 * (double) getResolution()) + .5;
+
+ return (int) d;
+}
+
+
+/*!
+ Convert layout units to pango units without zoom
+*/
+inline int GR_UnixPangoGraphics::ltpunz(int l) const
+{
+ double d = (double)l * PANGO_SCALE + .5; //getDeviceResolution()
return (int) d;
}
@@ -3280,16 +3443,18 @@
m_pf(NULL),
m_bGuiFont(bGuiFont),
m_pCover(NULL),
- m_pfd(NULL),
+ m_pfdDev(NULL),
+ m_pfdLay(NULL),
m_pPLang(NULL),
m_iAscent(0),
- m_iDescent(0)
+ m_iDescent(0),
+ m_pLayoutF(NULL)
{
m_eType = GR_FONT_UNIX_PANGO;
UT_return_if_fail( pDesc && pG && pLang);
+ m_sLayoutDesc = pDesc;
m_sDesc = pDesc;
-
setLanguage(pLang);
reloadFont(pG);
}
@@ -3302,7 +3467,12 @@
{
g_object_unref(m_pf);
}
- pango_font_description_free(m_pfd);
+ if (m_pLayoutF)
+ {
+ g_object_unref(m_pLayoutF);
+ }
+ pango_font_description_free(m_pfdDev);
+ pango_font_description_free(m_pfdLay);
}
void GR_UnixPangoFont::setLanguage(const char * pLang)
@@ -3327,37 +3497,57 @@
m_iZoom = iZoom;
UT_LocaleTransactor t(LC_NUMERIC, "C");
- UT_String s;
+ UT_String sLay;
+ UT_String sDev;
if(!m_bGuiFont && pG->queryProperties(GR_Graphics::DGP_SCREEN))
- UT_String_sprintf(s, "%s %f", m_sDesc.c_str(), m_dPointSize * (double)m_iZoom / 100.0);
+ {
+ UT_String_sprintf(sDev, "%s %f", m_sDesc.c_str(), m_dPointSize * (double)m_iZoom / 100.0);
+ UT_String_sprintf(sLay, "%s %f", m_sLayoutDesc.c_str(), m_dPointSize);
+ }
else
- UT_String_sprintf(s, "%s %f", m_sDesc.c_str(), m_dPointSize);
-
+ {
+ UT_String_sprintf(sDev, "%s %f", m_sDesc.c_str(), m_dPointSize);
+ UT_String_sprintf(sLay, "%s %f", m_sLayoutDesc.c_str(), m_dPointSize);
+ }
- if(m_pfd)
+ if(m_pfdLay)
{
- pango_font_description_free(m_pfd);
- m_pfd = NULL;
+ pango_font_description_free(m_pfdLay);
+ m_pfdLay = NULL;
+ }
+
+
+ if(m_pfdDev)
+ {
+ pango_font_description_free(m_pfdDev);
+ m_pfdDev = NULL;
}
- m_pfd = pango_font_description_from_string(s.c_str());
- UT_return_if_fail(m_pfd);
+ m_pfdLay = pango_font_description_from_string(sLay.c_str());
+ UT_return_if_fail(m_pfdLay);
+
+ m_pfdDev = pango_font_description_from_string(sDev.c_str());
+ UT_return_if_fail(m_pfdLay);
if (m_pf) {
g_object_unref(m_pf);
}
- m_pf = pango_context_load_font(pG->getContext(), m_pfd);
+ m_pf = pango_context_load_font(pG->getContext(), m_pfdDev);
+ m_pLayoutF = pango_context_load_font(pG->getLayoutContext(), m_pfdLay);
UT_return_if_fail( m_pf );
+ UT_return_if_fail( m_pLayoutF );
// FIXME: we probably want the real language from somewhere
- PangoFontMetrics * pfm = pango_font_get_metrics(m_pf, m_pPLang);
+ PangoFontMetrics * pfm = pango_font_get_metrics(m_pLayoutF, m_pPLang);
UT_return_if_fail( pfm);
// pango_metrics_ functions return in points * PANGO_SCALE (points * 1024)
- m_iAscent = (UT_uint32) pG->ptlu(pango_font_metrics_get_ascent(pfm));
- m_iDescent = (UT_uint32) pG->ptlu(pango_font_metrics_get_descent(pfm));
- xxx_UT_DEBUGMSG(("Font Ascent %d point size %f zoom %d \n",m_iAscent, m_dPointSize, m_iZoom));
+ m_iAscent = (UT_uint32) pango_font_metrics_get_ascent(pfm)/PANGO_SCALE;
+ m_iDescent = (UT_uint32) pango_font_metrics_get_descent(pfm)/PANGO_SCALE;
+ xxx_UT_DEBUGMSG(("Layout Font Ascent %d point size %f zoom %d \n",m_iAscent, m_dPointSize, m_iZoom));
pango_font_metrics_unref(pfm);
+
+ UT_return_if_fail( pfm);
}
@@ -3411,8 +3601,8 @@
{
UT_return_val_if_fail( m_pf, false );
- guint iGlyphIndx = pango_fc_font_get_glyph (PANGO_FC_FONT(m_pf), g);
- FT_Face pFace = pango_fc_font_lock_face(PANGO_FC_FONT(m_pf));
+ guint iGlyphIndx = pango_fc_font_get_glyph (PANGO_FC_FONT(m_pLayoutF), g);
+ FT_Face pFace = pango_fc_font_lock_face(PANGO_FC_FONT(m_pLayoutF));
double resRatio = 1.0;
@@ -3424,6 +3614,7 @@
if (pPGP)
resRatio = pPGP->_getResolutionRatio();
+
}
#endif
FT_Error error = FT_Load_Glyph(pFace, iGlyphIndx,
@@ -3439,8 +3630,7 @@
return false;
}
- UT_uint32 iSize = (UT_uint32)(0.5 + m_dPointSize * resRatio *(double)pG->getResolution() /
- (double)pG->getDeviceResolution());
+ UT_uint32 iSize = (UT_uint32)(0.5 + m_dPointSize * resRatio *(double)pG->getResolution() / (double)pG->getDeviceResolution());
rec.left = static_cast(0.5 + fontPoints2float(iSize, pFace,
pFace->glyph->metrics.horiBearingX));
@@ -3464,9 +3654,9 @@
const char* GR_UnixPangoFont::getFamily() const
{
- UT_return_val_if_fail( m_pfd, NULL );
+ UT_return_val_if_fail( m_pfdLay, NULL );
- return pango_font_description_get_family(m_pfd);
+ return pango_font_description_get_family(m_pfdLay);
}
@@ -3646,12 +3836,6 @@
else
{
#ifdef HAVE_PANGOFT2
- // hardcode to something sane-ish. printing and unixnull graphics will use this
- // fallback case
- m_iScreenResolution = m_iDeviceResolution;
-
- m_pContext = pango_ft2_get_context(m_iScreenResolution, m_iScreenResolution);
- m_pFontMap = pango_ft2_font_map_new ();
m_bOwnsFontMap = true;
#else
UT_DEBUGMSG(("No screen, no display, and no PangoFT2. We're screwed.\n"));
@@ -3745,32 +3929,32 @@
UT_uint32 GR_UnixPangoPrintGraphics::getFontAscent()
{
- return static_cast(static_cast(GR_UnixPangoGraphics::getFontAscent())*m_dResRatio);
+ return static_cast(static_cast(GR_UnixPangoGraphics::getFontAscent()));
}
UT_uint32 GR_UnixPangoPrintGraphics::getFontDescent()
{
- return static_cast(static_cast(GR_UnixPangoGraphics::getFontDescent())*m_dResRatio);
+ return static_cast(static_cast(GR_UnixPangoGraphics::getFontDescent()));
}
UT_uint32 GR_UnixPangoPrintGraphics::getFontHeight()
{
- return static_cast(static_cast(GR_UnixPangoGraphics::getFontHeight())*m_dResRatio);
+ return static_cast(static_cast(GR_UnixPangoGraphics::getFontHeight()));
}
UT_uint32 GR_UnixPangoPrintGraphics::getFontAscent(const GR_Font * fnt)
{
- return static_cast(static_cast(GR_UnixPangoGraphics::getFontAscent(fnt))*m_dResRatio);
+ return static_cast(static_cast(GR_UnixPangoGraphics::getFontAscent(fnt)));
}
UT_uint32 GR_UnixPangoPrintGraphics::getFontDescent(const GR_Font * fnt )
{
- return static_cast(static_cast(GR_UnixPangoGraphics::getFontDescent(fnt))*m_dResRatio);
+ return static_cast(static_cast(GR_UnixPangoGraphics::getFontDescent(fnt)));
}
UT_uint32 GR_UnixPangoPrintGraphics::getFontHeight(const GR_Font * fnt)
{
- return static_cast(static_cast(GR_UnixPangoGraphics::getFontHeight(fnt))*m_dResRatio);
+ return static_cast(static_cast(GR_UnixPangoGraphics::getFontHeight(fnt)));
}
UT_sint32 GR_UnixPangoPrintGraphics::scale_ydir (UT_sint32 in) const
@@ -3865,7 +4049,7 @@
UT_return_val_if_fail( ri, false );
GR_UnixPangoRenderInfo & RI = (GR_UnixPangoRenderInfo &)*ri;
-
+#if 0
for(int i = 0; i < RI.m_pGlyphs->num_glyphs; ++i)
{
RI.m_pGlyphs->glyphs[i].geometry.x_offset =
@@ -3880,13 +4064,13 @@
(int)((double)RI.m_pGlyphs->glyphs[i].geometry.width *
(double)m_iDeviceResolution / (double)m_iScreenResolution + 0.5);
}
-
+#endif
return true;
}
void GR_UnixPangoPrintGraphics::renderChars(GR_RenderInfo & ri)
{
- xxx_UT_DEBUGMSG(("GR_UnixPangoGraphics::renderChars\n"));
+ UT_DEBUGMSG(("GR_UnixPangoPrintGraphics::renderChars\n"));
UT_return_if_fail(ri.getType() == GRRI_UNIX_PANGO);
GR_UnixPangoRenderInfo & RI = (GR_UnixPangoRenderInfo &)ri;
GR_UnixPangoFont * pFont = (GR_UnixPangoFont *)RI.m_pFont;
@@ -3896,11 +4080,11 @@
if(RI.m_iLength == 0)
return;
- xxx_UT_DEBUGMSG(("PangoPrint renderChars: xoff %d yoff %d\n", RI.m_xoff, RI.m_yoff));
+ UT_DEBUGMSG(("PangoPrint renderChars: xoff %d yoff %d\n", RI.m_xoff, RI.m_yoff));
UT_sint32 xoff = _tduX(RI.m_xoff);
- UT_sint32 yoff = scale_ydir(_tduY(RI.m_yoff + getFontAscent(pFont)));
+ UT_sint32 yoff = scale_ydir(_tduY((RI.m_yoff + getFontAscent(pFont))));
- xxx_UT_DEBUGMSG(("about to gnome_print_pango_gplyph_string render xoff %d yoff %d\n",
+ UT_DEBUGMSG(("about to gnome_print_pango_gplyph_string render xoff %d yoff %d\n",
xoff, yoff));
UT_return_if_fail(m_gpc);
@@ -3921,10 +4105,24 @@
pango_font_description_free (pfd);
#define _N 1440
- xxx_UT_DEBUGMSG(("@@@@ tdu(%d)== %d, _tduX(%d) == %d, _tduY(%d) == %d\n",
+ UT_DEBUGMSG(("@@@@ tdu(%d)== %d, _tduX(%d) == %d, _tduY(%d) == %d\n",
_N, tdu(_N), _N, _tduX(_N), _N, _tduY(_N)));
#undef _N
- gnome_print_pango_glyph_string(m_gpc, pf, RI.m_pGlyphs);
+
+ for(int i = 0; i < RI.m_pGlyphs->num_glyphs; ++i)
+ {
+ RI.m_pScaledGlyphs->glyphs[i].geometry.x_offset =
+ _tduX(RI.m_pGlyphs->glyphs[i].geometry.x_offset);
+
+
+ RI.m_pScaledGlyphs->glyphs[i].geometry.y_offset =
+ _tduY(RI.m_pGlyphs->glyphs[i].geometry.y_offset);
+
+ RI.m_pScaledGlyphs->glyphs[i].geometry.width =
+ _tduX(RI.m_pGlyphs->glyphs[i].geometry.width );
+ }
+
+ gnome_print_pango_glyph_string(m_gpc, pf, RI.m_pScaledGlyphs);
gnome_print_grestore (m_gpc);
}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixPangoGraphics.h
--- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoGraphics.h 2008-04-06 16:59:45.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixPangoGraphics.h 2008-07-13 14:09:30.000000000 +0100
@@ -76,6 +76,7 @@
virtual bool doesGlyphExist(UT_UCS4Char g);
virtual bool glyphBox(UT_UCS4Char g, UT_Rect & rec, GR_Graphics * pG);
PangoFont * getPangoFont() const {return m_pf;}
+ PangoFont * getPangoLayoutFont() const {return m_pLayoutF;}
void reloadFont(GR_UnixPangoGraphics * pG);
double getPointSize() const {return m_dPointSize;}
@@ -84,7 +85,7 @@
const UT_String & getDescription() const {return m_sDesc;}
virtual const char* getFamily() const;
- const PangoFontDescription * getPangoDescription() const {return m_pfd;}
+ const PangoFontDescription * getPangoDescription() const {return m_pfdLay;}
// ascent/descent in layout units
UT_uint32 getAscent() const {return m_iAscent;}
@@ -96,21 +97,24 @@
private:
UT_String m_sDesc;
+ UT_String m_sLayoutDesc;
double m_dPointSize;
UT_uint32 m_iZoom;
PangoFont * m_pf;
bool m_bGuiFont;
mutable PangoCoverage *m_pCover;
- PangoFontDescription * m_pfd;
+ PangoFontDescription * m_pfdDev;
+ PangoFontDescription * m_pfdLay;
PangoLanguage * m_pPLang;
UT_uint32 m_iAscent;
UT_uint32 m_iDescent;
+ PangoFont * m_pLayoutF;
};
class GR_UnixPangoRenderInfo;
-class GR_UnixAllocInfo : public GR_AllocInfo
+class ABI_EXPORT GR_UnixAllocInfo : public GR_AllocInfo
{
public:
GR_UnixAllocInfo(GdkWindow * win)
@@ -209,6 +213,8 @@
PangoFontMap * getFontMap() const {return m_pFontMap;}
PangoContext * getContext() const {return m_pContext;}
+ PangoFontMap * getLayoutFontMap() const {return m_pLayoutFontMap;}
+ PangoContext * getLayoutContext() const {return m_pLayoutContext;}
virtual UT_uint32 getFontAscent();
virtual UT_uint32 getFontDescent();
@@ -257,7 +263,9 @@
int dtpu(int d) const;
int ptdu(int p) const;
int ptlu(int p) const;
+ int ptlunz(int p) const;
int ltpu(int l) const;
+ int ltpunz(int l) const;
int pftlu(int pf) const;
virtual bool queryProperties(GR_Graphics::Properties gp) const;
@@ -332,15 +340,19 @@
void _setColor(GdkColor & c);
PangoFont * _adjustedPangoFont (GR_UnixPangoFont * pFont, PangoFont * pf);
+ PangoFont * _adjustedLayoutPangoFont (GR_UnixPangoFont * pFont, PangoFont * pf);
protected:
PangoFontMap * m_pFontMap;
PangoContext * m_pContext;
+ PangoFontMap * m_pLayoutFontMap;
+ PangoContext * m_pLayoutContext;
bool m_bOwnsFontMap;
GR_UnixPangoFont* m_pPFont;
GR_UnixPangoFont* m_pPFontGUI;
PangoFont * m_pAdjustedPangoFont;
+ PangoFont * m_pAdjustedLayoutPangoFont;
GR_UnixPangoFont* m_pAdjustedPangoFontSource;
UT_uint32 m_iAdjustedPangoFontZoom;
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoPixmapGraphics.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixPangoPixmapGraphics.h
--- abiword-2.6.2/abiword/src/af/gr/unix/gr_UnixPangoPixmapGraphics.h 2008-04-06 16:59:45.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/unix/gr_UnixPangoPixmapGraphics.h 2008-07-13 14:09:30.000000000 +0100
@@ -24,7 +24,7 @@
#include "gr_UnixPangoGraphics.h"
-class GR_UnixPixmapAllocInfo : public GR_AllocInfo
+class ABI_EXPORT GR_UnixPixmapAllocInfo : public GR_AllocInfo
{
public:
GR_UnixPixmapAllocInfo(GdkPixmap * pix)
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/win/gr_Win32CharWidths.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/win/gr_Win32CharWidths.h
--- abiword-2.6.2/abiword/src/af/gr/win/gr_Win32CharWidths.h 2008-04-06 16:59:46.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/win/gr_Win32CharWidths.h 2008-07-13 14:09:32.000000000 +0100
@@ -26,7 +26,7 @@
// the only reason that we subclass is because Win32 provides a
// routine to fetch the widths of a whole font in one call.
-class GR_Win32CharWidths : public GR_CharWidths
+class ABI_EXPORT GR_Win32CharWidths : public GR_CharWidths
{
public:
void setCharWidthsOfRange(HDC hdc, UT_UCSChar c0, UT_UCSChar c1);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/win/gr_Win32Graphics.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/win/gr_Win32Graphics.cpp
--- abiword-2.6.2/abiword/src/af/gr/win/gr_Win32Graphics.cpp 2008-04-06 16:59:46.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/win/gr_Win32Graphics.cpp 2008-07-13 14:09:32.000000000 +0100
@@ -68,7 +68,7 @@
/*****************************************************************/
// A small helper class
-class private_FontReverter
+class ABI_EXPORT private_FontReverter
{
public:
private_FontReverter(GR_Win32Graphics& gr, GR_Font* pOldFont)
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/win/gr_Win32Graphics.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/win/gr_Win32Graphics.h
--- abiword-2.6.2/abiword/src/af/gr/win/gr_Win32Graphics.h 2008-04-06 16:59:46.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/win/gr_Win32Graphics.h 2008-07-13 14:09:32.000000000 +0100
@@ -150,7 +150,7 @@
//////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////
-class GR_Win32AllocInfo : public GR_AllocInfo
+class ABI_EXPORT GR_Win32AllocInfo : public GR_AllocInfo
{
public:
GR_Win32AllocInfo():
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/win/gr_Win32USPGraphics.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/win/gr_Win32USPGraphics.cpp
--- abiword-2.6.2/abiword/src/af/gr/win/gr_Win32USPGraphics.cpp 2008-04-06 16:59:46.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/win/gr_Win32USPGraphics.cpp 2008-07-13 14:09:32.000000000 +0100
@@ -106,7 +106,7 @@
}
#define GR_WIN32_USP_FONT_SCALING 20
-class GR_Win32USPItem: public GR_Item
+class ABI_EXPORT GR_Win32USPItem: public GR_Item
{
friend class GR_Win32USPGraphics;
@@ -126,7 +126,7 @@
SCRIPT_ITEM m_si;
};
-class GR_Win32USPRenderInfo : public GR_RenderInfo
+class ABI_EXPORT GR_Win32USPRenderInfo : public GR_RenderInfo
{
public:
GR_Win32USPRenderInfo(GR_ScriptType type):
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/xp/gr_Caret.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/xp/gr_Caret.h
--- abiword-2.6.2/abiword/src/af/gr/xp/gr_Caret.h 2008-04-06 16:59:46.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/xp/gr_Caret.h 2008-07-13 14:09:32.000000000 +0100
@@ -122,7 +122,7 @@
UT_sint32 m_iCaretNumber;
};
-class GR_CaretDisabler
+class ABI_EXPORT GR_CaretDisabler
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/xp/gr_CharWidthsCache.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/xp/gr_CharWidthsCache.h
--- abiword-2.6.2/abiword/src/af/gr/xp/gr_CharWidthsCache.h 2008-04-06 16:59:45.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/xp/gr_CharWidthsCache.h 2008-07-13 14:09:31.000000000 +0100
@@ -26,7 +26,7 @@
class GR_Font;
class GR_CharWidths;
-class GR_CharWidthsCache
+class ABI_EXPORT GR_CharWidthsCache
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/xp/gr_Graphics.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/xp/gr_Graphics.h
--- abiword-2.6.2/abiword/src/af/gr/xp/gr_Graphics.h 2008-04-06 16:59:46.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/xp/gr_Graphics.h 2008-07-13 14:09:32.000000000 +0100
@@ -268,7 +268,7 @@
Platform implementation needs to override getType() so that
graphicsAllocator() can do type-checking.
*/
-class GR_AllocInfo
+class ABI_EXPORT GR_AllocInfo
{
public:
virtual ~GR_AllocInfo() {}
@@ -288,7 +288,7 @@
use. The factory provides access to all graphics classes known to
the application.
*/
-class GR_GraphicsFactory
+class ABI_EXPORT GR_GraphicsFactory
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/xp/gr_Painter.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/xp/gr_Painter.h
--- abiword-2.6.2/abiword/src/af/gr/xp/gr_Painter.h 2008-04-06 16:59:45.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/xp/gr_Painter.h 2008-07-13 14:09:31.000000000 +0100
@@ -23,7 +23,7 @@
#include "xap_Features.h"
#include "gr_Graphics.h"
-class GR_Painter
+class ABI_EXPORT GR_Painter
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/gr/xp/gr_RenderInfo.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/gr/xp/gr_RenderInfo.h
--- abiword-2.6.2/abiword/src/af/gr/xp/gr_RenderInfo.h 2008-04-06 16:59:46.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/gr/xp/gr_RenderInfo.h 2008-07-13 14:09:31.000000000 +0100
@@ -69,7 +69,7 @@
\note constructor should be protected; new instances can only be created via
GR_Graphics::newItem()
*/
-class GR_Item
+class ABI_EXPORT GR_Item
{
public:
virtual ~GR_Item(){};
@@ -82,7 +82,7 @@
};
-class GR_XPItem : public GR_Item
+class ABI_EXPORT GR_XPItem : public GR_Item
{
friend class GR_Graphics;
@@ -119,7 +119,7 @@
getItemCount() returns the count of all items, including the dummy
GRScriptType_Void item.
*/
-class GR_Itemization
+class ABI_EXPORT GR_Itemization
{
public:
GR_Itemization():
@@ -206,7 +206,7 @@
always set them if the function to which GR_RenderInfo is passed is
going to use them
*/
-class GR_RenderInfo
+class ABI_EXPORT GR_RenderInfo
{
public:
GR_RenderInfo(GR_ScriptType type)
@@ -265,7 +265,7 @@
This is an xp implementation of GR_RenderInfo for use with the
built in UT_contextGlyph class.
*/
-class GR_XPRenderInfo : public GR_RenderInfo
+class ABI_EXPORT GR_XPRenderInfo : public GR_RenderInfo
{
public:
GR_XPRenderInfo(GR_ScriptType type);
@@ -310,7 +310,7 @@
/**
Encapsulates input to GR_Graphics::shape()
*/
-class GR_ShapingInfo
+class ABI_EXPORT GR_ShapingInfo
{
public:
GR_ShapingInfo(UT_TextIterator & text, UT_uint32 iLen,
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/unix/ut_unixAssert.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/unix/ut_unixAssert.cpp
--- abiword-2.6.2/abiword/src/af/util/unix/ut_unixAssert.cpp 2008-04-06 17:00:05.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/unix/ut_unixAssert.cpp 2008-07-13 14:09:51.000000000 +0100
@@ -25,7 +25,7 @@
#include "ut_assert.h"
#include "ut_unixAssert.h"
-void UT_UnixAssertMsg(const char * szMsg, const char * szFile, int iLine)
+int UT_UnixAssertMsg(const char * szMsg, const char * szFile, int iLine)
{
static int count = 0;
@@ -34,7 +34,7 @@
printf("**** (%d) %s at %s:%d ****\n", count,szMsg,szFile,iLine);
while (1)
{
- printf("**** (%d) Continue ? (y/n) [y] : ", count);
+ printf("**** (%d) Continue ? (y/n/i(gnore)) [y] : ", count);
fflush(stdout);
char buf[10];
@@ -48,12 +48,17 @@
case '\n':
case 'y':
case 'Y':
- return; // continue the application
+ return 1; // continue the application
case 'n':
case 'N':
abort(); // kill the application
- return;
+ return 0;
+
+ case 'i':
+ case 'I':
+ return -1;
+
default:
break; // ?? ask them again
}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/unix/ut_unixAssert.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/unix/ut_unixAssert.h
--- abiword-2.6.2/abiword/src/af/util/unix/ut_unixAssert.h 2008-04-06 17:00:05.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/unix/ut_unixAssert.h 2008-07-13 14:09:51.000000000 +0100
@@ -20,6 +20,6 @@
#ifndef UT_UNIXASSERT_H
#define UT_UNIXASSERT_H
-void UT_UnixAssertMsg(const char * szMsg, const char * szFile, int iLine);
+int UT_UnixAssertMsg(const char * szMsg, const char * szFile, int iLine);
#endif /* UT_UNIXASSERT_H */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/unix/ut_unixDirent.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/unix/ut_unixDirent.cpp
--- abiword-2.6.2/abiword/src/af/util/unix/ut_unixDirent.cpp 2008-04-06 17:00:05.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/unix/ut_unixDirent.cpp 2008-07-13 14:09:51.000000000 +0100
@@ -47,6 +47,8 @@
#include
#include
+#include
+
#include "ut_unixDirent.h"
/*
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/win/ut_mutexImpl.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/win/ut_mutexImpl.h
--- abiword-2.6.2/abiword/src/af/util/win/ut_mutexImpl.h 2008-04-06 17:00:12.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/win/ut_mutexImpl.h 2008-07-13 14:09:56.000000000 +0100
@@ -21,11 +21,12 @@
#define UT_MUTEXIMPL_H
#include
+#include "ut_types.h"
/*!
* Win32 implementation of a mutex class
*/
-class UT_MutexImpl
+class ABI_EXPORT UT_MutexImpl
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/win/ut_Win32Idle.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/win/ut_Win32Idle.h
--- abiword-2.6.2/abiword/src/af/util/win/ut_Win32Idle.h 2008-04-06 17:00:12.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/win/ut_Win32Idle.h 2008-07-13 14:09:56.000000000 +0100
@@ -25,7 +25,7 @@
#include "ut_idle.h"
#include "ut_vector.h"
-class UT_Win32Idle : public UT_Idle
+class ABI_EXPORT UT_Win32Idle : public UT_Idle
{
public:
UT_Win32Idle(UT_WorkerCallback pCallback, void* pData);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/win/ut_Win32Misc.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/win/ut_Win32Misc.cpp
--- abiword-2.6.2/abiword/src/af/util/win/ut_Win32Misc.cpp 2008-04-06 17:00:12.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/win/ut_Win32Misc.cpp 2008-07-13 14:09:56.000000000 +0100
@@ -413,7 +413,7 @@
Class that implements an assert dialogue; this is a private class, we only access it
through UT_Win32ThrowAssert() function
*/
-class UT_Win32AssertDlg
+class ABI_EXPORT UT_Win32AssertDlg
{
friend int ABI_EXPORT UT_Win32ThrowAssert(const char *, const char *, int, int);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_allocator.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_allocator.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_allocator.h 2008-04-06 17:00:12.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_allocator.h 2008-07-13 14:09:55.000000000 +0100
@@ -25,7 +25,7 @@
* This class is responsible for creating and destroying memory buffers
* It provides a default implementation based on g_try_malloc/g_free
*/
-class UT_Allocator
+class ABI_EXPORT UT_Allocator
{
public:
UT_Allocator ();
@@ -42,7 +42,7 @@
/*!
* Returns zeroed memory, either via g_try_malloc&memset or UT_calloc
*/
-class UT_NullAllocator : public UT_Allocator
+class ABI_EXPORT UT_NullAllocator : public UT_Allocator
{
public:
UT_NullAllocator ();
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_assert.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_assert.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_assert.h 2008-04-06 17:00:10.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_assert.h 2008-07-13 14:09:54.000000000 +0100
@@ -195,10 +195,12 @@
// Please keep the "/**/" to stop MSVC dependency generator complaining.
# include /**/ "ut_unixAssert.h"
# define UT_ASSERT(expr) \
- ((void) ((expr) || \
- (UT_UnixAssertMsg(#expr, \
- __FILE__, __LINE__), \
- 0)))
+ { \
+ static bool __bOnceOnly = false; \
+ if (!__bOnceOnly && !(expr)) \
+ if (UT_UnixAssertMsg(#expr, __FILE__, __LINE__) == -1) \
+ __bOnceOnly = true; \
+ }
# endif
#endif
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_bytebuf.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_bytebuf.cpp
--- abiword-2.6.2/abiword/src/af/util/xp/ut_bytebuf.cpp 2008-04-06 17:00:09.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_bytebuf.cpp 2008-07-13 14:09:54.000000000 +0100
@@ -198,7 +198,7 @@
if(!fp)
return false;
- bool res = insertFromInput (0, fp);
+ bool res = insertFromInput (iPosition, fp);
g_object_unref (fp);
return res;
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_crc32.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_crc32.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_crc32.h 2008-04-06 17:00:10.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_crc32.h 2008-07-13 14:09:54.000000000 +0100
@@ -12,7 +12,7 @@
#endif
//! CRC Checksum Calculation
-class UT_CRC32
+class ABI_EXPORT UT_CRC32
{
public:
enum {DIGESTSIZE = 4};
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_go_file.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_go_file.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_go_file.h 2008-04-06 17:00:10.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_go_file.h 2008-07-13 14:09:54.000000000 +0100
@@ -20,7 +20,13 @@
#ifndef UT_GO_FILE_H
#define UT_GO_FILE_H
-
+/* pre-emptive dismissal; ut_types.h is needed by just about everything,
+ * so even if it's commented out in-file that's still a lot of work for
+ * the preprocessor to do...
+ */
+#ifndef UT_TYPES_H
+#include "ut_types.h"
+#endif
#include
#include
@@ -51,52 +57,52 @@
UT_GO_DOTDOT_LEAVE /* Leave alone. */
} UT_GODotDot;
-gboolean UT_go_path_is_uri (const char * path);
+ABI_EXPORT gboolean UT_go_path_is_uri (const char * path);
-char *UT_go_filename_simplify (const char *filename, UT_GODotDot dotdot, gboolean make_absolute);
-char *UT_go_url_simplify (const char *uri);
+ABI_EXPORT char *UT_go_filename_simplify (const char *filename, UT_GODotDot dotdot, gboolean make_absolute);
+ABI_EXPORT char *UT_go_url_simplify (const char *uri);
-char *UT_go_filename_from_uri (const char *uri);
-char *UT_go_filename_to_uri (const char *filename);
+ABI_EXPORT char *UT_go_filename_from_uri (const char *uri);
+ABI_EXPORT char *UT_go_filename_to_uri (const char *filename);
-char *UT_go_url_resolve_relative (const char *ref_uri, const char *rel_uri);
-char *UT_go_url_make_relative (const char *uri, const char *ref_uri);
+ABI_EXPORT char *UT_go_url_resolve_relative (const char *ref_uri, const char *rel_uri);
+ABI_EXPORT char *UT_go_url_make_relative (const char *uri, const char *ref_uri);
-char *UT_go_shell_arg_to_uri (const char *arg);
-char *UT_go_basename_from_uri (const char *uri);
-char *UT_go_dirname_from_uri (const char *uri, gboolean brief);
-gboolean UT_go_directory_create (char const *uri, int mode, GError **err);
-gchar const **UT_go_shell_argv_to_glib_encoding (gint argc, gchar const **argv);
-void UT_go_shell_argv_to_glib_encoding_free (void);
+ABI_EXPORT char *UT_go_shell_arg_to_uri (const char *arg);
+ABI_EXPORT char *UT_go_basename_from_uri (const char *uri);
+ABI_EXPORT char *UT_go_dirname_from_uri (const char *uri, gboolean brief);
+ABI_EXPORT gboolean UT_go_directory_create (char const *uri, int mode, GError **err);
+ABI_EXPORT gchar const **UT_go_shell_argv_to_glib_encoding (gint argc, gchar const **argv);
+ABI_EXPORT void UT_go_shell_argv_to_glib_encoding_free (void);
-GsfInput *UT_go_file_open (char const *uri, GError **err);
-GsfOutput *UT_go_file_create (char const *uri, GError **err);
-GSList *UT_go_file_split_urls (char const *data);
+ABI_EXPORT GsfInput *UT_go_file_open (char const *uri, GError **err);
+ABI_EXPORT GsfOutput *UT_go_file_create (char const *uri, GError **err);
+ABI_EXPORT GSList *UT_go_file_split_urls (char const *data);
-gboolean UT_go_file_remove (char const *uri, GError **err);
+ABI_EXPORT gboolean UT_go_file_remove (char const *uri, GError **err);
-gboolean UT_go_file_exists (char const *uri);
+ABI_EXPORT gboolean UT_go_file_exists (char const *uri);
-UT_GOFilePermissions *UT_go_get_file_permissions (char const *uri);
-void UT_go_set_file_permissions (char const *uri, UT_GOFilePermissions * file_permissions);
+ABI_EXPORT UT_GOFilePermissions *UT_go_get_file_permissions (char const *uri);
+ABI_EXPORT void UT_go_set_file_permissions (char const *uri, UT_GOFilePermissions * file_permissions);
-time_t UT_go_file_get_date_accessed (char const *uri);
-time_t UT_go_file_get_date_modified (char const *uri);
-time_t UT_go_file_get_date_changed (char const *uri);
+ABI_EXPORT time_t UT_go_file_get_date_accessed (char const *uri);
+ABI_EXPORT time_t UT_go_file_get_date_modified (char const *uri);
+ABI_EXPORT time_t UT_go_file_get_date_changed (char const *uri);
-gchar *UT_go_url_decode (gchar const *text);
-gchar *UT_go_url_encode (gchar const *text, int type);
-GError *UT_go_url_show (gchar const *url);
-gboolean UT_go_url_check_extension (gchar const *uri,
+ABI_EXPORT gchar *UT_go_url_decode (gchar const *text);
+ABI_EXPORT gchar *UT_go_url_encode (gchar const *text, int type);
+ABI_EXPORT GError *UT_go_url_show (gchar const *url);
+ABI_EXPORT gboolean UT_go_url_check_extension (gchar const *uri,
gchar const *std_ext,
gchar **new_uri);
-gchar *UT_go_get_mime_type (gchar const *uri);
-gchar *UT_go_get_mime_type_for_data (gconstpointer data, int data_size);
-gchar const *UT_go_mime_type_get_description (gchar const *mime_type);
-
-const char * UT_go_guess_encoding (const char *raw, size_t len, const char *user_guess, char **utf8_str);
-char const * UT_go_get_real_name (void);
-gint UT_go_utf8_collate_casefold (const char *a, const char *b);
+ABI_EXPORT gchar *UT_go_get_mime_type (gchar const *uri);
+ABI_EXPORT gchar *UT_go_get_mime_type_for_data (gconstpointer data, int data_size);
+ABI_EXPORT gchar const *UT_go_mime_type_get_description (gchar const *mime_type);
+
+ABI_EXPORT const char * UT_go_guess_encoding (const char *raw, size_t len, const char *user_guess, char **utf8_str);
+ABI_EXPORT char const * UT_go_get_real_name (void);
+ABI_EXPORT gint UT_go_utf8_collate_casefold (const char *a, const char *b);
G_END_DECLS
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_hash.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_hash.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_hash.h 2008-04-06 17:00:10.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_hash.h 2008-07-13 14:09:54.000000000 +0100
@@ -1,3 +1,5 @@
+/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */
+
/* AbiSource Program Utilities
*
* Copyright (C) 2001 Mike Nordell
@@ -45,13 +47,13 @@
#endif
// fwd. decl.
-template class hash_slot;
+template class ABI_EXPORT hash_slot;
template class ABI_EXPORT UT_GenericStringMap;
// Like a std cursor
-class _UT_StringMapImp
+class ABI_EXPORT _UT_StringMapImp
{
@@ -62,7 +64,7 @@
{
public:
UT_GenericStringMap(size_t expected_cardinality = 11);
- ~UT_GenericStringMap();
+ virtual ~UT_GenericStringMap();
// insertion/addition
bool insert(const char* key, T value);
@@ -95,7 +97,7 @@
inline size_t cardinality() const { return n_keys; }
inline size_t size() const { return n_keys; }
- class UT_Cursor
+ class ABI_EXPORT UT_Cursor
{
friend class UT_GenericStringMap;
@@ -244,18 +246,24 @@
//template class ABI_EXPORT UT_GenericStringMap;
#endif
-typedef UT_GenericStringMap UT_StringPtrMap;
-
+// TODO Rob: try to export like this once plugin loading is fixed:
+// template class ABI_EXPORT UT_GenericStringMap;
+class ABI_EXPORT UT_StringPtrMap : public UT_GenericStringMap {
+public:
+ UT_StringPtrMap(size_t expected_cardinality = 11)
+ : UT_GenericStringMap(expected_cardinality)
+ {}
+};
// Template implementation
// fwd. decls.
-UT_uint32 _Recommended_hash_size(UT_uint32 size);
+ABI_EXPORT UT_uint32 _Recommended_hash_size(UT_uint32 size);
// wrapper class for keys
-class key_wrapper
+class ABI_EXPORT key_wrapper
{
public:
key_wrapper()
@@ -307,7 +315,7 @@
// bucket for data
-template class hash_slot
+template class ABI_EXPORT hash_slot
{
public:
hash_slot()
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_html.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_html.cpp
--- abiword-2.6.2/abiword/src/af/util/xp/ut_html.cpp 2008-04-06 17:00:11.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_html.cpp 2008-07-13 14:09:54.000000000 +0100
@@ -171,8 +171,8 @@
if (htmlParseChunk (ctxt, buffer, static_cast(length), 0))
{
UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n",
- szFilename, getLineNumber(ctxt),
- getColumnNumber(ctxt)));
+ szFilename, xmlSAX2GetLineNumber(ctxt),
+ xmlSAX2GetColumnNumber(ctxt)));
ret = UT_IE_IMPORTERROR;
break;
}
@@ -183,8 +183,8 @@
if (htmlParseChunk (ctxt, 0, 0, 1))
{
UT_DEBUGMSG (("Error parsing '%s' (Line: %d, Column: %d)\n",
- szFilename, getLineNumber(ctxt),
- getColumnNumber(ctxt)));
+ szFilename, xmlSAX2GetLineNumber(ctxt),
+ xmlSAX2GetColumnNumber(ctxt)));
ret = UT_IE_IMPORTERROR;
}
}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_iconv.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_iconv.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_iconv.h 2008-04-06 17:00:11.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_iconv.h 2008-07-13 14:09:55.000000000 +0100
@@ -62,27 +62,27 @@
G_BEGIN_DECLS
-const char * ucs2Internal ();
+ABI_EXPORT const char * ucs2Internal ();
#define UCS_2_INTERNAL ucs2Internal()
-const char * ucs4Internal ();
+ABI_EXPORT const char * ucs4Internal ();
#define UCS_INTERNAL ucs4Internal()
-UT_iconv_t UT_iconv_open( const char* to, const char* from );
-size_t UT_iconv( UT_iconv_t cd, const char **inbuf,
+ABI_EXPORT UT_iconv_t UT_iconv_open( const char* to, const char* from );
+ABI_EXPORT size_t UT_iconv( UT_iconv_t cd, const char **inbuf,
size_t *inbytesleft, char **outbuf,
size_t *outbytesleft );
-int UT_iconv_close( UT_iconv_t cd );
-void UT_iconv_reset( UT_iconv_t cd );
-int UT_iconv_isValid ( UT_iconv_t cd );
+ABI_EXPORT int UT_iconv_close( UT_iconv_t cd );
+ABI_EXPORT void UT_iconv_reset( UT_iconv_t cd );
+ABI_EXPORT int UT_iconv_isValid ( UT_iconv_t cd );
-char * UT_convert (const char *str,
+ABI_EXPORT char * UT_convert (const char *str,
UT_sint32 len,
const char *from_codeset,
const char *to_codeset,
UT_uint32 *bytes_read,
UT_uint32 *bytes_written);
-char * UT_convert_cd (const char *str,
+ABI_EXPORT char * UT_convert_cd (const char *str,
UT_sint32 len,
UT_iconv_t cd,
UT_uint32 *bytes_read,
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_locale.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_locale.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_locale.h 2008-04-06 17:00:10.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_locale.h 2008-07-13 14:09:54.000000000 +0100
@@ -23,7 +23,7 @@
#include
#include "ut_string_class.h"
-class UT_LocaleTransactor
+class ABI_EXPORT UT_LocaleTransactor
{
public:
@@ -40,7 +40,7 @@
char * mOldLocale;
};
-class UT_LocaleInfo
+class ABI_EXPORT UT_LocaleInfo
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_misc.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_misc.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_misc.h 2008-04-06 17:00:09.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_misc.h 2008-07-13 14:09:54.000000000 +0100
@@ -214,7 +214,7 @@
UT_uint32 m_iID[(UT_uint32)_Last];
};
-bool UT_parseBool (const char * param, bool dfl);
+ABI_EXPORT bool UT_parseBool (const char * param, bool dfl);
#if 0
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_mutex.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_mutex.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_mutex.h 2008-04-06 17:00:11.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_mutex.h 2008-07-13 14:09:55.000000000 +0100
@@ -19,6 +19,14 @@
#ifndef UT_MUTEX_H
#define UT_MUTEX_H
+/* pre-emptive dismissal; ut_types.h is needed by just about everything,
+ * so even if it's commented out in-file that's still a lot of work for
+ * the preprocessor to do...
+ */
+#ifndef UT_TYPES_H
+#include "ut_types.h"
+#endif
+
class UT_MutexImpl;
class UT_MutexAcquirer;
@@ -30,7 +38,7 @@
* UT_MutexImpl has the same signature as UT_Mutex except that it's
* implemented in platform-specific code
*/
-class UT_Mutex
+class ABI_EXPORT UT_Mutex
{
friend class UT_MutexImpl;
friend class UT_MutexAcquirer;
@@ -67,7 +75,7 @@
* // done transparently by the acquirer
* }
*/
-class UT_MutexAcquirer
+class ABI_EXPORT UT_MutexAcquirer
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_PropVector.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_PropVector.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_PropVector.h 2008-04-06 17:00:11.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_PropVector.h 2008-07-13 14:09:55.000000000 +0100
@@ -22,7 +22,7 @@
#include "ut_vector.h"
-class UT_PropVector
+class ABI_EXPORT UT_PropVector
: public UT_GenericVector
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_stringbuf.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_stringbuf.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_stringbuf.h 2008-04-06 17:00:10.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_stringbuf.h 2008-07-13 14:09:54.000000000 +0100
@@ -46,7 +46,7 @@
template
-class UT_StringImpl
+class ABI_EXPORT UT_StringImpl
{
public:
UT_StringImpl();
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_string_class.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_string_class.cpp
--- abiword-2.6.2/abiword/src/af/util/xp/ut_string_class.cpp 2008-04-06 17:00:11.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_string_class.cpp 2008-07-13 14:09:55.000000000 +0100
@@ -269,18 +269,9 @@
UT_String& UT_String_vprintf (UT_String & inStr, const char *format,
va_list args1)
{
- char *buffer;
- va_list args2;
-
- G_VA_COPY (args2, args1);
-
- buffer = new char [ g_printf_string_upper_bound (format, args1) ];
- vsprintf (buffer, format, args2);
- va_end (args2);
-
+ char *buffer = g_strdup_vprintf(format, args1);
inStr = buffer;
-
- delete [] buffer;
+ g_free(buffer);
return inStr;
}
@@ -556,6 +547,7 @@
bool operator==(const UT_String& s1, const UT_String& s2)
{
+ if (s1.size() != s2.size()) return false;
return strcmp(s1.c_str(), s2.c_str()) == 0;
}
@@ -1190,12 +1182,13 @@
}
bool operator==(const UT_UTF8String& s1, const UT_UTF8String& s2)
{
+ if (s1.size() != s2.size()) return false;
return strcmp(s1.utf8_str(), s2.utf8_str()) == 0;
}
bool operator!=(const UT_UTF8String& s1, const UT_UTF8String& s2)
{
- return strcmp(s1.utf8_str(), s2.utf8_str()) != 0;
+ return !(s1 == s2);
}
bool operator==(const UT_UTF8String& s1, const char * s2)
@@ -1210,11 +1203,13 @@
bool operator==(const UT_UTF8String& s1, const std::string &s2)
{
+ if (s1.size() != s2.size()) return false;
return s1.utf8_str() == s2;
}
bool operator!=(const UT_UTF8String& s1, const std::string &s2)
{
+ if (s1.size() != s2.size()) return true;
return s1.utf8_str() != s2;
}
@@ -1482,6 +1477,7 @@
bool operator==(const UT_UCS4String& s1, const UT_UCS4String& s2)
{
+ if (s1.size() != s2.size()) return false;
return UT_UCS4_strcmp(s1.ucs4_str(), s2.ucs4_str()) == 0;
}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_unicode.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_unicode.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_unicode.h 2008-04-06 17:00:11.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_unicode.h 2008-07-13 14:09:55.000000000 +0100
@@ -31,7 +31,7 @@
/** contain various unicode function. Just a namespace */
-class UT_Unicode
+class ABI_EXPORT UT_Unicode
{
public:
/** scans a buffer for the next valid UTF-8 sequence and returns the corresponding
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_vector.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_vector.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_vector.h 2008-04-06 17:00:11.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_vector.h 2008-07-13 14:09:55.000000000 +0100
@@ -140,12 +140,23 @@
UT_uint32 m_iPostCutoffIncrement;
};
-#if 0 //def _MSC_VER // have to intialise the templates in order to have class exported
-#include "ut_Win32Vector.h"
-#endif
+// TODO Rob: try to export like this once plugin loading is fixed:
+// template class ABI_EXPORT UT_GenericVector;
+class ABI_EXPORT UT_Vector : public UT_GenericVector {
+public:
+ UT_Vector(UT_uint32 sizehint = 32, UT_uint32 baseincr = 4, bool bPrealloc = false)
+ : UT_GenericVector(sizehint, baseincr, bPrealloc)
+ {}
+};
-typedef ABI_EXPORT UT_GenericVector UT_Vector;
-typedef ABI_EXPORT UT_GenericVector UT_NumberVector;
+// TODO Rob: try to export like this once plugin loading is fixed:
+// template class ABI_EXPORT UT_GenericVector;
+class ABI_EXPORT UT_NumberVector : public UT_GenericVector {
+public:
+ UT_NumberVector(UT_uint32 sizehint = 32, UT_uint32 baseincr = 4, bool bPrealloc = false)
+ : UT_GenericVector(sizehint, baseincr, bPrealloc)
+ {}
+};
#include
#include
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_xml.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_xml.cpp
--- abiword-2.6.2/abiword/src/af/util/xp/ut_xml.cpp 2008-04-06 17:00:11.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_xml.cpp 2008-07-13 14:09:55.000000000 +0100
@@ -356,7 +356,7 @@
/**************************************************************/
/**************************************************************/
-class UT_XML_Decoder : public UT_XML::Listener
+class ABI_EXPORT UT_XML_Decoder : public UT_XML::Listener
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_xml.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_xml.h
--- abiword-2.6.2/abiword/src/af/util/xp/ut_xml.h 2008-04-06 17:00:10.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_xml.h 2008-07-13 14:09:54.000000000 +0100
@@ -195,7 +195,7 @@
void defaultData (const gchar * buffer, int length);
};
-class DefaultReader : public UT_XML::Reader
+class ABI_EXPORT DefaultReader : public UT_XML::Reader
{
public:
DefaultReader ();
@@ -214,7 +214,7 @@
*
* NOTE: The buffer is not copied, or g_free()ed.
*/
-class UT_XML_BufReader : public UT_XML::Reader
+class ABI_EXPORT UT_XML_BufReader : public UT_XML::Reader
{
public:
UT_XML_BufReader (const char * buffer, UT_uint32 length);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/util/xp/ut_xml_libxml2.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/util/xp/ut_xml_libxml2.cpp
--- abiword-2.6.2/abiword/src/af/util/xp/ut_xml_libxml2.cpp 2008-04-06 17:00:09.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/util/xp/ut_xml_libxml2.cpp 2008-07-13 14:09:53.000000000 +0100
@@ -207,7 +207,7 @@
{
if(getNumMinorErrors() > getNumRecoveredErrors())
{
- UT_DEBUGMSG (("Error - 1 parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt)));
+ UT_DEBUGMSG (("Error - 1 parsing '%s' (Line: %d, Column: %d)\n", szFilename, xmlSAX2GetLineNumber(ctxt), xmlSAX2GetColumnNumber(ctxt)));
ret = UT_IE_IMPORTERROR;
break;
}
@@ -218,7 +218,7 @@
{
if (xmlParseChunk (ctxt, "", 0, 1))
{
- UT_DEBUGMSG (("Error -2 parsing '%s' (Line: %d, Column: %d)\n", szFilename, getLineNumber(ctxt), getColumnNumber(ctxt)));
+ UT_DEBUGMSG (("Error -2 parsing '%s' (Line: %d, Column: %d)\n", szFilename, xmlSAX2GetLineNumber(ctxt), xmlSAX2GetColumnNumber(ctxt)));
ret = UT_IE_IMPORTERROR;
}
}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixApp.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixApp.cpp
--- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixApp.cpp 2008-04-06 16:59:48.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixApp.cpp 2008-07-13 14:09:34.000000000 +0100
@@ -180,8 +180,6 @@
bool XAP_UnixApp::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue)
{
- if (!g_thread_supported ()) g_thread_init (NULL);
-
// let our base class do it's thing.
XAP_App::initialize(szKeyBindingsKey, szKeyBindingsDefaultValue);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp
--- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp 2008-04-06 16:59:47.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.cpp 2008-07-13 14:09:34.000000000 +0100
@@ -1,3 +1,5 @@
+/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */
+
/* AbiSource Application Framework
* Copyright (C) 1998-2000 AbiSource, Inc.
*
@@ -175,7 +177,7 @@
return FALSE;
}
-static void s_select_row_font(GtkWidget * /* widget */, XAP_UnixDialog_FontChooser * dlg)
+static void s_select_row_font(GtkTreeSelection * /* widget */, XAP_UnixDialog_FontChooser * dlg)
{
UT_return_if_fail(dlg);
// update the row number and show the changed preview
@@ -184,7 +186,7 @@
}
-static void s_select_row_style(GtkWidget * /* widget */, XAP_UnixDialog_FontChooser * dlg)
+static void s_select_row_style(GtkTreeSelection * /* widget */, XAP_UnixDialog_FontChooser * dlg)
{
UT_return_if_fail(dlg);
@@ -192,7 +194,7 @@
dlg->styleRowChanged();
}
-static void s_select_row_size(GtkWidget * /* widget */, XAP_UnixDialog_FontChooser * dlg)
+static void s_select_row_size(GtkTreeSelection * /* widget */, XAP_UnixDialog_FontChooser * dlg)
{
UT_return_if_fail(dlg);
@@ -288,17 +290,18 @@
void XAP_UnixDialog_FontChooser::fontRowChanged(void)
{
static char szFontFamily[60];
- GtkTreeSelection* selection;
- GtkTreeModel* model;
+ GtkTreeSelection *selection;
+ GtkTreeModel *model;
GtkTreeIter iter;
- gchar* text;
+ gchar *text;
+ model = gtk_tree_view_get_model(GTK_TREE_VIEW(m_fontList));
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_fontList));
if ( gtk_tree_selection_get_selected (selection, &model, &iter) )
{
gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1);
- UT_ASSERT(text);
g_snprintf(szFontFamily, 50, "%s",text);
+ g_free(text), text = NULL;
addOrReplaceVecProp("font-family",static_cast(szFontFamily));
}
@@ -310,7 +313,6 @@
GtkTreeSelection* selection;
GtkTreeModel* model;
GtkTreeIter iter;
- gchar* text;
gint rowNumber;
GtkTreePath* path;
@@ -321,9 +323,6 @@
rowNumber = gtk_tree_path_get_indices(path)[0];
gtk_tree_path_free(path);
- gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1);
- UT_ASSERT(text);
-
// perhaps these attributes really should be smashed
// into bitfields. :)
if (rowNumber == LIST_STYLE_NORMAL)
@@ -369,13 +368,9 @@
{
gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1);
UT_ASSERT(text);
-
g_snprintf(szFontSize, 50, "%spt",
static_cast(XAP_EncodingManager::fontsizes_mapping.lookupByTarget(text)));
-
-// g_snprintf(szFontSize, 50, "%spt",(UT_convertToPoints(text[0])));
-// g_snprintf(szFontSize, 50, "%spt",text[0]);
-
+ g_free(text), text = NULL;
addOrReplaceVecProp("font-size",static_cast(szFontSize));
}
updatePreview();
@@ -447,6 +442,7 @@
// the Windows layout, with some changes for color selector
GtkWidget * XAP_UnixDialog_FontChooser::constructWindowContents(GtkWidget *parent)
{
+ GtkTreeSelection *selection;
GtkWidget *vboxMain;
GtkWidget *notebookMain;
GtkWidget *labelFont;
@@ -778,19 +774,26 @@
G_CALLBACK(s_transparency_toggled),
static_cast(this));
- g_signal_connect(G_OBJECT(listFonts),
- "cursor_changed",
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(listFonts));
+ g_signal_connect(G_OBJECT(selection),
+ "changed",
G_CALLBACK(s_select_row_font),
static_cast(this));
+ selection = NULL;
- g_signal_connect(G_OBJECT(listStyles),
- "cursor_changed",
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(listStyles));
+ g_signal_connect(G_OBJECT(selection),
+ "changed",
G_CALLBACK(s_select_row_style),
static_cast(this));
- g_signal_connect(G_OBJECT(listSizes),
- "cursor_changed",
+ selection = NULL;
+
+ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(listSizes));
+ g_signal_connect(G_OBJECT(selection),
+ "changed",
G_CALLBACK(s_select_row_size),
static_cast(this));
+ selection = NULL;
// This is a catch-all color selector callback which catches any
// real-time updating of the color so we can refresh our preview
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.h
--- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.h 2008-04-06 16:59:47.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixDlg_FontChooser.h 2008-07-13 14:09:33.000000000 +0100
@@ -1,3 +1,5 @@
+/* -*- mode: C++; tab-width: 4; c-basic-offset: 4; -*- */
+
/* AbiSource Application Framework
* Copyright (C) 1998-2000 AbiSource, Inc.
*
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_History.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixDlg_History.cpp
--- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixDlg_History.cpp 2008-04-06 16:59:47.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixDlg_History.cpp 2008-07-13 14:09:34.000000000 +0100
@@ -56,7 +56,8 @@
}
UT_DEBUGMSG(("In s_history_selected \n"));
// Get the row and col number
- GValue value = {0,};
+ GValue value;
+ g_value_init(&value, G_TYPE_INVALID);
gtk_tree_model_get_value (model, &iter,3,&value);
item = g_value_get_int(&value);
UT_DEBUGMSG(("Vlaue of id selected %d \n",item));
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixFrameImpl.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixFrameImpl.cpp
--- abiword-2.6.2/abiword/src/af/xap/unix/xap_UnixFrameImpl.cpp 2008-04-06 16:59:47.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/unix/xap_UnixFrameImpl.cpp 2008-07-13 14:09:34.000000000 +0100
@@ -1803,7 +1803,7 @@
pUnixKeyboard->charDataEvent(pView, static_cast(0),
text, strlen(text));
- UT_DEBUGMSG(("<<<<<<<<_imCommit: text %s, len %d\n", text, strlen(text)));
+ xxx_UT_DEBUGMSG(("<<<<<<<<_imCommit: text %s, len %d\n", text, strlen(text)));
}
GtkIMContext * XAP_UnixFrameImpl::getIMContext()
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32App.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32App.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32App.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32App.h 2008-07-13 14:09:45.000000000 +0100
@@ -41,7 +41,7 @@
******************************************************************
*****************************************************************/
-class XAP_Win32App : public XAP_App
+class ABI_EXPORT XAP_Win32App : public XAP_App
{
public:
XAP_Win32App(HINSTANCE hInstance, XAP_Args * pArgs, const char * szAppName);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32AppImpl.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32AppImpl.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32AppImpl.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32AppImpl.h 2008-07-13 14:09:46.000000000 +0100
@@ -22,7 +22,7 @@
#include "xap_AppImpl.h"
-class XAP_Win32AppImpl
+class ABI_EXPORT XAP_Win32AppImpl
: public XAP_AppImpl
{
protected:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Clipboard.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Clipboard.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Clipboard.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Clipboard.h 2008-07-13 14:09:45.000000000 +0100
@@ -24,7 +24,7 @@
#include "ut_vector.h"
#include "xap_Clipboard.h"
-class XAP_Win32Clipboard
+class ABI_EXPORT XAP_Win32Clipboard
{
public:
XAP_Win32Clipboard(void);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32ColourButton.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32ColourButton.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32ColourButton.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32ColourButton.h 2008-07-13 14:09:45.000000000 +0100
@@ -25,7 +25,7 @@
#define COLOUR_SMPLENGTH 20
#define COLOUR_SMPHIGH 10
-class XAP_Win32ColourButton
+class ABI_EXPORT XAP_Win32ColourButton
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32DialogBase.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32DialogBase.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32DialogBase.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32DialogBase.h 2008-07-13 14:09:46.000000000 +0100
@@ -39,7 +39,7 @@
class XAP_Frame;
class XAP_StringSet;
-class XAP_Win32DialogBase
+class ABI_EXPORT XAP_Win32DialogBase
{
public:
XAP_Win32DialogBase() : m_tag(magic_tag), m_hDlg(0), m_pDlg(0), m_pSS(0) {}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32DialogHelper.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32DialogHelper.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32DialogHelper.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32DialogHelper.h 2008-07-13 14:09:46.000000000 +0100
@@ -35,7 +35,7 @@
#include "xap_Win32FrameImpl.h"
#include "ut_Xpm2Bmp.h"
-class XAP_Win32Dialog
+class ABI_EXPORT XAP_Win32Dialog
{
public:
virtual BOOL _onInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) = 0;
@@ -43,7 +43,7 @@
virtual BOOL _onDeltaPos(NM_UPDOWN * pnmud) = 0;
};
-class XAP_Win32DialogHelper
+class ABI_EXPORT XAP_Win32DialogHelper
{
public:
XAP_Win32DialogHelper(XAP_Win32Dialog* p_dialog)
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_About.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_About.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_About.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_About.h 2008-07-13 14:09:45.000000000 +0100
@@ -25,7 +25,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_About: public XAP_Dialog_About
+class ABI_EXPORT XAP_Win32Dialog_About: public XAP_Dialog_About
{
public:
XAP_Win32Dialog_About(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_ClipArt.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_ClipArt.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_ClipArt.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_ClipArt.h 2008-07-13 14:09:46.000000000 +0100
@@ -25,7 +25,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_ClipArt: public XAP_Dialog_ClipArt
+class ABI_EXPORT XAP_Win32Dialog_ClipArt: public XAP_Dialog_ClipArt
{
public:
XAP_Win32Dialog_ClipArt(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_DocComparison.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_DocComparison.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_DocComparison.h 2008-04-06 16:59:59.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_DocComparison.h 2008-07-13 14:09:47.000000000 +0100
@@ -27,7 +27,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_DocComparison: public XAP_Dialog_DocComparison
+class ABI_EXPORT XAP_Win32Dialog_DocComparison: public XAP_Dialog_DocComparison
{
public:
XAP_Win32Dialog_DocComparison(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Encoding.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Encoding.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Encoding.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Encoding.h 2008-07-13 14:09:46.000000000 +0100
@@ -27,7 +27,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_Encoding: public XAP_Win32DialogBase, public XAP_Dialog_Encoding
+class ABI_EXPORT XAP_Win32Dialog_Encoding: public XAP_Win32DialogBase, public XAP_Dialog_Encoding
{
public:
XAP_Win32Dialog_Encoding(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_FileOpenSaveAs.h 2008-07-13 14:09:46.000000000 +0100
@@ -29,7 +29,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_FileOpenSaveAs : public XAP_Dialog_FileOpenSaveAs
+class ABI_EXPORT XAP_Win32Dialog_FileOpenSaveAs : public XAP_Dialog_FileOpenSaveAs
{
public:
XAP_Win32Dialog_FileOpenSaveAs(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_FontChooser.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_FontChooser.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_FontChooser.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_FontChooser.h 2008-07-13 14:09:45.000000000 +0100
@@ -27,7 +27,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_FontChooser : public XAP_Dialog_FontChooser
+class ABI_EXPORT XAP_Win32Dialog_FontChooser : public XAP_Dialog_FontChooser
{
public:
XAP_Win32Dialog_FontChooser(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_History.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_History.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_History.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_History.h 2008-07-13 14:09:45.000000000 +0100
@@ -27,7 +27,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_History: public XAP_Dialog_History
+class ABI_EXPORT XAP_Win32Dialog_History: public XAP_Dialog_History
{
public:
XAP_Win32Dialog_History(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_HTMLOptions.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_HTMLOptions.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_HTMLOptions.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_HTMLOptions.h 2008-07-13 14:09:45.000000000 +0100
@@ -27,7 +27,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_HTMLOptions : public XAP_Win32DialogBase, public XAP_Dialog_HTMLOptions
+class ABI_EXPORT XAP_Win32Dialog_HTMLOptions : public XAP_Win32DialogBase, public XAP_Dialog_HTMLOptions
{
public:
XAP_Win32Dialog_HTMLOptions(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Image.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Image.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Image.h 2008-04-06 16:59:59.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Image.h 2008-07-13 14:09:46.000000000 +0100
@@ -26,7 +26,7 @@
class XAP_Frame;
/*****************************************************************/
-class XAP_Win32Dialog_Image: public XAP_Win32DialogBase, public XAP_Dialog_Image
+class ABI_EXPORT XAP_Win32Dialog_Image: public XAP_Win32DialogBase, public XAP_Dialog_Image
{
public:
XAP_Win32Dialog_Image(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Insert_Symbol.h 2008-07-13 14:09:45.000000000 +0100
@@ -35,7 +35,7 @@
static char Symbol_font_selected[32] = "Symbol";
-class XAP_Draw_Symbol_sample : public XAP_Preview
+class ABI_EXPORT XAP_Draw_Symbol_sample : public XAP_Preview
{
public:
@@ -59,7 +59,7 @@
-class XAP_Win32Dialog_Insert_Symbol: public XAP_Win32DialogBase, public XAP_Dialog_Insert_Symbol
+class ABI_EXPORT XAP_Win32Dialog_Insert_Symbol: public XAP_Win32DialogBase, public XAP_Dialog_Insert_Symbol
{
public:
XAP_Win32Dialog_Insert_Symbol(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Language.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Language.cpp
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Language.cpp 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Language.cpp 2008-07-13 14:09:45.000000000 +0100
@@ -301,6 +301,7 @@
{
bool b = (IsDlgButtonChecked(hWnd,XAP_RID_DIALOG_LANGUAGE_DOCLANG_CHKBOX)==BST_CHECKED);
setMakeDocumentDefault(b);
+ return 1;
}
default: // we did not handle this notification
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Language.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Language.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Language.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Language.h 2008-07-13 14:09:46.000000000 +0100
@@ -26,7 +26,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_Language: public XAP_Dialog_Language
+class ABI_EXPORT XAP_Win32Dialog_Language: public XAP_Dialog_Language
{
public:
XAP_Win32Dialog_Language(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_ListDocuments.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_ListDocuments.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_ListDocuments.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_ListDocuments.h 2008-07-13 14:09:45.000000000 +0100
@@ -27,7 +27,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_ListDocuments: public XAP_Dialog_ListDocuments
+class ABI_EXPORT XAP_Win32Dialog_ListDocuments: public XAP_Dialog_ListDocuments
{
public:
XAP_Win32Dialog_ListDocuments(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_MessageBox.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_MessageBox.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_MessageBox.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_MessageBox.h 2008-07-13 14:09:46.000000000 +0100
@@ -25,7 +25,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_MessageBox : public XAP_Dialog_MessageBox
+class ABI_EXPORT XAP_Win32Dialog_MessageBox : public XAP_Dialog_MessageBox
{
public:
XAP_Win32Dialog_MessageBox(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Password.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Password.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Password.h 2008-04-06 16:59:59.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Password.h 2008-07-13 14:09:47.000000000 +0100
@@ -29,7 +29,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_Password: public XAP_Win32DialogBase, public XAP_Dialog_Password
+class ABI_EXPORT XAP_Win32Dialog_Password: public XAP_Win32DialogBase, public XAP_Dialog_Password
{
public:
XAP_Win32Dialog_Password(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_PluginManager.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_PluginManager.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_PluginManager.h 2008-04-06 16:59:59.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_PluginManager.h 2008-07-13 14:09:46.000000000 +0100
@@ -27,7 +27,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_PluginManager: public XAP_Win32DialogBase, public XAP_Dialog_PluginManager
+class ABI_EXPORT XAP_Win32Dialog_PluginManager: public XAP_Win32DialogBase, public XAP_Dialog_PluginManager
{
public:
XAP_Win32Dialog_PluginManager(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Print.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Print.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Print.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Print.h 2008-07-13 14:09:46.000000000 +0100
@@ -26,7 +26,7 @@
#include
/*****************************************************************/
-class XAP_Win32Dialog_Print : public XAP_Dialog_Print
+class ABI_EXPORT XAP_Win32Dialog_Print : public XAP_Dialog_Print
{
public:
XAP_Win32Dialog_Print(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_PrintPreview.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_PrintPreview.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_PrintPreview.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_PrintPreview.h 2008-07-13 14:09:46.000000000 +0100
@@ -25,7 +25,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_PrintPreview : public XAP_Dialog_PrintPreview
+class ABI_EXPORT XAP_Win32Dialog_PrintPreview : public XAP_Dialog_PrintPreview
{
public:
XAP_Win32Dialog_PrintPreview(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Stub.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Stub.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Stub.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Stub.h 2008-07-13 14:09:45.000000000 +0100
@@ -25,7 +25,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_Stub: public XAP_Dialog_Stub
+class ABI_EXPORT XAP_Win32Dialog_Stub: public XAP_Dialog_Stub
{
public:
XAP_Win32Dialog_Stub(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_WindowMore.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_WindowMore.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_WindowMore.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_WindowMore.h 2008-07-13 14:09:45.000000000 +0100
@@ -26,7 +26,7 @@
class XAP_Frame;
/*****************************************************************/
-class XAP_Win32Dialog_WindowMore: public XAP_Win32DialogBase, public XAP_Dialog_WindowMore
+class ABI_EXPORT XAP_Win32Dialog_WindowMore: public XAP_Win32DialogBase, public XAP_Dialog_WindowMore
{
public:
XAP_Win32Dialog_WindowMore(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Zoom.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Zoom.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Dlg_Zoom.h 2008-04-06 16:59:59.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Dlg_Zoom.h 2008-07-13 14:09:46.000000000 +0100
@@ -28,7 +28,7 @@
/*****************************************************************/
-class XAP_Win32Dialog_Zoom: public XAP_Win32DialogBase, public XAP_Dialog_Zoom
+class ABI_EXPORT XAP_Win32Dialog_Zoom: public XAP_Win32DialogBase, public XAP_Dialog_Zoom
{
public:
XAP_Win32Dialog_Zoom(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32EncodingManager.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32EncodingManager.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32EncodingManager.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32EncodingManager.h 2008-07-13 14:09:46.000000000 +0100
@@ -4,7 +4,7 @@
#include "xap_EncodingManager.h"
/* it's assumed that only one instance of this class will exist */
-class XAP_Win32EncodingManager: public XAP_EncodingManager
+class ABI_EXPORT XAP_Win32EncodingManager: public XAP_EncodingManager
{
protected:
XAP_Win32EncodingManager();
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32FontPreview.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32FontPreview.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32FontPreview.h 2008-04-06 16:59:59.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32FontPreview.h 2008-07-13 14:09:46.000000000 +0100
@@ -26,7 +26,7 @@
class GR_Win32Graphics;
-class XAP_Win32FontPreview : public XAP_FontPreview
+class ABI_EXPORT XAP_Win32FontPreview : public XAP_FontPreview
{
public:
XAP_Win32FontPreview(XAP_Frame * pFrame, UT_sint32 left, UT_uint32 top);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Module.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Module.cpp
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Module.cpp 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Module.cpp 2008-07-13 14:09:46.000000000 +0100
@@ -35,7 +35,7 @@
static const char szErrAlreadyLoaded[] = "Library already loaded";
static const char szErrCouldNotUnload[] = "Could not unload library";
-class XAP_Win32ModuleImpl
+class ABI_EXPORT XAP_Win32ModuleImpl
{
public:
XAP_Win32ModuleImpl() : m_hMod(0), m_pszErr(0), m_pszModuleName(0) { }
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Module.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Module.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Module.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Module.h 2008-07-13 14:09:46.000000000 +0100
@@ -18,8 +18,8 @@
* 02111-1307, USA.
*/
-#ifndef XAP_UNIXMODULE_H
-#define XAP_UNIXMODULE_H
+#ifndef XAP_WIN32MODULE_H
+#define XAP_WIN32MODULE_H
#include "xap_Module.h"
@@ -28,7 +28,7 @@
Implements the XAP_Module interface.
*/
-class XAP_Win32Module : public XAP_Module
+class ABI_EXPORT XAP_Win32Module : public XAP_Module
{
friend class XAP_ModuleManager;
@@ -49,4 +49,4 @@
class XAP_Win32ModuleImpl* pimpl;
};
-#endif /* XAP_UNIXMODULE_H */
+#endif /* XAP_WIN32MODULE_H */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32PreviewWidget.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32PreviewWidget.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32PreviewWidget.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32PreviewWidget.h 2008-07-13 14:09:45.000000000 +0100
@@ -36,7 +36,7 @@
//////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////
-class XAP_Win32PreviewWidget
+class ABI_EXPORT XAP_Win32PreviewWidget
{
public:
XAP_Win32PreviewWidget(XAP_Win32App * pWin32App,
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32PropertySheet.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32PropertySheet.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32PropertySheet.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32PropertySheet.h 2008-07-13 14:09:46.000000000 +0100
@@ -39,7 +39,7 @@
#define ID_APPLY_NOW 0x3021
-class XAP_Win32PropertyPage
+class ABI_EXPORT XAP_Win32PropertyPage
{
public:
@@ -73,7 +73,7 @@
};
-class XAP_Win32PropertySheet
+class ABI_EXPORT XAP_Win32PropertySheet
{
public:
XAP_Win32PropertySheet();
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Slurp.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Slurp.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Slurp.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Slurp.h 2008-07-13 14:09:46.000000000 +0100
@@ -21,7 +21,7 @@
#include
class XAP_Win32APP;
-class XAP_Win32Slurp
+class ABI_EXPORT XAP_Win32Slurp
{
public:
XAP_Win32Slurp(XAP_Win32App * pApp);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32_TB_CFactory.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32_TB_CFactory.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32_TB_CFactory.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32_TB_CFactory.h 2008-07-13 14:09:45.000000000 +0100
@@ -22,7 +22,7 @@
#include "xap_Toolbar_ControlFactory.h"
-class AP_Win32Toolbar_ControlFactory : public XAP_Toolbar_ControlFactory
+class ABI_EXPORT AP_Win32Toolbar_ControlFactory : public XAP_Toolbar_ControlFactory
{
public:
AP_Win32Toolbar_ControlFactory();
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Toolbar_Icons.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Toolbar_Icons.h
--- abiword-2.6.2/abiword/src/af/xap/win/xap_Win32Toolbar_Icons.h 2008-04-06 16:59:58.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/win/xap_Win32Toolbar_Icons.h 2008-07-13 14:09:45.000000000 +0100
@@ -27,7 +27,7 @@
/*****************************************************************/
-class AP_Win32Toolbar_Icons : public AP_Toolbar_Icons
+class ABI_EXPORT AP_Win32Toolbar_Icons : public AP_Toolbar_Icons
{
public:
AP_Win32Toolbar_Icons(void);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xad_Document.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xad_Document.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xad_Document.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xad_Document.h 2008-07-13 14:09:43.000000000 +0100
@@ -44,7 +44,7 @@
class AV_View;
// a helper class for history tracking
-class AD_VersionData
+class ABI_EXPORT AD_VersionData
{
public:
@@ -94,7 +94,7 @@
// a helper class for keeping track of revisions in the document
-class AD_Revision
+class ABI_EXPORT AD_Revision
{
public:
AD_Revision(UT_uint32 iId, UT_UCS4Char * pDesc, time_t start, UT_uint32 iVer = 0)
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_App.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_App.cpp
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_App.cpp 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_App.cpp 2008-07-13 14:09:43.000000000 +0100
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include "ut_types.h"
@@ -302,6 +303,8 @@
bool XAP_App::initialize(const char * szKeyBindingsKey, const char * szKeyBindingsDefaultValue)
{
+ if (!g_thread_supported ())
+ g_thread_init (NULL);
gsf_init();
// create application-wide resources that
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_AppImpl.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_AppImpl.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_AppImpl.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_AppImpl.h 2008-07-13 14:09:42.000000000 +0100
@@ -21,10 +21,18 @@
#ifndef _XAP_APP_IMPL_H_
#define _XAP_APP_IMPL_H_
+/* pre-emptive dismissal; ut_types.h is needed by just about everything,
+ * so even if it's commented out in-file that's still a lot of work for
+ * the preprocessor to do...
+ */
+#ifndef UT_TYPES_H
+#include "ut_types.h"
+#endif
+
class UT_String;
-class XAP_AppImpl
+class ABI_EXPORT XAP_AppImpl
{
public:
virtual ~XAP_AppImpl() {}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Args.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Args.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Args.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Args.h 2008-07-13 14:09:43.000000000 +0100
@@ -28,7 +28,7 @@
#include "ut_types.h"
#endif
-class XAP_Args
+class ABI_EXPORT XAP_Args
{
public:
XAP_Args(int argc, const char ** argv); /* for systems which cut up the command line for us */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dialog.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dialog.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dialog.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dialog.h 2008-07-13 14:09:43.000000000 +0100
@@ -259,7 +259,7 @@
{
public:
- class Page {
+ class ABI_EXPORT Page {
public:
Page() {}
Page(const gchar *title, AbiNativeWidget * widget)
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_About.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_About.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_About.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_About.h 2008-07-13 14:09:43.000000000 +0100
@@ -20,6 +20,14 @@
#ifndef XAP_DIALOG_ABOUT_H
#define XAP_DIALOG_ABOUT_H
+/* pre-emptive dismissal; ut_types.h is needed by just about everything,
+ * so even if it's commented out in-file that's still a lot of work for
+ * the preprocessor to do...
+ */
+#ifndef UT_TYPES_H
+#include "ut_types.h"
+#endif
+
#include "xap_Dialog.h"
#include "xav_View.h"
@@ -62,7 +70,7 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \
GNU General Public License for more details."
-class XAP_Dialog_About : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_About : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_About(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_ClipArt.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_ClipArt.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_ClipArt.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_ClipArt.h 2008-07-13 14:09:42.000000000 +0100
@@ -26,7 +26,7 @@
class XAP_Frame;
-class XAP_Dialog_ClipArt : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_ClipArt : public XAP_Dialog_NonPersistent
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_DocComparison.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_DocComparison.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_DocComparison.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_DocComparison.h 2008-07-13 14:09:42.000000000 +0100
@@ -54,7 +54,7 @@
const UT_uint32 iResultCount = 4;
-class XAP_Dialog_DocComparison : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_DocComparison : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_DocComparison(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Encoding.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Encoding.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Encoding.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Encoding.h 2008-07-13 14:09:43.000000000 +0100
@@ -49,7 +49,7 @@
-class XAP_Dialog_Encoding : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_Encoding : public XAP_Dialog_NonPersistent
{
public:
typedef enum { a_OK, a_CANCEL, a_YES, a_NO } tAnswer;
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_FontChooser.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_FontChooser.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_FontChooser.h 2008-07-13 14:09:43.000000000 +0100
@@ -38,7 +38,7 @@
class GR_Graphics;
-class XAP_Preview_FontPreview : public XAP_Preview
+class ABI_EXPORT XAP_Preview_FontPreview : public XAP_Preview
{
public:
explicit XAP_Preview_FontPreview(GR_Graphics * gc, const gchar * pszClrBackgound);
@@ -70,7 +70,7 @@
/*****************************************************************/
-class XAP_Dialog_FontChooser : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_FontChooser : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_FontChooser(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_History.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_History.cpp
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_History.cpp 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_History.cpp 2008-07-13 14:09:42.000000000 +0100
@@ -114,17 +114,35 @@
tT = pUUID->getTime();
tM = localtime(&tT);
s = (char*)g_try_malloc(30);
- strftime(s,30,"%c",tM);
+ if(!s)
+ return NULL;
+
+ size_t len = strftime(s,30,"%c",tM);
+ if(!len)
+ {
+ FREEP(s);
+ return NULL;
+ }
+
return s;
}
case 3:
- tT = m_pDoc->getLastSavedTime();
- tM = localtime(&tT);
- s = (char*)g_try_malloc(30);
- strftime(s,30,"%c",tM);
- return s;
+ {
+ tT = m_pDoc->getLastSavedTime();
+ tM = localtime(&tT);
+ s = (char*)g_try_malloc(30);
+ if(!s)
+ return NULL;
+ size_t len = strftime(s,30,"%c",tM);
+ if(!len)
+ {
+ FREEP(s);
+ return NULL;
+ }
+ return s;
+ }
case 4:
{
UT_uint32 iEditTime = m_pDoc->getEditTime();
@@ -205,11 +223,22 @@
return g_strdup(S.c_str());
case 1:
- tT = m_pDoc->getHistoryNthTimeStarted(item);
- tM = localtime(&tT);
- s = (char*)g_try_malloc(30);
- strftime(s,30,"%c",tM);
- return s;
+ {
+ tT = m_pDoc->getHistoryNthTimeStarted(item);
+ tM = localtime(&tT);
+ s = (char*)g_try_malloc(30);
+ if(!s)
+ return NULL;
+
+ size_t len = strftime(s,30,"%c",tM);
+ if(!len)
+ {
+ FREEP(s);
+ return NULL;
+ }
+
+ return s;
+ }
case 2:
{
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_History.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_History.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_History.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_History.h 2008-07-13 14:09:44.000000000 +0100
@@ -59,7 +59,7 @@
const UT_uint32 iButtonCount = 2;
const UT_uint32 iListColumnCount = 3;
-class XAP_Dialog_History : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_History : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_History(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_HTMLOptions.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_HTMLOptions.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_HTMLOptions.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_HTMLOptions.h 2008-07-13 14:09:43.000000000 +0100
@@ -53,7 +53,7 @@
bool bMultipart;
};
-class XAP_Dialog_HTMLOptions : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_HTMLOptions : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_HTMLOptions (XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Image.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Image.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Image.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Image.h 2008-07-13 14:09:44.000000000 +0100
@@ -51,7 +51,7 @@
/* #include "xav_View.h" */
-class XAP_Dialog_Image : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_Image : public XAP_Dialog_NonPersistent
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Insert_Symbol.h 2008-07-13 14:09:43.000000000 +0100
@@ -31,7 +31,7 @@
class XAP_Frame;
class XAP_Draw_Symbol;
-class XAP_Insert_symbol_listener
+class ABI_EXPORT XAP_Insert_symbol_listener
{
public:
virtual ~XAP_Insert_symbol_listener() {}
@@ -40,7 +40,7 @@
virtual bool insertSymbol(UT_UCSChar Char, const char *p_font_name) = 0;
};
-class XAP_Dialog_Insert_Symbol : public XAP_Dialog_Modeless
+class ABI_EXPORT XAP_Dialog_Insert_Symbol : public XAP_Dialog_Modeless
{
public:
XAP_Dialog_Insert_Symbol(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_ListDocuments.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_ListDocuments.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_ListDocuments.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_ListDocuments.h 2008-07-13 14:09:43.000000000 +0100
@@ -58,7 +58,7 @@
*/
-class XAP_Dialog_ListDocuments : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_ListDocuments : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_ListDocuments(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_MessageBox.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_MessageBox.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_MessageBox.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_MessageBox.h 2008-07-13 14:09:44.000000000 +0100
@@ -23,7 +23,7 @@
#include "xap_Dialog.h"
#include "xap_Strings.h"
-class XAP_Dialog_MessageBox : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_MessageBox : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_MessageBox(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Password.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Password.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Password.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Password.h 2008-07-13 14:09:44.000000000 +0100
@@ -28,7 +28,7 @@
class XAP_Frame;
-class XAP_Dialog_Password : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_Password : public XAP_Dialog_NonPersistent
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_PluginManager.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_PluginManager.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_PluginManager.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_PluginManager.h 2008-07-13 14:09:44.000000000 +0100
@@ -34,7 +34,7 @@
// todo: it makes sense to make me modeless
-class XAP_Dialog_PluginManager : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_PluginManager : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_PluginManager (XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Print.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Print.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Print.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Print.h 2008-07-13 14:09:43.000000000 +0100
@@ -26,7 +26,7 @@
/*****************************************************************/
-class XAP_Dialog_Print : public XAP_Dialog_AppPersistent
+class ABI_EXPORT XAP_Dialog_Print : public XAP_Dialog_AppPersistent
{
public:
XAP_Dialog_Print(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_PrintPreview.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_PrintPreview.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_PrintPreview.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_PrintPreview.h 2008-07-13 14:09:43.000000000 +0100
@@ -30,7 +30,7 @@
/*****************************************************************/
-class XAP_Dialog_PrintPreview : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_PrintPreview : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_PrintPreview(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Stub.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Stub.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Stub.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Stub.h 2008-07-13 14:09:44.000000000 +0100
@@ -40,7 +40,7 @@
*much* better off stealing code from another existing dialog which
does something real.
*/
-class XAP_Dialog_Stub : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_Stub : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_Stub(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_WindowMore.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_WindowMore.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_WindowMore.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_WindowMore.h 2008-07-13 14:09:43.000000000 +0100
@@ -25,7 +25,7 @@
class XAP_Frame;
-class XAP_Dialog_WindowMore : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_WindowMore : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_WindowMore(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Zoom.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Zoom.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Dlg_Zoom.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Dlg_Zoom.h 2008-07-13 14:09:43.000000000 +0100
@@ -32,7 +32,7 @@
#define XAP_DLG_ZOOM_MAXIMUM_ZOOM 500 // arbitrary value (percentage)
#define XAP_DLG_ZOOM_MINIMUM_ZOOM 20 // arbitrary value (percentage)
-class XAP_Dialog_Zoom : public XAP_Dialog_NonPersistent
+class ABI_EXPORT XAP_Dialog_Zoom : public XAP_Dialog_NonPersistent
{
public:
XAP_Dialog_Zoom(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Draw_Symbol.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Draw_Symbol.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Draw_Symbol.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Draw_Symbol.h 2008-07-13 14:09:43.000000000 +0100
@@ -34,7 +34,7 @@
class GR_Font;
-class XAP_Draw_Symbol : public XAP_Preview
+class ABI_EXPORT XAP_Draw_Symbol : public XAP_Preview
{
public:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_FakeClipboard.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_FakeClipboard.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_FakeClipboard.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_FakeClipboard.h 2008-07-13 14:09:43.000000000 +0100
@@ -33,7 +33,7 @@
struct _ClipboardItem;
-class XAP_FakeClipboard
+class ABI_EXPORT XAP_FakeClipboard
{
public:
XAP_FakeClipboard();
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_FontPreview.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_FontPreview.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_FontPreview.h 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_FontPreview.h 2008-07-13 14:09:43.000000000 +0100
@@ -32,7 +32,7 @@
#define PREVIEW_WIDTH 400
#define PREVIEW_HEIGHT 75
-class XAP_FontPreview
+class ABI_EXPORT XAP_FontPreview
{
public:
XAP_FontPreview();
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_LoadBindings.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_LoadBindings.h
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_LoadBindings.h 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_LoadBindings.h 2008-07-13 14:09:43.000000000 +0100
@@ -26,7 +26,7 @@
/*****************************************************************/
-class XAP_BindingSet
+class ABI_EXPORT XAP_BindingSet
{
public:
XAP_BindingSet(EV_EditMethodContainer * pemc);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Log.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Log.cpp
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Log.cpp 2008-04-06 16:59:56.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Log.cpp 2008-07-13 14:09:43.000000000 +0100
@@ -7,7 +7,7 @@
XAP_Log *XAP_Log::m_pInstance = 0;
-class XAP_LogDestructor
+class ABI_EXPORT XAP_LogDestructor
{
public:
XAP_LogDestructor() : t_(0) {}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/src/af/xap/xp/xap_Prefs.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword/src/af/xap/xp/xap_Prefs.cpp
--- abiword-2.6.2/abiword/src/af/xap/xp/xap_Prefs.cpp 2008-04-06 16:59:55.000000000 +0100
+++ abiword-2.6.4/abiword/src/af/xap/xp/xap_Prefs.cpp 2008-07-13 14:09:43.000000000 +0100
@@ -446,6 +446,7 @@
case Error:
*s += "error: ";
+ break;
case Log:
default:
*s += "message: ";
@@ -1495,7 +1496,7 @@
"\t
@@ -17,9 +17,9 @@
-
-
-
+
+
+
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/user/wp/strings/pt-BR.strings /tmp/qY2gb79Nml/abiword-2.6.4/abiword/user/wp/strings/pt-BR.strings
--- abiword-2.6.2/abiword/user/wp/strings/pt-BR.strings 2008-04-06 17:00:56.000000000 +0100
+++ abiword-2.6.4/abiword/user/wp/strings/pt-BR.strings 2008-07-13 14:10:57.000000000 +0100
@@ -954,7 +954,7 @@
DLG_Styles_ErrBlankName="O nome do estilo no pode ficar em branco"
DLG_Styles_ErrNoStyle="Para modificar um estilo
tem de o selecionar primeiro"
DLG_Styles_ErrNotTitle1="Nome do Estilo - "
-DLG_Styles_ErrNotTitle2="Reservado.
No pode usar este nome. Escolha outro
"
+DLG_Styles_ErrNotTitle2=" - Reservado.
No pode usar este nome. Escolha outro
"
DLG_Styles_ErrStyleBuiltin="No pode modificar um estilo base."
DLG_Styles_ErrStyleCantDelete="No possvel apagar este estilo."
DLG_Styles_ErrStyleNot="Este estilo no existe
e por isso no pode ser modificado"
@@ -1112,10 +1112,10 @@
MENU_LABEL_EDIT_COPY_FRAME="Copiar Caixa de Texto"
MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION="C&opia localizao de hiperlink"
MENU_LABEL_EDIT_CUT="Co&rtar"
-MENU_LABEL_EDIT_CUTEMBED="Definir"
+MENU_LABEL_EDIT_CUTEMBED="Remover Objeto"
MENU_LABEL_EDIT_CUTIMAGE="Remover Imagem"
MENU_LABEL_EDIT_CUT_FRAME="Remover Caixa de Texto"
-MENU_LABEL_EDIT_DELETEEMBED="Apagar &Tabela"
+MENU_LABEL_EDIT_DELETEEMBED="Apagar Objeto"
MENU_LABEL_EDIT_DELETEFRAME="Remover Caixa de Texto"
MENU_LABEL_EDIT_DELETEIMAGE="Remover Imagem"
MENU_LABEL_EDIT_EDITFOOTER="Editar &Rodap"
@@ -1174,7 +1174,7 @@
MENU_LABEL_FMT_DIRECTION_DO_LTR="Texto no sentido &esquerda para a direita"
MENU_LABEL_FMT_DIRECTION_DO_RTL="Texto no sentido &direita para esquerda"
MENU_LABEL_FMT_DOCUMENT="&Documento"
-MENU_LABEL_FMT_EMBED="Formatar Tabela"
+MENU_LABEL_FMT_EMBED="Formatar Objeto"
MENU_LABEL_FMT_FONT="&Tipo"
MENU_LABEL_FMT_FOOTNOTES="Formatar Notas de Rodap e do Final"
MENU_LABEL_FMT_FRAME="Caixa de Texto"
@@ -1188,7 +1188,7 @@
MENU_LABEL_FMT_SETPOSIMAGE="Colocar Imagem Posicionada"
MENU_LABEL_FMT_STRIKE="&Riscar"
MENU_LABEL_FMT_STYLE="&Estilo"
-MENU_LABEL_FMT_STYLE_DEFINE="&Criar e Modificar"
+MENU_LABEL_FMT_STYLE_DEFINE="&Criar e Modificar Estilos"
MENU_LABEL_FMT_STYLIST=""
MENU_LABEL_FMT_SUBSCRIPT="n&dice"
MENU_LABEL_FMT_SUPERSCRIPT="&Expoente"
@@ -1361,14 +1361,14 @@
MENU_LABEL_WINDOW_9="&9 %s"
MENU_LABEL_WINDOW_MORE="&Mais janelas"
MENU_LABEL_WINDOW_NEW="&Nova"
-MENU_LABEL__BOGUS1__="Fechar documento"
-MENU_LABEL__BOGUS2__="Fechar documento"
-MENU_STATUSLINE_ALIGN="Fechar documento"
+MENU_LABEL__BOGUS1__=" "
+MENU_LABEL__BOGUS2__=" "
+MENU_STATUSLINE_ALIGN=" "
MENU_STATUSLINE_ALIGN_CENTER="Centralizar texto"
MENU_STATUSLINE_ALIGN_JUSTIFY="Justificar texto"
MENU_STATUSLINE_ALIGN_LEFT="Alinhar esquerda"
MENU_STATUSLINE_ALIGN_RIGHT="Alinhar direita"
-MENU_STATUSLINE_EDIT="Fechar documento"
+MENU_STATUSLINE_EDIT=" "
MENU_STATUSLINE_EDIT_CLEAR="Apagar seleo"
MENU_STATUSLINE_EDIT_COPY="Copiar seleo"
MENU_STATUSLINE_EDIT_COPYEMBED="Copiar Objeto Embutido"
@@ -1395,7 +1395,7 @@
MENU_STATUSLINE_EDIT_SELECTALL="Selecionar todo o documento"
MENU_STATUSLINE_EDIT_SELECT_FRAME="Selecionar a Caixa de Texto"
MENU_STATUSLINE_EDIT_UNDO="Cancelar ltima ao"
-MENU_STATUSLINE_FILE="Fechar documento"
+MENU_STATUSLINE_FILE=" "
MENU_STATUSLINE_FILE_CLOSE="Fechar documento"
MENU_STATUSLINE_FILE_EXIT="Fechar todas as janelas e sair"
MENU_STATUSLINE_FILE_EXPORT="Salvar como"
@@ -1425,7 +1425,7 @@
MENU_STATUSLINE_FILE_SAVEEMBED="Salvar o Objeto Embutido"
MENU_STATUSLINE_FILE_SAVEIMAGE="Salvar a imagem selecionadas para um arquivo"
MENU_STATUSLINE_FILE_SAVE_TEMPLATE="Salvar o documento como modelo"
-MENU_STATUSLINE_FMT="Fechar documento"
+MENU_STATUSLINE_FMT=" "
MENU_STATUSLINE_FMT_BACKGROUND="Mudar cor de fundo"
MENU_STATUSLINE_FMT_BACKGROUND_PAGE_COLOR="Mudar a cor de pgina do seu documento"
MENU_STATUSLINE_FMT_BACKGROUND_PAGE_IMAGE="Colocar uma imagem como fundo para sua pgina"
@@ -1462,8 +1462,8 @@
MENU_STATUSLINE_FMT_TOGGLECASE="Mudar capitalizao da rea seleccionada"
MENU_STATUSLINE_FMT_TOPLINE="Colocar/Remover linha acima da seleo"
MENU_STATUSLINE_FMT_UNDERLINE="Sublinhar texto"
-MENU_STATUSLINE_FORMAT="Fechar documento"
-MENU_STATUSLINE_HELP="Fechar documento"
+MENU_STATUSLINE_FORMAT=" "
+MENU_STATUSLINE_HELP=" "
MENU_STATUSLINE_HELP_ABOUT="Ver informaes sobre o programa, nmero de verso e copyrights"
MENU_STATUSLINE_HELP_ABOUT_GNOMEOFFICE="Saiba mais sobre o projecto GNOME Office"
MENU_STATUSLINE_HELP_CHECKVER="Verificar se h verses atualizadas do AbiWord na Internet"
@@ -1472,7 +1472,7 @@
MENU_STATUSLINE_HELP_INDEX="Mostrar o Index da ajuda"
MENU_STATUSLINE_HELP_REPORT_BUG="Relatar um erro e ajudar o AbiWord a se tornar um produto melhor"
MENU_STATUSLINE_HELP_SEARCH="Pesquisar ajuda sobre..."
-MENU_STATUSLINE_INSERT="Fechar documento"
+MENU_STATUSLINE_INSERT=" "
MENU_STATUSLINE_INSERT_BOOKMARK="Inserir bookmark"
MENU_STATUSLINE_INSERT_BREAK="Inserir quebras de pgina, seo..."
MENU_STATUSLINE_INSERT_CLIPART="Inserir grficos do portfolio"
@@ -1497,7 +1497,7 @@
MENU_STATUSLINE_INSERT_SYMBOL="Inserir caracteres especiais"
MENU_STATUSLINE_INSERT_TABLEOFCONTENTS="Inserir um ndice baseado nos Cabealhos"
MENU_STATUSLINE_INSERT_TEXTBOX="Inserir uma Caixa de Texto"
-MENU_STATUSLINE_OPEN_TEMPLATE="Fechar documento"
+MENU_STATUSLINE_OPEN_TEMPLATE=" "
MENU_STATUSLINE_SPELL_ADD="Adicionar esta palavra ao dicionrio custumizvel"
MENU_STATUSLINE_SPELL_IGNOREALL="Ignorar todas as ocorrncias desta palavra no documento"
MENU_STATUSLINE_SPELL_SUGGEST_1="Mudar para a sugesto"
@@ -1551,7 +1551,7 @@
MENU_STATUSLINE_TABLE_TEXTTOTABLE="Converter Texto Selectionado em Tabela"
MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL="Dividir em todos os delimitadores de palavras, incluindo espaos"
MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES="Dividir em todos os delimitadores com exceo dos espaos"
-MENU_STATUSLINE_TOOLS="Fechar documento"
+MENU_STATUSLINE_TOOLS=" "
MENU_STATUSLINE_TOOLS_AUTOSPELL="Verificar ortografia do documento automaticamente"
MENU_STATUSLINE_TOOLS_HISTORY="Ver histrico do documento corrente"
MENU_STATUSLINE_TOOLS_HISTORY_PURGE="Remover cabealho"
@@ -1578,10 +1578,10 @@
MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_BEFORE="Mostrar como o documento antes das revises"
MENU_STATUSLINE_TOOLS_SCRIPTS="Executar scripts"
MENU_STATUSLINE_TOOLS_SPELL="Verificar ortografia do documento agora"
-MENU_STATUSLINE_TOOLS_SPELLING="Fechar documento"
+MENU_STATUSLINE_TOOLS_SPELLING=" "
MENU_STATUSLINE_TOOLS_SPELLPREFS="Definir opes de ortografia"
MENU_STATUSLINE_TOOLS_WORDCOUNT="Contar palavras no documento"
-MENU_STATUSLINE_VIEW="Fechar documento"
+MENU_STATUSLINE_VIEW=" "
MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT="Voltar o layout das barra de ferramenta atual para o padro"
MENU_STATUSLINE_VIEW_FULLSCREEN="Mostrar somente as pginas"
MENU_STATUSLINE_VIEW_HEADFOOT="Editar os cabealhos e rodaps"
@@ -1596,7 +1596,7 @@
MENU_STATUSLINE_VIEW_TB_2="Mostrar ou esconder a barra de ferramentas"
MENU_STATUSLINE_VIEW_TB_3="Mostrar ou esconder a barra de ferramentas"
MENU_STATUSLINE_VIEW_TB_4="Mostrar ou esconder a barra de ferramentas"
-MENU_STATUSLINE_VIEW_TOOLBARS="Fechar documento"
+MENU_STATUSLINE_VIEW_TOOLBARS=" "
MENU_STATUSLINE_VIEW_WEB="Ver documento como pgina WWW"
MENU_STATUSLINE_VIEW_ZOOM="Aproximar ou afastar do texto"
MENU_STATUSLINE_VIEW_ZOOM_100="Zoom a 100%"
@@ -1608,7 +1608,7 @@
MENU_STATUSLINE_VIEW_ZOOM_WIDTH="Zoom largura da pgina"
MENU_STATUSLINE_WEB_SAVEASWEB="Ver o documento (antes de imprimir) como uma pgina de WWW"
MENU_STATUSLINE_WEB_WEBPREVIEW="Ver o documento (antes de imprimir) como uma pgina de WWW"
-MENU_STATUSLINE_WINDOW="Fechar documento"
+MENU_STATUSLINE_WINDOW=" "
MENU_STATUSLINE_WINDOW_1="Mudar para a primeira janela"
MENU_STATUSLINE_WINDOW_2="Mudar para a primeira janela"
MENU_STATUSLINE_WINDOW_3="Mudar para a primeira janela"
@@ -1620,8 +1620,8 @@
MENU_STATUSLINE_WINDOW_9="Mudar para a primeira janela"
MENU_STATUSLINE_WINDOW_MORE="Mostrar lista completa de janelas"
MENU_STATUSLINE_WINDOW_NEW="Abrir outra janela para este documento"
-MENU_STATUSLINE__BOGUS1__="Fechar documento"
-MENU_STATUSLINE__BOGUS2__="Fechar documento"
+MENU_STATUSLINE__BOGUS1__=" "
+MENU_STATUSLINE__BOGUS2__=" "
MSG_AfterRestartNew="Estas alteraes tomaro efeito quando recomear o AbiWord ou quando criar um novo documento."
MSG_AutoMerge="Reconciliao automtica"
MSG_AutoRevisionOffWarning="Voc tem certeza de que no quer manter o registro completo do histrico? Se voc proceder, poder no ser possver restaurar verses anteriores deste documento."
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/user/wp/strings/zh-CN.strings /tmp/qY2gb79Nml/abiword-2.6.4/abiword/user/wp/strings/zh-CN.strings
--- abiword-2.6.2/abiword/user/wp/strings/zh-CN.strings 2008-04-06 17:00:56.000000000 +0100
+++ abiword-2.6.4/abiword/user/wp/strings/zh-CN.strings 2008-07-13 14:10:57.000000000 +0100
@@ -13,6 +13,8 @@
DLG_ABOUT_Title="关于 %s"
DLG_Apply="应用"
DLG_Break_Insert="插入"
+DLG_CLIPART_Error="无法加载美工图案"
+DLG_CLIPART_Loading="美工图案"
DLG_CLIPART_Title="美工图案"
DLG_Cancel="取消"
DLG_Close="关闭"
@@ -21,7 +23,7 @@
DLG_Delete="删除"
DLG_DocComparison_Content="正文:"
DLG_DocComparison_Different="差异"
-DLG_DocComparison_Diverging="在%S的d%版本后分割"
+DLG_DocComparison_Diverging="在%s的%d版本后分割"
DLG_DocComparison_DivergingPos="在文件 %d后分割"
DLG_DocComparison_DocsCompared="比较后的文件"
DLG_DocComparison_Fmt="格式:"
@@ -38,6 +40,7 @@
DLG_FOSA_ALLDOCS="全部文件"
DLG_FOSA_ALLIMAGES="全部图像文件"
DLG_FOSA_ExportTitle="导出文件"
+DLG_FOSA_ExtensionDoesNotMatch="给定的文件扩展名与文件类型不匹配。仍然使用这个文件名么?"
DLG_FOSA_FileInsertMath="插入MathML文件:"
DLG_FOSA_FileInsertObject="插入嵌入对象文件:"
DLG_FOSA_FileOpenTypeLabel="打开文件的格式:"
@@ -79,7 +82,7 @@
DLG_History_List_Title="版本历史"
DLG_History_Path="文件名称:"
DLG_History_Version="版本:"
-DLG_History_Version_AutoRevisioned="自动修正"
+DLG_History_Version_AutoRevisioned="自动修订"
DLG_History_Version_Started="创建"
DLG_History_Version_Version="版本"
DLG_History_WindowLabel="文件历史"
@@ -117,7 +120,7 @@
DLG_LISTDOCS_Heading1="从列表中选择文件"
DLG_LISTDOCS_Title="已打开文件"
DLG_Lists_Box_List="方框列表"
-DLG_Lists_Bullet_List="小圆点列表"
+DLG_Lists_Bullet_List="项目列表"
DLG_Lists_Dashed_List="横线列表"
DLG_Lists_Diamond_List="菱形列表"
DLG_Lists_Font="字体:"
@@ -173,7 +176,7 @@
DLG_Password_Title="请输入密码"
DLG_QNXMB_No="否"
DLG_QNXMB_Yes="是"
-DLG_Remove_Icon="您想把这个图标从工具栏移除吗?"
+DLG_Remove_Icon="您想把这个图标从工具栏删除吗?"
DLG_Restore="恢复"
DLG_Select="选择"
DLG_Show="显示"
@@ -209,7 +212,7 @@
DLG_UFS_TransparencyCheck="设定不用文本背景颜色"
DLG_UFS_UnderlineCheck="下划线"
DLG_ULANG_AvailableLanguages="可用的语言"
-DLG_ULANG_DefaultLangChkbox="为这份文件设为默认"
+DLG_ULANG_DefaultLangChkbox="设为该文件的默认语言"
DLG_ULANG_DefaultLangLabel="默认语言:"
DLG_ULANG_LangLabel="选译语言:"
DLG_ULANG_LangTitle="语言设定"
@@ -334,7 +337,11 @@
LANG_AR_SA="阿拉伯文 (沙特阿拉伯)"
LANG_AST_ES="阿斯图里文 (西班牙)"
LANG_AS_IN="阿萨姆文"
+LANG_AYC_BO="艾马拉语 (Oruro)"
+LANG_AYM_BO="艾马拉语 (La Paz)"
+LANG_AYR="中艾马拉语"
LANG_BE_BY="白俄罗斯语"
+LANG_BE_LATIN="白俄罗斯语"
LANG_BG_BG="保加利亚文"
LANG_BN_IN="孟加拉文"
LANG_BR_FR="布列塔尼文"
@@ -409,8 +416,11 @@
LANG_PA_IN="旁遮普语(Gurmukhi)"
LANG_PA_PK="旁遮普语(Shahmukhi)"
LANG_PL_PL="波兰文"
+LANG_PS="粘贴"
LANG_PT_BR="葡萄牙文 (巴西)"
LANG_PT_PT="葡萄牙文 (葡萄牙)"
+LANG_QUH_BO="盖丘亚语 (3 元音)"
+LANG_QUL_BO="盖丘亚语 (5 元音)"
LANG_QU_BO="盖丘亚语"
LANG_RO_RO="罗马尼亚文"
LANG_RU_RU="俄文 (俄罗斯)"
@@ -432,6 +442,7 @@
LANG_UR_PK="乌尔都语(巴基斯坦)"
LANG_UZ_UZ="乌兹别克语"
LANG_VI_VN="越南文"
+LANG_WO_SN="沃洛夫语 (塞内加尔)"
LANG_YI="意第绪文"
LANG_ZH_CN="中文 (中国大陆)"
LANG_ZH_HK="中文 (香港)"
@@ -446,13 +457,13 @@
MENU_STATUSLINE_TABLE_DELETE="删除"
MENU_STATUSLINE_TABLE_INSERT="插入"
MENU_STATUSLINE_TABLE_SELECT="选择"
-MSG_AutoRevision="自动修正"
+MSG_AutoRevision="自动修订"
MSG_BuildingDoc="生成文件:"
-MSG_HistoryConfirmSave="你应该在继续之前把更变保存到文件,现在保存吗?"
-MSG_HistoryNoRestore="AbiWord无法完整的保存版本%d的文件, 因为缺少这个版本信息。"
-MSG_HistoryPartRestore1="AbiWord无法完整的保存版本%d的文件, 因为这个版本信息不完全。"
+MSG_HistoryConfirmSave="你应该在继续之前把修改保存到文件 %s,现在保存吗?"
+MSG_HistoryNoRestore="AbiWord无法恢复到版本%d,因为这个版本信息不存在。"
+MSG_HistoryPartRestore1="AbiWord无法完全恢复到版本%d,因为这个版本信息不完全。"
MSG_HistoryPartRestore2="能够完整保存的版本是 %d. 你要用这个版本保存吗? 要部分保存版本 %d,选择不。"
-MSG_HistoryPartRestore3="不管怎么样都要继续,就按OK"
+MSG_HistoryPartRestore3="按OK继续,"
MSG_HistoryPartRestore4="要退出恢复的尝试,按取消"
MSG_ImportingDoc="正在导入文件..."
MSG_NoUndo="这个操作没有完成,你确定你要进行吗?"
@@ -460,7 +471,7 @@
SPELL_CANTLOAD_DLL="AbiWord无法找到拼写文件 %s.dll
请从http://aspell.net/win32/Aspell下载并安装它"
STYLE_BLOCKTEXT="屏蔽文本"
STYLE_BOXLIST="方框列表"
-STYLE_BULLETLIST="小圆点列表"
+STYLE_BULLETLIST="项目列表"
STYLE_CHAPHEADING="章标题"
STYLE_DASHEDLIST="横线列表"
STYLE_DIAMONLIST="菱形列表"
@@ -495,6 +506,7 @@
STYLE_TRIANGLELIST="三角列表"
STYLE_UPPERCASTELIST="大写英文字母列表"
STYLE_UPPERROMANLIST="大写罗马数字列表"
+TB_ClearBackground="清除背景颜色"
TB_Font_Symbol="符号"
TB_InsertNewTable="插入表格"
TB_Table="表格 "
@@ -574,17 +586,17 @@
DLG_DateTime_AvailableFormats_Capital="可用格式"
DLG_DateTime_DateTimeTitle="插入日期与时间"
DLG_FR_FindLabel="寻找目标(&N):"
-DLG_FR_FindNextButton="寻找下一个(&F)"
-DLG_FR_FindTitle="寻找"
-DLG_FR_FinishedFind="AbiWord已经搜索完了文档。"
-DLG_FR_FinishedReplace="AbiWord已经完成了文档的搜索和%d处替换。"
-DLG_FR_MatchCase="大小写须相符(&M)"
+DLG_FR_FindNextButton="查找下一个(&F)"
+DLG_FR_FindTitle="查找"
+DLG_FR_FinishedFind="AbiWord已经完成文档搜索。"
+DLG_FR_FinishedReplace="AbiWord已经完成文档搜索和%d处替换。"
+DLG_FR_MatchCase="大小写匹配(&M)"
DLG_FR_ReplaceAllButton="全部替换(&A)"
DLG_FR_ReplaceButton="替换(&R)"
DLG_FR_ReplaceTitle="替换"
DLG_FR_ReplaceWithLabel="替换为(&P):"
-DLG_FR_ReverseFind="反向寻找(&V)"
-DLG_FR_WholeWord="全文(&W)"
+DLG_FR_ReverseFind="反向查找(&V)"
+DLG_FR_WholeWord="整个单词(&W)"
DLG_Field_FieldTitle="插入字段"
DLG_Field_FieldTitle_Capital="插入字段"
DLG_Field_Fields="字段(&F):"
@@ -627,7 +639,7 @@
DLG_FormatTOC_DetailsTabPage="空格与页码"
DLG_FormatTOC_DetailsTop="标签定义"
DLG_FormatTOC_DispStyle="显示样式:"
-DLG_FormatTOC_FillStyle="填写样式:"
+DLG_FormatTOC_FillStyle="填充样式:"
DLG_FormatTOC_General="一般"
DLG_FormatTOC_HasHeading="设置标题(&H)"
DLG_FormatTOC_HasLabel="带标签(&A)"
@@ -635,7 +647,7 @@
DLG_FormatTOC_HeadingText="标题文本(&E):"
DLG_FormatTOC_Indent="缩进(&N)"
DLG_FormatTOC_InheritLabel="继承标签(&I)"
-DLG_FormatTOC_LayoutDetails="页面细节"
+DLG_FormatTOC_LayoutDetails="布局细节"
DLG_FormatTOC_Level1="1级"
DLG_FormatTOC_Level2="2级"
DLG_FormatTOC_Level3="3级"
@@ -707,14 +719,14 @@
DLG_ListRevisions_Column2Label="日期"
DLG_ListRevisions_Column3Label="说明"
DLG_ListRevisions_Label1="存在的修订:"
-DLG_ListRevisions_LevelZero="(隐藏所有修订)"
+DLG_ListRevisions_LevelZero="(显示所有修订)"
DLG_ListRevisions_Title="选择修订"
DLG_Lists_Align="文本对齐:"
-DLG_Lists_Apply_Current="应用至目前列表"
+DLG_Lists_Apply_Current="应用至当前列表"
DLG_Lists_Arabic_List="阿拉伯列表"
DLG_Lists_ButtonFont="字体..."
DLG_Lists_Cur_Change_Start="变更目前列表"
-DLG_Lists_Current_Font="当前字型"
+DLG_Lists_Current_Font="当前字体"
DLG_Lists_Current_List_Label="当前列表标签"
DLG_Lists_Current_List_Type="当前列表类型"
DLG_Lists_Customize="自订列表"
@@ -751,9 +763,9 @@
DLG_MailMerge_Insert_No_Colon="字段名称"
DLG_MailMerge_MailMergeTitle="插入邮件合并字段"
DLG_MailMerge_OpenFile="打开文件(&O)"
-DLG_MarkRevisions_Check1Label="继续前一个修正 (number %d)"
+DLG_MarkRevisions_Check1Label="继续前一个修订 (number %d)"
DLG_MarkRevisions_Check2Label="开始新修订版"
-DLG_MarkRevisions_Comment2Label="与修正有关的说明"
+DLG_MarkRevisions_Comment2Label="与修订有关的说明"
DLG_MarkRevisions_Title="标记修订"
DLG_MergeCellsTitle="合并单元格"
DLG_MergeCells_Above="向上合并"
@@ -774,11 +786,11 @@
DLG_MetaData_TAB_General="一般"
DLG_MetaData_TAB_Permission="许可"
DLG_MetaData_TAB_Summary="摘要"
-DLG_MetaData_Title="文件属性"
+DLG_MetaData_Title="文档属性"
DLG_NEW_Choose="选择"
DLG_NEW_Create="从模板新建文件"
DLG_NEW_NoFile="没有文件"
-DLG_NEW_Open="打开已存在的文件"
+DLG_NEW_Open="打开已有文件"
DLG_NEW_StartEmpty="新建空白文件"
DLG_NEW_Tab1="文字处理"
DLG_NEW_Tab1_FAX1="新建传真"
@@ -798,14 +810,14 @@
DLG_Options_Label_Both="文字和图标"
DLG_Options_Label_CheckAllowCustomToolbars="允许自订工具栏"
DLG_Options_Label_CheckAutoLoadPlugins="自动加载所有找到的插件"
-DLG_Options_Label_CheckEnableSmoothScrolling="启动平滑滚动"
+DLG_Options_Label_CheckEnableSmoothScrolling="启用平滑滚动"
DLG_Options_Label_CheckWhiteForTransparent="允许白色以外的屏幕颜色"
DLG_Options_Label_ChooseForTransparent="选择屏幕颜色"
DLG_Options_Label_ColorChooserLabel="选择 AbiWord 的屏幕颜色"
DLG_Options_Label_CustomDict="custom.dic"
DLG_Options_Label_DefaultPageSize="预设页面大小"
DLG_Options_Label_DirectionRtl="预设文字左右方向"
-DLG_Options_Label_Documents="文件"
+DLG_Options_Label_Documents="文档"
DLG_Options_Label_FileExtension="文件扩展:"
DLG_Options_Label_General="一般"
DLG_Options_Label_Grammar="自动检查语法"
@@ -814,19 +826,18 @@
DLG_Options_Label_Hide="隐藏"
DLG_Options_Label_Icons="图标"
DLG_Options_Label_Ignore="略过"
-DLG_Options_Label_InvalidRangeForAutoSave="你应该在1到120之间选择自动保存的频率"
+DLG_Options_Label_InvalidRangeForAutoSave="自动保存的频率应该在1到120之间"
DLG_Options_Label_LangSettings="语言设定"
DLG_Options_Label_Language="语言"
-DLG_Options_Label_Layout="页面设置"
+DLG_Options_Label_Layout="页面布局"
DLG_Options_Label_Look="按钮样式"
DLG_Options_Label_Minutes="分钟"
DLG_Options_Label_PrefsAutoSave="自动保存这个方案(&A)"
DLG_Options_Label_PrefsCurrentScheme="目前偏好的方案(&C)"
DLG_Options_Label_Schemes="偏好设定方案"
-DLG_Options_Label_ShowSplash="程序启动时显示 AbiWord 欢迎画面"
DLG_Options_Label_SmartQuotesEnable="启用智能引号(&E)"
-DLG_Options_Label_SpellAutoReplace="自动修改拼错了的单词"
-DLG_Options_Label_SpellCheckAsType="自动拼写检查(&P)"
+DLG_Options_Label_SpellAutoReplace="自动替换拼错了的单词"
+DLG_Options_Label_SpellCheckAsType="输入时拼写检查(&P)"
DLG_Options_Label_SpellCustomDict="自订词典:"
DLG_Options_Label_SpellDictionaries="词典"
DLG_Options_Label_SpellHideErrors="隐藏文件中的拼写错误(&S)"
@@ -891,7 +902,7 @@
DLG_PageSetup_Page="页面"
DLG_PageSetup_Paper="纸张..."
DLG_PageSetup_Paper_Size="纸张大小(&Z):"
-DLG_PageSetup_Percent="正常大小的%"
+DLG_PageSetup_Percent="正常大小的 %"
DLG_PageSetup_Portrait="直印(&P)"
DLG_PageSetup_Right="右(&R):"
DLG_PageSetup_Scale="比例缩放..."
@@ -964,7 +975,7 @@
DLG_Styles_ErrBlankName="样式名称不能留空"
DLG_Styles_ErrNoStyle="未选择样式
所以不能修改"
DLG_Styles_ErrNotTitle1="样式名称 - "
-DLG_Styles_ErrNotTitle2=" - 已保留。
您不能用这个名称。请选择另一个。
"
+DLG_Styles_ErrNotTitle2=" - 已保留。
您不能使用这个名称。请选择另一个。
"
DLG_Styles_ErrStyleBuiltin="不能修改内定的样式"
DLG_Styles_ErrStyleCantDelete="不能删除这个样式"
DLG_Styles_ErrStyleNot="这个样式不存在
所以不能修改"
@@ -991,13 +1002,13 @@
DLG_Styles_New="新增..."
DLG_Styles_NewTitle="新样式"
DLG_Styles_ParaPrev="段落预览"
-DLG_Styles_RemoveButton="移除"
-DLG_Styles_RemoveLab="从样式中移除属性"
+DLG_Styles_RemoveButton="删除"
+DLG_Styles_RemoveLab="从样式中删除属性"
DLG_Styles_StylesLocked="禁止除样式以外的所有格式命令"
DLG_Styles_StylesTitle="样式"
DLG_Stylist_FootnoteStyles="注释样式"
DLG_Stylist_HeadingStyles="标题样式"
-DLG_Stylist_ListStyles="样式列表"
+DLG_Stylist_ListStyles="列表样式"
DLG_Stylist_MiscStyles="其它样式"
DLG_Stylist_Styles="样式"
DLG_Stylist_Title="样式"
@@ -1098,7 +1109,7 @@
FIELD_PieceTable_MartinTest="边界测试"
FIELD_PieceTable_Test="Kevins 测试"
FIELD_Type_Datetime="日期及时间"
-FIELD_Type_Document="文件"
+FIELD_Type_Document="文档"
FIELD_Type_Numbers="数字"
FIELD_Type_PieceTable="表格"
FirstLineIndentStatus="第一行缩进 [%s]"
@@ -1120,7 +1131,7 @@
MENU_LABEL_EDIT_COPYEMBED="复制对象"
MENU_LABEL_EDIT_COPYIMAGE="复制图像"
MENU_LABEL_EDIT_COPY_FRAME="复制文本框"
-MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION="复制超级链接的地址(&O)"
+MENU_LABEL_EDIT_COPY_HYPERLINK_LOCATION="复制超链接的地址(&O)"
MENU_LABEL_EDIT_CUT="剪切(&T)"
MENU_LABEL_EDIT_CUTEMBED="剪切对象"
MENU_LABEL_EDIT_CUTIMAGE="剪切图像"
@@ -1130,14 +1141,14 @@
MENU_LABEL_EDIT_DELETEIMAGE="删除图像"
MENU_LABEL_EDIT_EDITFOOTER="编辑页脚"
MENU_LABEL_EDIT_EDITHEADER="编辑页眉"
-MENU_LABEL_EDIT_FIND="寻找(&F)"
+MENU_LABEL_EDIT_FIND="查找(&F)"
MENU_LABEL_EDIT_GOTO="转到(&G)"
MENU_LABEL_EDIT_LATEXEQUATION="编辑公式"
MENU_LABEL_EDIT_PASTE="粘贴(&P)"
MENU_LABEL_EDIT_PASTE_SPECIAL="无格式粘贴(&S)"
MENU_LABEL_EDIT_REDO="重做(&R)"
-MENU_LABEL_EDIT_REMOVEFOOTER="移除页脚"
-MENU_LABEL_EDIT_REMOVEHEADER="移除页眉"
+MENU_LABEL_EDIT_REMOVEFOOTER="删除页脚"
+MENU_LABEL_EDIT_REMOVEHEADER="删除页眉"
MENU_LABEL_EDIT_REPLACE="替换(&E)"
MENU_LABEL_EDIT_SELECTALL="全选"
MENU_LABEL_EDIT_SELECT_FRAME="选择文本框"
@@ -1219,11 +1230,12 @@
MENU_LABEL_HELP_INDEX="帮助介绍(&I)"
MENU_LABEL_HELP_REPORT_BUG="报告程序错误(&B)"
MENU_LABEL_HELP_SEARCH="搜寻帮助(&S)"
+MENU_LABEL_INSERT_ANNOTATION="注解"
MENU_LABEL_INSERT_BOOKMARK="书签(&K)"
MENU_LABEL_INSERT_BREAK="分隔符(&B)"
MENU_LABEL_INSERT_CLIPART="美工图案(&C)"
MENU_LABEL_INSERT_DATETIME="日期及时间(&T)"
-MENU_LABEL_INSERT_DELETE_HYPERLINK="删除超级链接(&D)"
+MENU_LABEL_INSERT_DELETE_HYPERLINK="删除超链接(&D)"
MENU_LABEL_INSERT_DIRECTIONMARKER="文本方向标记(&D)"
MENU_LABEL_INSERT_DIRECTIONMARKER_LRM="从左到右标记(&L)"
MENU_LABEL_INSERT_DIRECTIONMARKER_RLM="从右到左标记(&R)"
@@ -1239,7 +1251,7 @@
MENU_LABEL_INSERT_GOTO_HYPERLINK="转到超链接(&J)"
MENU_LABEL_INSERT_GRAPHIC="图片(&P)"
MENU_LABEL_INSERT_HEADER="页眉"
-MENU_LABEL_INSERT_HYPERLINK="超级链接(&H)"
+MENU_LABEL_INSERT_HYPERLINK="超链接(&H)"
MENU_LABEL_INSERT_MAILMERGE="邮件合并域(&M)"
MENU_LABEL_INSERT_PAGENO="页码(&U)"
MENU_LABEL_INSERT_SYMBOL="符号(&M)"
@@ -1258,7 +1270,7 @@
MENU_LABEL_SPELL_SUGGEST_8="%s"
MENU_LABEL_SPELL_SUGGEST_9="%s"
MENU_LABEL_TABLE="表格(&A)"
-MENU_LABEL_TABLE_AUTOFIT="自动填充表格(&A)"
+MENU_LABEL_TABLE_AUTOFIT="自动调整表格(&A)"
MENU_LABEL_TABLE_DELETE="删除(&D)"
MENU_LABEL_TABLE_DELETECOLUMN="删除列(&L)"
MENU_LABEL_TABLE_DELETEROW="删除行(&W)"
@@ -1269,7 +1281,7 @@
MENU_LABEL_TABLE_DELETE_TABLE="表格(&T)"
MENU_LABEL_TABLE_FORMAT="设定表格格式(&F)"
MENU_LABEL_TABLE_HEADING_ROWS_REPEAT="重复此行作为标题"
-MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE="移除标题行"
+MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_REMOVE="删除标题行"
MENU_LABEL_TABLE_HEADING_ROWS_REPEAT_THIS="把这一行设定为标题"
MENU_LABEL_TABLE_INSERTCOLUMN="插入列(&C)"
MENU_LABEL_TABLE_INSERTROW="插入行(&R)"
@@ -1296,15 +1308,15 @@
MENU_LABEL_TABLE_SPLIT_CELLS="拆分单元格(&P)"
MENU_LABEL_TABLE_SPLIT_TABLE="拆分表格(&T)"
MENU_LABEL_TABLE_TABLETOTEXT="将表格转换为文本"
-MENU_LABEL_TABLE_TABLETOTEXTCOMMAS="以逗号分割"
-MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS="依逗号和标签分割"
-MENU_LABEL_TABLE_TABLETOTEXTTABS="依跳格分割"
+MENU_LABEL_TABLE_TABLETOTEXTCOMMAS="以逗号分隔"
+MENU_LABEL_TABLE_TABLETOTEXTCOMMASTABS="以逗号和制表符分隔"
+MENU_LABEL_TABLE_TABLETOTEXTTABS="依制表符分隔"
MENU_LABEL_TABLE_TEXTTOTABLE="将文本转换为表格"
MENU_LABEL_TABLE_TEXTTOTABLE_ALL="在标点和空格处拆分文本"
MENU_LABEL_TABLE_TEXTTOTABLE_NOSPACES="在标点处拆分文本"
MENU_LABEL_TOOLS="工具(&T)"
MENU_LABEL_TOOLS_AUTOSPELL="自动检查拼写(&A)"
-MENU_LABEL_TOOLS_HISTORY="文件历史(&D)"
+MENU_LABEL_TOOLS_HISTORY="文档历史(&D)"
MENU_LABEL_TOOLS_HISTORY_PURGE="删除历史(&P)"
MENU_LABEL_TOOLS_HISTORY_SHOW="显示历史(&S)"
MENU_LABEL_TOOLS_LANGUAGE="语言(&L)"
@@ -1315,14 +1327,13 @@
MENU_LABEL_TOOLS_REVISIONS_ACCEPT_REVISION="接受修订(&A)"
MENU_LABEL_TOOLS_REVISIONS_AUTO="保存全部历史(&M)"
MENU_LABEL_TOOLS_REVISIONS_COMPARE_DOCUMENTS="比较文件(&C)"
-MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT="查找下一个修正"
-MENU_LABEL_TOOLS_REVISIONS_FIND_PREV="查找上一个修正"
-MENU_LABEL_TOOLS_REVISIONS_MARK="输入时检查(&M)"
-MENU_LABEL_TOOLS_REVISIONS_MERGE_DOCUMENTS="合并文件(&E)"
+MENU_LABEL_TOOLS_REVISIONS_FIND_NEXT="查找下一个修订"
+MENU_LABEL_TOOLS_REVISIONS_FIND_PREV="查找上一个修订"
+MENU_LABEL_TOOLS_REVISIONS_MARK="输入时标记修订(&M)"
MENU_LABEL_TOOLS_REVISIONS_NEW_REVISION="开始新修订版(&W)"
-MENU_LABEL_TOOLS_REVISIONS_PURGE="清理修正(&U)"
-MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION="放弃修正(&R)"
-MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL="选择修正(&S)"
+MENU_LABEL_TOOLS_REVISIONS_PURGE="清理修订(&U)"
+MENU_LABEL_TOOLS_REVISIONS_REJECT_REVISION="放弃修订(&R)"
+MENU_LABEL_TOOLS_REVISIONS_SET_VIEW_LEVEL="选择修订(&S)"
MENU_LABEL_TOOLS_REVISIONS_SHOW="显示修订(&H)"
MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTER="显示修订后的文档(&F)"
MENU_LABEL_TOOLS_REVISIONS_SHOW_AFTERPREV="显示前一次修正后的文档(&P)"
@@ -1335,22 +1346,22 @@
MENU_LABEL_TOOLTIP_INSERT_EQUATION="插入公式"
MENU_LABEL_TOOLTIP_INSERT_EQUATION_FILE="从文件中插入MathML公式"
MENU_LABEL_TOOLTIP_INSERT_EQUATION_LATEX="从LaTeX中插入公式"
-MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT="恢复到默认的模式(&R)"
+MENU_LABEL_VIEW_DEFAULT_TB_LAYOUT="恢复到默认的布局(&R)"
MENU_LABEL_VIEW_FULLSCREEN="全屏幕(&U)"
MENU_LABEL_VIEW_HEADFOOT="页眉/页脚(&H)"
-MENU_LABEL_VIEW_LOCKSTYLES="启动格式化工具(&F)"
+MENU_LABEL_VIEW_LOCKSTYLES="启用格式化工具(&F)"
MENU_LABEL_VIEW_LOCK_TB_LAYOUT="版面设定(&L)"
-MENU_LABEL_VIEW_NORMAL="标准模式(&N)"
-MENU_LABEL_VIEW_PRINT="打印模式(&P)"
+MENU_LABEL_VIEW_NORMAL="标准布局(&N)"
+MENU_LABEL_VIEW_PRINT="打印布局(&P)"
MENU_LABEL_VIEW_RULER="显示标尺(&R)"
MENU_LABEL_VIEW_SHOWPARA="显示格式标记(&F)"
-MENU_LABEL_VIEW_STATUSBAR="显示状态列(&S)"
+MENU_LABEL_VIEW_STATUSBAR="显示状态行(&S)"
MENU_LABEL_VIEW_TB_1="(&1) %s"
MENU_LABEL_VIEW_TB_2="(&2) %s"
MENU_LABEL_VIEW_TB_3="(&3) %s"
MENU_LABEL_VIEW_TB_4="(&4) %s"
MENU_LABEL_VIEW_TOOLBARS="工具栏(&T)"
-MENU_LABEL_VIEW_WEB="网页模式(&W)"
+MENU_LABEL_VIEW_WEB="网页布局(&W)"
MENU_LABEL_VIEW_ZOOM="缩放(&Z)"
MENU_LABEL_VIEW_ZOOM_100="缩放至 &100%"
MENU_LABEL_VIEW_ZOOM_200="缩放至 &200%"
@@ -1371,7 +1382,7 @@
MENU_LABEL_WINDOW_7="(&7) %s"
MENU_LABEL_WINDOW_8="(&8) %s"
MENU_LABEL_WINDOW_9="(&9) %s"
-MENU_LABEL_WINDOW_MORE="其他文件(&M)"
+MENU_LABEL_WINDOW_MORE="更多文件(&M)"
MENU_LABEL_WINDOW_NEW="新窗口(&N)"
MENU_LABEL__BOGUS1__=" "
MENU_LABEL__BOGUS2__=" "
@@ -1386,37 +1397,37 @@
MENU_STATUSLINE_EDIT_COPYEMBED="复制嵌入对象"
MENU_STATUSLINE_EDIT_COPYIMAGE="保存图像备份到剪贴板"
MENU_STATUSLINE_EDIT_COPY_FRAME="复制文本框到剪贴板"
-MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION="复制超级链接地址"
+MENU_STATUSLINE_EDIT_COPY_HYPERLINK_LOCATION="复制超链接地址"
MENU_STATUSLINE_EDIT_CUT="剪切到剪贴板"
MENU_STATUSLINE_EDIT_CUTEMBED="剪切嵌入对象"
-MENU_STATUSLINE_EDIT_CUTIMAGE="移除图像并备份到剪贴板中"
+MENU_STATUSLINE_EDIT_CUTIMAGE="删除图像并备份到剪贴板中"
MENU_STATUSLINE_EDIT_CUT_FRAME="剪切文本框"
MENU_STATUSLINE_EDIT_DELETEEMBED="删除嵌入对象"
-MENU_STATUSLINE_EDIT_DELETEFRAME="将此文本框从文件中移除"
-MENU_STATUSLINE_EDIT_DELETEIMAGE="将此图像从文件中移除"
+MENU_STATUSLINE_EDIT_DELETEFRAME="将此文本框从文件中删除"
+MENU_STATUSLINE_EDIT_DELETEIMAGE="将此图像从文件中删除"
MENU_STATUSLINE_EDIT_EDITFOOTER="编辑本页的页脚"
MENU_STATUSLINE_EDIT_EDITHEADER="编辑本页的页眉"
-MENU_STATUSLINE_EDIT_FIND="搜寻特定的文字"
+MENU_STATUSLINE_EDIT_FIND="查找特定的文字"
MENU_STATUSLINE_EDIT_GOTO="跳到新的插入点"
MENU_STATUSLINE_EDIT_LATEXEQUATION="编辑Latex公式"
MENU_STATUSLINE_EDIT_PASTE="将剪贴板上的内容贴到工作区"
MENU_STATUSLINE_EDIT_PASTE_SPECIAL="插入未格式化的剪贴板内容"
MENU_STATUSLINE_EDIT_REDO="重做以前复原了的编辑"
-MENU_STATUSLINE_EDIT_REMOVEFOOTER="把本页的页脚从文件中移除"
-MENU_STATUSLINE_EDIT_REMOVEHEADER="把本页的页眉从文件中移除"
-MENU_STATUSLINE_EDIT_REPLACE="替换此文本为其它文本"
+MENU_STATUSLINE_EDIT_REMOVEFOOTER="把本页的页脚从文件中删除"
+MENU_STATUSLINE_EDIT_REMOVEHEADER="把本页的页眉从文件中删除"
+MENU_STATUSLINE_EDIT_REPLACE="将此文本替换为其它文本"
MENU_STATUSLINE_EDIT_SELECTALL="选取整个文件"
MENU_STATUSLINE_EDIT_SELECT_FRAME="选取文本框"
MENU_STATUSLINE_EDIT_UNDO="取消修改"
MENU_STATUSLINE_FILE=" "
-MENU_STATUSLINE_FILE_CLOSE="关闭此文件"
+MENU_STATUSLINE_FILE_CLOSE="关闭此文档"
MENU_STATUSLINE_FILE_EXIT="关闭这个应用程序所有窗口并离开"
MENU_STATUSLINE_FILE_EXPORT="以原来的文件名称保存文件"
MENU_STATUSLINE_FILE_IMPORT="以副本打开新文件"
MENU_STATUSLINE_FILE_IMPORTSTYLES="从文件中导入样式定义"
MENU_STATUSLINE_FILE_NEW="新建文件"
MENU_STATUSLINE_FILE_NEW_USING_TEMPLATE="从模板新建文件"
-MENU_STATUSLINE_FILE_OPEN="打开已存在的文件"
+MENU_STATUSLINE_FILE_OPEN="打开已有文件"
MENU_STATUSLINE_FILE_PAGESETUP="改变打印选项"
MENU_STATUSLINE_FILE_PRINT="打印文件或其部份"
MENU_STATUSLINE_FILE_PRINT_DIRECTLY="使用内部的 PS 驱动程序打印"
@@ -1432,7 +1443,7 @@
MENU_STATUSLINE_FILE_RECENT_7="打开这份文件"
MENU_STATUSLINE_FILE_RECENT_8="打开这份文件"
MENU_STATUSLINE_FILE_RECENT_9="打开这份文件"
-MENU_STATUSLINE_FILE_REVERT="把文件恢复至上一次保存时的状态"
+MENU_STATUSLINE_FILE_REVERT="把文件恢复至上一次保存的状态"
MENU_STATUSLINE_FILE_SAVE="保存这份文件"
MENU_STATUSLINE_FILE_SAVEAS="将文件换名保存"
MENU_STATUSLINE_FILE_SAVEEMBED="保存嵌入对象"
@@ -1446,7 +1457,7 @@
MENU_STATUSLINE_FMT_BORDERS="向选定的区域添加边框及底纹设定"
MENU_STATUSLINE_FMT_BOTTOMLINE="选区内加行底线 (切换)"
MENU_STATUSLINE_FMT_BULLETS="在选中的段落中增加或修改项目符号和编号"
-MENU_STATUSLINE_FMT_COLUMNS="改变字段数"
+MENU_STATUSLINE_FMT_COLUMNS="改变栏数"
MENU_STATUSLINE_FMT_DIRECTION="改变文本的方向"
MENU_STATUSLINE_FMT_DIRECTION_DD_RTL="把本段落文字方向改为右到左"
MENU_STATUSLINE_FMT_DIRECTION_DOCD_RTL="把本文档文本方向改为右到左"
@@ -1455,26 +1466,26 @@
MENU_STATUSLINE_FMT_DIRECTION_SD_RTL="把本节文字方向改为右到左"
MENU_STATUSLINE_FMT_DOCUMENT="设定您的文件的版面属性,例如纸张大小和边界"
MENU_STATUSLINE_FMT_EMBED="格式化嵌入对象"
-MENU_STATUSLINE_FMT_FONT="改变已选文字的字型"
+MENU_STATUSLINE_FMT_FONT="改变选中文字的字体"
MENU_STATUSLINE_FMT_FOOTNOTES="设定脚注及尾注类型"
MENU_STATUSLINE_FMT_FRAME="改变文本框的属性"
MENU_STATUSLINE_FMT_HDRFTR="设定页眉及页脚类型"
MENU_STATUSLINE_FMT_IMAGE="改变这个图像的大小"
MENU_STATUSLINE_FMT_ITALIC="使选取区字体变斜 (切换)"
-MENU_STATUSLINE_FMT_LANGUAGE="改变已选文字的语言"
+MENU_STATUSLINE_FMT_LANGUAGE="改变选中文字的语言"
MENU_STATUSLINE_FMT_OVERLINE="在选取区加入上标线 (切换)"
-MENU_STATUSLINE_FMT_PARAGRAPH="改变已选段落的格式"
+MENU_STATUSLINE_FMT_PARAGRAPH="改变选中段落的格式"
MENU_STATUSLINE_FMT_POSIMAGE="设定这个图像格式"
MENU_STATUSLINE_FMT_SETPOSIMAGE="固定本图片"
MENU_STATUSLINE_FMT_STRIKE="为选取区文字加删除线 (切换)"
-MENU_STATUSLINE_FMT_STYLE="为选取区文字定义或套用样式"
-MENU_STATUSLINE_FMT_STYLE_DEFINE="为选取区文字定义或套用样式"
+MENU_STATUSLINE_FMT_STYLE="为选中文字定义或应用样式"
+MENU_STATUSLINE_FMT_STYLE_DEFINE="为选中文字定义或应用样式"
MENU_STATUSLINE_FMT_STYLIST="用样式设定你的文件"
MENU_STATUSLINE_FMT_SUBSCRIPT="使选取区文字成为下标字 (切换)"
MENU_STATUSLINE_FMT_SUPERSCRIPT="使选取区文字成为上标字 (切换)"
MENU_STATUSLINE_FMT_TABLEOFCONTENTS="设定目录类型及样式"
MENU_STATUSLINE_FMT_TABS="设定制表符"
-MENU_STATUSLINE_FMT_TOGGLECASE="改变已选文字的大小写"
+MENU_STATUSLINE_FMT_TOGGLECASE="改变选中文字的大小写"
MENU_STATUSLINE_FMT_TOPLINE="选区内加行顶线 (切换)"
MENU_STATUSLINE_FMT_UNDERLINE="在选取区加下划线(切换)"
MENU_STATUSLINE_FORMAT=" "
@@ -1488,6 +1499,7 @@
MENU_STATUSLINE_HELP_REPORT_BUG="报告程序错误,让AbiWord做得更好"
MENU_STATUSLINE_HELP_SEARCH="在帮助中搜寻相关内容..."
MENU_STATUSLINE_INSERT=" "
+MENU_STATUSLINE_INSERT_ANNOTATION="插入注解"
MENU_STATUSLINE_INSERT_BOOKMARK="插入书签"
MENU_STATUSLINE_INSERT_BREAK="插入一个分页符、分栏符或分节符"
MENU_STATUSLINE_INSERT_CLIPART="插入美工图案"
@@ -1502,7 +1514,7 @@
MENU_STATUSLINE_INSERT_FILE="插入另一个文件的内容目录"
MENU_STATUSLINE_INSERT_FOOTER="插入页脚"
MENU_STATUSLINE_INSERT_FOOTNOTE="插入脚注"
-MENU_STATUSLINE_INSERT_GOTO_HYPERLINK="转到超级链接"
+MENU_STATUSLINE_INSERT_GOTO_HYPERLINK="转到超链接"
MENU_STATUSLINE_INSERT_GRAPHIC="插入现有的文件中图片"
MENU_STATUSLINE_INSERT_HEADER="插入页眉"
MENU_STATUSLINE_INSERT_HYPERLINK="插入超级链接"
@@ -1533,7 +1545,7 @@
MENU_STATUSLINE_TABLE_DELETE_TABLE="删除表格"
MENU_STATUSLINE_TABLE_FORMAT="设定表格格式"
MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT="换页时重复此行作为标题"
-MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE="移除本页首行"
+MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_REMOVE="删除本页首行"
MENU_STATUSLINE_TABLE_HEADING_ROWS_REPEAT_THIS="把这一行设定为每一页出现的表格标题"
MENU_STATUSLINE_TABLE_INSERTCOLUMN="插入一列到右边"
MENU_STATUSLINE_TABLE_INSERTROW="向下插入行"
@@ -1559,18 +1571,18 @@
MENU_STATUSLINE_TABLE_SPLIT_CELLS="拆分单元格"
MENU_STATUSLINE_TABLE_SPLIT_TABLE="拆分表格"
MENU_STATUSLINE_TABLE_TABLETOTEXT="从表格转换到文本"
-MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS="依逗号分割表格项目"
-MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS="依逗号和标签分割表格项目"
-MENU_STATUSLINE_TABLE_TABLETOTEXTTABS="依标签分割表格项目"
+MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMAS="以逗号分隔表格项目"
+MENU_STATUSLINE_TABLE_TABLETOTEXTCOMMASTABS="以逗号和标签分隔表格项目"
+MENU_STATUSLINE_TABLE_TABLETOTEXTTABS="以制表符分隔表格项目"
MENU_STATUSLINE_TABLE_TEXTTOTABLE="将选中的文本转换为表格"
MENU_STATUSLINE_TABLE_TEXTTOTABLE_ALL="拆分所有的边界(包括空格)"
MENU_STATUSLINE_TABLE_TEXTTOTABLE_NOSPACES="拆分所有的边界(除了空格)"
MENU_STATUSLINE_TOOLS=" "
MENU_STATUSLINE_TOOLS_AUTOSPELL="自动为文件检查拼写"
MENU_STATUSLINE_TOOLS_HISTORY="查看当前文件的历史"
-MENU_STATUSLINE_TOOLS_HISTORY_PURGE="从文件中移除文档全部历史"
+MENU_STATUSLINE_TOOLS_HISTORY_PURGE="从文件中删除文档全部历史"
MENU_STATUSLINE_TOOLS_HISTORY_SHOW="查看文档历史"
-MENU_STATUSLINE_TOOLS_LANGUAGE="改变已选文字的语言"
+MENU_STATUSLINE_TOOLS_LANGUAGE="改变选中文字的语言"
MENU_STATUSLINE_TOOLS_MAILMERGE="邮件合并"
MENU_STATUSLINE_TOOLS_OPTIONS="设定偏好"
MENU_STATUSLINE_TOOLS_PLUGINS="管理插件"
@@ -1578,13 +1590,13 @@
MENU_STATUSLINE_TOOLS_REVISIONS_ACCEPT_REVISION="接受建议的更改"
MENU_STATUSLINE_TOOLS_REVISIONS_AUTO="保留每一页的更改"
MENU_STATUSLINE_TOOLS_REVISIONS_COMPARE_DOCUMENTS="把当前文件与另一文件进行比较"
-MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT="查找文件中下一个明显修正"
-MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV="查找文件中上一个明显修正"
+MENU_STATUSLINE_TOOLS_REVISIONS_FIND_NEXT="查找文件中下一个可见修订"
+MENU_STATUSLINE_TOOLS_REVISIONS_FIND_PREV="查找文件中上一个可见修订"
MENU_STATUSLINE_TOOLS_REVISIONS_MARK="输入时标记修订"
MENU_STATUSLINE_TOOLS_REVISIONS_MERGE_DOCUMENTS="把另外的文件合并到当前文件"
MENU_STATUSLINE_TOOLS_REVISIONS_NEW_REVISION="从当前的文本进行严谨的检查"
-MENU_STATUSLINE_TOOLS_REVISIONS_PURGE="移除文档中所有的修订信息"
-MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION="移除这个建议的更改"
+MENU_STATUSLINE_TOOLS_REVISIONS_PURGE="删除文档中的所有修订信息"
+MENU_STATUSLINE_TOOLS_REVISIONS_REJECT_REVISION="删除这个建议的更改"
MENU_STATUSLINE_TOOLS_REVISIONS_SET_VIEW_LEVEL="选择哪一个你要看的修正"
MENU_STATUSLINE_TOOLS_REVISIONS_SHOW="显示现在在文档中的修正"
MENU_STATUSLINE_TOOLS_REVISIONS_SHOW_AFTER="显示修正后的文档的样子"
@@ -1596,10 +1608,10 @@
MENU_STATUSLINE_TOOLS_SPELLPREFS="设定您的拼写检查偏好"
MENU_STATUSLINE_TOOLS_WORDCOUNT="计算本篇文章的字数"
MENU_STATUSLINE_VIEW=" "
-MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT="恢复工具栏的默认设置"
+MENU_STATUSLINE_VIEW_DEFAULT_TB_LAYOUT="恢复工具栏的默认布局"
MENU_STATUSLINE_VIEW_FULLSCREEN="以全屏幕模式查看文件"
MENU_STATUSLINE_VIEW_HEADFOOT="编辑每一页的页眉/页脚"
-MENU_STATUSLINE_VIEW_LOCKSTYLES="允许只用样式格式化"
+MENU_STATUSLINE_VIEW_LOCKSTYLES="允许只用样式进行格式化"
MENU_STATUSLINE_VIEW_LOCK_TB_LAYOUT="锁定当前工具栏的布局"
MENU_STATUSLINE_VIEW_NORMAL="标准查看模式"
MENU_STATUSLINE_VIEW_PRINT="打印模式"
@@ -1638,20 +1650,20 @@
MENU_STATUSLINE__BOGUS2__=" "
MSG_AfterRestartNew="这项变更要等到您重新启动 AbiWord 或打开新文件后才会生效。"
MSG_AutoMerge="自动合并"
-MSG_AutoRevisionOffWarning="你确认你不想保存全部的历史记录吗?如果你这样执行,你就不能够还原这个文档。"
-MSG_BookmarkNotFound="在这份文件中找不到书签 "%s""
-MSG_CHECK_PRINT_MODE="页眉和页脚只能在打印模式中编辑
要进入这种模式,从菜单中选择查看->打印模式。
你现在要进入打印模式吗?"
+MSG_AutoRevisionOffWarning="你确认不想保存全部的历史记录吗?如果你这样执行,你就不能将这个文档还原至早期版本。"
+MSG_BookmarkNotFound="在文档中找不到书签 "%s""
+MSG_CHECK_PRINT_MODE="页眉和页脚只能在打印视图中创建和编辑
要进入这种模式,从菜单中选择查看->打印布局。
你现在要进入打印模式吗?"
MSG_ConfirmSave="关闭文档 %s 之前保存?"
MSG_ConfirmSaveSecondary="如果你不保存你的修改,他们将会丢失。"
MSG_DefaultDirectionChg="您已改变了预设方向"
MSG_DirectionModeChg="您已改变了方向模式"
-MSG_DlgNotImp="%s 功能尚未写好。
如果您是一位程序设计师,欢迎您在 %s,第 %d 行加入程序代码,
并把补丁寄到:
\tabiword-dev@abisource.com
否则,请您耐心等待了。"
+MSG_DlgNotImp="%s 功能尚未实现。
如果您是一位程序员,欢迎您在 %s,第 %d 行加入程序代码,
并把补丁寄到:
\tabiword-dev@abisource.com
否则,还请您耐心等待。"
MSG_EmptySelection="当前选择为空"
-MSG_Exception="发生致命错误,Abiword将要关闭了。
当前的文档已经被保存到了一".saved"扩展的文件。"
-MSG_HiddenRevisions="这份文件包含有隐藏的修正。请参阅AbiWord关于处理修正的文档。"
-MSG_HyperlinkCrossesBoundaries="超级链接所依附的文字必须在一段之内。"
+MSG_Exception="发生致命错误,Abiword将要关闭了。
当前的文档已经被保存到一个扩展名为".saved"的文件。"
+MSG_HiddenRevisions="这份文件包含有隐藏的修订。请参阅AbiWord关于处理修订的文档。"
+MSG_HyperlinkCrossesBoundaries="超链接所依附的文字必须在一段之内。"
MSG_HyperlinkNoBookmark="警告: 您提供的书签 [%s] 并不存在。"
-MSG_HyperlinkNoSelection="您插入超级链接之前必须先选择文件的一部份。"
+MSG_HyperlinkNoSelection="您插入超链接之前必须先选择文件的一部份。"
MSG_IE_BogusDocument="AbiWord 不能打开 %s,它可能是一个无效的文件"
MSG_IE_CouldNotOpen="不能打开%s 进行写入"
MSG_IE_CouldNotWrite="不能写入文件 %s "
@@ -1661,7 +1673,6 @@
MSG_IE_UnknownType="文件 %s 类型不明"
MSG_IE_UnsupportedType="文件 %s 不属于目前支持的文件类型"
MSG_ImportError="导入文件 %s 发生错误。"
-MSG_MergeDocsNotRelated="您尝试合并的文件并不相关. AbiWord将尝试 合并它们,但是结果可能没有意义。"
MSG_NoBreakInsideFrame="在文字框中无法插入间隔"
MSG_NoBreakInsideTable="在表格中无法插入间隔"
MSG_OpenFailed="不能打开文件 %s 。"
@@ -1672,16 +1683,17 @@
MSG_RevertFile="把文件恢复到上次保存的状态?"
MSG_SaveFailed="不能写入文件 %s 。"
MSG_SaveFailedExport="保存 %s 时发生错误: 不能构建导出器"
-MSG_SaveFailedName="保存 %s 时发生错误: 档名无效"
+MSG_SaveFailedName="保存 %s 时发生错误: 文档名无效"
MSG_SaveFailedWrite="保存 %s 时发生写入错误"
-MSG_SpellDone="拼写检查已经完成了。"
+MSG_SpellDone="拼写检查完成。"
MSG_SpellSelectionDone="AbiWord完成检查选中的部分。"
-PRINT_CANNOTSTARTPRINTJOB="不能开始打印工作"
+PRINT_CANNOTSTARTPRINTJOB="不能开始打印任务"
PageInfoField="第 %d 页 共 %d 页"
RightIndentStatus="右缩进 [%s]"
RightMarginStatus="右边界 [%s]"
SCRIPT_CANTRUN="执行 %s 脚本时发生错误"
SCRIPT_NOSCRIPTS="找不到任何脚本"
+TB_Embedded="嵌入"
TB_Extra="额外"
TB_Format="格式"
TB_Simple="简单"
@@ -1707,8 +1719,8 @@
TOOLBAR_LABEL_EDIT_HEADER="编辑页眉"
TOOLBAR_LABEL_EDIT_PASTE="粘贴"
TOOLBAR_LABEL_EDIT_REDO="重做"
-TOOLBAR_LABEL_EDIT_REMOVEFOOTER="移除页脚"
-TOOLBAR_LABEL_EDIT_REMOVEHEADER="移除页眉"
+TOOLBAR_LABEL_EDIT_REMOVEFOOTER="删除页脚"
+TOOLBAR_LABEL_EDIT_REMOVEHEADER="删除页眉"
TOOLBAR_LABEL_EDIT_UNDO="撤销"
TOOLBAR_LABEL_FILE_NEW="新建"
TOOLBAR_LABEL_FILE_OPEN="打开"
@@ -1731,6 +1743,7 @@
TOOLBAR_LABEL_INSERT_TABLE="插入表格"
TOOLBAR_LABEL_LISTS_BULLETS="项目符号"
TOOLBAR_LABEL_LISTS_NUMBERS="项目编号"
+TOOLBAR_LABEL_MENU="菜单"
TOOLBAR_LABEL_MERGEABOVE="向上合并"
TOOLBAR_LABEL_MERGEBELOW="向下合并"
TOOLBAR_LABEL_MERGELEFT="向左合并"
@@ -1749,8 +1762,8 @@
TOOLBAR_STATUSLINE_1COLUMN="一栏"
TOOLBAR_STATUSLINE_2COLUMN="二栏"
TOOLBAR_STATUSLINE_3COLUMN="三栏"
-TOOLBAR_STATUSLINE_ADD_COLUMN="在当前列后向这个表格添加一列"
-TOOLBAR_STATUSLINE_ADD_ROW="在当前行后向这个表格添加一行"
+TOOLBAR_STATUSLINE_ADD_COLUMN="在表格的当前列后添加一列"
+TOOLBAR_STATUSLINE_ADD_ROW="在表格的当前行后添加一行"
TOOLBAR_STATUSLINE_ALIGN_CENTER="居中对齐"
TOOLBAR_STATUSLINE_ALIGN_JUSTIFY="段落左右对齐"
TOOLBAR_STATUSLINE_ALIGN_LEFT="左对齐"
@@ -1765,17 +1778,17 @@
TOOLBAR_STATUSLINE_EDIT_FOOTER="编辑页脚"
TOOLBAR_STATUSLINE_EDIT_HEADER="编辑页眉"
TOOLBAR_STATUSLINE_EDIT_PASTE="粘贴"
-TOOLBAR_STATUSLINE_EDIT_REDO="复原编辑"
-TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER="移除页脚"
-TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER="移除页眉"
+TOOLBAR_STATUSLINE_EDIT_REDO="重做编辑"
+TOOLBAR_STATUSLINE_EDIT_REMOVEFOOTER="删除页脚"
+TOOLBAR_STATUSLINE_EDIT_REMOVEHEADER="删除页眉"
TOOLBAR_STATUSLINE_EDIT_UNDO="取消修改"
TOOLBAR_STATUSLINE_FILE_NEW="新建文件"
-TOOLBAR_STATUSLINE_FILE_OPEN="打开已存在的文件"
+TOOLBAR_STATUSLINE_FILE_OPEN="打开已有文件"
TOOLBAR_STATUSLINE_FILE_PRINT="打印文件"
TOOLBAR_STATUSLINE_FILE_PRINT_PREVIEW="打印前先预览文件"
TOOLBAR_STATUSLINE_FILE_SAVE="保存这份文件"
TOOLBAR_STATUSLINE_FILE_SAVEAS="将文件换名保存"
-TOOLBAR_STATUSLINE_FMTPAINTER="把原来复制的文段覆盖选中的文字"
+TOOLBAR_STATUSLINE_FMTPAINTER="将之前复制文段的格式应用于选中的文字"
TOOLBAR_STATUSLINE_FMT_BOOKMARK="插入书签到文件"
TOOLBAR_STATUSLINE_FMT_CHOOSE="选择字体"
TOOLBAR_STATUSLINE_FMT_DIR_OVERRIDE_LTR="强制文字从左到右方向"
@@ -1791,6 +1804,7 @@
TOOLBAR_STATUSLINE_INSERT_TABLE="在文件中新建表格"
TOOLBAR_STATUSLINE_LISTS_BULLETS="项目符号"
TOOLBAR_STATUSLINE_LISTS_NUMBERS="项目编号"
+TOOLBAR_STATUSLINE_MENU="菜单"
TOOLBAR_STATUSLINE_MERGEABOVE="和上面的单元格合并"
TOOLBAR_STATUSLINE_MERGEBELOW="和下面的单元格合并"
TOOLBAR_STATUSLINE_MERGELEFT="和左边的单元格合并"
@@ -1809,8 +1823,8 @@
TOOLBAR_TOOLTIP_1COLUMN="一栏"
TOOLBAR_TOOLTIP_2COLUMN="二栏"
TOOLBAR_TOOLTIP_3COLUMN="三栏"
-TOOLBAR_TOOLTIP_ADD_COLUMN="在当前列后向这个表格添加一列"
-TOOLBAR_TOOLTIP_ADD_ROW="在当前行后向这个表格添加一行"
+TOOLBAR_TOOLTIP_ADD_COLUMN="在表格的当前列后添加一列"
+TOOLBAR_TOOLTIP_ADD_ROW="在表格的当前行后添加一行"
TOOLBAR_TOOLTIP_ALIGN_CENTER="居中对齐"
TOOLBAR_TOOLTIP_ALIGN_JUSTIFY="段落左右对齐"
TOOLBAR_TOOLTIP_ALIGN_LEFT="左对齐"
@@ -1825,17 +1839,17 @@
TOOLBAR_TOOLTIP_EDIT_FOOTER="编辑页脚"
TOOLBAR_TOOLTIP_EDIT_HEADER="编辑页眉"
TOOLBAR_TOOLTIP_EDIT_PASTE="粘贴"
-TOOLBAR_TOOLTIP_EDIT_REDO="复原编辑"
-TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER="移除页脚"
-TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER="移除页眉"
+TOOLBAR_TOOLTIP_EDIT_REDO="重做编辑"
+TOOLBAR_TOOLTIP_EDIT_REMOVEFOOTER="删除页脚"
+TOOLBAR_TOOLTIP_EDIT_REMOVEHEADER="删除页眉"
TOOLBAR_TOOLTIP_EDIT_UNDO="取消修改"
TOOLBAR_TOOLTIP_FILE_NEW="新建文件"
-TOOLBAR_TOOLTIP_FILE_OPEN="打开已存在的文件"
+TOOLBAR_TOOLTIP_FILE_OPEN="打开已有文件"
TOOLBAR_TOOLTIP_FILE_PRINT="打印文件"
TOOLBAR_TOOLTIP_FILE_PRINT_PREVIEW="打印前先预览文件"
TOOLBAR_TOOLTIP_FILE_SAVE="保存这份文件"
TOOLBAR_TOOLTIP_FILE_SAVEAS="将文件换名保存"
-TOOLBAR_TOOLTIP_FMTPAINTER="把原来复制的文段覆盖选中的文字"
+TOOLBAR_TOOLTIP_FMTPAINTER="将之前复制文段的格式应用于选中的文字"
TOOLBAR_TOOLTIP_FMT_BOOKMARK="插入书签到文件"
TOOLBAR_TOOLTIP_FMT_CHOOSE="选择字体"
TOOLBAR_TOOLTIP_FMT_DIR_OVERRIDE_LTR="强制文字从左到右方向"
@@ -1851,6 +1865,7 @@
TOOLBAR_TOOLTIP_INSERT_TABLE="在文件中新建表格"
TOOLBAR_TOOLTIP_LISTS_BULLETS="项目符号"
TOOLBAR_TOOLTIP_LISTS_NUMBERS="项目编号"
+TOOLBAR_TOOLTIP_MENU="菜单"
TOOLBAR_TOOLTIP_MERGEABOVE="和上面的单元格合并"
TOOLBAR_TOOLTIP_MERGEBELOW="和下面的单元格合并"
TOOLBAR_TOOLTIP_MERGELEFT="和左边的单元格合并"
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword/user/wp/templates/normal.awt-de_CH /tmp/qY2gb79Nml/abiword-2.6.4/abiword/user/wp/templates/normal.awt-de_CH
--- abiword-2.6.2/abiword/user/wp/templates/normal.awt-de_CH 2008-04-06 17:00:58.000000000 +0100
+++ abiword-2.6.4/abiword/user/wp/templates/normal.awt-de_CH 2008-07-13 14:11:00.000000000 +0100
@@ -1,6 +1,6 @@
-
+
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-docs/configure /tmp/qY2gb79Nml/abiword-2.6.4/abiword-docs/configure
--- abiword-2.6.2/abiword-docs/configure 2008-04-06 22:25:40.000000000 +0100
+++ abiword-2.6.4/abiword-docs/configure 2008-07-13 14:09:50.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for abiword-docs 2.6.2.
+# Generated by GNU Autoconf 2.61 for abiword-docs 2.6.4.
#
# Report bugs to .
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='abiword-docs'
PACKAGE_TARNAME='abiword-docs'
-PACKAGE_VERSION='2.6.2'
-PACKAGE_STRING='abiword-docs 2.6.2'
+PACKAGE_VERSION='2.6.4'
+PACKAGE_STRING='abiword-docs 2.6.4'
PACKAGE_BUGREPORT='http://www.abisource.com/'
ac_subst_vars='SHELL
@@ -1154,7 +1154,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures abiword-docs 2.6.2 to adapt to many kinds of systems.
+\`configure' configures abiword-docs 2.6.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1220,7 +1220,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of abiword-docs 2.6.2:";;
+ short | recursive ) echo "Configuration of abiword-docs 2.6.4:";;
esac
cat <<\_ACEOF
@@ -1296,7 +1296,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-abiword-docs configure 2.6.2
+abiword-docs configure 2.6.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1310,7 +1310,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by abiword-docs $as_me 2.6.2, which was
+It was created by abiword-docs $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2000,7 +2000,7 @@
# Define the identity of the package.
PACKAGE='abiword-docs'
- VERSION='2.6.2'
+ VERSION='2.6.4'
cat >>confdefs.h <<_ACEOF
@@ -2857,7 +2857,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by abiword-docs $as_me 2.6.2, which was
+This file was extended by abiword-docs $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2900,7 +2900,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-abiword-docs config.status 2.6.2
+abiword-docs config.status 2.6.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-docs/configure.ac /tmp/qY2gb79Nml/abiword-2.6.4/abiword-docs/configure.ac
--- abiword-2.6.2/abiword-docs/configure.ac 2008-04-06 22:24:07.000000000 +0100
+++ abiword-2.6.4/abiword-docs/configure.ac 2008-07-13 13:05:31.000000000 +0100
@@ -1,5 +1,5 @@
-AC_INIT([abiword-docs],[2.6.2],[http://www.abisource.com/])
+AC_INIT([abiword-docs],[2.6.4],[http://www.abisource.com/])
AM_INIT_AUTOMAKE
PKG_PROG_PKG_CONFIG
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-extras/aclocal.m4 /tmp/qY2gb79Nml/abiword-2.6.4/abiword-extras/aclocal.m4
--- abiword-2.6.2/abiword-extras/aclocal.m4 2008-07-18 04:24:34.000000000 +0100
+++ abiword-2.6.4/abiword-extras/aclocal.m4 2008-07-13 13:07:33.000000000 +0100
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,10 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.61],,
-[m4_warning([this file was generated for autoconf 2.61.
-You have another version of autoconf. It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
#
@@ -177,7 +174,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -192,7 +189,7 @@
[am__api_version='1.10'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.10], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -208,10 +205,8 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
@@ -483,7 +478,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`AS_DIRNAME("$mf")`
else
continue
@@ -531,13 +526,13 @@
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
+# 2005, 2006 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 13
+# serial 12
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -642,17 +637,16 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
-_am_arg=$1
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $_am_arg | $_am_arg:* )
+ $1 | $1:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
@@ -924,7 +918,7 @@
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-extras/clipart/Makefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-extras/clipart/Makefile.in
--- abiword-2.6.2/abiword-extras/clipart/Makefile.in 2008-07-18 04:24:34.000000000 +0100
+++ abiword-2.6.4/abiword-extras/clipart/Makefile.in 2008-07-13 14:09:48.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-extras/configure /tmp/qY2gb79Nml/abiword-2.6.4/abiword-extras/configure
--- abiword-2.6.2/abiword-extras/configure 2008-07-18 04:24:34.000000000 +0100
+++ abiword-2.6.4/abiword-extras/configure 2008-07-13 14:09:50.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for abiword-extras 2.6.2.
+# Generated by GNU Autoconf 2.61 for abiword-extras 2.6.4.
#
# Report bugs to .
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='abiword-extras'
PACKAGE_TARNAME='abiword-extras'
-PACKAGE_VERSION='2.6.2'
-PACKAGE_STRING='abiword-extras 2.6.2'
+PACKAGE_VERSION='2.6.4'
+PACKAGE_STRING='abiword-extras 2.6.4'
PACKAGE_BUGREPORT='http://www.abisource.com/'
# Factoring default headers for most tests.
@@ -1215,7 +1215,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures abiword-extras 2.6.2 to adapt to many kinds of systems.
+\`configure' configures abiword-extras 2.6.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1281,7 +1281,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of abiword-extras 2.6.2:";;
+ short | recursive ) echo "Configuration of abiword-extras 2.6.4:";;
esac
cat <<\_ACEOF
@@ -1370,7 +1370,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-abiword-extras configure 2.6.2
+abiword-extras configure 2.6.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1384,7 +1384,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by abiword-extras $as_me 2.6.2, which was
+It was created by abiword-extras $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2074,7 +2074,7 @@
# Define the identity of the package.
PACKAGE='abiword-extras'
- VERSION='2.6.2'
+ VERSION='2.6.4'
cat >>confdefs.h <<_ACEOF
@@ -4312,7 +4312,7 @@
fi
-abi_pkg='abiword'
+abi_pkg='abiword-2.6'
pkg_failed=no
{ echo "$as_me:$LINENO: checking for ABIWORD_EXTRAS_DEPS" >&5
@@ -4877,7 +4877,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by abiword-extras $as_me 2.6.2, which was
+This file was extended by abiword-extras $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4924,7 +4924,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-abiword-extras config.status 2.6.2
+abiword-extras config.status 2.6.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -5505,7 +5505,7 @@
# each Makefile.in and add a new line on top of each file to say so.
# Grep'ing the whole file is not good either: AIX grep has a line
# limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-extras/configure.ac /tmp/qY2gb79Nml/abiword-2.6.4/abiword-extras/configure.ac
--- abiword-2.6.2/abiword-extras/configure.ac 2008-04-06 22:23:51.000000000 +0100
+++ abiword-2.6.4/abiword-extras/configure.ac 2008-07-13 13:04:50.000000000 +0100
@@ -1,5 +1,5 @@
-AC_INIT([abiword-extras],[2.6.2],[http://www.abisource.com/])
+AC_INIT([abiword-extras],[2.6.4],[http://www.abisource.com/])
AM_INIT_AUTOMAKE
PKG_PROG_PKG_CONFIG
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-extras/dictionary/Makefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-extras/dictionary/Makefile.in
--- abiword-2.6.2/abiword-extras/dictionary/Makefile.in 2008-07-18 04:24:34.000000000 +0100
+++ abiword-2.6.4/abiword-extras/dictionary/Makefile.in 2008-07-13 14:09:48.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-extras/Makefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-extras/Makefile.in
--- abiword-2.6.2/abiword-extras/Makefile.in 2008-07-18 04:24:34.000000000 +0100
+++ abiword-2.6.4/abiword-extras/Makefile.in 2008-07-13 14:09:49.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -277,8 +277,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -303,8 +303,8 @@
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -314,12 +314,13 @@
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -393,10 +394,6 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -423,8 +420,6 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -575,17 +570,17 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
- install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
+ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am
dist-hook:
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-extras/templates/Makefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-extras/templates/Makefile.in
--- abiword-2.6.2/abiword-extras/templates/Makefile.in 2008-07-18 04:24:34.000000000 +0100
+++ abiword-2.6.4/abiword-extras/templates/Makefile.in 2008-07-13 14:09:49.000000000 +0100
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/acinclude.m4 /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/acinclude.m4
--- abiword-2.6.2/abiword-plugins/acinclude.m4 2008-04-06 22:37:21.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/acinclude.m4 2008-07-13 14:09:32.000000000 +0100
@@ -178,21 +178,36 @@
#
-# Checks for the collaborate.abisource.com service backend
+# Checks for the abicollab.net service backend
#
-AC_ARG_WITH(abicollab-service-backend,[ --with-abicollab-service-backend enable the collaborate.abisource.com service backend for abicollab],[
+AC_ARG_WITH(abicollab-service-backend,[ --with-abicollab-service-backend enable the abicollab.net service backend for abicollab; NOTE to packagers: do NOT enable this, the service is not publically available yet],[
AC_CHECK_HEADERS(asio.hpp,[
- ABI_PLUGIN_REPORT([abicollab collaborate.abisource.com support: yes])
abicollab_handler_service=yes
- ],[ ABI_PLUGIN_REPORT([abicollab collaborate.abisource.com support: no, asio >= 0.3.8rc1 required])
+ ],[ ABI_PLUGIN_REPORT([abicollab abicollab.net support: no, asio >= 0.3.8rc1 required])
])
+
+ if test "x$abicollab_handler_service" = "xyes" ; then
+ PKG_CHECK_MODULES(ABICOLLAB_SOUP, [libsoup-2.2 >= 2.2.100],[
+ ABI_PLUGIN_REPORT([abicollab abicollab.net support: yes])
+ abicollab_handler_service=yes
+ ],[ PKG_CHECK_MODULES(ABICOLLAB_SOUP, [libsoup-2.4 >= 2.4.1],[
+ ABICOLLAB_SOUP_CFLAGS+=-DSOUP24
+ ABI_PLUGIN_REPORT([abicollab abicollab.net support: yes])
+ abicollab_handler_service=yes
+ ],[
+ ABI_PLUGIN_REPORT([abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required])
+ abicollab_handler_service=no
+ ])
+ ])
+ fi
+
],[
- ABI_PLUGIN_REPORT([abicollab collaborate.abisource.com support: no])
+ ABI_PLUGIN_REPORT([abicollab abicollab.net support: no])
abicollab_handler_service=no
])
if test "x$abicollab_handler_service" = "xyes" ; then
- ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS"
- ABICOLLAB_SERVICE_LIBS="-lpthread"
+ ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS $ABICOLLAB_SOUP_CFLAGS"
+ ABICOLLAB_SERVICE_LIBS="-lpthread $ABICOLLAB_SOUP_LIBS"
fi
AC_SUBST(ABICOLLAB_SERVICE_CPPFLAGS)
AC_SUBST(ABICOLLAB_SERVICE_LIBS)
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/configure /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/configure
--- abiword-2.6.2/abiword-plugins/configure 2008-04-06 22:38:04.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/configure 2008-07-13 14:10:30.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for abiword-plugins 2.6.2.
+# Generated by GNU Autoconf 2.61 for abiword-plugins 2.6.4.
#
# Report bugs to .
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='abiword-plugins'
PACKAGE_TARNAME='abiword-plugins'
-PACKAGE_VERSION='2.6.2'
-PACKAGE_STRING='abiword-plugins 2.6.2'
+PACKAGE_VERSION='2.6.4'
+PACKAGE_STRING='abiword-plugins 2.6.4'
PACKAGE_BUGREPORT='http://bugzilla.abisource.com/'
ac_unique_file="ac-helpers/abi-plugin-init.m4"
@@ -917,6 +917,8 @@
_abi_dbus_glib_LIBS
ABICOLLAB_SUGAR_CPPFLAGS
ABICOLLAB_SUGAR_LIBS
+ABICOLLAB_SOUP_CFLAGS
+ABICOLLAB_SOUP_LIBS
ABICOLLAB_SERVICE_CPPFLAGS
ABICOLLAB_SERVICE_LIBS
ABICOLLAB_HANDLER_FAKE_TRUE
@@ -1063,6 +1065,8 @@
_abi_dbus_LIBS
_abi_dbus_glib_CFLAGS
_abi_dbus_glib_LIBS
+ABICOLLAB_SOUP_CFLAGS
+ABICOLLAB_SOUP_LIBS
_abi_glib_CFLAGS
_abi_glib_LIBS
GOFFICE_CFLAGS
@@ -1599,7 +1603,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures abiword-plugins 2.6.2 to adapt to many kinds of systems.
+\`configure' configures abiword-plugins 2.6.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1669,7 +1673,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of abiword-plugins 2.6.2:";;
+ short | recursive ) echo "Configuration of abiword-plugins 2.6.4:";;
esac
cat <<\_ACEOF
@@ -1764,7 +1768,7 @@
specify the root directory for boost (optional)
--with-asio=DIR use ASIO in DIR
--with-abicollab-sugar-backend enable the Sugar backend for abicollab
- --with-abicollab-service-backend enable the collaborate.abisource.com service backend for abicollab
+ --with-abicollab-service-backend enable the abicollab.net service backend for abicollab; NOTE to packagers: do NOT enable this, the service is not publically available yet
--without-abicommand
--without-abidash
--without-abigimp
@@ -1870,6 +1874,10 @@
C compiler flags for _abi_dbus_glib, overriding pkg-config
_abi_dbus_glib_LIBS
linker flags for _abi_dbus_glib, overriding pkg-config
+ ABICOLLAB_SOUP_CFLAGS
+ C compiler flags for ABICOLLAB_SOUP, overriding pkg-config
+ ABICOLLAB_SOUP_LIBS
+ linker flags for ABICOLLAB_SOUP, overriding pkg-config
_abi_glib_CFLAGS
C compiler flags for _abi_glib, overriding pkg-config
_abi_glib_LIBS
@@ -2004,7 +2012,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-abiword-plugins configure 2.6.2
+abiword-plugins configure 2.6.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2018,7 +2026,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by abiword-plugins $as_me 2.6.2, which was
+It was created by abiword-plugins $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2504,12 +2512,12 @@
abi_plugin_topdir=`pwd`
rm -f $abi_plugin_topdir/plugin.status
- if test "x2.6.2" = "x" ; then
+ if test "x2.6.4" = "x" ; then
{ { echo "$as_me:$LINENO: error: No AbiWord plugins version number!" >&5
echo "$as_me: error: No AbiWord plugins version number!" >&2;}
{ (exit 1); exit 1; }; }
fi
- abi_plugin_version="2.6.2"
+ abi_plugin_version="2.6.4"
abi_plugin_major=`echo $abi_plugin_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
abi_plugin_minor=`echo $abi_plugin_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
abi_plugin_micro=`echo $abi_plugin_version | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
@@ -7592,7 +7600,7 @@
# Define the identity of the package.
PACKAGE='abiword-plugins'
- VERSION='2.6.2'
+ VERSION='2.6.4'
cat >>confdefs.h <<_ACEOF
@@ -8590,7 +8598,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8593 "configure"' > conftest.$ac_ext
+ echo '#line 8601 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10387,11 +10395,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10390: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10398: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10394: \$? = $ac_status" >&5
+ echo "$as_me:10402: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10677,11 +10685,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10680: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10688: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10684: \$? = $ac_status" >&5
+ echo "$as_me:10692: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -10781,11 +10789,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10784: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10792: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10788: \$? = $ac_status" >&5
+ echo "$as_me:10796: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13132,7 +13140,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:15663: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15659: \$? = $ac_status" >&5
+ echo "$as_me:15667: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15756,11 +15764,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15759: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15767: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15763: \$? = $ac_status" >&5
+ echo "$as_me:15771: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17320,11 +17328,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17323: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17331: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17327: \$? = $ac_status" >&5
+ echo "$as_me:17335: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17424,11 +17432,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17427: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17435: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17431: \$? = $ac_status" >&5
+ echo "$as_me:17439: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19613,11 +19621,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19616: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19624: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19620: \$? = $ac_status" >&5
+ echo "$as_me:19628: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -19903,11 +19911,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19906: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19914: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19910: \$? = $ac_status" >&5
+ echo "$as_me:19918: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -20007,11 +20015,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:20010: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:20018: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:20014: \$? = $ac_status" >&5
+ echo "$as_me:20022: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -23834,7 +23842,7 @@
#
-# Checks for the collaborate.abisource.com service backend
+# Checks for the abicollab.net service backend
#
# Check whether --with-abicollab-service-backend was given.
@@ -23981,30 +23989,293 @@
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
+ abicollab_handler_service=yes
+
+else
- if test "xabicollab collaborate.abisource.com support: yes" != "x" ; then
- echo "abicollab collaborate.abisource.com support: yes" >> $abi_plugin_topdir/plugin.status
+ if test "xabicollab abicollab.net support: no, asio >= 0.3.8rc1 required" != "x" ; then
+ echo "abicollab abicollab.net support: no, asio >= 0.3.8rc1 required" >> $abi_plugin_topdir/plugin.status
fi
- abicollab_handler_service=yes
+
+fi
+
+done
+
+
+ if test "x$abicollab_handler_service" = "xyes" ; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for ABICOLLAB_SOUP" >&5
+echo $ECHO_N "checking for ABICOLLAB_SOUP... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$ABICOLLAB_SOUP_CFLAGS"; then
+ pkg_cv_ABICOLLAB_SOUP_CFLAGS="$ABICOLLAB_SOUP_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= 2.2.100\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= 2.2.100") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ABICOLLAB_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2 >= 2.2.100" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$ABICOLLAB_SOUP_LIBS"; then
+ pkg_cv_ABICOLLAB_SOUP_LIBS="$ABICOLLAB_SOUP_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2 >= 2.2.100\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.2 >= 2.2.100") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ABICOLLAB_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.2 >= 2.2.100" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2 >= 2.2.100"`
+ else
+ ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2 >= 2.2.100"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ABICOLLAB_SOUP_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for ABICOLLAB_SOUP" >&5
+echo $ECHO_N "checking for ABICOLLAB_SOUP... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$ABICOLLAB_SOUP_CFLAGS"; then
+ pkg_cv_ABICOLLAB_SOUP_CFLAGS="$ABICOLLAB_SOUP_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ABICOLLAB_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.4.1" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$ABICOLLAB_SOUP_LIBS"; then
+ pkg_cv_ABICOLLAB_SOUP_LIBS="$ABICOLLAB_SOUP_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ABICOLLAB_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.4.1" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4 >= 2.4.1"`
+ else
+ ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 >= 2.4.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ABICOLLAB_SOUP_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+
+ if test "xabicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" != "x" ; then
+ echo "abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" >> $abi_plugin_topdir/plugin.status
+ fi
+
+ abicollab_handler_service=no
+
+elif test $pkg_failed = untried; then
+
+
+ if test "xabicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" != "x" ; then
+ echo "abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" >> $abi_plugin_topdir/plugin.status
+ fi
+
+ abicollab_handler_service=no
else
+ ABICOLLAB_SOUP_CFLAGS=$pkg_cv_ABICOLLAB_SOUP_CFLAGS
+ ABICOLLAB_SOUP_LIBS=$pkg_cv_ABICOLLAB_SOUP_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+ ABICOLLAB_SOUP_CFLAGS+=-DSOUP24
- if test "xabicollab collaborate.abisource.com support: no, asio >= 0.3.8rc1 required" != "x" ; then
- echo "abicollab collaborate.abisource.com support: no, asio >= 0.3.8rc1 required" >> $abi_plugin_topdir/plugin.status
+ if test "xabicollab abicollab.net support: yes" != "x" ; then
+ echo "abicollab abicollab.net support: yes" >> $abi_plugin_topdir/plugin.status
fi
+ abicollab_handler_service=yes
fi
-done
+elif test $pkg_failed = untried; then
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for ABICOLLAB_SOUP" >&5
+echo $ECHO_N "checking for ABICOLLAB_SOUP... $ECHO_C" >&6; }
+if test -n "$PKG_CONFIG"; then
+ if test -n "$ABICOLLAB_SOUP_CFLAGS"; then
+ pkg_cv_ABICOLLAB_SOUP_CFLAGS="$ABICOLLAB_SOUP_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ABICOLLAB_SOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.4.1" 2>/dev/null`
else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$ABICOLLAB_SOUP_LIBS"; then
+ pkg_cv_ABICOLLAB_SOUP_LIBS="$ABICOLLAB_SOUP_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.4.1\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.4.1") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ABICOLLAB_SOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.4.1" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
- if test "xabicollab collaborate.abisource.com support: no" != "x" ; then
- echo "abicollab collaborate.abisource.com support: no" >> $abi_plugin_topdir/plugin.status
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4 >= 2.4.1"`
+ else
+ ABICOLLAB_SOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 >= 2.4.1"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ABICOLLAB_SOUP_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+
+ if test "xabicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" != "x" ; then
+ echo "abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" >> $abi_plugin_topdir/plugin.status
+ fi
+
+ abicollab_handler_service=no
+
+elif test $pkg_failed = untried; then
+
+
+ if test "xabicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" != "x" ; then
+ echo "abicollab abicollab.net support: no, libsoup-2.2 >= 2.2.100 or libsoup-2.4 >= 2.4.1 required" >> $abi_plugin_topdir/plugin.status
+ fi
+
+ abicollab_handler_service=no
+
+else
+ ABICOLLAB_SOUP_CFLAGS=$pkg_cv_ABICOLLAB_SOUP_CFLAGS
+ ABICOLLAB_SOUP_LIBS=$pkg_cv_ABICOLLAB_SOUP_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+ ABICOLLAB_SOUP_CFLAGS+=-DSOUP24
+
+ if test "xabicollab abicollab.net support: yes" != "x" ; then
+ echo "abicollab abicollab.net support: yes" >> $abi_plugin_topdir/plugin.status
+ fi
+
+ abicollab_handler_service=yes
+
+fi
+
+else
+ ABICOLLAB_SOUP_CFLAGS=$pkg_cv_ABICOLLAB_SOUP_CFLAGS
+ ABICOLLAB_SOUP_LIBS=$pkg_cv_ABICOLLAB_SOUP_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+
+ if test "xabicollab abicollab.net support: yes" != "x" ; then
+ echo "abicollab abicollab.net support: yes" >> $abi_plugin_topdir/plugin.status
+ fi
+
+ abicollab_handler_service=yes
+
+fi
+ fi
+
+
+else
+
+
+ if test "xabicollab abicollab.net support: no" != "x" ; then
+ echo "abicollab abicollab.net support: no" >> $abi_plugin_topdir/plugin.status
fi
abicollab_handler_service=no
@@ -24012,8 +24283,8 @@
fi
if test "x$abicollab_handler_service" = "xyes" ; then
- ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS"
- ABICOLLAB_SERVICE_LIBS="-lpthread"
+ ABICOLLAB_SERVICE_CPPFLAGS="-DABICOLLAB_HANDLER_SERVICE $ABICOLLAB_ASIO_CPPFLAGS $ABICOLLAB_SOUP_CFLAGS"
+ ABICOLLAB_SERVICE_LIBS="-lpthread $ABICOLLAB_SOUP_LIBS"
fi
@@ -31886,7 +32157,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by abiword-plugins $as_me 2.6.2, which was
+This file was extended by abiword-plugins $as_me 2.6.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -31933,7 +32204,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-abiword-plugins config.status 2.6.2
+abiword-plugins config.status 2.6.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -32436,6 +32707,8 @@
_abi_dbus_glib_LIBS!$_abi_dbus_glib_LIBS$ac_delim
ABICOLLAB_SUGAR_CPPFLAGS!$ABICOLLAB_SUGAR_CPPFLAGS$ac_delim
ABICOLLAB_SUGAR_LIBS!$ABICOLLAB_SUGAR_LIBS$ac_delim
+ABICOLLAB_SOUP_CFLAGS!$ABICOLLAB_SOUP_CFLAGS$ac_delim
+ABICOLLAB_SOUP_LIBS!$ABICOLLAB_SOUP_LIBS$ac_delim
ABICOLLAB_SERVICE_CPPFLAGS!$ABICOLLAB_SERVICE_CPPFLAGS$ac_delim
ABICOLLAB_SERVICE_LIBS!$ABICOLLAB_SERVICE_LIBS$ac_delim
ABICOLLAB_HANDLER_FAKE_TRUE!$ABICOLLAB_HANDLER_FAKE_TRUE$ac_delim
@@ -32480,8 +32753,6 @@
ABI_GDA_CPPFLAGS!$ABI_GDA_CPPFLAGS$ac_delim
ABI_GDA_LDFLAGS!$ABI_GDA_LDFLAGS$ac_delim
_abi_gtk_CFLAGS!$_abi_gtk_CFLAGS$ac_delim
-_abi_gtk_LIBS!$_abi_gtk_LIBS$ac_delim
-ABI_GDICT_CPPFLAGS!$ABI_GDICT_CPPFLAGS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -32523,6 +32794,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+_abi_gtk_LIBS!$_abi_gtk_LIBS$ac_delim
+ABI_GDICT_CPPFLAGS!$ABI_GDICT_CPPFLAGS$ac_delim
ABI_GDICT_LDFLAGS!$ABI_GDICT_LDFLAGS$ac_delim
LOADBINDINGS_CPPFLAGS!$LOADBINDINGS_CPPFLAGS$ac_delim
LOADBINDINGS_LDFLAGS!$LOADBINDINGS_LDFLAGS$ac_delim
@@ -32588,7 +32861,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 65; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/configure.ac /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/configure.ac
--- abiword-2.6.2/abiword-plugins/configure.ac 2008-04-06 22:37:25.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/configure.ac 2008-07-13 14:09:35.000000000 +0100
@@ -1,9 +1,9 @@
-AC_INIT([abiword-plugins], 2.6.2, [http://bugzilla.abisource.com/])
+AC_INIT([abiword-plugins], 2.6.4, [http://bugzilla.abisource.com/])
AC_CONFIG_SRCDIR([ac-helpers/abi-plugin-init.m4])
dnl First of all AbiWord plugin macros:
dnl
-ABI_PLUGIN_INIT(2.6.2)
+ABI_PLUGIN_INIT(2.6.4)
ABI_PLUGIN_CONFIG
# Checks for programs.
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/GNUmakefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/GNUmakefile.in
--- abiword-2.6.2/abiword-plugins/GNUmakefile.in 2008-04-06 22:38:02.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/GNUmakefile.in 2008-07-13 14:10:28.000000000 +0100
@@ -81,6 +81,8 @@
ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@
ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@
ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@
+ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@
+ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@
ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@
ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@
ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/GNUmakefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/GNUmakefile.in
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/GNUmakefile.in 2008-07-13 14:09:55.000000000 +0100
@@ -67,6 +67,8 @@
ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@
ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@
ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@
+ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@
+ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@
ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@
ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@
ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.cpp 2008-04-06 22:36:50.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.cpp 2008-07-13 13:05:19.000000000 +0100
@@ -293,7 +293,7 @@
}
addBuddy(pCollaborator);
- m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, true);
+ m_pSession = new AbiCollab(sSessionId, m_pDoc, sDocUUID /* FIXME: this is the local doc uuid, is that valid?? */, jsrre.m_iRev, pCollaborator, false, true);
pManager->joinSession(m_pSession, pCollaborator);
}
@@ -368,7 +368,7 @@
}
// a remote m_packets has been received; let it walk the normal path for incoming m_packets
- pManager->processPacket(*this, sp, rp.m_buddyName.utf8_str());
+ pManager->processPacket(*this, sp, getBuddy(rp.m_buddyName));
}
else
{
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.h 2008-04-06 22:36:50.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/xp/FakeAccountHandler.h 2008-07-13 13:05:19.000000000 +0100
@@ -28,7 +28,7 @@
class FakeBuddy;
class PD_Document;
-class ABI_EXPORT FakeAccountHandler : public AccountHandler
+class FakeAccountHandler : public AccountHandler
{
public:
FakeAccountHandler(const UT_UTF8String& sSessionURI, XAP_Frame* pFrame);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeBuddy.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/xp/FakeBuddy.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/FakeBuddy.h 2008-04-06 22:36:50.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/xp/FakeBuddy.h 2008-07-13 13:05:19.000000000 +0100
@@ -27,7 +27,7 @@
class DocHandle;
-ABI_EXPORT class FakeBuddy : public Buddy
+ class FakeBuddy : public Buddy
{
public:
FakeBuddy(AccountHandler* handler, const UT_UTF8String& name)
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/GNUmakefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/xp/GNUmakefile.in
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/fake/xp/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/fake/xp/GNUmakefile.in 2008-07-13 14:09:55.000000000 +0100
@@ -88,6 +88,8 @@
ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@
ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@
ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@
+ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@
+ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@
ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@
ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@
ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/GNUmakefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/GNUmakefile.in
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/GNUmakefile.in 2008-07-13 14:09:54.000000000 +0100
@@ -72,6 +72,8 @@
ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@
ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@
ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@
+ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@
+ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@
ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@
ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@
ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/Makefile /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/Makefile
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/Makefile 2008-04-06 22:36:51.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/Makefile 2008-07-13 13:05:21.000000000 +0100
@@ -20,13 +20,22 @@
ABI_ROOT:=$(shell pwd)/../../../../abi
include $(ABI_ROOT)/src/config/abi_defs.mk
+include $(shell pwd)/../abicollab_config.mk
-DIRS= xp tcp
+DIRS= xp
+
+ifeq ($(BUILD_TCP_BACKEND),1)
+DIRS += tcp
+endif
+
+ifeq ($(BUILD_SERVICE_BACKEND),1)
+DIRS += service
+endif
TARGETS= $(OBJS)
-#CFLAGS += -DABI_DLL
+CFLAGS += -DABI_DLL
ifeq ($(ABI_FE), Win32)
# common to all Win32 compilers
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/cacert.pem /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/cacert.pem
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/cacert.pem 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/cacert.pem 2008-07-13 13:05:18.000000000 +0100
@@ -0,0 +1,69 @@
+##
+## ca-bundle.crt -- Bundle of CA Root Certificates
+## Converted by the service run by Daniel Stenberg
+## URL: http://curl.haxx.se/docs/caextract.html
+## Converted at: Wed Jun 4 03:12:09 UTC 2008
+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.47.2.1 $ $Date: 2008/05/03 03:13:22 $"
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt). This file can be found in the mozilla source tree:
+## '/mozilla/security/nss/lib/ckfw/builtins/certdata.txt'
+##
+## This file was automatically converted and downloaded through the services
+## provided by http://curl.haxx.se/docs/caextract.html
+##
+##
+## The contents of this file are subject to the Mozilla Public License Version
+## 1.1 (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+## http://www.mozilla.org/MPL/
+##
+## Software distributed under the License is distributed on an "AS IS" basis,
+## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+## for the specific language governing rights and limitations under the
+## License.
+##
+## The Original Code is the Netscape security libraries.
+##
+## The Initial Developer of the Original Code is Netscape Communications
+## Corporation. Portions created by Netscape are Copyright (C) 1994-2000
+## Netscape Communications Corporation. All Rights Reserved.
+##
+## Contributor(s):
+##
+## Alternatively, the contents of this file may be used under the terms of the
+## GNU General Public License Version 2 or later (the "GPL"), in which case
+## the provisions of the GPL are applicable instead of those above. If you
+## wish to allow use of your version of this file only under the terms of the
+## GPL and not to allow others to use your version of this file under the MPL,
+## indicate your decision by deleting the provisions above and replace them
+## with the notice and other provisions required by the GPL. If you do not
+## delete the provisions above, a recipient may use your version of this file
+## under either the MPL or the GPL.
+##
+##
+## Sat Jun 07 2008 - stripped all CA Root Certificates except the
+## Thawte Premium Server CA, which is the only one the abicollab.net backend
+## for the AbiWord AbiCollab plugin needs. - Marc Maurer
+
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.am /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.am
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.am 2008-04-06 22:36:49.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.am 2008-07-13 13:05:18.000000000 +0100
@@ -1 +1,10 @@
-SUBDIRS = unix xp
\ No newline at end of file
+SUBDIRS = unix xp
+
+# TODO: fix the hardcoded cert dir
+certdir=$(datadir)/abiword-2.6/certs
+
+cert_DATA = \
+ cacert.pem
+
+EXTRA_DIST = \
+ $(cert_DATA)
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.in
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/GNUmakefile.in 2008-07-13 14:09:55.000000000 +0100
@@ -13,6 +13,7 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -55,6 +56,15 @@
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(certdir)"
+certDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(cert_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
ETAGS = etags
@@ -67,6 +77,8 @@
ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@
ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@
ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@
+ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@
+ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@
ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@
ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@
ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@
@@ -295,6 +307,15 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = unix xp
+
+# TODO: fix the hardcoded cert dir
+certdir = $(datadir)/abiword-2.6/certs
+cert_DATA = \
+ cacert.pem
+
+EXTRA_DIST = \
+ $(cert_DATA)
+
all: all-recursive
.SUFFIXES:
@@ -333,6 +354,23 @@
clean-libtool:
-rm -rf .libs _libs
+install-certDATA: $(cert_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(certdir)" || $(MKDIR_P) "$(DESTDIR)$(certdir)"
+ @list='$(cert_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(certDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(certdir)/$$f'"; \
+ $(certDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(certdir)/$$f"; \
+ done
+
+uninstall-certDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(cert_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(certdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(certdir)/$$f"; \
+ done
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -510,9 +548,12 @@
done
check-am: all-am
check: check-recursive
-all-am: GNUmakefile
+all-am: GNUmakefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
+ for dir in "$(DESTDIR)$(certdir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
@@ -555,7 +596,7 @@
info-am:
-install-data-am:
+install-data-am: install-certDATA
install-dvi: install-dvi-recursive
@@ -589,7 +630,7 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-certDATA
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
install-strip
@@ -598,15 +639,15 @@
all all-am check check-am clean clean-generic clean-libtool \
ctags ctags-recursive distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am
+ html-am info info-am install install-am install-certDATA \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-certDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.cpp 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.cpp 2008-07-13 13:05:16.000000000 +0100
@@ -0,0 +1,124 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#include "xap_App.h"
+#include "ap_UnixApp.h"
+#include "xap_UnixApp.h"
+#include "xap_Frame.h"
+#include "xap_UnixDialogHelper.h"
+#include "ut_string_class.h"
+#include
+
+#include "ap_UnixDialog_GenericInput.h"
+
+static void s_ok_clicked(GtkWidget * wid, AP_UnixDialog_GenericInput * dlg)
+{
+ dlg->event_Ok();
+}
+
+XAP_Dialog * AP_UnixDialog_GenericInput::static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id)
+{
+ return static_cast(new AP_UnixDialog_GenericInput(pFactory, id));
+}
+pt2Constructor ap_Dialog_GenericInput_Constructor = &AP_UnixDialog_GenericInput::static_constructor;
+
+AP_UnixDialog_GenericInput::AP_UnixDialog_GenericInput(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id)
+ : AP_Dialog_GenericInput(pDlgFactory, id),
+ m_wWindowMain(NULL),
+ m_wOk(NULL)
+{
+}
+
+void AP_UnixDialog_GenericInput::runModal(XAP_Frame * pFrame)
+{
+ UT_return_if_fail(pFrame);
+
+ // Build the dialog's window
+ m_wWindowMain = _constructWindow();
+ UT_return_if_fail(m_wWindowMain);
+
+ _populateWindowData();
+
+ switch ( abiRunModalDialog ( GTK_DIALOG(m_wWindowMain),
+ pFrame, this, GTK_RESPONSE_CANCEL, false ) )
+ {
+ case GTK_RESPONSE_CANCEL:
+ m_answer = AP_UnixDialog_GenericInput::a_CANCEL;
+ break;
+ case GTK_RESPONSE_OK:
+ m_answer = AP_UnixDialog_GenericInput::a_OK;
+ break;
+ default:
+ m_answer = AP_UnixDialog_GenericInput::a_CANCEL;
+ break;
+ }
+
+ abiDestroyWidget(m_wWindowMain);
+}
+
+/*****************************************************************/
+GtkWidget * AP_UnixDialog_GenericInput::_constructWindow(void)
+{
+ GtkWidget* window;
+ //const XAP_StringSet * pSS = XAP_App::getApp()->getStringSet();
+
+ // get the path where our glade file is located
+ XAP_UnixApp * pApp = static_cast(XAP_App::getApp());
+ UT_String glade_path( pApp->getAbiSuiteAppGladeDir() );
+ glade_path += "/ap_UnixDialog_GenericInput.glade";
+ // load the dialog from the glade file
+ GladeXML *xml = abiDialogNewFromXML( glade_path.c_str() );
+ if (!xml)
+ return NULL;
+
+ // Update our member variables with the important widgets that
+ // might need to be queried or altered later
+ window = glade_xml_get_widget(xml, "ap_UnixDialog_GenericInput");
+ m_wOk = glade_xml_get_widget(xml, "btOK");
+ m_wInput = glade_xml_get_widget(xml, "edInput");
+
+ // set the dialog title
+ abiDialogSetTitle(window, getTitle().utf8_str());
+
+ // set the question
+ gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "lbQuestion")), getQuestion().utf8_str());
+ gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "lbLabel")), getLabel().utf8_str());
+
+ // connect our signals
+ g_signal_connect(G_OBJECT(m_wOk),
+ "clicked",
+ G_CALLBACK(s_ok_clicked),
+ static_cast(this));
+
+ return window;
+}
+
+void AP_UnixDialog_GenericInput::_populateWindowData()
+{
+ // set the focus on the text input
+ // TODO: implement me
+
+ // set the password style input if requested
+ gtk_entry_set_visibility(GTK_ENTRY(m_wInput), !isPassword());
+}
+
+void AP_UnixDialog_GenericInput::event_Ok()
+{
+ _setInput(gtk_entry_get_text(GTK_ENTRY(m_wInput)));
+}
+
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.glade /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.glade
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.glade 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.glade 2008-07-13 13:05:16.000000000 +0100
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+ 5
+ Input
+ GTK_WINDOW_TOPLEVEL
+ GTK_WIN_POS_CENTER
+ False
+ True
+ False
+ True
+ False
+ False
+ GDK_WINDOW_TYPE_HINT_DIALOG
+ GDK_GRAVITY_NORTH_WEST
+ True
+ False
+ False
+
+
+
+ True
+ False
+ 2
+
+
+
+ True
+ GTK_BUTTONBOX_END
+
+
+
+ True
+ True
+ True
+ gtk-cancel
+ True
+ GTK_RELIEF_NORMAL
+ True
+ -6
+
+
+
+
+
+ True
+ True
+ True
+ gtk-ok
+ True
+ GTK_RELIEF_NORMAL
+ True
+ -5
+
+
+
+
+ 0
+ False
+ True
+ GTK_PACK_END
+
+
+
+
+
+ True
+ False
+ 18
+
+
+
+ True
+ 2
+ 2
+ False
+ 6
+ 0
+
+
+
+ True
+ %s
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 2
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 1
+ 2
+ fill
+
+
+
+
+
+
+ True
+ 1
+ 2
+ False
+ 0
+ 6
+
+
+
+ True
+ %s:
+ False
+ False
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ True
+ True
+ True
+ 0
+
+ True
+ •
+ False
+
+
+ 1
+ 2
+ 0
+ 1
+
+
+
+
+
+ 1
+ 2
+ 1
+ 2
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+
+
+
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericInput.h 2008-07-13 13:05:16.000000000 +0100
@@ -0,0 +1,45 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef AP_UNIXDIALOG_GENERICINPUT_H
+#define AP_UNIXDIALOG_GENERICINPUT_H
+
+#include
+#include
+
+class XAP_Frame;
+
+class AP_UnixDialog_GenericInput : public AP_Dialog_GenericInput
+{
+public:
+ AP_UnixDialog_GenericInput(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
+ static XAP_Dialog * static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id);
+ void runModal(XAP_Frame * pFrame);
+
+ void event_Ok();
+
+private:
+ GtkWidget* _constructWindow(void);
+ void _populateWindowData(void);
+
+ GtkWidget* m_wWindowMain;
+ GtkWidget* m_wOk;
+ GtkWidget* m_wInput;
+};
+
+#endif /* AP_UNIXDIALOG_GENERICINPUT_H */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.cpp 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.cpp 2008-07-13 13:05:16.000000000 +0100
@@ -0,0 +1,119 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#include "xap_App.h"
+#include "ap_UnixApp.h"
+#include "xap_UnixApp.h"
+#include "xap_Frame.h"
+#include "xap_UnixDialogHelper.h"
+#include "ut_string_class.h"
+#include
+
+#include "ap_UnixDialog_GenericProgress.h"
+
+XAP_Dialog * AP_UnixDialog_GenericProgress::static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id)
+{
+ return static_cast(new AP_UnixDialog_GenericProgress(pFactory, id));
+}
+pt2Constructor ap_Dialog_GenericProgress_Constructor = &AP_UnixDialog_GenericProgress::static_constructor;
+
+AP_UnixDialog_GenericProgress::AP_UnixDialog_GenericProgress(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id)
+ : AP_Dialog_GenericProgress(pDlgFactory, id),
+ m_wWindowMain(NULL),
+ m_wCancel(NULL),
+ m_wProgress(NULL)
+{
+}
+
+void AP_UnixDialog_GenericProgress::runModal(XAP_Frame * pFrame)
+{
+ UT_return_if_fail(pFrame);
+
+ // Build the dialog's window
+ m_wWindowMain = _constructWindow();
+ UT_return_if_fail(m_wWindowMain);
+
+ _populateWindowData();
+
+ switch ( abiRunModalDialog ( GTK_DIALOG(m_wWindowMain),
+ pFrame, this, AP_Dialog_GenericProgress::a_CANCEL, false ) )
+ {
+ case GTK_RESPONSE_CANCEL:
+ m_answer = AP_Dialog_GenericProgress::a_CANCEL;
+ break;
+ case GTK_RESPONSE_OK:
+ m_answer = AP_Dialog_GenericProgress::a_OK;
+ break;
+ default:
+ m_answer = AP_Dialog_GenericProgress::a_OK;
+ break;
+ }
+
+ abiDestroyWidget(m_wWindowMain);
+}
+
+void AP_UnixDialog_GenericProgress::close()
+{
+ UT_return_if_fail(m_wWindowMain);
+ gtk_dialog_response(GTK_DIALOG(m_wWindowMain), AP_Dialog_GenericProgress::a_OK);
+}
+
+void AP_UnixDialog_GenericProgress::setProgress(UT_uint32 progress)
+{
+ UT_return_if_fail(m_wProgress);
+ UT_return_if_fail(progress >= 0 && progress <= 100);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(m_wProgress), progress / 100.0f);
+}
+
+/*****************************************************************/
+GtkWidget * AP_UnixDialog_GenericProgress::_constructWindow(void)
+{
+ GtkWidget* window;
+ //const XAP_StringSet * pSS = XAP_App::getApp()->getStringSet();
+
+ // get the path where our glade file is located
+ XAP_UnixApp * pApp = static_cast(XAP_App::getApp());
+ UT_String glade_path( pApp->getAbiSuiteAppGladeDir() );
+ glade_path += "/ap_UnixDialog_GenericProgress.glade";
+ // load the dialog from the glade file
+ GladeXML *xml = abiDialogNewFromXML( glade_path.c_str() );
+ if (!xml)
+ return NULL;
+
+ // Update our member variables with the important widgets that
+ // might need to be queried or altered later
+ window = glade_xml_get_widget(xml, "ap_UnixDialog_GenericProgress");
+ m_wCancel = glade_xml_get_widget(xml, "btCancel");
+ m_wProgress = glade_xml_get_widget(xml, "pbProgress");
+
+ // set the dialog title
+ abiDialogSetTitle(window, getTitle().utf8_str());
+
+ // set the informative label
+ gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "lbInformation")), getInformation().utf8_str());
+ //gtk_label_set_text(GTK_LABEL(glade_xml_get_widget(xml, "lbLabel")), getLabel().utf8_str());
+
+ return window;
+}
+
+void AP_UnixDialog_GenericProgress::_populateWindowData()
+{
+ // set the focus on the text input
+ // TODO: implement me
+}
+
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.glade /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.glade
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.glade 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.glade 2008-07-13 13:05:16.000000000 +0100
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+ 5
+ Please wait...
+ GTK_WINDOW_TOPLEVEL
+ GTK_WIN_POS_CENTER
+ False
+ True
+ False
+ True
+ False
+ False
+ GDK_WINDOW_TYPE_HINT_DIALOG
+ GDK_GRAVITY_NORTH_WEST
+ True
+ False
+ False
+
+
+
+ True
+ False
+ 2
+
+
+
+ True
+ GTK_BUTTONBOX_END
+
+
+
+ True
+ True
+ True
+ gtk-cancel
+ True
+ GTK_RELIEF_NORMAL
+ True
+ -6
+
+
+
+
+ 0
+ False
+ True
+ GTK_PACK_END
+
+
+
+
+
+ True
+ False
+ 18
+
+
+
+ True
+ 2
+ 1
+ False
+ 6
+ 0
+
+
+
+ True
+ %s
+ False
+ True
+ GTK_JUSTIFY_LEFT
+ False
+ False
+ 0
+ 0.5
+ 0
+ 0
+ PANGO_ELLIPSIZE_NONE
+ -1
+ False
+ 0
+
+
+ 0
+ 1
+ 0
+ 1
+ fill
+
+
+
+
+
+
+ True
+ GTK_PROGRESS_LEFT_TO_RIGHT
+ 0
+ 0.10000000149
+
+ PANGO_ELLIPSIZE_NONE
+
+
+ 0
+ 1
+ 1
+ 2
+
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+ 0
+ True
+ True
+
+
+
+
+
+
+
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ap_UnixDialog_GenericProgress.h 2008-07-13 13:05:16.000000000 +0100
@@ -0,0 +1,46 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef AP_UNIXDIALOG_GENERICPROGRESS_H
+#define AP_UNIXDIALOG_GENERICPROGRESS_H
+
+#include
+#include
+
+class XAP_Frame;
+
+class AP_UnixDialog_GenericProgress : public AP_Dialog_GenericProgress
+{
+public:
+ AP_UnixDialog_GenericProgress(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
+ static XAP_Dialog * static_constructor(XAP_DialogFactory * pFactory, XAP_Dialog_Id id);
+ void runModal(XAP_Frame * pFrame);
+
+ virtual void close();
+ virtual void setProgress(UT_uint32 progress);
+
+private:
+ GtkWidget* _constructWindow(void);
+ void _populateWindowData(void);
+
+ GtkWidget* m_wWindowMain;
+ GtkWidget* m_wCancel;
+ GtkWidget* m_wProgress;
+};
+
+#endif /* AP_UNIXDIALOG_GENERICPROGRESS_H */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.am /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.am
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.am 2008-04-06 22:36:49.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.am 2008-07-13 13:05:16.000000000 +0100
@@ -1,17 +1,33 @@
CPPFLAGS = \
-I$(srcdir) \
+ -I$(srcdir)/.. \
-I$(srcdir)/../../.. \
-I$(srcdir)/../../../core/packet \
+ -I$(srcdir)/../../../core/session \
@ABI_CPPFLAGS@ @CPPFLAGS@ @ABICOLLAB_SERVICE_CPPFLAGS@ @PLATFORM_CPPFLAGS@
LDFLAGS = @LDFLAGS@ @ABICOLLAB_SERVICE_LIBS@ @PLATFORM_LDFLAGS@
+# TODO: fix the hardcoded glade dir
+gladedir=$(datadir)/abiword-2.6/glade
+
+glade_DATA = \
+ ap_UnixDialog_GenericInput.glade \
+ ap_UnixDialog_GenericProgress.glade
+
noinst_LTLIBRARIES = libAbiCollabServiceUnixHandler.la
libAbiCollabServiceUnixHandler_la_SOURCES = \
+ ap_UnixDialog_GenericInput.cpp \
+ ap_UnixDialog_GenericInput.h \
+ ap_UnixDialog_GenericProgress.cpp \
+ ap_UnixDialog_GenericProgress.h \
ServiceUnixAccountHandler.cpp \
ServiceUnixAccountHandler.h
libAbiCollabServiceUnixHandler_la_LIBADD= @ABI_LIBS@
libAbiCollabServiceUnixHandler_la_LDFLAGS = -no-undefined -module -avoid-version
+
+EXTRA_DIST = \
+ $(glade_DATA)
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.in
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/GNUmakefile.in 2008-07-13 14:09:55.000000000 +0100
@@ -14,6 +14,7 @@
@SET_MAKE@
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -50,6 +51,7 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libAbiCollabServiceUnixHandler_la_DEPENDENCIES =
am_libAbiCollabServiceUnixHandler_la_OBJECTS = \
+ ap_UnixDialog_GenericInput.lo ap_UnixDialog_GenericProgress.lo \
ServiceUnixAccountHandler.lo
libAbiCollabServiceUnixHandler_la_OBJECTS = \
$(am_libAbiCollabServiceUnixHandler_la_OBJECTS)
@@ -80,6 +82,15 @@
$(LDFLAGS) -o $@
SOURCES = $(libAbiCollabServiceUnixHandler_la_SOURCES)
DIST_SOURCES = $(libAbiCollabServiceUnixHandler_la_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(gladedir)"
+gladeDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(glade_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -89,6 +100,8 @@
ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@
ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@
ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@
+ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@
+ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@
ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@
ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@
ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@
@@ -148,8 +161,10 @@
CPP = @CPP@
CPPFLAGS = \
-I$(srcdir) \
+ -I$(srcdir)/.. \
-I$(srcdir)/../../.. \
-I$(srcdir)/../../../core/packet \
+ -I$(srcdir)/../../../core/session \
@ABI_CPPFLAGS@ @CPPFLAGS@ @ABICOLLAB_SERVICE_CPPFLAGS@ @PLATFORM_CPPFLAGS@
CXX = @CXX@
@@ -321,13 +336,27 @@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
+
+# TODO: fix the hardcoded glade dir
+gladedir = $(datadir)/abiword-2.6/glade
+glade_DATA = \
+ ap_UnixDialog_GenericInput.glade \
+ ap_UnixDialog_GenericProgress.glade
+
noinst_LTLIBRARIES = libAbiCollabServiceUnixHandler.la
libAbiCollabServiceUnixHandler_la_SOURCES = \
+ ap_UnixDialog_GenericInput.cpp \
+ ap_UnixDialog_GenericInput.h \
+ ap_UnixDialog_GenericProgress.cpp \
+ ap_UnixDialog_GenericProgress.h \
ServiceUnixAccountHandler.cpp \
ServiceUnixAccountHandler.h
libAbiCollabServiceUnixHandler_la_LIBADD = @ABI_LIBS@
libAbiCollabServiceUnixHandler_la_LDFLAGS = -no-undefined -module -avoid-version
+EXTRA_DIST = \
+ $(glade_DATA)
+
all: all-am
.SUFFIXES:
@@ -380,6 +409,8 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServiceUnixAccountHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap_UnixDialog_GenericInput.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap_UnixDialog_GenericProgress.Plo@am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -407,6 +438,23 @@
clean-libtool:
-rm -rf .libs _libs
+install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(gladeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gladedir)/$$f'"; \
+ $(gladeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gladedir)/$$f"; \
+ done
+
+uninstall-gladeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(glade_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(gladedir)/$$f'"; \
+ rm -f "$(DESTDIR)$(gladedir)/$$f"; \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -484,8 +532,11 @@
done
check-am: all-am
check: check-am
-all-am: GNUmakefile $(LTLIBRARIES)
+all-am: GNUmakefile $(LTLIBRARIES) $(DATA)
installdirs:
+ for dir in "$(DESTDIR)$(gladedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@@ -531,7 +582,7 @@
info-am:
-install-data-am:
+install-data-am: install-gladeDATA
install-dvi: install-dvi-am
@@ -567,7 +618,7 @@
ps-am:
-uninstall-am:
+uninstall-am: uninstall-gladeDATA
.MAKE: install-am install-strip
@@ -576,13 +627,14 @@
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+ install-dvi-am install-exec install-exec-am install-gladeDATA \
+ install-html install-html-am install-info install-info-am \
+ install-man install-pdf install-pdf-am install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-gladeDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.cpp 2008-04-06 22:36:49.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.cpp 2008-07-13 13:05:16.000000000 +0100
@@ -43,7 +43,7 @@
GtkVBox* parent = (GtkVBox*)pEmbeddingParent;
// username
- GtkWidget* username_label = gtk_label_new("Username:");
+ GtkWidget* username_label = gtk_label_new("E-mail address:");
gtk_misc_set_alignment(GTK_MISC(username_label), 0, 0.5);
gtk_table_attach_defaults(GTK_TABLE(table), username_label, 0, 1, 0, 1);
username_entry = gtk_entry_new();
@@ -80,8 +80,10 @@
{
UT_DEBUGMSG(("ServiceUnixAccountHandler::storeProperties()\n"));
+ addProperty("uri", "https://abicollab.net/soap/");
+
if (username_entry && GTK_IS_ENTRY(username_entry))
- addProperty("username", gtk_entry_get_text(GTK_ENTRY(username_entry)));
+ addProperty("email", gtk_entry_get_text(GTK_ENTRY(username_entry)));
if (password_entry && GTK_IS_ENTRY(password_entry))
addProperty("password", gtk_entry_get_text(GTK_ENTRY(password_entry)));
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.h 2008-04-06 22:36:49.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/unix/ServiceUnixAccountHandler.h 2008-07-13 13:05:16.000000000 +0100
@@ -1,4 +1,5 @@
/* Copyright (C) 2006,2007 Marc Maurer
+ * Copyright (C) 2008 AbiSource Corporation B.V.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.cpp 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.cpp 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,260 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#include
+#include "xap_App.h"
+#include "xap_DialogFactory.h"
+#include "ServiceAccountHandler.h"
+#include "ap_Dialog_GenericInput.h"
+#include
+#include "AbiCollabImport.h"
+#include "ServiceErrorCodes.h"
+
+class XmlDocDeleter {
+public:
+ void operator()(xmlDocPtr* doc) {
+ if (!doc || !*doc)
+ return;
+ xmlFreeDoc(*doc);
+ }
+};
+
+IE_Imp_AbiCollabSniffer abicollab_sniffer; // FIXME: this is not really nice if we allow plugin-unloading in the future again
+
+IE_Imp_AbiCollabSniffer::IE_Imp_AbiCollabSniffer()
+ : IE_ImpSniffer("AbiWord::AbiCollab-1.0")
+{
+ IE_Imp::registerImporter(this);
+}
+
+IE_Imp_AbiCollabSniffer::~IE_Imp_AbiCollabSniffer()
+{
+ IE_Imp::unregisterImporter(this);
+}
+
+static IE_SuffixConfidence IE_Imp_AbiCollabSniffer__SuffixConfidence[] = {
+ { "abicollab", UT_CONFIDENCE_PERFECT },
+ { "", UT_CONFIDENCE_ZILCH }
+};
+
+const IE_SuffixConfidence * IE_Imp_AbiCollabSniffer::getSuffixConfidence ()
+{
+ return IE_Imp_AbiCollabSniffer__SuffixConfidence;
+}
+
+UT_Confidence_t IE_Imp_AbiCollabSniffer::recognizeContents (const char * szBuf, UT_uint32 iNumbytes)
+{
+ std::string contents(szBuf, iNumbytes);
+ if (contents.find("") != std::string::npos &&
+ contents.find("") != std::string::npos &&
+ contents.find("") != std::string::npos &&
+ contents.find("") != std::string::npos)
+ return UT_CONFIDENCE_PERFECT;
+ return UT_CONFIDENCE_ZILCH;
+}
+
+bool IE_Imp_AbiCollabSniffer::getDlgLabels (const char ** pszDesc, const char ** pszSuffixList, IEFileType * ft)
+{
+ // TODO: should we hide this from the menu ?
+ *pszDesc = "Collaborative File Descriptor (.abicollab)";
+ *pszSuffixList = "*.abicollab";
+ *ft = getFileType();
+ return true;
+}
+
+UT_Error IE_Imp_AbiCollabSniffer::constructImporter (PD_Document * pDocument, IE_Imp ** ppie)
+{
+ *ppie = new IE_Imp_AbiCollab(pDocument);
+ return UT_OK;
+}
+
+// ******
+// ** IE_Imp_AbiCollab
+// ******
+
+IE_Imp_AbiCollab::IE_Imp_AbiCollab(PD_Document* pDocument)
+ : IE_Imp(pDocument)
+{
+ UT_DEBUGMSG(("IE_Imp_AbiCollab::IE_Imp_AbiCollab()\n"));
+}
+
+UT_Error IE_Imp_AbiCollab::_loadFile(GsfInput * input)
+{
+ UT_DEBUGMSG(("IE_Imp_AbiCollab::_loadFile()\n"));
+ UT_return_val_if_fail(input, UT_ERROR);
+
+ std::string email;
+ std::string server;
+ UT_sint64 doc_id;
+ UT_sint64 revision;
+
+ // get the information needed to open the document
+ if (!_parse(input, email, server, doc_id, revision))
+ return UT_ERROR;
+
+ // get an account handler to use for these settings
+ ServiceAccountHandler* pAccount = _getAccount(email, server);
+ UT_return_val_if_fail(pAccount, UT_ERROR);
+
+ return _openDocument(input, pAccount, email, server, doc_id, revision);
+}
+
+UT_Error IE_Imp_AbiCollab::_openDocument(GsfInput * input, ServiceAccountHandler* pAccount,
+ const std::string& email, const std::string& server, UT_sint64 doc_id, UT_sint64 revision)
+{
+ UT_DEBUGMSG(("IE_Imp_AbiCollab::_openDocument()\n"));
+ UT_return_val_if_fail(input, UT_ERROR);
+ UT_return_val_if_fail(pAccount, UT_ERROR);
+
+ AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager();
+ UT_return_val_if_fail(pManager, UT_ERROR);
+
+ // NOTE: the document id is a valid session identifier, as abicollab.net
+ // has one ever lasting session per document really
+ PD_Document* pDoc = getDoc();
+ UT_return_val_if_fail(pDoc, UT_ERROR);
+ UT_ASSERT_HARMLESS(XAP_App::getApp()->getLastFocussedFrame() != NULL);
+ acs::SOAP_ERROR err = pAccount->openDocument(doc_id, revision,
+ boost::lexical_cast(doc_id),
+ &pDoc, XAP_App::getApp()->getLastFocussedFrame());
+ switch (err)
+ {
+ case acs::SOAP_ERROR_OK:
+ return UT_OK;
+ case acs::SOAP_ERROR_INVALID_PASSWORD:
+ {
+ // TODO: asking for user input is not really nice in an async function
+ std::string password;
+ if (ServiceAccountHandler::askPassword(email, password))
+ {
+ // try again with the new password
+ pAccount->addProperty("password", password);
+ pManager->storeProfile();
+ return _openDocument(input, pAccount, email, server, doc_id, revision);
+ }
+ }
+ break;
+ default:
+ return UT_ERROR;
+ }
+
+ return UT_ERROR;
+}
+
+bool IE_Imp_AbiCollab::_parse(GsfInput * input, std::string& email, std::string& server, UT_sint64& doc_id, UT_sint64& revision)
+{
+ guint8 const* contents = gsf_input_read(input, gsf_input_size(input), NULL);
+ UT_return_val_if_fail(contents, UT_ERROR);
+
+ // FIXME: put this in a boost shared ptr
+ xmlDocPtr reader = xmlReadMemory(reinterpret_cast(contents),
+ strlen(reinterpret_cast(contents)), 0, "UTF-8", 0);
+ UT_return_val_if_fail(reader, UT_ERROR);
+ boost::shared_ptr reader_ptr(&reader, XmlDocDeleter());
+
+ xmlNode* root = xmlDocGetRootElement(*reader_ptr);
+ UT_return_val_if_fail(root, false);
+ UT_return_val_if_fail(strcmp(reinterpret_cast(root->name), "abicollab") == 0, false);
+
+ std::string doc_id_;
+ std::string revision_;
+ for (xmlNode* child = root->children; child; child = child->next)
+ {
+ if (child->type != XML_ELEMENT_NODE)
+ continue;
+ if (strcmp(reinterpret_cast(child->name), "email") == 0)
+ email = reinterpret_cast(xmlNodeGetContent(child)); // FIXME: memory leak
+ else if (strcmp(reinterpret_cast(child->name), "server") == 0)
+ server = reinterpret_cast(xmlNodeGetContent(child)); // FIXME: memory leak
+ else if (strcmp(reinterpret_cast(child->name), "doc_id") == 0)
+ doc_id_ = reinterpret_cast(xmlNodeGetContent(child)); // FIXME: memory leak
+ else if (strcmp(reinterpret_cast(child->name), "revision") == 0)
+ revision_ = reinterpret_cast(xmlNodeGetContent(child)); // FIXME: memory leak
+ }
+
+ UT_return_val_if_fail(email != "" && server != "" && doc_id_ != "" && revision_ != "", false);
+
+ try {
+ doc_id = boost::lexical_cast(doc_id_);
+ } catch (boost::bad_lexical_cast &) {
+ UT_DEBUGMSG(("Error casting doc_id (%s) to an UT_sint64\n", doc_id_.c_str()));
+ return false;
+ }
+
+ try {
+ revision = boost::lexical_cast(revision_);
+ } catch (boost::bad_lexical_cast &) {
+ UT_DEBUGMSG(("Error casting revision (%s) to an UT_sint64\n", revision_.c_str()));
+ return false;
+ }
+
+ return true;
+}
+
+ServiceAccountHandler* IE_Imp_AbiCollab::_getAccount(const std::string& email, const std::string& server)
+{
+ AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager();
+ UT_return_val_if_fail(pManager, NULL);
+
+ // check if we already have an account handler for this server;
+ // if not, we'll create it
+ ServiceAccountHandler* pExistingServiceAccount = NULL;
+ const UT_GenericVector accounts = pManager->getAccounts();
+ for (UT_sint32 i = 0; i < accounts.getItemCount(); i++)
+ {
+ AccountHandler* pAccount = accounts.getNthItem(i);
+ UT_continue_if_fail(pAccount);
+ // FIXME: don't hardcode this storage type; make it a static class variable
+ if (pAccount->getStorageType() == "com.abisource.abiword.abicollab.backend.service")
+ {
+ ServiceAccountHandler* pServiceAccount = static_cast(pAccount);
+ // TODO: check trailing '/' for the server name
+ if (pServiceAccount->getProperty("uri") == server &&
+ pServiceAccount->getProperty("email") == email)
+ {
+ UT_DEBUGMSG(("Found an existing account for server %s, email: %s!\n", server.c_str(), email.c_str()));
+ pExistingServiceAccount = pServiceAccount;
+ break;
+ }
+ }
+ }
+
+ if (!pExistingServiceAccount)
+ {
+ UT_DEBUGMSG(("No existing account exists for server %s, email: %s\n", server.c_str(), email.c_str()));
+
+ std::string password;
+ if (!ServiceAccountHandler::askPassword(email, password))
+ return NULL;
+
+ // create the new account
+ pExistingServiceAccount = static_cast(ServiceAccountHandlerConstructor());
+ pExistingServiceAccount->addProperty("email", email);
+ pExistingServiceAccount->addProperty("password", password);
+ pExistingServiceAccount->addProperty("uri", server);
+ pExistingServiceAccount->addProperty("autoconnect", "true");
+ bool success = pManager->addAccount(pExistingServiceAccount);
+ if (success)
+ pManager->storeProfile();
+ }
+
+ if (!pExistingServiceAccount->isOnline())
+ pExistingServiceAccount->connect();
+
+ return pExistingServiceAccount;
+}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabImport.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,53 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef __ABICOLLAB_IMPORT__
+#define __ABICOLLAB_IMPORT__
+
+#include "ie_imp.h"
+#include "ut_types.h"
+
+class IE_Imp_AbiCollabSniffer : public IE_ImpSniffer
+{
+public:
+ IE_Imp_AbiCollabSniffer();
+ virtual ~IE_Imp_AbiCollabSniffer();
+
+ virtual const IE_SuffixConfidence * getSuffixConfidence ();
+ virtual UT_Confidence_t recognizeContents(const char * szBuf, UT_uint32 iNumbytes);
+ virtual const IE_MimeConfidence * getMimeConfidence () { return NULL; }
+ virtual bool getDlgLabels (const char ** pszDesc, const char ** pszSuffixList, IEFileType * ft);
+ virtual UT_Error constructImporter (PD_Document * pDocument, IE_Imp ** ppie);
+};
+
+class IE_Imp_AbiCollab : public IE_Imp
+{
+public:
+ IE_Imp_AbiCollab(PD_Document* pDocument);
+
+protected:
+ virtual UT_Error _loadFile(GsfInput * input);
+
+private:
+ UT_Error _openDocument(GsfInput * input, ServiceAccountHandler* pAccount,
+ const std::string& email, const std::string& server, UT_sint64 doc_id, UT_sint64 revision);
+ bool _parse(GsfInput * input, std::string& email, std::string& server, UT_sint64& doc_id, UT_sint64& revision);
+ ServiceAccountHandler* _getAccount(const std::string& email, const std::string& server);
+};
+
+#endif /* __ABICOLLAB_IMPORT__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.cpp 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.cpp 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,192 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#include
+#include "xap_App.h"
+#include "ev_Menu_Actions.h"
+#include "ap_Menu_Id.h"
+#include "ap_Menu_Functions.h"
+#include "ev_Toolbar_Actions.h"
+#include "ap_Toolbar_Id.h"
+#include "ap_Toolbar_Functions.h"
+#include "ap_LoadBindings.h"
+#include "ev_EditEventMapper.h"
+#include "xap_Dlg_MessageBox.h"
+#include "fv_View.h"
+#include "xap_Frame.h"
+#include "ut_debugmsg.h"
+#include "AsyncWorker.h"
+#include "ServiceAccountHandler.h"
+#include
+#include
+#include "AbiCollabSaveInterceptor.h"
+
+#define SAVE_INTERCEPTOR_EM "com.abisource.abiword.abicollab.servicesaveinterceptor"
+
+static bool AbiCollabSaveInterceptor_interceptor(AV_View * v, EV_EditMethodCallData * d)
+{
+ return ServiceAccountHandler::m_saveInterceptor.intercept(v, d);
+}
+
+#define DO_NOT_USE ""
+
+static ap_bs_Char CharTable[] =
+{
+// {char, /* desc */ { none, _C, _A, _A_C }},
+ {0x53, /* S */ { "insertData", "fileSaveAs", DO_NOT_USE, "" }},
+ {0x73, /* s */ { "insertData", SAVE_INTERCEPTOR_EM, DO_NOT_USE, "" }},
+};
+
+AbiCollabSaveInterceptor::AbiCollabSaveInterceptor()
+ : m_pOldSaveEM(NULL)
+{
+ UT_DEBUGMSG(("Installing Save menu interceptor!\n"));
+ EV_EditMethodContainer *pEMC = XAP_App::getApp()->getEditMethodContainer();
+
+ // store the old/normale editmethod to fall back when a document is not under service control
+ m_pOldSaveEM = pEMC->findEditMethodByName("fileSave");
+ UT_return_if_fail(m_pOldSaveEM);
+ // install the edit method we will use to save to the webapp
+ EV_EditMethod* mySaveInterceptor = new EV_EditMethod (
+ SAVE_INTERCEPTOR_EM,
+ &AbiCollabSaveInterceptor_interceptor,
+ 0, "AbiCollab Service Save Interceptor"
+ );
+ pEMC->addEditMethod(mySaveInterceptor);
+
+ // install the new menu action with our custom save edit method
+ XAP_App::getApp()->getMenuActionSet()->setAction(
+ AP_MENU_ID_FILE_SAVE,
+ false, /* holds submenu */
+ false, /* raises dialog */
+ false, /* is checkable */
+ false, /* is radio */
+ SAVE_INTERCEPTOR_EM,
+ ap_GetState_Changes,
+ NULL, /* state label */
+ NULL
+ );
+
+ // install the new toolbar action with our custom save edit method
+ XAP_App::getApp()->getToolbarActionSet()->setAction(
+ AP_TOOLBAR_ID_FILE_SAVE,
+ EV_TBIT_PushButton,
+ SAVE_INTERCEPTOR_EM,
+ AV_CHG_ALL,
+ ap_ToolbarGetState_Changes
+ );
+
+ // install the new CTRL-s hook
+ // TODO: what to the with Save As?
+ const char * szCurrMode = XAP_App::getApp()->getInputMode();
+ EV_EditBindingMap* pEbMap = XAP_App::getApp()->getBindingMap(szCurrMode);
+ UT_return_if_fail(pEbMap);
+
+ AP_BindingSet* pBindingSet = static_cast(XAP_App::getApp()->getBindingSet());
+ UT_return_if_fail(pBindingSet);
+
+ pBindingSet->_loadChar(pEbMap, CharTable, 2, NULL, 0);
+}
+
+bool AbiCollabSaveInterceptor::intercept(AV_View * v, EV_EditMethodCallData * d)
+{
+ UT_DEBUGMSG(("AbiCollabSaveInterceptor_intercept\n"));
+ UT_return_val_if_fail(v, false);
+ FV_View* pView = static_cast(v);
+
+ AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager();
+ UT_return_val_if_fail(pManager, false);
+
+ PD_Document* pDoc = pView->getDocument();
+ UT_return_val_if_fail(pDoc, false);
+
+ if (!pManager->isInSession(pDoc))
+ return m_pOldSaveEM->Fn(v, d);
+
+ UT_DEBUGMSG(("Document is in a collaboration session!\n"));
+ AbiCollab* pSession = pManager->getSession(pDoc);
+ UT_return_val_if_fail(pSession, m_pOldSaveEM->Fn(v, d));
+
+ // the session id should be unique on a specific account handler; let's
+ // just look it up amonst all our account handlers (not too efficient or
+ // elegant, but it works)
+ for (UT_uint32 i = 0; i < pManager->getAccounts().getItemCount(); i++)
+ {
+ AccountHandler* pHandler = pManager->getAccounts().getNthItem(i);
+ UT_continue_if_fail(pHandler);
+ if (pHandler->hasSession(pSession->getSessionId()) &&
+ pHandler->getStorageType() == SERVICE_ACCOUNT_HANDLER_TYPE)
+ {
+ ServiceAccountHandler* pServiceHandler = static_cast(pHandler);
+ UT_DEBUGMSG(("Found the abicollab webservice account handler that controls this session!\n"));
+
+ pManager->beginAsyncOperation(pSession);
+ // FIXME: guarantee save order!
+ boost::shared_ptr > async_save_ptr(
+ new AsyncWorker(
+ boost::bind(&ServiceAccountHandler::saveDocument, pServiceHandler, pDoc, pSession->getSessionId()),
+ boost::bind(&AbiCollabSaveInterceptor::_save_cb, this, _1, pSession)
+ )
+ );
+ async_save_ptr->start();
+
+ // make the document clean (even if it isn't _yet_)
+ pSession->getDocument()->setClean();
+ pSession->getDocument()->signalListeners(PD_SIGNAL_DOCNAME_CHANGED);
+ pSession->getDocument()->signalListeners(PD_SIGNAL_DOCSAVED);
+
+ XAP_Frame * pFrame = static_cast (pView->getParentData());
+ if (pFrame->getViewNumber() > 0)
+ XAP_App::getApp()->updateClones(pFrame);
+ return true;
+ }
+ }
+
+ UT_DEBUGMSG(("This session does not use the abicollab webservice; saving the old fashioned way...\n"));
+ return m_pOldSaveEM->Fn(v, d);
+}
+
+void AbiCollabSaveInterceptor::_save_cb(UT_Error error, AbiCollab* pSession)
+{
+ UT_DEBUGMSG(("AbiCollabSaveInterceptor::_save_cb()\n"));
+
+ AbiCollabSessionManager* pManager = AbiCollabSessionManager::getManager();
+ UT_return_if_fail(pManager);
+
+ pManager->endAsyncOperation(pSession);
+
+ // WARNING: do NOT assume we have a valid view or frame here: it could already
+ // have been deleted if the frame was closed (or abiword shutdown) before this
+ // callback came back.
+ // You can safely use the AbiCollab pointer or PD_Document pointer though, as
+ // the AbiCollabSessionManager makes sure those are still valid.
+
+ if (error != UT_OK)
+ {
+ // idealy we would use the same frame that was used to save the document,
+ // but we don't know if that one is still valid
+ if (XAP_App::getApp()->getLastFocussedFrame())
+ {
+ // TODO: add the document name, error type and perhaps the server name
+ // TODO: offer some kind of solution to the user
+ UT_UTF8String msg("An error occured while saving this document to the web-service!");
+ XAP_App::getApp()->getLastFocussedFrame()->showMessageBox(msg.utf8_str(), XAP_Dialog_MessageBox::b_O, XAP_Dialog_MessageBox::a_OK);
+ }
+ }
+ return;
+}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabSaveInterceptor.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,41 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef __ABICOLLAB_SAVE_INTERCEPTOR__
+#define __ABICOLLAB_SAVE_INTERCEPTOR__
+
+#include "ev_EditMethod.h"
+
+class AV_View;
+class EV_EditMethodCallData;
+class EV_EditMethod;
+
+class AbiCollabSaveInterceptor
+{
+public:
+ AbiCollabSaveInterceptor();
+
+ bool intercept(AV_View * v, EV_EditMethodCallData * d);
+
+private:
+ void _save_cb(UT_Error error, AbiCollab* pSession);
+
+ EV_EditMethod* m_pOldSaveEM;
+};
+
+#endif /* __ABICOLLAB_SAVE_INTERCEPTOR__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.h 2008-04-06 22:36:49.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AbiCollabService_Export.h 2008-07-13 13:05:17.000000000 +0100
@@ -36,7 +36,7 @@
class PX_ChangeRecord;
class ChangeAdjust;
-class ABI_EXPORT AbiCollabService_Export : public PL_DocChangeListener
+class AbiCollabService_Export : public PL_DocChangeListener
{
public:
AbiCollabService_Export(PD_Document* pDoc, UT_sint64 iID);
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/abicollab_types.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/abicollab_types.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/abicollab_types.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/abicollab_types.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,113 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef __ABICOLLAB_TYPES__
+#define __ABICOLLAB_TYPES__
+
+#include
+#include "soa.h"
+
+namespace abicollab {
+
+class File {
+public:
+ static boost::shared_ptr construct(soa::GenericPtr value) {
+ if (soa::CollectionPtr coll = value->as()) {
+ boost::shared_ptr file(new File());
+ if (soa::StringPtr doc_id_ = coll->get("doc_id"))
+ file->doc_id = doc_id_->value();
+ if (soa::StringPtr filename_ = coll->get("filename"))
+ file->filename = filename_->value();
+ if (soa::StringPtr tags_ = coll->get("tags"))
+ file->tags = tags_->value();
+ if (soa::StringPtr filesize_ = coll->get("filesize"))
+ file->filesize = filesize_->value();
+ if (soa::StringPtr lastchanged_ = coll->get("lastchanged"))
+ file->lastchanged = lastchanged_->value();
+ if (soa::IntPtr lastrevision_ = coll->get("lastrevision"))
+ file->lastrevision = lastrevision_->value();
+ if (soa::StringPtr access_ = coll->get("access"))
+ file->access = access_->value();
+ return file;
+ }
+ return boost::shared_ptr();
+ }
+
+ std::string doc_id;
+ std::string filename;
+ std::string tags;
+ std::string filesize;
+ std::string lastchanged;
+ int64_t lastrevision;
+ std::string access;
+};
+typedef boost::shared_ptr FilePtr;
+typedef boost::shared_ptr< soa::Array< abicollab::FilePtr > > FileArrayPtr;
+
+class Friend : public soa::Collection {
+public:
+ Friend(const std::string& name)
+ : soa::Collection(name)
+ {}
+
+ static boost::shared_ptr construct(soa::GenericPtr value) {
+ if (soa::CollectionPtr coll = value->as()) {
+ boost::shared_ptr friend_(new Friend(coll->name()));
+ if (soa::StringPtr name_ = coll->get("name"))
+ friend_->name = name_->value();
+ if (soa::StringPtr email_ = coll->get("email"))
+ friend_->email = email_->value();
+ friend_->files = coll->get< soa::Array >("files");
+ return friend_;
+ }
+ return boost::shared_ptr();
+ }
+
+ std::string name;
+ std::string email;
+ soa::ArrayPtr files;
+};
+typedef boost::shared_ptr FriendPtr;
+typedef boost::shared_ptr< soa::Array< FriendPtr > > FriendArrayPtr;
+
+class Group : public soa::Collection {
+public:
+ Group(const std::string& name)
+ : soa::Collection(name)
+ {}
+
+ static boost::shared_ptr construct(soa::GenericPtr value) {
+ if (soa::CollectionPtr coll = value->as()) {
+ boost::shared_ptr group_(new Group(coll->name()));
+ if (soa::StringPtr name_ = coll->get("name"))
+ group_->name = name_->value();
+ group_->files = coll->get< soa::Array >("files");
+ return group_;
+ }
+ return boost::shared_ptr();
+ }
+
+ std::string name;
+ soa::ArrayPtr files;
+};
+typedef boost::shared_ptr GroupPtr;
+typedef boost::shared_ptr< soa::Array< GroupPtr > > GroupArrayPtr;
+
+}
+
+#endif /* __ABICOLLAB_TYPES__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.cpp 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.cpp 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,33 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#include "xap_App.h"
+#include "xap_Dialog_Id.h"
+#include "xap_DialogFactory.h"
+
+#include "ap_Dialog_GenericInput.h"
+
+AP_Dialog_GenericInput::AP_Dialog_GenericInput(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id)
+ : XAP_Dialog_NonPersistent(pDlgFactory, id, "interface/dialogcollaborationinput"),
+ m_bIsPassword(false)
+{
+}
+
+AP_Dialog_GenericInput::~AP_Dialog_GenericInput(void)
+{
+}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericInput.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,82 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef AP_DIALOG_GENERICINPUT_H
+#define AP_DIALOG_GENERICINPUT_H
+
+#include "ut_types.h"
+#include "xap_Dialog.h"
+
+extern pt2Constructor ap_Dialog_GenericInput_Constructor;
+
+class AP_Dialog_GenericInput : public XAP_Dialog_NonPersistent
+{
+public:
+ AP_Dialog_GenericInput(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
+ virtual ~AP_Dialog_GenericInput(void);
+
+ virtual void runModal(XAP_Frame * pFrame) = 0;
+
+ // functions related to password style input
+ bool isPassword()
+ { return m_bIsPassword; }
+ void setPassword(bool bIsPassword)
+ { m_bIsPassword = bIsPassword; }
+
+ // messages to display
+ void setTitle(const UT_UTF8String& sTitle)
+ { m_sTitle = sTitle; }
+
+ const UT_UTF8String& getTitle()
+ { return m_sTitle; }
+
+ void setQuestion(const UT_UTF8String& sQuestion)
+ { m_sQuestion = sQuestion; }
+
+ const UT_UTF8String& getQuestion()
+ { return m_sQuestion; }
+
+ void setLabel(const UT_UTF8String& sLabel)
+ { m_sLabel = sLabel; }
+
+ const UT_UTF8String& getLabel()
+ { return m_sLabel; }
+
+ typedef enum { a_OK, a_CANCEL } tAnswer;
+
+ AP_Dialog_GenericInput::tAnswer getAnswer(void) const
+ { return m_answer; }
+
+ const UT_UTF8String& getInput() const
+ { return m_input; }
+
+protected:
+ void _setInput(const UT_UTF8String& input)
+ { m_input = input; }
+
+ AP_Dialog_GenericInput::tAnswer m_answer;
+
+private:
+ UT_UTF8String m_sTitle;
+ UT_UTF8String m_sQuestion;
+ UT_UTF8String m_sLabel;
+ bool m_bIsPassword;
+ UT_UTF8String m_input;
+};
+
+#endif /* AP_DIALOG_GENERICINPUT_H */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.cpp 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.cpp 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,32 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#include "xap_App.h"
+#include "xap_Dialog_Id.h"
+#include "xap_DialogFactory.h"
+
+#include "ap_Dialog_GenericProgress.h"
+
+AP_Dialog_GenericProgress::AP_Dialog_GenericProgress(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id)
+ : XAP_Dialog_NonPersistent(pDlgFactory, id, "interface/dialogcollaborationprogress")
+{
+}
+
+AP_Dialog_GenericProgress::~AP_Dialog_GenericProgress(void)
+{
+}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ap_Dialog_GenericProgress.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,63 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef AP_DIALOG_GENERICPROGRESS_H
+#define AP_DIALOG_GENERICPROGRESS_H
+
+#include "ut_types.h"
+#include "xap_Dialog.h"
+
+extern pt2Constructor ap_Dialog_GenericProgress_Constructor;
+
+class AP_Dialog_GenericProgress : public XAP_Dialog_NonPersistent
+{
+public:
+ AP_Dialog_GenericProgress(XAP_DialogFactory * pDlgFactory, XAP_Dialog_Id id);
+ virtual ~AP_Dialog_GenericProgress(void);
+
+ virtual void runModal(XAP_Frame * pFrame) = 0;
+
+ void setTitle(const UT_UTF8String& sTitle)
+ { m_sTitle = sTitle; }
+
+ const UT_UTF8String& getTitle()
+ { return m_sTitle; }
+
+ void setInformation(const UT_UTF8String& sInformation)
+ { m_sInformation = sInformation; }
+
+ const UT_UTF8String& getInformation()
+ { return m_sInformation; }
+
+ virtual void close() = 0;
+ virtual void setProgress(UT_uint32 progress) = 0;
+
+ typedef enum { a_OK, a_CANCEL } tAnswer;
+
+ AP_Dialog_GenericProgress::tAnswer getAnswer(void) const
+ { return m_answer; }
+
+protected:
+ AP_Dialog_GenericProgress::tAnswer m_answer;
+
+private:
+ UT_UTF8String m_sTitle;
+ UT_UTF8String m_sInformation;
+};
+
+#endif /* AP_DIALOG_GENERICPROGRESS_H */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AsioRealmProtocol.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AsioRealmProtocol.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AsioRealmProtocol.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AsioRealmProtocol.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,59 @@
+#ifndef __ASIO_REALM_PROTOCOL__
+#define __ASIO_REALM_PROTOCOL__
+
+#include "RealmProtocol.h"
+
+namespace realm {
+
+namespace protocolv1 {
+
+ template
+ static void send(const RoutingPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) {
+ std::vector bufs(4);
+ bufs.push_back(asio::buffer(&p.type(), 1));
+ bufs.push_back(asio::buffer(&p.getPayloadSize(), 4)); // FIXME: not Big Endian safe!
+ bufs.push_back(asio::buffer(&p.getAddressCount(), 1));
+ bufs.push_back(asio::buffer(&(p.getConnectionIds()[0]), p.getConnectionIds().size()));
+ bufs.push_back(asio::buffer(*p.getMessage()));
+ asio::async_write(socket, bufs, handler);
+ }
+
+ template
+ static void send(const DeliverPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) {
+ std::vector bufs(4);
+ bufs.push_back(asio::buffer(&p.type(), 1));
+ bufs.push_back(asio::buffer(&p.getPayloadSize(), 4)); // FIXME: not Big Endian safe!
+ bufs.push_back(asio::buffer(&p.getConnectionId(), 1));
+ bufs.push_back(asio::buffer(*p.getMessage()));
+ asio::async_write(socket, bufs, handler);
+ }
+
+ template
+ static void send(const UserJoinedPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) {
+ std::vector bufs(4);
+ bufs.push_back(asio::buffer(&p.type(), 1));
+ bufs.push_back(asio::buffer(&p.getPayloadSize(), 4)); // FIXME: not Big Endian safe!
+ bufs.push_back(asio::buffer(&p.getConnectionId(), 1));
+ bufs.push_back(asio::buffer(&p.isMaster(), 1));
+ bufs.push_back(asio::buffer(*p.getUserInfo()));
+ asio::async_write(socket, bufs, handler);
+ }
+
+ template
+ static void send(const UserLeftPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) {
+ std::vector bufs(2);
+ bufs.push_back(asio::buffer(&p.type(), 1));
+ bufs.push_back(asio::buffer(&p.getConnectionId(), 1));
+ asio::async_write(socket, bufs, handler);
+ }
+
+ template
+ static void send(const SessionTakeOverPacket& p, asio::ip::tcp::socket& socket, WriteHandler handler) {
+ asio::async_write(socket, asio::buffer(&p.type(), 1), handler);
+ }
+
+}
+
+}
+
+#endif /* ASIO_REALM_PROTOCOL__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AsyncWorker.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AsyncWorker.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/AsyncWorker.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/AsyncWorker.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,83 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef __ASYNC_WORKER__
+#define __ASYNC_WORKER__
+
+#include
+#include
+#include
+#include
+#include
+#include "ut_debugmsg.h"
+#include
+
+template
+class AsyncWorker : private boost::noncopyable, public boost::enable_shared_from_this >
+{
+public:
+ AsyncWorker(boost::function async_func, boost::function async_callback)
+ : m_async_func(async_func),
+ m_async_callback(async_callback),
+ m_synchronizer() // can't initialize the synchronizer here yet, because you can't call shared_from_this() from a constructor
+ {
+ }
+
+ virtual ~AsyncWorker()
+ {
+ UT_DEBUGMSG(("~AsyncWorker()\n"));
+ if (m_thread_ptr)
+ m_thread_ptr->join();
+ }
+
+ virtual void start()
+ {
+ m_synchronizer.reset(new Synchronizer(boost::bind(&AsyncWorker::_signal,
+ boost::enable_shared_from_this >::shared_from_this())));
+ m_thread_ptr.reset(
+ new asio::thread(
+ boost::bind(&AsyncWorker::_thread_func,
+ AsyncWorker::shared_from_this())
+ )
+ );
+ }
+
+private:
+ void _signal()
+ {
+ UT_DEBUGMSG(("Calling async callback function from the main loop\n"));
+ m_async_callback(m_func_result);
+ m_synchronizer.reset();
+ }
+
+ void _thread_func()
+ {
+ UT_DEBUGMSG(("Starting async function...\n"));
+ m_func_result = m_async_func();
+ UT_DEBUGMSG(("Async function completed...\n"));
+ m_synchronizer->signal();
+ }
+
+ boost::function m_async_func;
+ boost::function m_async_callback;
+ boost::shared_ptr m_synchronizer;
+ boost::shared_ptr m_thread_ptr;
+ T m_func_result;
+};
+
+#endif /* __ASYNC_WORKER__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.am /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.am
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.am 2008-04-06 22:36:49.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.am 2008-07-13 13:05:17.000000000 +0100
@@ -11,11 +11,34 @@
noinst_LTLIBRARIES = libAbiCollabServiceHandler.la
libAbiCollabServiceHandler_la_SOURCES = \
+ AbiCollabSaveInterceptor.cpp \
+ AbiCollabSaveInterceptor.h \
+ ap_Dialog_GenericInput.cpp \
+ ap_Dialog_GenericInput.h \
+ ap_Dialog_GenericProgress.cpp \
+ ap_Dialog_GenericProgress.h \
ServiceAccountHandler.cpp \
ServiceAccountHandler.h \
+ ServiceBuddy.h \
+ AbiCollabImport.h \
+ AbiCollabImport.cpp \
AbiCollabService_Export.cpp \
- AbiCollabService_Export.h
-
+ AbiCollabService_Export.h \
+ AsioRealmProtocol.h \
+ AsyncWorker.h \
+ InterruptableAsyncWorker.h \
+ ProgressiveSoapCall.h \
+ RealmBuddy.h \
+ RealmConnection.h \
+ RealmConnection.cpp \
+ RealmGrowBuffer.h \
+ RealmProtocol.cpp \
+ ServiceErrorCodes.h \
+ soa.h \
+ soa_result.h \
+ soa_soup.h \
+ soa_types.h \
+ abicollab_types.h
libAbiCollabServiceHandler_la_LIBADD = ../unix/libAbiCollabServiceUnixHandler.la @ABI_LIBS@
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.in /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.in
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.in 2008-04-06 22:37:36.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/GNUmakefile.in 2008-07-13 14:09:56.000000000 +0100
@@ -50,8 +50,11 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libAbiCollabServiceHandler_la_DEPENDENCIES = \
../unix/libAbiCollabServiceUnixHandler.la
-am_libAbiCollabServiceHandler_la_OBJECTS = ServiceAccountHandler.lo \
- AbiCollabService_Export.lo
+am_libAbiCollabServiceHandler_la_OBJECTS = \
+ AbiCollabSaveInterceptor.lo ap_Dialog_GenericInput.lo \
+ ap_Dialog_GenericProgress.lo ServiceAccountHandler.lo \
+ AbiCollabImport.lo AbiCollabService_Export.lo \
+ RealmConnection.lo RealmProtocol.lo
libAbiCollabServiceHandler_la_OBJECTS = \
$(am_libAbiCollabServiceHandler_la_OBJECTS)
libAbiCollabServiceHandler_la_LINK = $(LIBTOOL) --tag=CXX \
@@ -90,6 +93,8 @@
ABICOLLAB_LIBXML2_LIBS = @ABICOLLAB_LIBXML2_LIBS@
ABICOLLAB_SERVICE_CPPFLAGS = @ABICOLLAB_SERVICE_CPPFLAGS@
ABICOLLAB_SERVICE_LIBS = @ABICOLLAB_SERVICE_LIBS@
+ABICOLLAB_SOUP_CFLAGS = @ABICOLLAB_SOUP_CFLAGS@
+ABICOLLAB_SOUP_LIBS = @ABICOLLAB_SOUP_LIBS@
ABICOLLAB_SUGAR_CPPFLAGS = @ABICOLLAB_SUGAR_CPPFLAGS@
ABICOLLAB_SUGAR_LIBS = @ABICOLLAB_SUGAR_LIBS@
ABICOLLAB_TCP_CPPFLAGS = @ABICOLLAB_TCP_CPPFLAGS@
@@ -325,10 +330,34 @@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libAbiCollabServiceHandler.la
libAbiCollabServiceHandler_la_SOURCES = \
+ AbiCollabSaveInterceptor.cpp \
+ AbiCollabSaveInterceptor.h \
+ ap_Dialog_GenericInput.cpp \
+ ap_Dialog_GenericInput.h \
+ ap_Dialog_GenericProgress.cpp \
+ ap_Dialog_GenericProgress.h \
ServiceAccountHandler.cpp \
ServiceAccountHandler.h \
+ ServiceBuddy.h \
+ AbiCollabImport.h \
+ AbiCollabImport.cpp \
AbiCollabService_Export.cpp \
- AbiCollabService_Export.h
+ AbiCollabService_Export.h \
+ AsioRealmProtocol.h \
+ AsyncWorker.h \
+ InterruptableAsyncWorker.h \
+ ProgressiveSoapCall.h \
+ RealmBuddy.h \
+ RealmConnection.h \
+ RealmConnection.cpp \
+ RealmGrowBuffer.h \
+ RealmProtocol.cpp \
+ ServiceErrorCodes.h \
+ soa.h \
+ soa_result.h \
+ soa_soup.h \
+ soa_types.h \
+ abicollab_types.h
libAbiCollabServiceHandler_la_LIBADD = ../unix/libAbiCollabServiceUnixHandler.la @ABI_LIBS@
libAbiCollabServiceHandler_la_LDFLAGS = -no-undefined -module -avoid-version
@@ -383,8 +412,14 @@
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AbiCollabImport.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AbiCollabSaveInterceptor.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AbiCollabService_Export.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RealmConnection.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RealmProtocol.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServiceAccountHandler.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap_Dialog_GenericInput.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ap_Dialog_GenericProgress.Plo@am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/InterruptableAsyncWorker.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/InterruptableAsyncWorker.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/InterruptableAsyncWorker.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/InterruptableAsyncWorker.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,152 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef __INTERRUPTABLE_ASYNC_WORKER__
+#define __INTERRUPTABLE_ASYNC_WORKER__
+
+#include
+#include
+#include "xap_App.h"
+#include "xap_DialogFactory.h"
+#include "AsyncWorker.h"
+#include "ap_Dialog_GenericProgress.h"
+#include "ServiceAccountHandler.h"
+
+class InterruptedException {};
+class InternalErrorException {};
+
+template
+class InterruptableAsyncWorker : public boost::enable_shared_from_this< InterruptableAsyncWorker >
+{
+public:
+ InterruptableAsyncWorker(boost::function async_func)
+ : m_async_func(async_func),
+ m_worker_ptr(),
+ m_pProgressDlg(NULL),
+ m_progress(0),
+ m_cancelled(false),
+ m_finished(false),
+ m_progressSynchronizerPtr(),
+ m_result()
+ {}
+
+ T run()
+ {
+ UT_DEBUGMSG(("InterruptableAsyncWorker::run()\n"));
+
+ m_worker_ptr.reset(new AsyncWorker(m_async_func, boost::bind(&InterruptableAsyncWorker::invoke_cb, InterruptableAsyncWorker::shared_from_this(), _1)));
+ m_progressSynchronizerPtr.reset(new Synchronizer(boost::bind(&InterruptableAsyncWorker::_updateDialog, InterruptableAsyncWorker::shared_from_this())));
+
+ // get the progress dialog
+ XAP_Frame* pFrame = XAP_App::getApp()->getLastFocussedFrame();
+ if (!pFrame)
+ throw InternalErrorException();
+
+ XAP_DialogFactory* pFactory = static_cast(XAP_App::getApp()->getDialogFactory());
+ if (!pFactory)
+ throw InternalErrorException();
+
+ m_pProgressDlg = static_cast(
+ pFactory->requestDialog(ServiceAccountHandler::getDialogGenericProgressId())
+ );
+ m_pProgressDlg->setTitle("Retrieving Document");
+ m_pProgressDlg->setInformation("Please wait while retrieving document...");
+
+ // start the asynchronous process
+ m_worker_ptr->start();
+
+ // run the dialog
+ m_pProgressDlg->runModal(pFrame);
+ UT_DEBUGMSG(("Progress dialog destroyed...\n"));
+ m_cancelled = m_pProgressDlg->getAnswer() == AP_Dialog_GenericProgress::a_CANCEL;
+ pFactory->releaseDialog(m_pProgressDlg);
+ m_pProgressDlg = NULL;
+ if (m_cancelled)
+ throw InterruptedException();
+ return m_result;
+ }
+
+ bool cancelled()
+ {
+ return m_cancelled;
+ }
+
+ void progress(uint32_t progress)
+ {
+ UT_DEBUGMSG(("InterruptableAsyncWorker::_progress_cb() - %d\n", progress));
+ UT_return_if_fail(m_progressSynchronizerPtr);
+
+ if (progress > 100)
+ progress = 100;
+
+ m_progress = progress;
+ m_progressSynchronizerPtr->signal();
+ }
+
+ // the result of run() is undefined when using this function
+ void forceFinished()
+ {
+ m_finished = true;
+ m_progressSynchronizerPtr->signal();
+ }
+
+private:
+ void invoke_cb(T result)
+ {
+ UT_DEBUGMSG(("InterruptableAsyncWorker::invoke_cb()\n"));
+ m_result = result;
+
+ // signal the mainloop that we are done
+ m_finished = true;
+ m_progressSynchronizerPtr->signal();
+ }
+
+ void _updateDialog()
+ {
+ UT_DEBUGMSG(("InterruptableAsyncWorker::_updateDialog()\n"));
+ if (m_finished)
+ {
+ UT_DEBUGMSG(("We are finished, closing dialog...\n"));
+ if (m_pProgressDlg)
+ m_pProgressDlg->close();
+ else
+ UT_DEBUGMSG(("Skipping dialog closure; it is destructed already\n"));
+ }
+ else
+ {
+ UT_DEBUGMSG(("Setting progress value to %d%%\n", m_progress));
+ if (m_pProgressDlg) // it could be that we have no dialog when we have been cancelled
+ m_pProgressDlg->setProgress(m_progress);
+ else
+ UT_DEBUGMSG(("Skipping dialog progress update; it is destructed already\n"));
+ }
+ }
+
+ boost::function m_async_func;
+ boost::shared_ptr< AsyncWorker > m_worker_ptr;
+
+ AP_Dialog_GenericProgress* m_pProgressDlg;
+ uint32_t m_progress;
+ bool m_cancelled;
+ bool m_finished;
+ boost::shared_ptr m_progressSynchronizerPtr;
+
+ T m_result;
+};
+
+#endif /* __INTERRUPTABLE_ASYNC_WORKER__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ProgressiveSoapCall.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ProgressiveSoapCall.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ProgressiveSoapCall.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ProgressiveSoapCall.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,107 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef __PROGRESSIVE_SOAP_CALL__
+#define __PROGRESSIVE_SOAP_CALL__
+
+#include
+#include
+#include "InterruptableAsyncWorker.h"
+#include "soa_soup.h"
+
+class ProgressiveSoapCall : public boost::enable_shared_from_this
+{
+public:
+ ProgressiveSoapCall(const std::string& uri, soa::function_call& fc, const std::string& ssl_ca_file)
+ : m_uri(uri),
+ m_fc(fc),
+ m_ssl_ca_file(ssl_ca_file),
+ m_worker_ptr(),
+ m_soapFault()
+ {}
+
+ soa::GenericPtr run()
+ {
+ UT_DEBUGMSG(("ProgressiveSoapCall::run()\n"));
+
+ m_worker_ptr.reset(new InterruptableAsyncWorker(
+ boost::bind(&ProgressiveSoapCall::invoke, shared_from_this())
+ ));
+
+ // start the asynchronous process and display the dialog
+ try
+ {
+ soa::GenericPtr res = m_worker_ptr->run();
+ if (m_soapFault)
+ throw *m_soapFault;
+ return res;
+ }
+ catch (InterruptedException e)
+ {
+ UT_DEBUGMSG(("Soap call interrupted!\n"));
+ return soa::GenericPtr();
+ }
+ }
+
+private:
+ soa::GenericPtr invoke()
+ {
+ UT_DEBUGMSG(("ProgressiveSoapCall::invoke()\n"));
+ try {
+ return soup_soa::invoke(
+ m_uri, soa::method_invocation("urn:AbiCollabSOAP", m_fc), m_ssl_ca_file,
+ boost::bind(&ProgressiveSoapCall::_progress_cb, this, _1, _2, _3)
+ );
+ } catch (soa::SoapFault& fault) {
+ m_soapFault.reset(new soa::SoapFault(fault));
+ return soa::GenericPtr();
+ }
+ }
+
+ void _progress_cb(SoupSession* session, SoupMessage* msg, uint32_t progress)
+ {
+ UT_DEBUGMSG(("ProgressiveSoapCall::_progress_cb()\n"));
+ UT_return_if_fail(session && msg);
+ UT_return_if_fail(m_worker_ptr);
+
+ if (m_worker_ptr->cancelled())
+ {
+#ifdef SOUP24
+ soup_session_cancel_message(session, msg, SOUP_STATUS_CANCELLED);
+#else
+ soup_message_set_status(msg, SOUP_STATUS_CANCELLED);
+ soup_session_cancel_message(session, msg);
+#endif
+ return;
+ }
+
+ m_worker_ptr->progress(progress);
+ }
+
+ std::string m_uri;
+ soa::function_call& m_fc;
+ std::string m_ssl_ca_file;
+
+ boost::shared_ptr< InterruptableAsyncWorker >
+ m_worker_ptr;
+
+ boost::shared_ptr m_soapFault;
+ soa::GenericPtr m_result;
+};
+
+#endif /* __PROGRESSIVE_SOAP_CALL__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmBuddy.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmBuddy.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmBuddy.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmBuddy.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,83 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef __REALM_BUDDY__
+#define __REALM_BUDDY__
+
+#include
+#include
+#include
+#include "ut_string_class.h"
+#include
+#include
+
+class RealmConnection;
+
+class RealmBuddy : public Buddy , public boost::enable_shared_from_this
+{
+public:
+ RealmBuddy(AccountHandler* handler, UT_uint8 realm_connection_id, bool master, RealmConnection& connection)
+ : Buddy(handler, boost::lexical_cast(realm_connection_id).c_str()),
+ m_realm_connection_id(realm_connection_id),
+ m_master(master),
+ m_connection(connection)
+ {
+ setVolatile(true);
+ }
+
+ virtual Buddy* clone() const { return new RealmBuddy( *this ); }
+
+ virtual UT_UTF8String getDescription() const
+ {
+ return getName();
+ }
+
+ virtual const DocTreeItem* getDocTreeItems() const
+ {
+ return NULL;
+ }
+
+ boost::shared_ptr ptr() {
+ return shared_from_this();
+ }
+
+ boost::shared_ptr ptr() const {
+ return shared_from_this();
+ }
+
+ RealmConnection& connection() const {
+ return m_connection;
+ }
+
+ UT_uint8 realm_connection_id() const {
+ return m_realm_connection_id;
+ }
+
+ bool master() const {
+ return m_master;
+ }
+
+private:
+ UT_uint8 m_realm_connection_id;
+ bool m_master;
+ RealmConnection& m_connection;
+};
+
+typedef boost::shared_ptr RealmBuddyPtr;
+
+#endif /* __REALM_BUDDY__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.cpp 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.cpp 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,308 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#include
+#include
+#include
+#include "ut_assert.h"
+#include "ut_debugmsg.h"
+#include "RealmConnection.h"
+
+namespace rpv1 = realm::protocolv1;
+
+RealmConnection::RealmConnection(const std::string& ca_file, const std::string& address, int port,
+ const std::string& cookie, UT_sint64 doc_id, bool master, const std::string& session_id,
+ boost::function sig)
+ : m_io_service(),
+ m_socket(m_io_service),
+ m_ca_file(ca_file),
+ m_address(address),
+ m_port(port),
+ m_thread_ptr(),
+ m_cookie(cookie),
+ m_doc_id(doc_id),
+ m_master(master),
+ m_session_id(session_id),
+ m_buf(1024), // always have a reasonable block of free memory available to cut back on the memory allocations a bit,
+ m_packet_queue(boost::bind(&RealmConnection::_signal, this)), // TODO: shouldn't this be a shared pointer? Can't we handle signals in this way while this object has been already deleted? - MARCM
+ m_sig(sig),
+ m_buddies(),
+ m_pdp_ptr(),
+ m_tls_tunnel_ptr()
+{
+}
+
+bool RealmConnection::connect()
+{
+ UT_DEBUGMSG(("RealmConnection::connect()\n"));
+ UT_return_val_if_fail(!m_thread_ptr, false);
+
+ try {
+ // setup our local TLS tunnel to the realm
+ m_tls_tunnel_ptr.reset(new tls_tunnel::ClientProxy(m_address, m_port, m_ca_file, false));
+ asio::thread thread(boost::bind(&tls_tunnel::ClientProxy::run, m_tls_tunnel_ptr));
+
+ // connect to the tunnel
+ asio::ip::tcp::resolver::query query(m_tls_tunnel_ptr->local_address(), boost::lexical_cast(m_tls_tunnel_ptr->local_port()));
+ asio::ip::tcp::resolver resolver(m_io_service);
+ asio::ip::tcp::resolver::iterator iterator(resolver.resolve(query));
+ m_socket.connect(*iterator);
+ }
+ catch (tls_tunnel::Exception& e)
+ {
+ UT_DEBUGMSG(("tls_tunnel exception connecting to realm: %s\n", e.message().c_str()));
+ return false;
+ }
+ catch (asio::system_error& se)
+ {
+ UT_DEBUGMSG(("Error connecting to realm: %s\n", se.what()));
+ return false;
+ }
+ catch (...)
+ {
+ UT_DEBUGMSG(("Error connecting to realm!\n"));
+ return false;
+ }
+
+ if (!_login())
+ {
+ UT_DEBUGMSG(("RealmConnection login failed!\n"));
+ _disconnect();
+ return false;
+ }
+
+ UT_DEBUGMSG(("RealmConnection connected\n"));
+
+ // start reading realm messages
+ _receive();
+
+ m_thread_ptr.reset(new asio::thread(boost::bind(&asio::io_service::run, &m_io_service)));
+ return true;
+}
+
+void RealmConnection::disconnect()
+{
+ UT_DEBUGMSG(("RealmConnection::disconnect()\n"));
+ if (m_socket.is_open())
+ {
+ asio::error_code ac;
+ m_socket.shutdown(asio::ip::tcp::socket::shutdown_both, ac);
+ m_socket.close(ac);
+ }
+}
+
+bool RealmConnection::isConnected()
+{
+ return m_socket.is_open();
+}
+
+void RealmConnection::addBuddy(RealmBuddyPtr buddy_ptr)
+{
+ m_buddies.push_back(buddy_ptr);
+}
+
+void RealmConnection::removeBuddy(UT_uint8 realm_connection_id)
+{
+ for (std::vector >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++)
+ {
+ UT_continue_if_fail(*it);
+ if ((*it)->realm_connection_id() == realm_connection_id)
+ {
+ m_buddies.erase(it);
+ return;
+ }
+ }
+
+ UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN);
+}
+
+RealmBuddyPtr RealmConnection::getBuddy(UT_uint8 realm_connection_id)
+{
+ for (std::vector >::iterator it = m_buddies.begin(); it != m_buddies.end(); it++)
+ {
+ UT_continue_if_fail(*it);
+ if ((*it)->realm_connection_id() == realm_connection_id)
+ {
+ return *it;
+ }
+ }
+ return RealmBuddyPtr();
+}
+
+void RealmConnection::_disconnect()
+{
+ UT_DEBUGMSG(("RealmConnection::_disconnect()\n"));
+
+ if (m_socket.is_open())
+ {
+ asio::error_code ac;
+ m_socket.shutdown(asio::ip::tcp::socket::shutdown_both, ac);
+ m_socket.close(ac);
+ }
+
+ if (m_thread_ptr)
+ {
+ m_io_service.stop();
+ m_thread_ptr->join();
+ m_thread_ptr.reset();
+ }
+
+ if (m_tls_tunnel_ptr)
+ {
+ m_tls_tunnel_ptr->stop();
+ m_tls_tunnel_ptr.reset();
+ }
+
+ // signal the packet queue, so the listener will be informed of the
+ // disconnect; this is a bit wacky (design wise), but it works
+ m_packet_queue.signal();
+}
+
+void RealmConnection::_signal()
+{
+ m_sig(*this);
+}
+
+bool RealmConnection::_login()
+{
+ UT_DEBUGMSG(("RealmConnection::_login()\n"));
+
+ // FIXME: make this a combined asio buffer
+ boost::shared_ptr header_ptr(new std::string(2*sizeof(UT_uint32) + m_cookie.size(), '\0'));
+ std::string& header = *header_ptr;
+
+ UT_uint32 proto_magic = 0x000A0B01;
+ UT_uint32 proto_version = 0x01;
+ // FIXME: not Big Endian safe!!
+ memcpy(&header[0], &proto_magic, sizeof(UT_uint32));
+ memcpy(&header[sizeof(UT_uint32)], &proto_version, sizeof(UT_uint32));
+ memcpy(&header[2*sizeof(UT_uint32)], m_cookie.data(), m_cookie.size());
+
+ // holds the login response information
+ std::string response(1, '\0');
+
+ try
+ {
+ // send the login credententials
+ // TODO: we should check the number of bytes written
+ asio::write(m_socket, asio::buffer(header));
+
+ // read the login response
+ // TODO: we should check the number of bytes read
+ asio::read(m_socket, asio::buffer(&response[0], response.size()));
+ }
+ catch (asio::system_error e)
+ {
+ UT_DEBUGMSG(("Error while writing/writing protocol header: %s\n", e.what()));
+ return false;
+ }
+
+ switch (response[0])
+ {
+ case realm::protocol::HANDSHAKE_RESERVED:
+ UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN);
+ return false;
+ case realm::protocol::HANDSHAKE_OK:
+ UT_DEBUGMSG(("Login response OK!\n"));
+ break;
+ case realm::protocol::HANDSHAKE_BAD_IDENTIFIER:
+ UT_DEBUGMSG(("realm::protocol::HANDSHAKE_BAD_IDENTIFIER response!\n"));
+ return false;
+ case realm::protocol::HANDSHAKE_UNSUPPORTED_PROTOCOL:
+ UT_DEBUGMSG(("realm::protocol::HANDSHAKE_UNSUPPORTED_PROTOCOL response!\n"));
+ return false;
+ case realm::protocol::HANDSHAKE_INVALID_COOKIE:
+ UT_DEBUGMSG(("realm::protocol::HANDSHAKE_INVALID_COOKIE response!\n"));
+ return false;
+ default:
+ UT_ASSERT_HARMLESS(UT_SHOULD_NOT_HAPPEN);
+ return false;
+ }
+
+ return true;
+}
+
+void RealmConnection::_receive()
+{
+ UT_DEBUGMSG(("RealmConnection::_receive()\n"));
+ m_buf.clear();
+ boost::shared_ptr msg_ptr(new std::string(1, '\0'));
+ asio::async_read(m_socket, asio::buffer(&(*msg_ptr)[0], msg_ptr->size()),
+ boost::bind(&RealmConnection::_message, shared_from_this(),
+ asio::placeholders::error, asio::placeholders::bytes_transferred, msg_ptr));
+}
+
+void RealmConnection::_message(const asio::error_code& e, std::size_t bytes_transferred, boost::shared_ptr msg_ptr)
+{
+ UT_DEBUGMSG(("RealmConnection::_message()\n"));
+ if (e)
+ {
+ UT_DEBUGMSG(("Error reading message: %s\n", e.message().c_str()));
+ _disconnect();
+ return;
+ }
+ UT_DEBUGMSG(("Constructing packet of type: 0x%x\n", (*msg_ptr)[0]));
+ PacketPtr packet_ptr = realm::protocolv1::Packet::construct(static_cast((*msg_ptr)[0]));
+ if (!packet_ptr) {
+ UT_DEBUGMSG(("Error constructing packet for type 0x%x\n", (*msg_ptr)[0]));
+ return;
+ }
+ _complete_packet(packet_ptr);
+}
+
+void RealmConnection::_complete_packet(PacketPtr packet_ptr)
+{
+ UT_DEBUGMSG(("RealmConnection::_complete_packet()\n"));
+ int bytes_needed = packet_ptr->complete(m_buf.data(), m_buf.size());
+ switch (bytes_needed)
+ {
+ case -1:
+ UT_DEBUGMSG(("Error determining packet (type: 0x%x) completion state!\n", packet_ptr->type()));
+ return;
+ case 0:
+ {
+ UT_DEBUGMSG(("Read full packet\n"));
+ UT_return_if_fail(packet_ptr->parse(m_buf.data(), m_buf.size()) != -1);
+ m_packet_queue.push(packet_ptr);
+ _receive();
+ }
+ break;
+ default:
+ UT_DEBUGMSG(("Need more data (%d bytes) for this packet...\n", bytes_needed));
+ // read the needed number of bytes
+ char* ptr = m_buf.prepare(bytes_needed);
+ asio::async_read(m_socket, asio::buffer(ptr, bytes_needed),
+ boost::bind(&RealmConnection::_complete, shared_from_this(),
+ asio::placeholders::error, asio::placeholders::bytes_transferred, packet_ptr)
+ );
+ break;
+ }
+}
+
+void RealmConnection::_complete(const asio::error_code& e, std::size_t bytes_transferred, PacketPtr packet_ptr)
+{
+ UT_DEBUGMSG(("RealmConnection::_complete()\n"));
+ if (e)
+ {
+ UT_DEBUGMSG(("Error reading message: %s\n", e.message().c_str()));
+ _disconnect();
+ return;
+ }
+ m_buf.commit(bytes_transferred);
+ _complete_packet(packet_ptr);
+}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmConnection.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,128 @@
+/* Copyright (C) 2008 AbiSource Corporation B.V.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
+ */
+
+#ifndef __REALM_CONNECTION__
+#define __REALM_CONNECTION__
+
+#include
+#include
+#include
+#include
+#include
+#include "ut_types.h"
+#include "RealmBuddy.h"
+#include "RealmGrowBuffer.h"
+#include "RealmProtocol.h"
+#include
+#include
+
+class AP_Dialog_GenericProgress;
+
+using realm::protocolv1::PacketPtr;
+
+struct PendingDocumentProperties
+{
+ PendingDocumentProperties(AP_Dialog_GenericProgress* pDlg_,
+ PD_Document** pDoc_, XAP_Frame* pFrame_, const std::string& filename_)
+ : pDlg(pDlg_), pDoc(pDoc_), pFrame(pFrame_), filename(filename_)
+ {}
+
+ AP_Dialog_GenericProgress* pDlg;
+ PD_Document** pDoc;
+ XAP_Frame* pFrame;
+ std::string filename;
+};
+
+class RealmConnection : public boost::enable_shared_from_this
+{
+public:
+ RealmConnection(const std::string& ca_file, const std::string& address, int port,
+ const std::string& cookie, UT_sint64 doc_id, bool master, const std::string& session_id,
+ boost::function sig);
+
+ bool connect();
+ void disconnect();
+ bool isConnected();
+
+ void addBuddy(RealmBuddyPtr buddy_ptr);
+ void removeBuddy(UT_uint8 realm_connection_id);
+ RealmBuddyPtr getBuddy(UT_uint8 realm_connection_id);
+ std::vector& getBuddies()
+ { return m_buddies; }
+
+ UT_sint64 doc_id()
+ { return m_doc_id; }
+ bool master()
+ { return m_master; }
+ const std::string& session_id()
+ { return m_session_id; }
+ SynchronizedQueue& queue()
+ { return m_packet_queue; }
+ asio::ip::tcp::socket& socket()
+ { return m_socket; }
+
+ void loadDocumentStart(AP_Dialog_GenericProgress* pDlg,
+ PD_Document** pDoc_, XAP_Frame* pFrame_, const std::string& filename_)
+ {
+ UT_return_if_fail(!m_pdp_ptr);
+ m_pdp_ptr.reset(new PendingDocumentProperties(pDlg, pDoc_, pFrame_, filename_));
+ }
+ boost::shared_ptr
+ getPendingDocProps()
+ { return m_pdp_ptr; }
+ void loadDocumentEnd()
+ { m_pdp_ptr.reset(); }
+
+
+private:
+ void _disconnect();
+ void _signal();
+ bool _login();
+ void _receive();
+ void _message(const asio::error_code& e,
+ std::size_t bytes_transferred,
+ boost::shared_ptr msg_ptr);
+
+ void _complete_packet(PacketPtr packet_ptr);
+ void _complete(const asio::error_code& e, std::size_t bytes_transferred,
+ PacketPtr packet_ptr);
+
+ asio::io_service m_io_service;
+ std::string m_ca_file;
+ std::string m_address;
+ int m_port;
+ asio::ip::tcp::socket m_socket;
+ boost::shared_ptr m_thread_ptr;
+ std::string m_cookie;
+ UT_sint64 m_doc_id;
+ bool m_master;
+ std::string m_session_id;
+ realm::GrowBuffer m_buf;
+ SynchronizedQueue m_packet_queue;
+ boost::function m_sig;
+ std::vector m_buddies;
+
+ boost::shared_ptr
+ m_pdp_ptr;
+ boost::shared_ptr
+ m_tls_tunnel_ptr;
+};
+
+typedef boost::shared_ptr ConnectionPtr;
+
+#endif /* __REALM_CONNECTION__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmGrowBuffer.h /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmGrowBuffer.h
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmGrowBuffer.h 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmGrowBuffer.h 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,58 @@
+#ifndef __REALM_GROW_BUFFER__
+#define __REALM_GROW_BUFFER__
+
+namespace realm {
+
+class GrowBuffer {
+public:
+ GrowBuffer(size_t capacity)
+ : m_capacity(capacity),
+ m_buf(capacity, '\0'),
+ m_index(0)
+ {}
+
+ GrowBuffer()
+ : m_capacity(0),
+ m_buf(),
+ m_index(0)
+ {}
+
+ void clear() {
+ if (m_buf.size() > m_capacity)
+ m_buf.resize(m_capacity);
+ m_index = 0;
+ }
+
+ char* data() {
+ return &m_buf[0];
+ }
+
+ size_t size() {
+ return m_index;
+ }
+
+ size_t free() {
+ return m_buf.size() - m_index;
+ }
+
+ char* prepare(size_t capacity) {
+ if (free() < capacity)
+ m_buf.resize(m_buf.size() + (capacity - free()));
+ return &m_buf[m_index];
+ }
+
+ void commit(size_t capacity) {
+ if (m_index + capacity > m_buf.size())
+ return; // TODO: throw exception
+ m_index += capacity;
+ }
+
+private:
+ size_t m_capacity;
+ std::string m_buf;
+ size_t m_index;
+};
+
+}
+
+#endif /* __REALM_GROW_BUFFER__ */
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.cpp 1970-01-01 01:00:00.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/RealmProtocol.cpp 2008-07-13 13:05:17.000000000 +0100
@@ -0,0 +1,192 @@
+#include "RealmProtocol.h"
+
+namespace realm {
+
+namespace protocolv1 {
+
+#define MAX_PACKET_DATA_SIZE 64*1024*1024
+
+#define RPV1_PACKET_NONEXISTENT -2
+#define RPV1_PACKET_VARIABLE -1
+
+static uint32_t body_size[6] = {
+ RPV1_PACKET_NONEXISTENT, /* 0: reserved */
+ RPV1_PACKET_VARIABLE, /* route; variable size */
+ RPV1_PACKET_VARIABLE, /* deliver; variable size */
+ RPV1_PACKET_VARIABLE, /* user joined */
+ 1, /* user left */
+ 0 /* session takeover */
+};
+
+PacketPtr Packet::construct(uint8_t type) {
+ switch (type) {
+ case 0x00: /* reserved */
+ return PacketPtr();
+ case 0x01: /* route */
+ return PacketPtr(new RoutingPacket());
+ case 0x02: /* deliver */
+ return PacketPtr(new DeliverPacket());
+ case 0x03: /* user joined */
+ return PacketPtr(new UserJoinedPacket());
+ case 0x04: /* user left */
+ return PacketPtr(new UserLeftPacket());
+ case 0x05: /* session takeover */
+ return PacketPtr(new SessionTakeOverPacket());
+ }
+
+ return PacketPtr();
+}
+
+Packet::Packet(uint8_t type)
+ : m_type(type)
+{}
+
+bool Packet::s_valid(char type) {
+ return type > 0 && type < __LAST_PACKET__;
+}
+
+uint32_t Packet::s_body_size(char type) {
+ return body_size[type];
+}
+
+int Packet::complete(const char* buf, size_t size) {
+ if (size >= body_size[m_type])
+ return 0;
+ return body_size[m_type]-size;
+}
+
+int PayloadPacket::complete(const char* buf, size_t size) {
+ if (size < 4+m_min_payload_size)
+ return 4+m_min_payload_size-size;
+ uint32_t payload_size = 0;
+ memcpy(&payload_size, &buf[0], 4); // FIXME: not Big Endian safe!
+ if (payload_size > MAX_PACKET_DATA_SIZE)
+ return -1;
+ if (size >= 4+payload_size)
+ return 0;
+ return 4+payload_size-size;
+}
+
+int PayloadPacket::parse(const char* buf, size_t size) {
+ // read and check the payload size
+ if (size < 4+m_min_payload_size)
+ return -1;
+ uint32_t payload_size = 0;
+ memcpy(&payload_size, &buf[0], 4); // FIXME: not Big Endian safe!
+ if (size < 4 + payload_size || payload_size < m_min_payload_size || payload_size > MAX_PACKET_DATA_SIZE)
+ return -1;
+ m_payload_size = payload_size;
+ return 4;
+}
+
+RoutingPacket::RoutingPacket()
+ : PayloadPacket(PACKET_ROUTE, 2),
+ m_address_count(0),
+ m_connection_ids(),
+ m_msg()
+{}
+
+RoutingPacket::RoutingPacket(std::vector& connection_ids, boost::shared_ptr msg)
+ : PayloadPacket(PACKET_ROUTE, 2, 1 + connection_ids.size() + msg->size()),
+ m_address_count(connection_ids.size()),
+ m_connection_ids(connection_ids),
+ m_msg(msg)
+{}
+
+int RoutingPacket::parse(const char* buf, size_t size) {
+ int parsed = PayloadPacket::parse(buf, size);
+ if (parsed == -1)
+ return -1;
+ // get the recipients
+ m_address_count = buf[parsed];
+ if (m_address_count + 1 > getPayloadSize())
+ return -1;
+ m_connection_ids.resize(m_address_count);
+ std::copy(buf+parsed+1, buf+parsed+1+m_address_count, m_connection_ids.begin());
+ // get the message data
+ uint32_t msg_start = parsed+1+m_address_count;
+ uint32_t msg_size = getPayloadSize() - 1 - m_address_count;
+ m_msg.reset(new std::string(msg_size, '\0'));
+ std::copy(buf+msg_start, buf+msg_start+msg_size, (*m_msg).begin());
+ return parsed + getPayloadSize();
+}
+
+DeliverPacket::DeliverPacket()
+ : PayloadPacket(PACKET_DELIVER, 1),
+ m_connection_id(0),
+ m_msg()
+{}
+
+DeliverPacket::DeliverPacket(uint8_t connection_id, boost::shared_ptr msg)
+ : PayloadPacket(PACKET_DELIVER, 1, 1 + msg->size()),
+ m_connection_id(connection_id),
+ m_msg(msg)
+{}
+
+int DeliverPacket::parse(const char* buf, size_t size) {
+ int parsed = PayloadPacket::parse(buf, size);
+ if (parsed == -1)
+ return -1;
+ // get the sender
+ m_connection_id = buf[parsed];
+ // get the message data
+ uint32_t msg_start = parsed + 1;
+ uint32_t msg_size = getPayloadSize() - 1;
+ m_msg.reset(new std::string(msg_size, '\0'));
+ std::copy(buf+msg_start, buf+msg_start+msg_size, (*m_msg).begin());
+ return parsed + getPayloadSize();
+}
+
+UserJoinedPacket::UserJoinedPacket()
+ : PayloadPacket(PACKET_USERJOINED, 2),
+ m_connection_id(0),
+ m_master(0),
+ m_userinfo()
+{}
+
+UserJoinedPacket::UserJoinedPacket(uint8_t connection_id, bool master, boost::shared_ptr userinfo)
+ : PayloadPacket(PACKET_USERJOINED, 2, 2 + userinfo->size()),
+ m_connection_id(connection_id),
+ m_master(static_cast(master)),
+ m_userinfo(userinfo)
+{}
+
+int UserJoinedPacket::parse(const char* buf, size_t size) {
+ int parsed = PayloadPacket::parse(buf, size);
+ if (parsed == -1)
+ return -1;
+ // get the user that joined
+ m_connection_id = buf[parsed];
+ // get the master information
+ m_master = buf[parsed+1];
+ // get the userinfo
+ uint32_t msg_start = parsed + 2;
+ uint32_t msg_size = getPayloadSize() - 2;
+ m_userinfo.reset(new std::string(msg_size, '\0'));
+ std::copy(buf+msg_start, buf+msg_start+msg_size, (*m_userinfo).begin());
+ return parsed + getPayloadSize();
+}
+
+UserLeftPacket::UserLeftPacket()
+ : Packet(PACKET_USERLEFT),
+ m_connection_id(0)
+{}
+
+UserLeftPacket::UserLeftPacket(uint8_t connection_id)
+ : Packet(PACKET_USERLEFT),
+ m_connection_id(connection_id)
+{}
+
+int UserLeftPacket::parse(const char* buf, size_t size) {
+ if (size < 1)
+ return false;
+ m_connection_id = buf[0];
+ return 1;
+}
+
+SessionTakeOverPacket::SessionTakeOverPacket()
+ : Packet(PACKET_SESSIONTAKEOVER)
+{}
+
+}
+}
diff -Nru /tmp/GY3Z5Jb0l4/abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.cpp /tmp/qY2gb79Nml/abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.cpp
--- abiword-2.6.2/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.cpp 2008-04-06 22:36:49.000000000 +0100
+++ abiword-2.6.4/abiword-plugins/tools/abicollab/backends/service/xp/ServiceAccountHandler.cpp 2008-07-13 13:05:17.000000000 +0100
@@ -1,4 +1,5 @@
/* Copyright (C) 2006,2007 Marc Maurer