(no commit message)

diff --git a/Makefile b/Makefile
index ebdf257..f894675 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -107,8 +107,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }

-am__installdirs = "$(DESTDIR)$(docdir)"
-DATA = $(dist_doc_DATA)
+am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"
+DATA = $(desktop_DATA) $(dist_doc_DATA)

 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \


@@ -301,6 +301,9 @@ dist_doc_DATA = AUTHORS \
        README \
        README.html
 
        README \
        README.html
 

+desktopdir = $(datadir)/applications
+desktop_DATA = prss.desktop
+EXTRA_DIST = $(desktop_DATA)

 all: all-recursive
 
 .SUFFIXES:
 all: all-recursive
 
 .SUFFIXES:


@@ -338,6 +341,27 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):

+install-desktopDATA: $(desktop_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+       done
+
+uninstall-desktopDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)

 install-dist_docDATA: $(dist_doc_DATA)
        @$(NORMAL_INSTALL)
        @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
 install-dist_docDATA: $(dist_doc_DATA)
        @$(NORMAL_INSTALL)
        @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \


@@ -687,7 +711,7 @@ check: check-recursive
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:

-       for dir in "$(DESTDIR)$(docdir)"; do \
+       for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"; do \

          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive


@@ -741,7 +765,7 @@ info: info-recursive
 
 info-am:
 
 
 info-am:
 

-install-data-am: install-dist_docDATA
+install-data-am: install-desktopDATA install-dist_docDATA

 
 install-dvi: install-dvi-recursive
 
 
 install-dvi: install-dvi-recursive
 


@@ -787,7 +811,7 @@ ps: ps-recursive
 
 ps-am:
 
 
 ps-am:
 

-uninstall-am: uninstall-dist_docDATA
+uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA

 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
        install-am install-strip tags-recursive
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
        install-am install-strip tags-recursive


@@ -799,14 +823,15 @@ uninstall-am: uninstall-dist_docDATA
        distcheck distclean distclean-generic distclean-tags \
        distcleancheck distdir distuninstallcheck dvi dvi-am html \
        html-am info info-am install install-am install-data \
        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-dist_docDATA 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 uninstall-dist_docDATA
+       install-data-am install-desktopDATA install-dist_docDATA \
+       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 \
+       uninstall-desktopDATA uninstall-dist_docDATA

 
 
 README.html: README
 
 
 README.html: README

diff --git a/Makefile.am b/Makefile.am
index b353711..48afdca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,3 +15,8 @@ README.html: README
 
 NEWS.html: NEWS
        asciidoc -n -a toc NEWS
 
 NEWS.html: NEWS
        asciidoc -n -a toc NEWS

+
+desktopdir = $(datadir)/applications
+desktop_DATA = prss.desktop
+
+EXTRA_DIST = $(desktop_DATA)

diff --git a/Makefile.in b/Makefile.in
index dc7ef77..fa16eb6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,8 +107,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }

-am__installdirs = "$(DESTDIR)$(docdir)"
-DATA = $(dist_doc_DATA)
+am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"
+DATA = $(desktop_DATA) $(dist_doc_DATA)

 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive        \
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \


@@ -301,6 +301,9 @@ dist_doc_DATA = AUTHORS \
        README \
        README.html
 
        README \
        README.html
 

+desktopdir = $(datadir)/applications
+desktop_DATA = prss.desktop
+EXTRA_DIST = $(desktop_DATA)

 all: all-recursive
 
 .SUFFIXES:
 all: all-recursive
 
 .SUFFIXES:


@@ -338,6 +341,27 @@ $(top_srcdir)/configure:  $(am__configure_deps)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):

+install-desktopDATA: $(desktop_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
+       done
+
+uninstall-desktopDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)

 install-dist_docDATA: $(dist_doc_DATA)
        @$(NORMAL_INSTALL)
        @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
 install-dist_docDATA: $(dist_doc_DATA)
        @$(NORMAL_INSTALL)
        @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \


@@ -687,7 +711,7 @@ check: check-recursive
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:

-       for dir in "$(DESTDIR)$(docdir)"; do \
+       for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(docdir)"; do \

          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-recursive


@@ -741,7 +765,7 @@ info: info-recursive
 
 info-am:
 
 
 info-am:
 

-install-data-am: install-dist_docDATA
+install-data-am: install-desktopDATA install-dist_docDATA

 
 install-dvi: install-dvi-recursive
 
 
 install-dvi: install-dvi-recursive
 


@@ -787,7 +811,7 @@ ps: ps-recursive
 
 ps-am:
 
 
 ps-am:
 

-uninstall-am: uninstall-dist_docDATA
+uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA

 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
        install-am install-strip tags-recursive
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
        install-am install-strip tags-recursive


