[tomboy/docs: 81/81] Merge branch 'master' into docs
- From: Sanford Armstrong <sharm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tomboy/docs: 81/81] Merge branch 'master' into docs
- Date: Sat, 26 Jun 2010 18:54:16 +0000 (UTC)
commit d59d986b464df6c42d7fe6d78b419221c9183622
Merge: 5c2924d 1fc5165
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date: Sat Jun 26 11:53:59 2010 -0700
Merge branch 'master' into docs
Makefile.am | 2 +-
Makefile.include | 3 +-
NEWS | 22 +
Setup/Setup.wxs | 2 +-
Tomboy-mac.csproj | 44 +-
Tomboy.mdp | 383 ++--
Tomboy/AddinManager.cs | 7 +-
Tomboy/Addins/Backlinks/Makefile.am | 6 +-
Tomboy/Addins/Bugzilla/Makefile.am | 6 +-
Tomboy/Addins/Evolution/Makefile.am | 6 +-
Tomboy/Addins/ExportToHtml/Makefile.am | 6 +-
Tomboy/Addins/FileSystemSyncService/Makefile.am | 6 +-
Tomboy/Addins/FixedWidth/Makefile.am | 6 +-
Tomboy/Addins/GalagoPresence/Makefile.am | 6 +-
Tomboy/Addins/InsertTimestamp/Makefile.am | 6 +-
Tomboy/Addins/NoteDirectoryWatcher/Makefile.am | 6 +-
Tomboy/Addins/NoteOfTheDay/Makefile.am | 6 +-
Tomboy/Addins/PrintNotes/Makefile.am | 6 +-
Tomboy/Addins/PrintNotes/PrintNotes.addin.xml | 2 +-
Tomboy/Addins/PrintNotes/PrintNotesNoteAddin.cs | 4 +
Tomboy/Addins/Sketching/Makefile.am | 6 +-
Tomboy/Addins/SshSyncService/Makefile.am | 6 +-
Tomboy/Addins/StickyNoteImport/Makefile.am | 6 +-
Tomboy/Addins/Tasks/Makefile.am | 6 +-
Tomboy/Addins/Tasque/Makefile.am | 8 +-
Tomboy/Addins/Underline/Makefile.am | 6 +-
Tomboy/Addins/VoiceNotes/Makefile.am | 6 +-
Tomboy/Addins/WebDavSyncService/Makefile.am | 6 +-
.../WebSyncService/Api/AnonymousConnection.cs | 2 +-
Tomboy/Addins/WebSyncService/Api/OAuth.cs | 2 +-
.../Addins/WebSyncService/Api/ProxiedWebRequest.cs | 82 +
Tomboy/Addins/WebSyncService/LibProxy/LibProxy.cs | 83 +
Tomboy/Addins/WebSyncService/Makefile.am | 7 +-
.../WebSyncService/WebSyncService-mac.csproj | 2 +
Tomboy/Addins/WebSyncService/WebSyncService.csproj | 2 +
Tomboy/Applet.cs | 7 +-
Tomboy/Defines.WIN32.cs | 4 +-
Tomboy/GnomeApplication.cs | 106 +-
Tomboy/GnomeSession.cs | 64 +
Tomboy/Logger.cs | 8 +-
Tomboy/MacApplication.cs | 3 +
Tomboy/Makefile.am | 46 +-
Tomboy/Note.cs | 186 +-
Tomboy/NoteEditor.cs | 2 +-
Tomboy/NoteTag.cs | 2 +-
Tomboy/Preferences.cs | 8 +
Tomboy/RecentChanges.cs | 6 +-
Tomboy/Synchronization/SyncManager.cs | 13 +-
Tomboy/Tomboy.cs | 51 +-
Tomboy/Tray.cs | 6 +
Tomboy/panelapplet/BonoboUIVerb.cs | 28 -
Tomboy/panelapplet/ChangeBackgroundHandler.cs | 30 -
Tomboy/panelapplet/ChangeSizeHandler.cs | 18 -
.../GnomeSharp.PanelAppletFactoryCallbackNative.cs | 42 -
Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs | 18 -
Tomboy/panelapplet/ObjectManager.cs | 19 -
Tomboy/panelapplet/PanelApplet.cs | 470 -----
Tomboy/panelapplet/PanelAppletBackgroundType.cs | 17 -
Tomboy/panelapplet/PanelAppletFactory.cs | 60 -
Tomboy/panelapplet/PanelAppletFactoryCallback.cs | 10 -
Tomboy/panelapplet/PanelAppletFlags.cs | 19 -
Tomboy/tomboy.in | 53 +-
configure.in | 71 +-
data/Makefile.am | 4 +-
data/icons/Makefile.am | 3 +
.../hicolor_mimetypes_16x16_application-x-note.png | Bin 0 -> 454 bytes
.../hicolor_mimetypes_22x22_application-x-note.png | Bin 0 -> 658 bytes
.../hicolor_mimetypes_48x48_application-x-note.png | Bin 0 -> 1785 bytes
data/tomboy.1 | 3 +
data/tomboy.schemas.in | 30 +
help/Makefile.am | 2 +-
help/el/el.po | 242 +--
help/lt/figures/add-notebook-search.png | Bin 0 -> 37641 bytes
help/lt/figures/add-to-notebook.png | Bin 0 -> 25731 bytes
help/lt/figures/delete-notebook.png | Bin 0 -> 24189 bytes
help/lt/figures/new-notebook.png | Bin 0 -> 72334 bytes
help/lt/figures/note-template.png | Bin 0 -> 24169 bytes
help/lt/figures/tomboy-main-menu.png | Bin 0 -> 17589 bytes
help/lt/figures/tomboy-new-note.png | Bin 0 -> 15974 bytes
help/lt/figures/tomboy-panel.png | Bin 0 -> 8597 bytes
help/lt/figures/tomboy-preferences-add-ins.png | Bin 0 -> 44062 bytes
help/lt/figures/tomboy-preferences-editing.png | Bin 0 -> 42631 bytes
help/lt/figures/tomboy-preferences-hotkeys.png | Bin 0 -> 34884 bytes
.../figures/tomboy-preferences-synchronization.png | Bin 0 -> 31733 bytes
help/lt/lt.po | 2085 +++++++++++++++++++
libtomboy/Makefile.am | 4 +-
libtomboy/tomboyutil.c | 8 +-
osx/Contents/Info.plist | 4 +-
osx/Contents/MacOS/Tomboy | 7 +-
po/LINGUAS | 1 +
po/bn.po | 1358 +++++++------
po/ca.po | 160 +-
po/ca valencia po | 982 ++++++----
po/cs.po | 158 +-
po/da.po | 733 ++++---
po/el.po | 2 +-
po/en shaw po | 1439 ++++++++++---
po/es.po | 325 ++--
po/et.po | 30 +-
po/eu.po | 217 ++-
po/fi.po | 869 +++++----
po/gl.po | 282 ++--
po/he.po | 1287 ++++++++----
po/hu.po | 387 ++--
po/id.po | 677 ++++---
po/lt.po | 714 ++++---
po/ms.po | 2193 ++++++++++++++++++++
po/nb.po | 366 ++--
po/nl.po | 1018 ++++++----
po/ru.po | 160 +-
po/sr.po | 739 ++++---
po/sr latin po | 739 ++++---
po/th.po | 613 ++++---
po/uk.po | 783 ++++----
po/zh_HK.po | 169 +-
po/zh_TW.po | 169 +-
postbuild.sh | 2 +-
test/Makefile.am | 8 +-
118 files changed, 14019 insertions(+), 7085 deletions(-)
---
diff --cc help/Makefile.am
index 35f52e7,6c73c5b..3096b94
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@@ -2,47 -2,9 +2,47 @@@
include $(top_srcdir)/gnome-doc-utils.make
dist-hook: doc-dist-hook
-DOC_MODULE = tomboy
-DOC_ENTITIES =
+DOC_ID = tomboy
DOC_INCLUDES = legal.xml
-DOC_FIGURES =
+DOC_FIGURES = \
+ figures/add-notebook-search.png \
+ figures/add-to-notebook.png \
+ figures/delete-notebook.png \
+ figures/move-notes-search.png \
+ figures/new-notebook.png \
+ figures/notebook-icon.png \
+ figures/note-template.png \
+ figures/tomboy-main-menu.png \
+ figures/tomboy-new-note.png \
+ figures/tomboy-panel.png \
+ figures/tomboy-pindown.png \
+ figures/tomboy-pinup.png \
+ figures/tomboy.png \
+ figures/tomboy-preferences-add-ins.png \
+ figures/tomboy-preferences-editing.png \
+ figures/tomboy-preferences-hotkeys.png \
+ figures/tomboy-preferences-synchronization.png \
+ figures/tomboy-tools.png
+
+DOC_PAGES = \
+ addins-desktop.page \
+ addins-formatting.page \
+ addins.page \
+ addins-sync.page \
+ addins-tools.page \
+ advanced.page \
+ create-notebook.page \
+ create-note.page \
+ delete-notes.page \
+ edit-note.page \
+ hotkeys.page \
+ index.page \
+ introduction.page \
+ note-edit-prefs.page \
+ prefs.page \
+ problems.page \
+ search.page \
+ sync.page \
+ whatsnew.page
- DOC_LINGUAS = ca cs de el en_GB es eu fr it oc pl pt_BR ru sv uk vi zh_CN
+ DOC_LINGUAS = ca cs de el en_GB es eu fr it lt oc pl pt_BR ru sv uk vi zh_CN
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
