using ./config/ instead of ./mate2/

This commit is contained in:
Perberos 2011-11-07 21:10:16 -03:00
parent 1d63a49a77
commit 421415f7cb
50 changed files with 939 additions and 995 deletions

4
README
View File

@ -72,8 +72,8 @@ enable python plugins support.
Simple install procedure:
% gzip -cd pluma-2.30.4.tar.gz | tar xvf - # unpack the sources
% cd pluma-2.30.4 # change to the toplevel directory
% gzip -cd mate-file-manager.tar.gz | tar xvf - # unpack the sources
% cd mate-file-manager # change to the toplevel directory
% ./configure # run the `configure' script
% make # build pluma
[ Become root if necessary ]

View File

@ -500,10 +500,10 @@ AC_SUBST(PLUMA_IMPLIB)
AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
AC_SUBST(LOADER_LIBTOOL_FLAGS)
PLUMA_PLUGINS_DATA_DIR="$datadir/pluma-2/plugins"
PLUMA_PLUGINS_DATA_DIR="$datadir/pluma/plugins"
AC_SUBST(PLUMA_PLUGINS_DATA_DIR)
PLUMA_PLUGINS_LIBS_DIR="$libdir/pluma-2/plugins"
PLUMA_PLUGINS_LIBS_DIR="$libdir/pluma/plugins"
AC_SUBST(PLUMA_PLUGINS_LIBS_DIR)
MATE_DOC_INIT([0.9.0],,

View File

@ -16,7 +16,7 @@ pkgconfig_DATA = pluma-@PLUMA_API_VERSION@.pc
pluma-@PLUMA_API_VERSION@.pc: pluma.pc
cp pluma.pc pluma-@PLUMA_API_VERSION@.pc
bugreportdir = $(libexecdir)/pluma-2
bugreportdir = $(libexecdir)/pluma
bugreport_SCRIPTS = pluma-bugreport.sh
if MATECONF_SCHEMAS_INSTALL

View File

@ -20,21 +20,21 @@ echo_padded ()
#if (which mateconftool-2 >/dev/null)
#then
# echo "MateConf configuration dump:"
# mateconftool-2 --dump /apps/pluma-2 | grep -Ev "</?(entry|mateconfentryfile|entrylist|value|schema_key)" | cut -c4-
# mateconftool-2 --dump /apps/pluma | grep -Ev "</?(entry|mateconfentryfile|entrylist|value|schema_key)" | cut -c4-
# echo
#fi
echo "Active plugins:"
mateconftool-2 --get /apps/pluma-2/plugins/active-plugins \
mateconftool-2 --get /apps/pluma/plugins/active-plugins \
| sed -r -e 's/^\[(.*)\]$/\1/' -e 's/,/\n/g' \
| sed -e 's/^.*$/ - \0/'
echo
# Manually installed plugins (in $HOME)
if [ -d $HOME/.mate2/pluma/plugins ]
if [ -d $HOME/.config/pluma/plugins ]
then
echo "Plugins in \$HOME:"
ls $HOME/.mate2/pluma/plugins/*.pluma-plugin \
ls $HOME/.config/pluma/plugins/*.pluma-plugin \
| sed -r -e 's#.*/([^/]*)\.pluma-plugin$# - \1#'
else
echo "No plugin installed in \$HOME."

View File

@ -15,4 +15,4 @@ X-MATE-Bugzilla-Bugzilla=MATE
X-MATE-Bugzilla-Product=pluma
X-MATE-Bugzilla-Component=general
X-MATE-Bugzilla-Version=@VERSION@
X-MATE-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/pluma-2/pluma-bugreport.sh
X-MATE-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/pluma/pluma-bugreport.sh

View File

@ -1,8 +1,8 @@
<mateconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/font/use_default_font</key>
<applyto>/apps/pluma-2/preferences/editor/font/use_default_font</applyto>
<key>/schemas/apps/pluma/preferences/editor/font/use_default_font</key>
<applyto>/apps/pluma/preferences/editor/font/use_default_font</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>
@ -16,8 +16,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/font/editor_font</key>
<applyto>/apps/pluma-2/preferences/editor/font/editor_font</applyto>
<key>/schemas/apps/pluma/preferences/editor/font/editor_font</key>
<applyto>/apps/pluma/preferences/editor/font/editor_font</applyto>
<owner>pluma</owner>
<type>string</type>
<locale name="C">
@ -31,8 +31,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/colors/scheme</key>
<applyto>/apps/pluma-2/preferences/editor/colors/scheme</applyto>
<key>/schemas/apps/pluma/preferences/editor/colors/scheme</key>
<applyto>/apps/pluma/preferences/editor/colors/scheme</applyto>
<owner>pluma</owner>
<type>string</type>
<default>classic</default>
@ -44,8 +44,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/save/create_backup_copy</key>
<applyto>/apps/pluma-2/preferences/editor/save/create_backup_copy</applyto>
<key>/schemas/apps/pluma/preferences/editor/save/create_backup_copy</key>
<applyto>/apps/pluma/preferences/editor/save/create_backup_copy</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -58,8 +58,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/save/auto_save</key>
<applyto>/apps/pluma-2/preferences/editor/save/auto_save</applyto>
<key>/schemas/apps/pluma/preferences/editor/save/auto_save</key>
<applyto>/apps/pluma/preferences/editor/save/auto_save</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -72,8 +72,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/save/auto_save_interval</key>
<applyto>/apps/pluma-2/preferences/editor/save/auto_save_interval</applyto>
<key>/schemas/apps/pluma/preferences/editor/save/auto_save_interval</key>
<applyto>/apps/pluma/preferences/editor/save/auto_save_interval</applyto>
<owner>pluma</owner>
<type>int</type>
<default>10</default>
@ -86,8 +86,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/undo/undo_actions_limit</key>
<applyto>/apps/pluma-2/preferences/editor/undo/undo_actions_limit</applyto>
<key>/schemas/apps/pluma/preferences/editor/undo/undo_actions_limit</key>
<applyto>/apps/pluma/preferences/editor/undo/undo_actions_limit</applyto>
<owner>pluma</owner>
<type>int</type>
<default>25</default>
@ -100,8 +100,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/undo/max_undo_actions</key>
<applyto>/apps/pluma-2/preferences/editor/undo/max_undo_actions</applyto>
<key>/schemas/apps/pluma/preferences/editor/undo/max_undo_actions</key>
<applyto>/apps/pluma/preferences/editor/undo/max_undo_actions</applyto>
<owner>pluma</owner>
<type>int</type>
<default>2000</default>
@ -113,8 +113,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/wrap_mode/wrap_mode</key>
<applyto>/apps/pluma-2/preferences/editor/wrap_mode/wrap_mode</applyto>
<key>/schemas/apps/pluma/preferences/editor/wrap_mode/wrap_mode</key>
<applyto>/apps/pluma/preferences/editor/wrap_mode/wrap_mode</applyto>
<owner>pluma</owner>
<type>string</type>
<default>GTK_WRAP_WORD</default>
@ -130,8 +130,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/tabs/tabs_size</key>
<applyto>/apps/pluma-2/preferences/editor/tabs/tabs_size</applyto>
<key>/schemas/apps/pluma/preferences/editor/tabs/tabs_size</key>
<applyto>/apps/pluma/preferences/editor/tabs/tabs_size</applyto>
<owner>pluma</owner>
<type>int</type>
<default>8</default>
@ -143,8 +143,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/tabs/insert_spaces</key>
<applyto>/apps/pluma-2/preferences/editor/tabs/insert_spaces</applyto>
<key>/schemas/apps/pluma/preferences/editor/tabs/insert_spaces</key>
<applyto>/apps/pluma/preferences/editor/tabs/insert_spaces</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -155,8 +155,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/auto_indent/auto_indent</key>
<applyto>/apps/pluma-2/preferences/editor/auto_indent/auto_indent</applyto>
<key>/schemas/apps/pluma/preferences/editor/auto_indent/auto_indent</key>
<applyto>/apps/pluma/preferences/editor/auto_indent/auto_indent</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -167,8 +167,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/line_numbers/display_line_numbers</key>
<applyto>/apps/pluma-2/preferences/editor/line_numbers/display_line_numbers</applyto>
<key>/schemas/apps/pluma/preferences/editor/line_numbers/display_line_numbers</key>
<applyto>/apps/pluma/preferences/editor/line_numbers/display_line_numbers</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -180,8 +180,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/current_line/highlight_current_line</key>
<applyto>/apps/pluma-2/preferences/editor/current_line/highlight_current_line</applyto>
<key>/schemas/apps/pluma/preferences/editor/current_line/highlight_current_line</key>
<applyto>/apps/pluma/preferences/editor/current_line/highlight_current_line</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -192,8 +192,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/bracket_matching/bracket_matching</key>
<applyto>/apps/pluma-2/preferences/editor/bracket_matching/bracket_matching</applyto>
<key>/schemas/apps/pluma/preferences/editor/bracket_matching/bracket_matching</key>
<applyto>/apps/pluma/preferences/editor/bracket_matching/bracket_matching</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -204,8 +204,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/right_margin/display_right_margin</key>
<applyto>/apps/pluma-2/preferences/editor/right_margin/display_right_margin</applyto>
<key>/schemas/apps/pluma/preferences/editor/right_margin/display_right_margin</key>
<applyto>/apps/pluma/preferences/editor/right_margin/display_right_margin</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -217,8 +217,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/right_margin/right_margin_position</key>
<applyto>/apps/pluma-2/preferences/editor/right_margin/right_margin_position</applyto>
<key>/schemas/apps/pluma/preferences/editor/right_margin/right_margin_position</key>
<applyto>/apps/pluma/preferences/editor/right_margin/right_margin_position</applyto>
<owner>pluma</owner>
<type>int</type>
<default>80</default>
@ -229,8 +229,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/smart_home_end/smart_home_end</key>
<applyto>/apps/pluma-2/preferences/editor/smart_home_end/smart_home_end</applyto>
<key>/schemas/apps/pluma/preferences/editor/smart_home_end/smart_home_end</key>
<applyto>/apps/pluma/preferences/editor/smart_home_end/smart_home_end</applyto>
<owner>pluma</owner>
<type>string</type>
<default>after</default>
@ -248,8 +248,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/ui/toolbar/toolbar_visible</key>
<applyto>/apps/pluma-2/preferences/ui/toolbar/toolbar_visible</applyto>
<key>/schemas/apps/pluma/preferences/ui/toolbar/toolbar_visible</key>
<applyto>/apps/pluma/preferences/ui/toolbar/toolbar_visible</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>
@ -260,8 +260,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/ui/toolbar/toolbar_buttons_style</key>
<applyto>/apps/pluma-2/preferences/ui/toolbar/toolbar_buttons_style</applyto>
<key>/schemas/apps/pluma/preferences/ui/toolbar/toolbar_buttons_style</key>
<applyto>/apps/pluma/preferences/ui/toolbar/toolbar_buttons_style</applyto>
<owner>pluma</owner>
<type>string</type>
<default>@TOOLBAR_STYLE@</default>
@ -278,8 +278,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/ui/statusbar/statusbar_visible</key>
<applyto>/apps/pluma-2/preferences/ui/statusbar/statusbar_visible</applyto>
<key>/schemas/apps/pluma/preferences/ui/statusbar/statusbar_visible</key>
<applyto>/apps/pluma/preferences/ui/statusbar/statusbar_visible</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>
@ -291,8 +291,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/ui/side_pane/side_pane_visible</key>
<applyto>/apps/pluma-2/preferences/ui/side_pane/side_pane_visible</applyto>
<key>/schemas/apps/pluma/preferences/ui/side_pane/side_pane_visible</key>
<applyto>/apps/pluma/preferences/ui/side_pane/side_pane_visible</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -304,8 +304,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/ui/bottom_panel/bottom_panel_visible</key>
<applyto>/apps/pluma-2/preferences/ui/bottom_panel/bottom_panel_visible</applyto>
<key>/schemas/apps/pluma/preferences/ui/bottom_panel/bottom_panel_visible</key>
<applyto>/apps/pluma/preferences/ui/bottom_panel/bottom_panel_visible</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -317,8 +317,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/print/page/print_syntax_highlighting</key>
<applyto>/apps/pluma-2/preferences/print/page/print_syntax_highlighting</applyto>
<key>/schemas/apps/pluma/preferences/print/page/print_syntax_highlighting</key>
<applyto>/apps/pluma/preferences/print/page/print_syntax_highlighting</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>
@ -330,8 +330,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/print/page/print_header</key>
<applyto>/apps/pluma-2/preferences/print/page/print_header</applyto>
<key>/schemas/apps/pluma/preferences/print/page/print_header</key>
<applyto>/apps/pluma/preferences/print/page/print_header</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>
@ -343,8 +343,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/print/page/print_wrap_mode</key>
<applyto>/apps/pluma-2/preferences/print/page/print_wrap_mode</applyto>
<key>/schemas/apps/pluma/preferences/print/page/print_wrap_mode</key>
<applyto>/apps/pluma/preferences/print/page/print_wrap_mode</applyto>
<owner>pluma</owner>
<type>string</type>
<default>GTK_WRAP_WORD</default>
@ -360,8 +360,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/print/page/print_line_numbers</key>
<applyto>/apps/pluma-2/preferences/print/page/print_line_numbers</applyto>
<key>/schemas/apps/pluma/preferences/print/page/print_line_numbers</key>
<applyto>/apps/pluma/preferences/print/page/print_line_numbers</applyto>
<owner>pluma</owner>
<type>int</type>
<default>0</default>
@ -374,8 +374,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/print/fonts/print_font_body_pango</key>
<applyto>/apps/pluma-2/preferences/print/fonts/print_font_body_pango</applyto>
<key>/schemas/apps/pluma/preferences/print/fonts/print_font_body_pango</key>
<applyto>/apps/pluma/preferences/print/fonts/print_font_body_pango</applyto>
<owner>pluma</owner>
<type>string</type>
<locale name="C">
@ -388,8 +388,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/print/fonts/print_font_header_pango</key>
<applyto>/apps/pluma-2/preferences/print/fonts/print_font_header_pango</applyto>
<key>/schemas/apps/pluma/preferences/print/fonts/print_font_header_pango</key>
<applyto>/apps/pluma/preferences/print/fonts/print_font_header_pango</applyto>
<owner>pluma</owner>
<type>string</type>
<locale name="C">
@ -403,8 +403,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/print/fonts/print_font_numbers_pango</key>
<applyto>/apps/pluma-2/preferences/print/fonts/print_font_numbers_pango</applyto>
<key>/schemas/apps/pluma/preferences/print/fonts/print_font_numbers_pango</key>
<applyto>/apps/pluma/preferences/print/fonts/print_font_numbers_pango</applyto>
<owner>pluma</owner>
<type>string</type>
<locale name="C">
@ -418,8 +418,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/ui/recents/max_recents</key>
<applyto>/apps/pluma-2/preferences/ui/recents/max_recents</applyto>
<key>/schemas/apps/pluma/preferences/ui/recents/max_recents</key>
<applyto>/apps/pluma/preferences/ui/recents/max_recents</applyto>
<owner>pluma</owner>
<type>int</type>
<default>5</default>
@ -431,8 +431,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/encodings/auto_detected</key>
<applyto>/apps/pluma-2/preferences/encodings/auto_detected</applyto>
<key>/schemas/apps/pluma/preferences/encodings/auto_detected</key>
<applyto>/apps/pluma/preferences/encodings/auto_detected</applyto>
<owner>pluma</owner>
<type>list</type>
<list_type>string</list_type>
@ -455,8 +455,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/encodings/shown_in_menu</key>
<applyto>/apps/pluma-2/preferences/encodings/shown_in_menu</applyto>
<key>/schemas/apps/pluma/preferences/encodings/shown_in_menu</key>
<applyto>/apps/pluma/preferences/encodings/shown_in_menu</applyto>
<owner>pluma</owner>
<type>list</type>
<list_type>string</list_type>
@ -470,8 +470,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/syntax_highlighting/enable</key>
<applyto>/apps/pluma-2/preferences/syntax_highlighting/enable</applyto>
<key>/schemas/apps/pluma/preferences/syntax_highlighting/enable</key>
<applyto>/apps/pluma/preferences/syntax_highlighting/enable</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>
@ -482,8 +482,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/plugins/active-plugins</key>
<applyto>/apps/pluma-2/plugins/active-plugins</applyto>
<key>/schemas/apps/pluma/plugins/active-plugins</key>
<applyto>/apps/pluma/plugins/active-plugins</applyto>
<owner>pluma</owner>
<type>list</type>
<list_type>string</list_type>
@ -496,8 +496,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/save/writable_vfs_schemes</key>
<applyto>/apps/pluma-2/preferences/editor/save/writable_vfs_schemes</applyto>
<key>/schemas/apps/pluma/preferences/editor/save/writable_vfs_schemes</key>
<applyto>/apps/pluma/preferences/editor/save/writable_vfs_schemes</applyto>
<owner>pluma</owner>
<type>list</type>
<list_type>string</list_type>
@ -510,8 +510,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/cursor_position/restore_cursor_position</key>
<applyto>/apps/pluma-2/preferences/editor/cursor_position/restore_cursor_position</applyto>
<key>/schemas/apps/pluma/preferences/editor/cursor_position/restore_cursor_position</key>
<applyto>/apps/pluma/preferences/editor/cursor_position/restore_cursor_position</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>
@ -522,8 +522,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/preferences/editor/search_highlighting/enable</key>
<applyto>/apps/pluma-2/preferences/editor/search_highlighting/enable</applyto>
<key>/schemas/apps/pluma/preferences/editor/search_highlighting/enable</key>
<applyto>/apps/pluma/preferences/editor/search_highlighting/enable</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>

View File

@ -32,6 +32,9 @@ package() {
make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
# just for easy find
ln -s pluma /usr/bin/mate-text-editor
install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas

View File

@ -387,7 +387,7 @@
</orderedlist>
<para>Valid types of <replaceable>URI</replaceable> include <literal>http:</literal>, <literal>ftp:</literal>, <literal>file:</literal>, and all of the methods supported by <literal>mate-vfs</literal>.</para>
<para>Files from some types of URI are opened as read-only, and any changes you make must be saved to a different location. HTTP only allows files to be read. Files opened from FTP are read-only because because not all FTP servers may correctly work with saving remote files.</para>
<warning><para>Saving to FTP servers can be enabled with <ulink type="help" url="ghelp:mateconf-editor"><application>Configuration Editor</application></ulink>, setting the key <systemitem>/apps/pluma-2/preferences/editor/save/writable_vfs_schemes</systemitem>, but this may cause errors.</para></warning>
<warning><para>Saving to FTP servers can be enabled with <ulink type="help" url="ghelp:mateconf-editor"><application>Configuration Editor</application></ulink>, setting the key <systemitem>/apps/pluma/preferences/editor/save/writable_vfs_schemes</systemitem>, but this may cause errors.</para></warning>
</sect2>
<!-- ============= Working with tabs ======================== -->

View File

@ -686,12 +686,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"الحفظ إلى خوادم إف&#8203;تي&#8203;بي يمكن أن يُفعل من <ulink type=\"help\" "
"url=\"ghelp:mateconf-editor\"><application>محرر التشكيل</application></ulink>، "
"ضبط المفتاح <systemitem>/apps/pluma-2/preferences/editor/save/"
"ضبط المفتاح <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>، لكن هذا قد يسبب أخطاءً."
#: C/pluma.xml:395(title)

View File

@ -814,12 +814,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"Es pot habilitar el desament a servidors FTP amb l'<ulink type=\"help\" url="
"\"ghelp:mateconf-editor\"><application>editor de configuració</application></"
"ulink>, en establir la clau <systemitem>/apps/pluma-2/preferences/editor/"
"ulink>, en establir la clau <systemitem>/apps/pluma/preferences/editor/"
"save/writable_vfs_schemes</systemitem>, però això pot causar errors."
#: C/pluma.xml:395(title)

View File

@ -807,12 +807,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"Ukládání na FTP servery můžete povolit v <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Editoru nastavení</application></ulink> "
"nastavením klíče <systemitem>/apps/pluma-2/preferences/editor/save/"
"nastavením klíče <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, ale může to způsobovat chyby."
#: C/pluma.xml:395(title)

View File

@ -824,12 +824,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"At gemme til FTP-servere kan aktiveres med <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Konfigurationsredigering</application></ulink> "
"ved at sætte nøglen <systemitem>/apps/pluma-2/preferences/editor/save/"
"ved at sætte nøglen <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, men dette kan give fejlmeddelelser."
#: ../C/pluma.xml:395(title)

View File

@ -817,13 +817,13 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"Das Speichern auf FTP-Servern kann mit Hilfe des <ulink type=\"help\" url="
"\"ghelp:mateconf-editor\"><application>Konfigurationsditors</application></"
"ulink> ermöglicht werden. Aktivieren Sie den Schlüssel <systemitem>/apps/"
"pluma-2/preferences/editor/save/writable_vfs_schemes</systemitem>, aber "
"pluma/preferences/editor/save/writable_vfs_schemes</systemitem>, aber "
"bedenken Sie, dass dies Fehler zur Folge haben kann."
#: C/pluma.xml:395(title)

View File

@ -539,8 +539,8 @@ msgid "Files from some types of URI are opened as read-only, and any changes you
msgstr "Αρχεία από μερικούς τύπους URI ανοίγονται μόνο για ανάγνωση, και ό,τι αλλαγές κάνετε θα πρέπει να αποθηκευτούν σε μια διαφορετική τοποθεσία. Το HTTP επιτρέπει μόνο την ανάγνωση αρχείων. Αρχεία που ανοίγονται από FTP είναι μόνο για ανάγνωση γιατί δεν υποστηρίζουν όλοι οι εξυπηρετητές FTP την αποθήκευση απομακρυσμένων αρχείων."
#: C/pluma.xml:390(para)
msgid "Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Configuration Editor</application></ulink>, setting the key <systemitem>/apps/pluma-2/preferences/editor/save/writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr "Η αποθήκευση σε εξυπηρετητές FTP μπορεί να ενεργοποιηθεί από τον <ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Configuration Editor</application></ulink>, με την επιλογή του κλειδιού <systemitem>/apps/pluma-2/preferences/editor/save/writable_vfs_schemes</systemitem>, αλλά αυτό μπορεί να προκαλέσει σφάλματα."
msgid "Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Configuration Editor</application></ulink>, setting the key <systemitem>/apps/pluma/preferences/editor/save/writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr "Η αποθήκευση σε εξυπηρετητές FTP μπορεί να ενεργοποιηθεί από τον <ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Configuration Editor</application></ulink>, με την επιλογή του κλειδιού <systemitem>/apps/pluma/preferences/editor/save/writable_vfs_schemes</systemitem>, αλλά αυτό μπορεί να προκαλέσει σφάλματα."
#: C/pluma.xml:395(title)
msgid "Working With Tabs"

View File

@ -823,12 +823,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"Guardar a servidores FTP puede activarse con el <ulink type=\"help\" url="
"\"ghelp:mateconf-editor\"><application>Editor de configuración</application></"
"ulink>, estableciendo la clave <systemitem>/apps/pluma-2/preferences/editor/"
"ulink>, estableciendo la clave <systemitem>/apps/pluma/preferences/editor/"
"save/writable_vfs_schemes</systemitem>, pero puede causar errores."
#: C/pluma.xml:395(title)

View File

@ -779,12 +779,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"FTP-palvelimille tallentaminen voidaan kytkeä päälle <ulink type=\"help\" "
"url=\"ghelp:mateconf-editor\"><application>Asetusten muokkaimella</"
"application></ulink> asettamalla avain <systemitem>/apps/pluma-2/preferences/"
"application></ulink> asettamalla avain <systemitem>/apps/pluma/preferences/"
"editor/save/writable_vfs_schemes</systemitem>, mutta tämä voi tuottaa "
"virheitä."

View File

@ -822,13 +822,13 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"L'enregistrement de fichiers sur les serveurs FTP peut être activé avec "
"l'<ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Éditeur de "
"configuration</application></ulink>, en paramétrant la clé <systemitem>/apps/"
"pluma-2/preferences/editor/save/writable_vfs_schemes</systemitem>, mais cela "
"pluma/preferences/editor/save/writable_vfs_schemes</systemitem>, mais cela "
"peut provoquer des erreurs."
#: C/pluma.xml:395(title)

View File

@ -802,12 +802,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"Az FTP kiszolgálókra való mentés a <ulink type=\"help\" url=\"ghelp:mateconf-"
"editor\"><application>Konfigurációszerkesztővel</application></ulink> "
"kapcsolható be. A <systemitem>/apps/pluma-2/preferences/editor/save/"
"kapcsolható be. A <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem> kulcsot kell beállítani, de ez hibákat "
"okozhat."

View File

@ -819,13 +819,13 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"Il salvataggio di file su server FTP può essere abilitato attraverso "
"l'<ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Editor della "
"configurazione</application></ulink>, impostando la chiave <systemitem>/apps/"
"pluma-2/preferences/editor/save/writable_vfs_schemes</systemitem>. Questo "
"pluma/preferences/editor/save/writable_vfs_schemes</systemitem>. Questo "
"però, potrebbe causare degli errori."
#: C/pluma.xml:395(title)

View File

@ -822,12 +822,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"<ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>設定エディタ</application></ulink>を利用すれば"
"FTP サーバへの保存も利用可能になります。<systemitem>/apps/pluma-2/preferences/"
"FTP サーバへの保存も利用可能になります。<systemitem>/apps/pluma/preferences/"
"editor/save/writable_vfs_schemes</systemitem> キーを変更してください。"
"ただしこれはエラーの原因にもなります。"

View File

@ -800,12 +800,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"FTP 서버로 저장하는 기능은 <ulink type=\"help\" url=\"ghelp:mateconf-editor"
"\"><application>설정 편집기</application></ulink>로 저장할 수 있게 바꿀 수 있"
"습니다. <systemitem>/apps/pluma-2/preferences/editor/save/"
"습니다. <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>키를 설정하면 되지만, 이 기능때문에 오류가 "
"발생할 수도 있습니다."

View File

@ -687,7 +687,7 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""

View File

@ -820,12 +820,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"Salvar em servidores FTP pode ser habilitado com o <ulink type=\"help\" url="
"\"ghelp:mateconf-editor\"><application>Editor de Configurações</application></"
"ulink>, ajustando a chave <systemitem>/apps/pluma-2/preferences/editor/save/"
"ulink>, ajustando a chave <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, mas isso pode causar erros."
#: C/pluma.xml:395(title)

View File

@ -806,12 +806,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"Запись на FTP-серверы может быть включена с помощью приложения <ulink type="
"\"help\" url=\"ghelp:mateconf-editor\"><application>Редактор конфигурации</"
"application></ulink>, установкой ключа <systemitem>/apps/pluma-2/preferences/"
"application></ulink>, установкой ключа <systemitem>/apps/pluma/preferences/"
"editor/save/writable_vfs_schemes</systemitem>, но это может приводить к "
"ошибкам."

View File

@ -534,8 +534,8 @@ msgid "Files from some types of URI are opened as read-only, and any changes you
msgstr "Filer från vissa typer av uri:er öppnas skrivskyddade, och alla ändringar du gör måste sparas på en annan plats. HTTP tillåter endast filer att bli lästa. Filer öppnade från en FTP-server är skrivskyddade på grund av att inte alla FTP-servrar fungerar korrekt när man sparar fjärrfiler."
#: C/pluma.xml:390(para)
msgid "Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Configuration Editor</application></ulink>, setting the key <systemitem>/apps/pluma-2/preferences/editor/save/writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr "Skrivning till FTP-servrar kan aktiveras med <ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Konfigurationsredigerare</application></ulink>, ställ in nyckeln <systemitem>/apps/pluma-2/preferences/editor/save/writable_vfs_schemes</systemitem>, men det kan orsaka fel."
msgid "Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Configuration Editor</application></ulink>, setting the key <systemitem>/apps/pluma/preferences/editor/save/writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr "Skrivning till FTP-servrar kan aktiveras med <ulink type=\"help\" url=\"ghelp:mateconf-editor\"><application>Konfigurationsredigerare</application></ulink>, ställ in nyckeln <systemitem>/apps/pluma/preferences/editor/save/writable_vfs_schemes</systemitem>, men det kan orsaka fel."
#: C/pluma.xml:395(title)
msgid "Working With Tabs"

View File

@ -778,7 +778,7 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""

View File

@ -809,12 +809,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"Збереження файлів на сервер FTP можна увімкнути у <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Редакторі конфігурації</application></ulink>, "
"встановивши ключ <systemitem>/apps/pluma-2/preferences/editor/save/"
"встановивши ключ <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>. Але подібний режим використання може призводити до помилок."
#: ../C/pluma.xml:388(title)

View File

@ -760,12 +760,12 @@ msgstr ""
msgid ""
"Saving to FTP servers can be enabled with <ulink type=\"help\" url=\"ghelp:"
"mateconf-editor\"><application>Configuration Editor</application></ulink>, "
"setting the key <systemitem>/apps/pluma-2/preferences/editor/save/"
"setting the key <systemitem>/apps/pluma/preferences/editor/save/"
"writable_vfs_schemes</systemitem>, but this may cause errors."
msgstr ""
"保存到远程服务器,可以通过 <ulink type=\"help\" url=\"ghelp:mateconf-editor"
"\"><application>配置编辑器</application></ulink> 来启用,设置 <systemitem>/"
"apps/pluma-2/preferences/editor/save/writable_vfs_schemes</systemitem>,但这"
"apps/pluma/preferences/editor/save/writable_vfs_schemes</systemitem>,但这"
"可能导致错误发生。"
#: C/pluma.xml:395(title)

View File

@ -1,7 +1,7 @@
icondir = $(datadir)/pluma-2/icons
icondir = $(datadir)/pluma/icons
icon_DATA = pluma-plugin.png
logodir = $(datadir)/pluma-2/logo
logodir = $(datadir)/pluma/logo
logo_DATA = pluma-logo.png
EXTRA_DIST = \

View File

@ -1,6 +1,6 @@
# C plugin loader
loaderdir = $(libdir)/pluma-2/plugin-loaders
loaderdir = $(libdir)/pluma/plugin-loaders
INCLUDES = \
-I$(top_srcdir) \

View File

@ -1,7 +1,7 @@
# C plugin loader
SUBDIRS = bindings
loaderdir = $(libdir)/pluma-2/plugin-loaders
loaderdir = $(libdir)/pluma/plugin-loaders
INCLUDES = \
-I$(top_srcdir) \

View File

@ -35,7 +35,7 @@
#include <pluma/pluma-message-area.h>
#endif
#define MATECONF_KEY_BASE "/apps/pluma-2/plugins/checkupdate"
#define MATECONF_KEY_BASE "/apps/pluma/plugins/checkupdate"
#define MATECONF_KEY_IGNORE_VERSION MATECONF_KEY_BASE "/ignore_version"
#define WINDOW_DATA_KEY "PlumaCheckUpdatePluginWindowData"

View File

@ -1,8 +1,8 @@
<mateconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/pluma-2/plugins/checkupdate/ignore_version</key>
<applyto>/apps/pluma-2/plugins/checkupdate/ignore_version</applyto>
<key>/schemas/apps/pluma/plugins/checkupdate/ignore_version</key>
<applyto>/apps/pluma/plugins/checkupdate/ignore_version</applyto>
<owner>pluma</owner>
<type>string</type>
<locale name="C">

View File

@ -41,7 +41,7 @@ class ToolLibrary(Singleton):
if platform.platform() != 'Windows':
for d in self.get_xdg_data_dirs():
self.locations.append(os.path.join(d, 'pluma-2', 'plugins', 'externaltools', 'tools'))
self.locations.append(os.path.join(d, 'pluma', 'plugins', 'externaltools', 'tools'))
self.locations.append(datadir)
@ -53,7 +53,7 @@ class ToolLibrary(Singleton):
if userdir:
toolsdir = os.path.join(userdir, 'pluma/tools')
else:
toolsdir = os.path.expanduser('~/.mate2/pluma/tools')
toolsdir = os.path.expanduser('~/.config/pluma/tools')
self.locations.insert(0, toolsdir);
@ -82,7 +82,7 @@ class ToolLibrary(Singleton):
if userdir:
filename = os.path.join(userdir, 'pluma/pluma-tools.xml')
else:
filename = os.path.expanduser('~/.mate2/pluma/pluma-tools.xml')
filename = os.path.expanduser('~/.config/pluma/pluma-tools.xml')
if not os.path.isfile(filename):
return

View File

@ -40,7 +40,7 @@
#include "pluma-file-browser-messages.h"
#define WINDOW_DATA_KEY "PlumaFileBrowserPluginWindowData"
#define FILE_BROWSER_BASE_KEY "/apps/pluma-2/plugins/filebrowser"
#define FILE_BROWSER_BASE_KEY "/apps/pluma/plugins/filebrowser"
#define CAJA_CLICK_POLICY_BASE_KEY "/apps/caja/preferences"
#define CAJA_CLICK_POLICY_KEY "click_policy"
#define CAJA_ENABLE_DELETE_KEY "enable_delete"

View File

@ -1,8 +1,8 @@
<mateconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/pluma-2/plugins/filebrowser/on_load/tree_view</key>
<applyto>/apps/pluma-2/plugins/filebrowser/on_load/tree_view</applyto>
<key>/schemas/apps/pluma/plugins/filebrowser/on_load/tree_view</key>
<applyto>/apps/pluma/plugins/filebrowser/on_load/tree_view</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>
@ -13,8 +13,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/plugins/filebrowser/on_load/root</key>
<applyto>/apps/pluma-2/plugins/filebrowser/on_load/root</applyto>
<key>/schemas/apps/pluma/plugins/filebrowser/on_load/root</key>
<applyto>/apps/pluma/plugins/filebrowser/on_load/root</applyto>
<owner>pluma</owner>
<type>string</type>
<default></default>
@ -26,8 +26,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/plugins/filebrowser/on_load/virtual_root</key>
<applyto>/apps/pluma-2/plugins/filebrowser/on_load/virtual_root</applyto>
<key>/schemas/apps/pluma/plugins/filebrowser/on_load/virtual_root</key>
<applyto>/apps/pluma/plugins/filebrowser/on_load/virtual_root</applyto>
<owner>pluma</owner>
<type>string</type>
<default></default>
@ -40,8 +40,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/plugins/filebrowser/on_load/enable_remote</key>
<applyto>/apps/pluma-2/plugins/filebrowser/on_load/enable_remote</applyto>
<key>/schemas/apps/pluma/plugins/filebrowser/on_load/enable_remote</key>
<applyto>/apps/pluma/plugins/filebrowser/on_load/enable_remote</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>FALSE</default>
@ -52,8 +52,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/plugins/filebrowser/open_at_first_doc</key>
<applyto>/apps/pluma-2/plugins/filebrowser/open_at_first_doc</applyto>
<key>/schemas/apps/pluma/plugins/filebrowser/open_at_first_doc</key>
<applyto>/apps/pluma/plugins/filebrowser/open_at_first_doc</applyto>
<owner>pluma</owner>
<type>bool</type>
<default>TRUE</default>
@ -67,8 +67,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/plugins/filebrowser/filter_mode</key>
<applyto>/apps/pluma-2/plugins/filebrowser/filter_mode</applyto>
<key>/schemas/apps/pluma/plugins/filebrowser/filter_mode</key>
<applyto>/apps/pluma/plugins/filebrowser/filter_mode</applyto>
<owner>pluma</owner>
<type>string</type>
<default>hidden_and_binary</default>
@ -82,8 +82,8 @@
</schema>
<schema>
<key>/schemas/apps/pluma-2/plugins/filebrowser/filter_pattern</key>
<applyto>/apps/pluma-2/plugins/filebrowser/filter_pattern</applyto>
<key>/schemas/apps/pluma/plugins/filebrowser/filter_pattern</key>
<applyto>/apps/pluma/plugins/filebrowser/filter_pattern</applyto>
<owner>pluma</owner>
<type>string</type>
<default></default>

View File

@ -29,7 +29,7 @@ import gtk
__all__ = ('PythonConsoleConfig', 'PythonConsoleConfigDialog')
MATECONF_KEY_BASE = '/apps/pluma-2/plugins/pythonconsole'
MATECONF_KEY_BASE = '/apps/pluma/plugins/pythonconsole'
MATECONF_KEY_COMMAND_COLOR = MATECONF_KEY_BASE + '/command-color'
MATECONF_KEY_ERROR_COLOR = MATECONF_KEY_BASE + '/error-color'

View File

@ -45,7 +45,7 @@ class SnippetsPlugin(pluma.Plugin):
if userdir:
snippetsdir = os.path.join(userdir, 'pluma/snippets')
else:
snippetsdir = os.path.expanduser('~/.mate2/pluma/snippets')
snippetsdir = os.path.expanduser('~/.config/pluma/snippets')
library.set_dirs(snippetsdir, self.system_dirs())
@ -59,7 +59,7 @@ class SnippetsPlugin(pluma.Plugin):
dirs = []
for d in datadirs.split(os.pathsep):
d = os.path.join(d, 'pluma-2', 'plugins', 'snippets')
d = os.path.join(d, 'pluma', 'plugins', 'snippets')
if os.path.isdir(d):
dirs.append(d)

View File

@ -38,7 +38,7 @@
#define PLUMA_SORT_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), PLUMA_TYPE_SORT_PLUGIN, PlumaSortPluginPrivate))
/* Key in case the plugin ever needs any settings. */
#define SORT_BASE_KEY "/apps/pluma-2/plugins/sort"
#define SORT_BASE_KEY "/apps/pluma/plugins/sort"
#define WINDOW_DATA_KEY "PlumaSortPluginWindowData"
#define MENU_PATH "/MenuBar/EditMenu/EditOps_6"

View File

@ -44,7 +44,7 @@
#include "pluma-taglist-plugin-parser.h"
/* we screwed up so we still look here for compatibility */
#define USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY ".pluma-2/plugins/taglist/"
#define USER_PLUMA_TAGLIST_PLUGIN_LOCATION_LEGACY ".pluma/plugins/taglist/"
#define USER_PLUMA_TAGLIST_PLUGIN_LOCATION "pluma/taglist/"
TagList *taglist = NULL;
@ -629,7 +629,7 @@ TagList* create_taglist (const gchar *data_dir)
else if (home != NULL)
{
pdir = g_build_filename (home,
".mate2",
".config",
USER_PLUMA_TAGLIST_PLUGIN_LOCATION,
NULL);
parse_taglist_dir (pdir);

View File

@ -53,7 +53,7 @@
#define MENU_PATH "/MenuBar/EditMenu/EditOps_4"
/* mateconf keys */
#define TIME_BASE_KEY "/apps/pluma-2/plugins/time"
#define TIME_BASE_KEY "/apps/pluma/plugins/time"
#define PROMPT_TYPE_KEY TIME_BASE_KEY "/prompt_type"
#define SELECTED_FORMAT_KEY TIME_BASE_KEY "/selected_format"
#define CUSTOM_FORMAT_KEY TIME_BASE_KEY "/custom_format"

View File

@ -205,7 +205,7 @@ pluma-marshal.c: pluma-marshal.list $(GLIB_GENMARSHAL)
$(AM_V_GEN) echo "#include \"pluma-marshal.h\"" > $@ && \
$(GLIB_GENMARSHAL) $< --body --prefix=pluma_marshal >> $@
uidir = $(datadir)/pluma-2/ui/
uidir = $(datadir)/pluma/ui/
ui_DATA = \
pluma-ui.xml \
pluma-print-preferences.ui

View File

@ -1,4 +1,4 @@
uidir = $(datadir)/pluma-2/ui/
uidir = $(datadir)/pluma/ui/
INCLUDES = \
-I$(top_srcdir) \

View File

@ -5,6 +5,7 @@
* Copyright (C) 1998, 1999 Alex Roberts, Evan Lawrence
* Copyright (C) 2000, 2001 Chema Celorio, Paolo Maggi
* Copyright (C) 2002-2005 Paolo Maggi
* Copyright (C) 2011 Perberos
*
* 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
@ -23,7 +24,7 @@
*/
/*
* Modified by the pluma Team, 1998-2005. See the AUTHORS file for a
* Modified by the gedit Team, 1998-2005. See the AUTHORS file for a
* list of people on the pluma Team.
* See the ChangeLog files for a list of changes.
*
@ -42,18 +43,14 @@
#include "pluma-help.h"
#include "pluma-dirs.h"
void
_pluma_cmd_help_contents (GtkAction *action,
PlumaWindow *window)
void _pluma_cmd_help_contents(GtkAction* action, PlumaWindow* window)
{
pluma_debug(DEBUG_COMMANDS);
pluma_help_display(GTK_WINDOW(window), NULL, NULL);
}
void
_pluma_cmd_help_about (GtkAction *action,
PlumaWindow *window)
void _pluma_cmd_help_about(GtkAction* action, PlumaWindow* window)
{
static const gchar* const authors[] = {
"Paolo Maggi <paolo@gnome.org>",
@ -64,11 +61,12 @@ _pluma_cmd_help_about (GtkAction *action,
"James Willcox <jwillcox@gnome.org>",
"Chema Celorio",
"Federico Mena Quintero <federico@novell.com>",
"Perberos <perberos@gmail.com>",
NULL
};
static const gchar* const documenters[] = {
"Sun MATE Documentation Team <gdocteam@sun.com>",
"Sun GNOME Documentation Team <gdocteam@sun.com>",
"Eric Baudais <baudais@okstate.edu>",
NULL
};
@ -81,23 +79,17 @@ _pluma_cmd_help_about (GtkAction *action,
"Copyright \xc2\xa9 2011 Perberos";
static const gchar comments[] = \
N_("pluma is a small and lightweight text editor for the "
"MATE Desktop");
GdkPixbuf *logo;
gchar *data_dir;
gchar *logo_file;
N_("pluma is a small and lightweight text editor for the MATE Desktop");
pluma_debug (DEBUG_COMMANDS);
data_dir = pluma_dirs_get_pluma_data_dir ();
logo_file = g_build_filename (data_dir,
"logo",
"pluma.png",
NULL);
g_free (data_dir);
logo = gdk_pixbuf_new_from_file (logo_file, NULL);
g_free (logo_file);
GdkPixbuf* logo = NULL;
GtkIconTheme* icon_theme = gtk_icon_theme_get_default();
if (gtk_icon_theme_has_icon(icon_theme, "accessories-text-editor"))
{
logo = gtk_icon_theme_load_icon(icon_theme, "accessories-text-editor", 64, 0, NULL);
}
gtk_show_about_dialog (GTK_WINDOW (window),
"program-name", "Pluma",
@ -112,5 +104,7 @@ _pluma_cmd_help_about (GtkAction *action,
NULL);
if (logo)
{
g_object_unref(logo);
}
}

View File

@ -3,6 +3,7 @@
* This file is part of pluma
*
* Copyright (C) 2008 Ignacio Casal Quinteiro
* Copyright (C) 2011 Perberos
*
* 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
@ -30,8 +31,7 @@
#include <ige-mac-bundle.h>
#endif
gchar *
pluma_dirs_get_user_config_dir (void)
gchar* pluma_dirs_get_user_config_dir(void)
{
gchar* config_dir = NULL;
@ -41,12 +41,10 @@ pluma_dirs_get_user_config_dir (void)
/* Support old libmate env var */
envvar = g_getenv("MATE22_USER_DIR");
if (envvar != NULL)
{
config_dir = g_build_filename (envvar,
"pluma",
NULL);
config_dir = g_build_filename(envvar, "pluma", NULL);
}
else
{
@ -54,51 +52,39 @@ pluma_dirs_get_user_config_dir (void)
if (home != NULL)
{
config_dir = g_build_filename (home,
".mate2",
"pluma",
NULL);
config_dir = g_build_filename(home, ".config", "pluma", NULL);
}
}
#else
config_dir = g_build_filename (g_get_user_config_dir (),
"pluma",
NULL);
config_dir = g_build_filename(g_get_user_config_dir(), "pluma", NULL);
#endif
return config_dir;
}
gchar *
pluma_dirs_get_user_cache_dir (void)
gchar* pluma_dirs_get_user_cache_dir(void)
{
const gchar* cache_dir;
cache_dir = g_get_user_cache_dir();
return g_build_filename (cache_dir,
"pluma",
NULL);
return g_build_filename(cache_dir, "pluma", NULL);
}
gchar *
pluma_dirs_get_user_plugins_dir (void)
gchar* pluma_dirs_get_user_plugins_dir(void)
{
gchar* config_dir;
gchar* plugin_dir;
config_dir = pluma_dirs_get_user_config_dir();
plugin_dir = g_build_filename (config_dir,
"plugins",
NULL);
plugin_dir = g_build_filename(config_dir, "plugins", NULL);
g_free(config_dir);
return plugin_dir;
}
gchar *
pluma_dirs_get_user_accels_file (void)
gchar* pluma_dirs_get_user_accels_file(void)
{
gchar* accels = NULL;
@ -106,18 +92,16 @@ pluma_dirs_get_user_accels_file (void)
const gchar* envvar;
const gchar* home;
/* on linux accels are stored in .mate2/accels
/* on linux accels are stored in .config/accels
* for historic reasons (backward compat with the
* old libmate that took care of saving them */
/* Support old libmate env var */
envvar = g_getenv("MATE22_USER_DIR");
if (envvar != NULL)
{
accels = g_build_filename (envvar,
"accels",
"pluma",
NULL);
accels = g_build_filename(envvar, "accels", "pluma", NULL);
}
else
{
@ -125,32 +109,24 @@ pluma_dirs_get_user_accels_file (void)
if (home != NULL)
{
accels = g_build_filename (home,
".mate2",
"accels",
"pluma",
NULL);
accels = g_build_filename(home, ".config", "accels", "pluma", NULL);
}
}
#else
{
gchar *config_dir = NULL;
config_dir = pluma_dirs_get_user_config_dir();
accels = g_build_filename (config_dir,
"accels",
"pluma",
NULL);
accels = g_build_filename(config_dir, "accels", "pluma", NULL);
g_free(config_dir);
}
#endif
return accels;
}
gchar *
pluma_dirs_get_pluma_data_dir (void)
gchar* pluma_dirs_get_pluma_data_dir(void)
{
gchar* data_dir;
@ -159,53 +135,47 @@ pluma_dirs_get_pluma_data_dir (void)
win32_dir = g_win32_get_package_installation_directory_of_module(NULL);
data_dir = g_build_filename (win32_dir,
"share",
"pluma-2",
NULL);
data_dir = g_build_filename(win32_dir, "share", "pluma", NULL);
g_free(win32_dir);
#elif defined(OS_OSX)
IgeMacBundle* bundle = ige_mac_bundle_get_default();
if (ige_mac_bundle_get_is_app_bundle(bundle))
{
const gchar* bundle_data_dir = ige_mac_bundle_get_datadir(bundle);
data_dir = g_build_filename (bundle_data_dir,
"pluma-2",
NULL);
data_dir = g_build_filename(bundle_data_dir, "pluma", NULL);
}
else
{
data_dir = g_build_filename (DATADIR, "pluma-2", NULL);
data_dir = g_build_filename(DATADIR, "pluma", NULL);
}
#else
data_dir = g_build_filename (DATADIR,
"pluma-2",
NULL);
data_dir = g_build_filename(DATADIR, "pluma", NULL);
#endif
return data_dir;
}
gchar *
pluma_dirs_get_pluma_locale_dir (void)
gchar* pluma_dirs_get_pluma_locale_dir(void)
{
gchar* locale_dir;
#ifdef G_OS_WIN32
gchar* win32_dir;
win32_dir = g_win32_get_package_installation_directory_of_module(NULL);
locale_dir = g_build_filename (win32_dir,
"share",
"locale",
NULL);
locale_dir = g_build_filename(win32_dir, "share", "locale", NULL);
g_free(win32_dir);
#elif defined(OS_OSX)
IgeMacBundle *bundle = ige_mac_bundle_get_default();
if (ige_mac_bundle_get_is_app_bundle(bundle))
@ -214,95 +184,75 @@ pluma_dirs_get_pluma_locale_dir (void)
}
else
{
locale_dir = g_build_filename (DATADIR,
"locale",
NULL);
locale_dir = g_build_filename(DATADIR, "locale", NULL);
}
#else
locale_dir = g_build_filename (DATADIR,
"locale",
NULL);
locale_dir = g_build_filename(DATADIR, "locale", NULL);
#endif
return locale_dir;
}
gchar *
pluma_dirs_get_pluma_lib_dir (void)
gchar* pluma_dirs_get_pluma_lib_dir(void)
{
gchar* lib_dir;
#ifdef G_OS_WIN32
gchar* win32_dir;
win32_dir = g_win32_get_package_installation_directory_of_module(NULL);
lib_dir = g_build_filename (win32_dir,
"lib",
"pluma-2",
NULL);
lib_dir = g_build_filename(win32_dir, "lib", "pluma", NULL);
g_free(win32_dir);
#elif defined(OS_OSX)
IgeMacBundle* bundle = ige_mac_bundle_get_default();
if (ige_mac_bundle_get_is_app_bundle(bundle))
{
const gchar* path = ige_mac_bundle_get_resourcesdir(bundle);
lib_dir = g_build_filename (path,
"lib",
"pluma-2",
NULL);
lib_dir = g_build_filename(path, "lib", "pluma", NULL);
}
else
{
lib_dir = g_build_filename (LIBDIR,
"pluma-2",
NULL);
lib_dir = g_build_filename(LIBDIR, "pluma", NULL);
}
#else
lib_dir = g_build_filename (LIBDIR,
"pluma-2",
NULL);
lib_dir = g_build_filename(LIBDIR, "pluma", NULL);
#endif
return lib_dir;
}
gchar *
pluma_dirs_get_pluma_plugins_dir (void)
gchar* pluma_dirs_get_pluma_plugins_dir(void)
{
gchar* lib_dir;
gchar* plugin_dir;
lib_dir = pluma_dirs_get_pluma_lib_dir();
plugin_dir = g_build_filename (lib_dir,
"plugins",
NULL);
plugin_dir = g_build_filename(lib_dir, "plugins", NULL);
g_free(lib_dir);
return plugin_dir;
}
gchar *
pluma_dirs_get_pluma_plugin_loaders_dir (void)
gchar* pluma_dirs_get_pluma_plugin_loaders_dir(void)
{
gchar* lib_dir;
gchar* loader_dir;
lib_dir = pluma_dirs_get_pluma_lib_dir();
loader_dir = g_build_filename (lib_dir,
"plugin-loaders",
NULL);
loader_dir = g_build_filename(lib_dir, "plugin-loaders", NULL);
g_free(lib_dir);
return loader_dir;
}
gchar *
pluma_dirs_get_ui_file (const gchar *file)
gchar* pluma_dirs_get_ui_file(const gchar* file)
{
gchar* datadir;
gchar* ui_file;
@ -310,10 +260,7 @@ pluma_dirs_get_ui_file (const gchar *file)
g_return_val_if_fail(file != NULL, NULL);
datadir = pluma_dirs_get_pluma_data_dir();
ui_file = g_build_filename (datadir,
"ui",
file,
NULL);
ui_file = g_build_filename(datadir, "ui", file, NULL);
g_free(datadir);
return ui_file;

View File

@ -217,7 +217,7 @@ pluma_plugin_get_data_dir (PlumaPlugin *plugin)
/* If it's a "user" plugin the data dir is
* install_dir/data_dir_name if instead it's a
* "system" plugin the data dir is under pluma_data_dir,
* so it's under $prefix/share/pluma-2/plugins/data_dir_name
* so it's under $prefix/share/pluma/plugins/data_dir_name
* where data_dir_name usually it's the name of the plugin
*/
pluma_lib_dir = pluma_dirs_get_pluma_lib_dir ();

View File

@ -46,7 +46,7 @@
#include "pluma-object-module.h"
#include "pluma-dirs.h"
#define PLUMA_PLUGINS_ENGINE_BASE_KEY "/apps/pluma-2/plugins"
#define PLUMA_PLUGINS_ENGINE_BASE_KEY "/apps/pluma/plugins"
#define PLUMA_PLUGINS_ENGINE_KEY PLUMA_PLUGINS_ENGINE_BASE_KEY "/active-plugins"
#define PLUGIN_EXT ".pluma-plugin"

View File

@ -146,7 +146,7 @@ static void pluma_prefs_manager_lockdown_changed (MateConfClient *client,
#define PLUMA_STATE_DEFAULT_SIDE_PANEL_SIZE 200
#define PLUMA_STATE_DEFAULT_BOTTOM_PANEL_SIZE 140
#define PLUMA_STATE_FILE_LOCATION "pluma-2"
#define PLUMA_STATE_FILE_LOCATION "pluma.ini"
#define PLUMA_STATE_WINDOW_GROUP "window"
#define PLUMA_STATE_WINDOW_STATE "state"

View File

@ -35,7 +35,7 @@
#include <gtksourceview/gtksourceview.h>
#include "pluma-app.h"
#define PLUMA_BASE_KEY "/apps/pluma-2"
#define PLUMA_BASE_KEY "/apps/pluma"
#define GPM_PREFS_DIR PLUMA_BASE_KEY "/preferences"

View File

@ -219,22 +219,22 @@ cp -R "${_gtksourceview_prefix}/share/gtksourceview-2.0/language-specs" installe
cp -R "${_gtksourceview_prefix}/share/gtksourceview-2.0/styles" installer/pluma/share/gtksourceview-2.0 || exit
#GtkBuilder files and xml files
mkdir -p installer/pluma/share/pluma-2/ui || exit
cp "${_pluma_prefix}/share/pluma-2/ui/"* installer/pluma/share/pluma-2/ui || exit
mkdir -p installer/pluma/share/pluma/ui || exit
cp "${_pluma_prefix}/share/pluma/ui/"* installer/pluma/share/pluma/ui || exit
#Icons & logo
mkdir -p installer/pluma/share/pluma-2/icons || exit
cp "${_pluma_prefix}/share/pluma-2/icons/pluma-plugin.png" installer/pluma/share/pluma-2/icons || exit
mkdir -p installer/pluma/share/pluma-2/logo || exit
cp "${_pluma_prefix}/share/pluma-2/logo/pluma-logo.png" installer/pluma/share/pluma-2/logo || exit
mkdir -p installer/pluma/share/pluma/icons || exit
cp "${_pluma_prefix}/share/pluma/icons/pluma-plugin.png" installer/pluma/share/pluma/icons || exit
mkdir -p installer/pluma/share/pluma/logo || exit
cp "${_pluma_prefix}/share/pluma/logo/pluma-logo.png" installer/pluma/share/pluma/logo || exit
#Plugins
mkdir -p installer/pluma/share/pluma-2/plugins || exit
cp -R "${_pluma_prefix}/share/pluma-2/plugins/"* installer/pluma/share/pluma-2/plugins || exit
mkdir -p installer/pluma/lib/pluma-2/plugins || exit
cp -R "${_pluma_prefix}/lib/pluma-2/plugins/"* installer/pluma/lib/pluma-2/plugins || exit
mkdir -p installer/pluma/lib/pluma-2/plugin-loaders || exit
cp -R "${_pluma_prefix}/lib/pluma-2/plugin-loaders/"* installer/pluma/lib/pluma-2/plugin-loaders || exit
mkdir -p installer/pluma/share/pluma/plugins || exit
cp -R "${_pluma_prefix}/share/pluma/plugins/"* installer/pluma/share/pluma/plugins || exit
mkdir -p installer/pluma/lib/pluma/plugins || exit
cp -R "${_pluma_prefix}/lib/pluma/plugins/"* installer/pluma/lib/pluma/plugins || exit
mkdir -p installer/pluma/lib/pluma/plugin-loaders || exit
cp -R "${_pluma_prefix}/lib/pluma/plugin-loaders/"* installer/pluma/lib/pluma/plugin-loaders || exit
#MateConf
mkdir -p installer/pluma/etc/mateconf/schemas || exit