@@ -799,14 +823,15 @@ uninstall-am: uninstall-dist_docDATA
        distcheck distclean distclean-generic distclean-tags \
        distcleancheck distdir distuninstallcheck dvi dvi-am html \
        html-am info info-am install install-am install-data \
        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-dist_docDATA 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 uninstall-dist_docDATA
+       install-data-am install-desktopDATA install-dist_docDATA \
+       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 \
+       uninstall-desktopDATA uninstall-dist_docDATA

 
 
 README.html: README
 
 
 README.html: README

diff --git a/po/fr.gmo b/po/fr.gmo
index dcc565b..89cafca 100644 (file)
Binary files a/po/fr.gmo and b/po/fr.gmo differ

diff --git a/po/fr.po b/po/fr.po
index 3e6fda1..0ea91ea 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ptask\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 msgstr ""
 "Project-Id-Version: ptask\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2013-04-25 21:37+0200\n"
+"POT-Creation-Date: 2013-04-26 08:54+0200\n"

 "PO-Revision-Date: 2012-05-13 18:15+0000\n"
 "Last-Translator: jeanfi <Unknown>\n"
 "Language-Team: French <>\n"
 "PO-Revision-Date: 2012-05-13 18:15+0000\n"
 "Last-Translator: jeanfi <Unknown>\n"
 "Language-Team: French <>\n"


@@ -68,11 +68,29 @@ msgstr ""
 msgid "%s home page: <%s>\n"
 msgstr ""
 
 msgid "%s home page: <%s>\n"
 msgstr ""
 

-#: src/main.c:419
+#: src/main.c:390
+msgid "PRSS is a GTK+ client application for Tiny Tiny RSS"
+msgstr ""
+
+#: src/main.c:392
+msgid ""
+"Copyright(c) 2010-2013\n"
+"jeanfi@gmail.com"
+msgstr ""
+
+#: src/main.c:395
+msgid "About PRSS"
+msgstr ""
+
+#: src/main.c:398
+msgid "PRSS Homepage"
+msgstr ""
+
+#: src/main.c:445

 msgid "Enables debug mode."
 msgstr ""
 
 msgid "Enables debug mode."
 msgstr ""
 

-#: src/main.c:434
+#: src/main.c:460

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""

diff --git a/po/prss.pot b/po/prss.pot
index c390cab..fd266d6 100644 (file)
--- a/po/prss.pot
+++ b/po/prss.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jeanfi@gmail.com\n"

-"POT-Creation-Date: 2013-04-25 21:37+0200\n"
+"POT-Creation-Date: 2013-04-26 08:54+0200\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -65,11 +65,29 @@ msgstr ""
 msgid "%s home page: <%s>\n"
 msgstr ""
 
 msgid "%s home page: <%s>\n"
 msgstr ""
 

-#: src/main.c:419
+#: src/main.c:390
+msgid "PRSS is a GTK+ client application for Tiny Tiny RSS"
+msgstr ""
+
+#: src/main.c:392
+msgid ""
+"Copyright(c) 2010-2013\n"
+"jeanfi@gmail.com"
+msgstr ""
+
+#: src/main.c:395
+msgid "About PRSS"
+msgstr ""
+
+#: src/main.c:398
+msgid "PRSS Homepage"
+msgstr ""
+
+#: src/main.c:445

 msgid "Enables debug mode."
 msgstr ""
 
 msgid "Enables debug mode."
 msgstr ""
 

-#: src/main.c:434
+#: src/main.c:460

 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""

diff --git a/prss.desktop b/prss.desktop
new file mode 100644 (file)
index 0000000..3f25886
--- /dev/null
+++ b/prss.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=PRSS
+GenericName=PRSS
+Comment=PRSS is a GTK+ client application for Tiny Tiny RSS
+Icon=prss
+TryExec=prss
+Exec=prss
+Categories=Network;News;
+

diff --git a/src/main.c b/src/main.c
index cfa9218..d649842 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -387,7 +387,7 @@ void help_activate_cbk(GtkWidget *menu_item, gpointer data)
        gtk_show_about_dialog
                (NULL,
                 "comments",
        gtk_show_about_dialog
                (NULL,
                 "comments",

-                _("PRSS is a GTK+ client application for Tiny Tiny RSS "),
+                _("PRSS is a GTK+ client application for Tiny Tiny RSS"),

                 "copyright",
                 _("Copyright(c) 2010-2013\njeanfi@gmail.com"),
                 "logo-icon-name", "prss",
                 "copyright",
                 _("Copyright(c) 2010-2013\njeanfi@gmail.com"),
                 "logo-icon-name", "prss",