wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' of github.com:mate-desktop/pluma

This commit is contained in:
Stefano Karapetsas 2014-02-17 09:30:06 +01:00
parent 879dbc0ccd 24c8142ce7
commit 928082bef8
6 changed files with 504 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -4,7 +4,7 @@ AC_PREREQ(2.63.2)
m4_define(pluma_major_version, 1) m4_define(pluma_major_version, 1)
m4_define(pluma_minor_version, 7) m4_define(pluma_minor_version, 7)
m4_define(pluma_micro_version, 1) m4_define(pluma_micro_version, 2)
m4_define(pluma_version, pluma_major_version.pluma_minor_version.pluma_micro_version) m4_define(pluma_version, pluma_major_version.pluma_minor_version.pluma_micro_version)
AC_INIT([pluma], [pluma_version], AC_INIT([pluma], [pluma_version],

3
pluma/Makefile.am
View File

@ -226,9 +226,6 @@ install-exec-hook:
if PLATFORM_WIN32 if PLATFORM_WIN32
$(mkinstalldirs) "$(DESTDIR)$(libdir)" $(mkinstalldirs) "$(DESTDIR)$(libdir)"
$(INSTALL_DATA) libpluma.a "$(DESTDIR)$(libdir)" $(INSTALL_DATA) libpluma.a "$(DESTDIR)$(libdir)"
else
rm -f $(DESTDIR)$(bindir)/mate-text-editor
ln -s pluma $(DESTDIR)$(bindir)/mate-text-editor
endif endif
if !OS_WIN32 if !OS_WIN32

5
pluma/pluma-style-scheme-manager.c
View File

@ -38,6 +38,11 @@
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gtk/gtk.h>
#if GTK_CHECK_VERSION (3, 0, 0)
#include <gtksourceview/gtksource.h>
#endif
#include "pluma-style-scheme-manager.h" #include "pluma-style-scheme-manager.h"
#include "pluma-prefs-manager.h" #include "pluma-prefs-manager.h"
#include "pluma-dirs.h" #include "pluma-dirs.h"

7
po/hu.po
View File

@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# #
# Translators: # Translators:
# i_sty <szollosi.istv4n@gmail.com>, 2014
# Rezső Páder <rezso@rezso.net>, 2013 # Rezső Páder <rezso@rezso.net>, 2013
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: MATE Desktop Environment\n" "Project-Id-Version: MATE Desktop Environment\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-04 12:56+0100\n" "POT-Creation-Date: 2013-11-04 12:56+0100\n"
"PO-Revision-Date: 2013-11-04 14:55+0000\n" "PO-Revision-Date: 2014-01-26 13:43+0000\n"
"Last-Translator: Rezső Páder <rezso@rezso.net>\n" "Last-Translator: i_sty <szollosi.istv4n@gmail.com>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/MATE/language/hu/)\n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/MATE/language/hu/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -2499,7 +2500,7 @@ msgstr "Keresés"
#: ../plugins/externaltools/data/switch-c.desktop.in.h:1 #: ../plugins/externaltools/data/switch-c.desktop.in.h:1
msgid "Switch onto a file .c and .h" msgid "Switch onto a file .c and .h"
msgstr "" msgstr "Kapcsoljon rá egy .c és egy .h fájlt"
#: ../plugins/filebrowser/filebrowser.pluma-plugin.desktop.in.h:1 #: ../plugins/filebrowser/filebrowser.pluma-plugin.desktop.in.h:1
msgid "File Browser Pane" msgid "File Browser Pane"

12
po/it.po
View File

@ -4,14 +4,14 @@
# #
# Translators: # Translators:
# luca123 <l_moscato1@hotmail.it>, 2013 # luca123 <l_moscato1@hotmail.it>, 2013
# Stefano Karapetsas <stefano@karapetsas.com>, 2013 # Stefano Karapetsas <stefano@karapetsas.com>, 2013-2014
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: MATE Desktop Environment\n" "Project-Id-Version: MATE Desktop Environment\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-04 12:56+0100\n" "POT-Creation-Date: 2013-11-04 12:56+0100\n"
"PO-Revision-Date: 2013-11-24 17:49+0000\n" "PO-Revision-Date: 2014-01-25 23:01+0000\n"
"Last-Translator: luca123 <l_moscato1@hotmail.it>\n" "Last-Translator: Stefano Karapetsas <stefano@karapetsas.com>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/MATE/language/it/)\n" "Language-Team: Italian (http://www.transifex.com/projects/p/MATE/language/it/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
@ -786,7 +786,7 @@ msgstr "_Ricominciare dall'inizio"
#: ../pluma/dialogs/pluma-search-dialog.ui.h:9 #: ../pluma/dialogs/pluma-search-dialog.ui.h:9
msgid "_Parse escape sequences (e.g. \\n)" msgid "_Parse escape sequences (e.g. \\n)"
msgstr "" msgstr "Analizza le sequenze di esca_pe (es. \\n)"
#: ../pluma/pluma.c:126 #: ../pluma/pluma.c:126
msgid "Show the application's version" msgid "Show the application's version"
@ -2072,7 +2072,7 @@ msgstr "_Maiuscole/Minuscole"
msgid "" msgid ""
"_Parse escape sequences (e.g. \n" "_Parse escape sequences (e.g. \n"
")" ")"
msgstr "" msgstr "Analizza le sequenze di esca_pe (es. \n)"
#: ../pluma/pluma-view.c:1418 #: ../pluma/pluma-view.c:1418
msgid "String you want to search for" msgid "String you want to search for"
@ -2500,7 +2500,7 @@ msgstr "Cerca"
#: ../plugins/externaltools/data/switch-c.desktop.in.h:1 #: ../plugins/externaltools/data/switch-c.desktop.in.h:1
msgid "Switch onto a file .c and .h" msgid "Switch onto a file .c and .h"
msgstr "" msgstr "Passa tra file .c e .h"
#: ../plugins/filebrowser/filebrowser.pluma-plugin.desktop.in.h:1 #: ../plugins/filebrowser/filebrowser.pluma-plugin.desktop.in.h:1
msgid "File Browser Pane" msgid "File Browser Pane"

974
po/sk.po
View File

File diff suppressed because it is too large Load Diff