diff --git a/Makefile.am b/Makefile.am index 21cd7e1..43be0ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,10 +12,6 @@ distclean-local: distuninstallcheck_listfiles = \ find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache -rpm: dist - rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz - @rm -f $(PACKAGE)-$(VERSION).tar.gz - .PHONY: ChangeLog ChangeLog: Makefile @@ -33,6 +29,7 @@ EXTRA_DIST = \ DISTCLEANFILES = \ intltool-extract \ intltool-merge \ - intltool-update + intltool-update \ + ./po/.intltool-merge-cache.lock # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/NEWS b/NEWS index b244321..8235550 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +4.6.0 (2022-04-04) +===== +- Add Chibi theme (!4) +- Small code improvements +- Translation Updates: + Albanian, Armenian (Armenia), Basque, Belarusian, English (Canada), + Finnish, French, Hebrew, Slovenian, Spanish, Thai, Ukrainian, Uyghur + 4.5.1 ====== - Update URLs. Remove ref. to translations.x.o (Bug #16162) diff --git a/configure.ac.in b/configure.ac.in index f2114e5..785e07f 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,8 +5,8 @@ dnl *************************** dnl *** Version information *** dnl *************************** m4_define([eyes_version_major], [4]) -m4_define([eyes_version_minor], [5]) -m4_define([eyes_version_micro], [1]) +m4_define([eyes_version_minor], [6]) +m4_define([eyes_version_micro], [0]) m4_define([eyes_version_build], [r@REVISION@]) m4_define([eyes_version_tag], [git]) m4_define([eyes_version], [eyes_version_major().eyes_version_minor().eyes_version_micro()ifelse(eyes_version_tag(), [git], [eyes_version_tag()-eyes_version_build()], [eyes_version_tag()])]) @@ -32,7 +32,7 @@ dnl ******************************** dnl *** Check for basic programs *** dnl ******************************** AC_PROG_CC() -AC_PROG_LD() +LT_PATH_LD() AC_PROG_INSTALL() LT_PREREQ([2.2.6]) LT_INIT([disable-static]) @@ -57,6 +57,7 @@ XDT_I18N([@LINGUAS@]) dnl *********************************** dnl *** Check for required packages *** dnl *********************************** +XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.26.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.14.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0]) @@ -84,5 +85,8 @@ themes/Default/Makefile themes/Default-tiny/Makefile themes/Horrid/Makefile themes/Tango/Makefile +themes/Chibi/Makefile +themes/Sam/Makefile +themes/Sam-tiny/Makefile ]) AC_OUTPUT diff --git a/po/ga.po b/po/ga.po new file mode 100644 index 0000000..fcc311d --- /dev/null +++ b/po/ga.po @@ -0,0 +1,39 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Michael O'Connor, 2022 +msgid "" +msgstr "" +"Project-Id-Version: Xfce Panel Plugins\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-08-02 06:32+0200\n" +"PO-Revision-Date: 2013-07-03 18:59+0000\n" +"Last-Translator: Michael O'Connor, 2022\n" +"Language-Team: Irish (http://www.transifex.com/xfce/xfce-panel-plugins/language/ga/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ga\n" +"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n" + +#: ../panel-plugin/eyes.c:367 ../panel-plugin/eyes.desktop.in.h:1 +msgid "Eyes" +msgstr "Súile" + +#: ../panel-plugin/eyes.c:370 +msgid "_Close" +msgstr "_Scoir" + +#: ../panel-plugin/eyes.c:387 +msgid "_Select a theme:" +msgstr "_Roghnaigh téama:" + +#: ../panel-plugin/eyes.c:423 +msgid "Use single _row in multi-row panel" +msgstr "Úsáid _ró amháin i bpainéal il-ró" + +#: ../panel-plugin/eyes.desktop.in.h:2 +msgid "Eyes that spy on you" +msgstr "Súile go mbíonn ag spiaireacht ort" diff --git a/po/ro.po b/po/ro.po index e23c532..796de1c 100644 --- a/po/ro.po +++ b/po/ro.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-02 06:32+0200\n" -"PO-Revision-Date: 2019-08-02 04:32+0000\n" -"Last-Translator: Xfce Bot \n" +"POT-Creation-Date: 2022-11-28 15:06+0100\n" +"PO-Revision-Date: 2013-07-03 18:59+0000\n" +"Last-Translator: Mișu Moldovan , 2004,2011\n" "Language-Team: Romanian (http://www.transifex.com/xfce/xfce-panel-plugins/language/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,19 +18,19 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: ../panel-plugin/eyes.c:367 ../panel-plugin/eyes.desktop.in.h:1 +#: ../panel-plugin/eyes.c:365 ../panel-plugin/eyes.desktop.in.h:1 msgid "Eyes" msgstr "Ochi" -#: ../panel-plugin/eyes.c:370 +#: ../panel-plugin/eyes.c:368 msgid "_Close" -msgstr "" +msgstr "În_chide" -#: ../panel-plugin/eyes.c:387 +#: ../panel-plugin/eyes.c:385 msgid "_Select a theme:" msgstr "_Selectați o temă:" -#: ../panel-plugin/eyes.c:423 +#: ../panel-plugin/eyes.c:421 msgid "Use single _row in multi-row panel" msgstr "Utilizează un singur _rând în panou" diff --git a/po/sl.po b/po/sl.po index b8eb6ec..ab257c0 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,13 +4,13 @@ # # Translators: # 8b03701f910565d01acaec9ce3f558ab_e9f0fee , 2013 -# Arnold Marko , 2019 +# Arnold Marko , 2019,2021 msgid "" msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-02 06:32+0200\n" -"PO-Revision-Date: 2019-11-03 17:26+0000\n" +"PO-Revision-Date: 2021-05-26 07:43+0000\n" "Last-Translator: Arnold Marko \n" "Language-Team: Slovenian (http://www.transifex.com/xfce/xfce-panel-plugins/language/sl/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "_Izberite temo:" #: ../panel-plugin/eyes.c:423 msgid "Use single _row in multi-row panel" -msgstr "Uporabi eno _vrstico v več-vrstičnem pultu" +msgstr "Uporabi eno _vrstico na več-vrstičnem panoju" #: ../panel-plugin/eyes.desktop.in.h:2 msgid "Eyes that spy on you" diff --git a/po/th.po b/po/th.po index f6d25d6..3d116b5 100644 --- a/po/th.po +++ b/po/th.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Xfce Panel Plugins\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-02 06:32+0200\n" -"PO-Revision-Date: 2019-08-02 04:32+0000\n" +"PO-Revision-Date: 2021-06-30 09:41+0000\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai (http://www.transifex.com/xfce/xfce-panel-plugins/language/th/)\n" "MIME-Version: 1.0\n" diff --git a/themes/Chibi/Makefile.am b/themes/Chibi/Makefile.am new file mode 100644 index 0000000..bc895c7 --- /dev/null +++ b/themes/Chibi/Makefile.am @@ -0,0 +1,8 @@ +Chibidir = $(datadir)/xfce4/eyes/themes/Chibi + +Chibi_DATA = \ + chibi-eye.png \ + chibi-pupil.png \ + config + +EXTRA_DIST = $(Chibi_DATA) diff --git a/themes/Chibi/chibi-eye.png b/themes/Chibi/chibi-eye.png new file mode 100644 index 0000000..444e259 Binary files /dev/null and b/themes/Chibi/chibi-eye.png differ diff --git a/themes/Chibi/chibi-pupil.png b/themes/Chibi/chibi-pupil.png new file mode 100644 index 0000000..93d0fca Binary files /dev/null and b/themes/Chibi/chibi-pupil.png differ diff --git a/themes/Chibi/config b/themes/Chibi/config new file mode 100644 index 0000000..03703fe --- /dev/null +++ b/themes/Chibi/config @@ -0,0 +1,4 @@ +wall-thickness = 4 +num-eyes = 2 +eye-pixmap = "chibi-eye.png" +pupil-pixmap = "chibi-pupil.png" diff --git a/themes/Makefile.am b/themes/Makefile.am index 23fc69c..4bf0657 100644 --- a/themes/Makefile.am +++ b/themes/Makefile.am @@ -2,8 +2,11 @@ SUBDIRS = \ Bizarre \ Bloodshot \ Default \ - Default-tiny \ + Default-tiny \ Horrid \ - Tango + Tango \ + Chibi \ + Sam \ + Sam-tiny # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/themes/Sam-tiny/.gitignore b/themes/Sam-tiny/.gitignore new file mode 100644 index 0000000..e8f6ad0 --- /dev/null +++ b/themes/Sam-tiny/.gitignore @@ -0,0 +1 @@ +*.xcf \ No newline at end of file diff --git a/themes/Sam-tiny/Makefile.am b/themes/Sam-tiny/Makefile.am new file mode 100644 index 0000000..958b01f --- /dev/null +++ b/themes/Sam-tiny/Makefile.am @@ -0,0 +1,10 @@ +Sam_tinydir = $(datadir)/xfce4/eyes/themes/Sam-tiny + +Sam_tiny_DATA = \ + sam-tiny-eye.png \ + sam-tiny-pupil.png \ + config + +EXTRA_DIST = $(Sam_tiny_DATA) + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/themes/Sam-tiny/config b/themes/Sam-tiny/config new file mode 100644 index 0000000..4ae1edf --- /dev/null +++ b/themes/Sam-tiny/config @@ -0,0 +1,4 @@ +wall-thickness = 7 +num-eyes = 2 +eye-pixmap = "sam-tiny-eye.png" +pupil-pixmap = "sam-tiny-pupil.png" diff --git a/themes/Sam-tiny/sam-tiny-eye.png b/themes/Sam-tiny/sam-tiny-eye.png new file mode 100644 index 0000000..ed8687d Binary files /dev/null and b/themes/Sam-tiny/sam-tiny-eye.png differ diff --git a/themes/Sam-tiny/sam-tiny-pupil.png b/themes/Sam-tiny/sam-tiny-pupil.png new file mode 100644 index 0000000..ededf94 Binary files /dev/null and b/themes/Sam-tiny/sam-tiny-pupil.png differ diff --git a/themes/Sam/.gitignore b/themes/Sam/.gitignore new file mode 100644 index 0000000..e8f6ad0 --- /dev/null +++ b/themes/Sam/.gitignore @@ -0,0 +1 @@ +*.xcf \ No newline at end of file diff --git a/themes/Sam/Makefile.am b/themes/Sam/Makefile.am new file mode 100644 index 0000000..376c145 --- /dev/null +++ b/themes/Sam/Makefile.am @@ -0,0 +1,10 @@ +Samdir = $(datadir)/xfce4/eyes/themes/Sam + +Sam_DATA = \ + sam-eye.png \ + sam-pupil.png \ + config + +EXTRA_DIST = $(Sam_DATA) + +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/themes/Sam/config b/themes/Sam/config new file mode 100644 index 0000000..def865a --- /dev/null +++ b/themes/Sam/config @@ -0,0 +1,4 @@ +wall-thickness = 13 +num-eyes = 2 +eye-pixmap = "sam-eye.png" +pupil-pixmap = "sam-pupil.png" diff --git a/themes/Sam/sam-eye.png b/themes/Sam/sam-eye.png new file mode 100644 index 0000000..c5b88c8 Binary files /dev/null and b/themes/Sam/sam-eye.png differ diff --git a/themes/Sam/sam-pupil.png b/themes/Sam/sam-pupil.png new file mode 100644 index 0000000..fff7607 Binary files /dev/null and b/themes/Sam/sam-pupil.png differ