diff -Nru almanah-0.10.8/ChangeLog almanah-0.11.0/ChangeLog --- almanah-0.10.8/ChangeLog 2013-02-26 21:36:23.000000000 +0000 +++ almanah-0.11.0/ChangeLog 2013-11-30 12:47:42.000000000 +0000 @@ -1,6 +1,673 @@ +commit 27dec53600137f1fc86e02f4ff70af26f4abb460 +Author: Álvaro Peña +Date: Sat Nov 30 13:46:42 2013 +0100 + + appdata: fixed the screenshot URL. + + data/almanah.appdata.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7ad171e8602a0f779a8d660e13034241313a902d +Author: Álvaro Peña +Date: Sat Nov 30 13:14:32 2013 +0100 + + trivial: Updated the URL of the project + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a7eadede6fcfcdf0e3a7fddb776ee8f7e69ed509 +Author: Álvaro Peña +Date: Sat Nov 30 13:13:51 2013 +0100 + + Bug 719447 - Updated website and screenshot links in the AppData file + + data/almanah.appdata.xml.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit f9c3a521f1c05b14bc004b9213efae42fe286f00 +Author: Enrico Nicoletto +Date: Tue Nov 26 01:03:42 2013 -0200 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 32 ++++++++++++++++++++++---------- + 1 file changed, 22 insertions(+), 10 deletions(-) + +commit 4172fa4d0f06aa0e5857f9eecfce88a876a0cbfb +Author: Daniel Mustieles +Date: Wed Nov 20 17:28:27 2013 +0100 + + Updated Spanish translation + + po/es.po | 85 + ++++++++++++++++++++++++++++++++++++++++++++++------------------ + 1 file changed, 62 insertions(+), 23 deletions(-) + +commit ead6e5357d8af3a05b1770caa52c3db9caad128e +Author: Piotr Drąg +Date: Sun Nov 17 19:01:11 2013 +0100 + + Updated Polish translation + + po/pl.po | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +commit cbde56f6b357579e0884989e7651890b45e33d30 +Author: Piotr Drąg +Date: Sun Nov 17 18:58:25 2013 +0100 + + Updated POTFILES.in + + po/POTFILES.in | 1 + + 1 file changed, 1 insertion(+) + +commit cc5c3e34e98f070eeb8503eff205db305c996bd0 +Author: Álvaro Peña +Date: Sun Nov 17 17:36:06 2013 +0100 + + accessibility: Improve the accessibility around the application. + + Now the AlmanahTag accept the focus and export the action "remove" + with the + implementation of the AtkAction interface. + + The main window now have access to the UI manager accellerators. + + src/Makefile.am | 2 + + src/main-window.c | 6 +- + src/widgets/entry-tags-area.c | 1 + + src/widgets/tag-accessible.c | 168 + ++++++++++++++++++++++++++++++++++++++++++ + src/widgets/tag-accessible.h | 51 +++++++++++++ + src/widgets/tag-entry.c | 144 ++++++++++++++++++------------------ + src/widgets/tag.c | 29 +++++++- + src/widgets/tag.h | 7 +- + 8 files changed, 331 insertions(+), 77 deletions(-) + +commit 467b4f75b0944b90ccd67b8e2c0fc45256792668 +Author: Álvaro Peña +Date: Sun Nov 17 17:28:54 2013 +0100 + + icons: Added a 256x256 icon (png and svg) which looks better in + gnome-shell than 48x48 + + configure.ac | 1 + + data/icons/256x256/Makefile.am | 6 + + data/icons/256x256/almanah.png | Bin 0 -> 18991 bytes + data/icons/256x256/almanah.svg | 482 + +++++++++++++++++++++++++++++++++++++++++ + data/icons/Makefile.am | 2 +- + 5 files changed, 490 insertions(+), 1 deletion(-) + +commit d86652d76591bc98e686c9f9ba63a1f871401e00 +Author: Álvaro Peña +Date: Sat Nov 16 13:19:03 2013 +0100 + + style: fixed some issues with the GNOME 3.10 theme + + data/almanah.css | 3 +++ + data/almanah.ui | 10 ++++++---- + 2 files changed, 9 insertions(+), 4 deletions(-) + +commit 6354fa55e938308d6e4dfd7ff4fa44209a11ef0d +Author: Matej Urbančič +Date: Sat Nov 2 11:53:05 2013 +0100 + + Updated Slovenian translation + + po/sl.po | 65 + +++++++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 42 insertions(+), 23 deletions(-) + +commit 9d6b621959ad9b2f1582b9f98620354a64b876a5 +Author: Antonio Fernandes C. Neto +Date: Wed Oct 30 23:19:28 2013 -0200 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 157 + ++++-------------------------------------------------------- + 1 file changed, 8 insertions(+), 149 deletions(-) + +commit 90d9341f3e0bcdfbd05560de4e06e358e51a08dd +Author: Enrico Nicoletto +Date: Wed Oct 30 23:05:50 2013 -0200 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 65 + ++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 43 insertions(+), 22 deletions(-) + +commit 5d2eea1352b5bbc6e9c6317ee55fa1dd2eeef9d8 +Author: Piotr Drąg +Date: Wed Oct 30 18:56:19 2013 +0100 + + Updated Polish translation + + po/pl.po | 60 + +++++++++++++++++++++++++++++++++++++++++------------------- + 1 file changed, 41 insertions(+), 19 deletions(-) + +commit 0e00b6cb7265c0642d05566fb24a93c614145e9d +Author: Daniel Mustieles +Date: Tue Oct 8 12:44:49 2013 +0200 + + core: Change permissions of diary.db to 0600 + + Add chmod() calls at various places in the StorageManager and + import and + export code to change the permissions of files containing diary + entries + (including the database, the encrypted database, database backups and + different formats of exported files) to be 0600. + + src/export-operation.c | 36 +++++++++++++++++++++++++++++++---- + src/storage-manager.c | 51 + +++++++++++++++++++++++++++++++++++++++++++------- + 2 files changed, 76 insertions(+), 11 deletions(-) + +commit fcb70f637527d48392c13cd7bf52de7b312820ec +Author: Andika Triwidada +Date: Fri Oct 4 22:26:02 2013 +0700 + + Updated Indonesian translation + + po/id.po | 280 + ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 160 insertions(+), 120 deletions(-) + +commit 61ee111f27579671657f3c2e87838bae095c4052 +Author: Rūdolfs Mazurs +Date: Sat Sep 21 23:32:16 2013 +0300 + + Updated Latvian translatio + + po/lv.po | 489 + +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 271 insertions(+), 218 deletions(-) + +commit 87bfbe1ccfa97ba52d0b1ab5e735a44f7163b6c0 +Author: Fran Diéguez +Date: Fri Sep 13 00:48:45 2013 +0200 + + Updated Galician translations + + po/gl.po | 89 + +++++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 60 insertions(+), 29 deletions(-) + +commit 3aaff4d928858d86b2053114c32af6fd6748358f +Author: Joe Hansen +Date: Tue Sep 10 23:27:06 2013 +0200 + + Updated Danish translation + + po/da.po | 127 + ++++++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 81 insertions(+), 46 deletions(-) + +commit 7823722fc45f8ea385ed1014e33e03abe30f693e +Author: Matej Urbančič +Date: Tue Sep 10 21:30:05 2013 +0200 + + Updated Slovenian translation + + po/sl.po | 90 + ++++++++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 60 insertions(+), 30 deletions(-) + +commit 64f21bef5e092ee04db74f4d7d6a95c3fb644e59 +Author: Balázs Úr +Date: Tue Sep 10 00:01:14 2013 +0200 + + Updated Hungarian translation + + po/hu.po | 90 + +++++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 61 insertions(+), 29 deletions(-) + +commit c0a322cb9097f74bfdd51f427f2159e2f5d35204 +Author: Мирослав Николић +Date: Sun Sep 8 07:45:15 2013 +0200 + + Updated Serbian translation + + po/sr.po | 88 + +++++++++++++++++++++++++++++++++++++++------------------- + po/sr@latin.po | 88 + +++++++++++++++++++++++++++++++++++++++------------------- + 2 files changed, 118 insertions(+), 58 deletions(-) + +commit 406c8e286dfedfcb0df589f6efc5b079efb1e25b +Author: Marek Černocký +Date: Fri Sep 6 21:03:43 2013 +0200 + + Updated Czech translation + + po/cs.po | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +commit 2133e7eee01f4a36a8050fd4523e0489a3fe4832 +Author: Ramon Brandão +Date: Thu Sep 5 21:37:52 2013 -0300 + + Updated Brazilian Portuguese translation proofread by Enrico Nicoletto + + po/pt_BR.po | 100 + +++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 66 insertions(+), 34 deletions(-) + +commit f10e138941584112fc81c320e49879f8a6f92f15 +Author: Álvaro Peña +Date: Thu Sep 5 19:42:37 2013 +0200 + + Added a shortcut to select a concrete date. + + data/almanah.ui | 1 + + 1 file changed, 1 insertion(+) + +commit 527063ff309ee04f4aa0ccb28879be37b82c86f5 +Author: Piotr Drąg +Date: Thu Sep 5 14:47:55 2013 +0200 + + Updated Polish translation + + po/pl.po | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +commit 82b78b92318c1e7fc3f26b7afe2c59d582e9df75 +Author: Daniel Mustieles +Date: Thu Sep 5 11:44:16 2013 +0200 + + Updated Spanish translation + + po/es.po | 90 + +++++++++++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 61 insertions(+), 29 deletions(-) + +commit eb543f421cff98e7f5552940f1275c47df494674 +Author: Álvaro Peña +Date: Thu Sep 5 01:23:40 2013 +0200 + + Bug 707517 - Added an AppData file + + Allowing the publication in the GNOME Software Center. + + data/Makefile.am | 9 +++++++++ + data/almanah.appdata.xml.in | 21 +++++++++++++++++++++ + po/POTFILES.in | 1 + + 3 files changed, 31 insertions(+) + +commit f380ba72d3fc9e379b4c1a7ef2601ba548ceee19 +Author: Marek Černocký +Date: Wed Sep 4 22:33:25 2013 +0200 + + Updated Czech translation + + po/cs.po | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +commit cb3e088f069906ab3ac5100a02c1d952a2e020bf +Author: Marek Černocký +Date: Wed Sep 4 22:32:08 2013 +0200 + + Updated Czech translation + + po/cs.po | 68 + ++++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 38 insertions(+), 30 deletions(-) + +commit 5cf3c22c131980dfa27b71589f653fba5380d283 +Author: Piotr Drąg +Date: Wed Sep 4 22:12:50 2013 +0200 + + Updated Polish translation + + po/pl.po | 70 + +++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 41 insertions(+), 29 deletions(-) + +commit c3f8e26c03ab3d28cbd619f63ec72d4210bb8f1b +Author: Piotr Drąg +Date: Wed Sep 4 22:10:42 2013 +0200 + + Updated POTFILES.in + + po/POTFILES.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit ecdff3cf9c94eae44eff145b0abe88f4e1880f85 +Author: Álvaro Peña +Date: Wed Sep 4 18:26:10 2013 +0200 + + Bug 684412 Simplified the tags area widget. + + Removed all the custom container stuff about style and added a button + in the toolbar + to show/hide the tags zone. + + configure.ac | 1 + + data/almanah.css | 20 ------- + data/almanah.ui | 19 ++++++- + data/icons/Makefile.am | 2 +- + data/icons/scalable/Makefile.am | 6 ++ + data/icons/scalable/almanah-tags-symbolic.svg | 81 + +++++++++++++++++++++++++++ + src/main-window.c | 18 ++++++ + src/widgets/entry-tags-area.c | 22 +++----- + 8 files changed, 130 insertions(+), 39 deletions(-) + +commit 63209c10286a1e62fa002a79ef22b486eb459e70 +Author: Álvaro Peña +Date: Wed Sep 4 18:18:40 2013 +0200 + + Localized the tags feature + + src/widgets/entry-tags-area.c | 4 +++- + src/widgets/tag-entry.c | 5 ++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +commit a393571d25a8a3a1bdf027b5280fdf3cc23ee2f6 +Author: Álvaro Peña +Date: Mon Sep 2 21:16:55 2013 +0200 + + Makes the tag entry a little wider + + src/widgets/tag-entry.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 7aa988baef20591ef0c1af309b09bc869d30d67a +Author: Álvaro Peña +Date: Mon Sep 2 21:15:36 2013 +0200 + + Some top margin for entry text. + + data/almanah.ui | 1 + + 1 file changed, 1 insertion(+) + +commit d3bf01e6874d2607054876ac48e52152bd691a00 +Author: Fran Diéguez +Date: Wed Aug 28 01:06:01 2013 +0200 + + Updated Galician translations + + po/gl.po | 216 + +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 113 insertions(+), 103 deletions(-) + +commit 4cc562a4377ab10dead553632b9651f1f9432939 +Author: Piotr Drąg +Date: Tue Aug 20 23:02:33 2013 +0200 + + Updated Polish translation + + po/pl.po | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 145d2f4b6d9412c1e9dccdf8f435e635eab254f1 +Author: Philip Withnall +Date: Fri Aug 2 11:18:33 2013 +0200 + + core: Add missing unit to CSS file + + This fixes a GTK+ warning. + + data/almanah.css | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 121925efd91dcac72944d07eebd215f974d7d8ca +Author: Adorilson Bezerra +Date: Sun Jun 30 08:24:58 2013 -0300 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 54 ++++++++++++++++++++++++++++++------------------------ + 1 file changed, 30 insertions(+), 24 deletions(-) + +commit 5491816d57ab3d555cf79e2adc1d893a4115665e +Author: Balázs Úr +Date: Sun Jun 16 20:23:23 2013 +0200 + + Updated Hungarian translation + + po/hu.po | 163 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 84 insertions(+), 79 deletions(-) + +commit ccac08b0fb077280be559eeae32208082753e140 +Author: Matej Urbančič +Date: Mon Jun 3 21:57:14 2013 +0200 + + Updated Slovenian translation + + po/sl.po | 44 +++++++++++++++++++++++++------------------- + 1 file changed, 25 insertions(+), 19 deletions(-) + +commit 9d02aac53858cdd16259f48abf1f8aadcd5109c8 +Author: Marek Černocký +Date: Wed May 15 14:49:40 2013 +0200 + + Updated Czech translation + + po/cs.po | 166 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 85 insertions(+), 81 deletions(-) + +commit b7f7c720b8253dfdbbd56d84486405f0493783ad +Author: Álvaro Peña +Date: Tue May 14 12:41:47 2013 +0200 + + Bug 700274 - Fix spell checking errors + + src/storage-manager.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +commit 92ee614ce120fe03d0289b050d381595b6449286 +Author: Piotr Drąg +Date: Tue May 14 18:54:27 2013 +0200 + + Updated Polish translation + + po/pl.po | 43 ++++++++++++++++++++++++------------------- + 1 file changed, 24 insertions(+), 19 deletions(-) + +commit 9e3da0d3d24af0f00ba64c2e0035f74ed7def1a0 +Author: Daniel Mustieles +Date: Tue May 14 16:01:20 2013 +0200 + + Updated Spanish translation + + po/es.po | 167 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 86 insertions(+), 81 deletions(-) + +commit 33fc88ba4eb67321153a34f397d6200148d89cec +Author: Мирослав Николић +Date: Tue May 14 12:24:24 2013 +0200 + + Updated Serbian translation + + po/sr.po | 163 + +++++++++++++++++++++++++++++---------------------------- + po/sr@latin.po | 163 + +++++++++++++++++++++++++++++---------------------------- + 2 files changed, 168 insertions(+), 158 deletions(-) + +commit 9cbb0c00931714ece2b55a518630ef94d9771727 +Author: Álvaro Peña +Date: Tue May 14 10:56:12 2013 +0200 + + Bug 700273 - Add Keywords to .desktop file + + data/almanah.desktop.in | 2 ++ + 1 file changed, 2 insertions(+) + +commit 7503b5865457370fae92e1a421e9d4b62e4c5d90 +Author: Dominique Leuenberger +Date: Thu Apr 18 09:08:31 2013 +0200 + + main: include interface.h + + We make use of prototypes in this header (almanah_get_css_path). + + https://bugzilla.gnome.org/show_bug.cgi?id=698259 + + src/application.c | 1 + + 1 file changed, 1 insertion(+) + +commit e39e376bb1e8256e4e2569edd469c6c305ff47c5 +Author: Dimitris Spingos +Date: Wed Apr 10 18:02:30 2013 +0300 + + Updated Greek translation + + po/el.po | 946 + ++++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 536 insertions(+), 410 deletions(-) + +commit a00b3bf413c90989a7fff0679f55a3d4263e9058 +Author: Balázs Úr +Date: Sat Mar 16 19:56:36 2013 +0100 + + Updated Hungarian translation + + po/hu.po | 66 + +++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 34 insertions(+), 32 deletions(-) + +commit 9736ec244620fb16015a69d3c0dbfcb2c4e6e027 +Author: Enrico Nicoletto +Date: Tue Mar 12 19:17:42 2013 -0300 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 220 + +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 113 insertions(+), 107 deletions(-) + +commit b8f0177bc5b25cb5e82356c32f77629c57fa61ec +Author: Joe Hansen +Date: Tue Mar 12 21:09:12 2013 +0100 + + Updated Danish translation + + po/da.po | 637 + +++++++++++++++++++++++++-------------------------------------- + 1 file changed, 253 insertions(+), 384 deletions(-) + +commit f532dcad9ff4e04cffc1263d07ae71e1cd496985 +Merge: dd6190a 91eae05 +Author: Álvaro Peña +Date: Mon Mar 11 12:20:49 2013 +0100 + + Merge branch 'Version_0_10_1' + + Conflicts: + NEWS + configure.ac + +commit 91eae05ad9076d14eccbe7cc918421a69ecebe7b +Author: Álvaro Peña +Date: Mon Mar 11 12:14:31 2013 +0100 + + Release 0.10.1 with a critical bug fixed (see + https://bugzilla.gnome.org/show_bug.cgi?id=695117) + + NEWS | 11 ++++++----- + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 6 deletions(-) + +commit 58749595ba914e60ebe81d9ee2cd582c5412fcaf +Merge: 5ae30e1 87c67ae +Author: Álvaro Peña +Date: Mon Mar 11 12:08:29 2013 +0100 + + Merge branch 'V_0_9_1' into Version_0_10_1 + + Conflicts: + NEWS + configure.ac + +commit 87c67aebfbb9e9d88ee14ae6928589cbbea69383 +Author: Álvaro Peña +Date: Mon Mar 11 11:23:19 2013 +0100 + + Release 0.9.1 + + NEWS | 6 ++++++ + configure.ac | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +commit dd6190a0c5397ca972688c61ebbbb58ed40d8515 +Author: Alexandre Franke +Date: Sun Mar 10 19:10:20 2013 +0100 + + Update French translation + + po/fr.po | 206 + ++++++++++++++++++++++++++------------------------------------- + 1 file changed, 85 insertions(+), 121 deletions(-) + +commit 41ef1173ea2bcf14409c789aab0294ddec1d6472 +Author: Alexandre Franke +Date: Sun Mar 10 19:08:32 2013 +0100 + + Update French translation + + po/fr.po | 432 + ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 233 insertions(+), 199 deletions(-) + +commit 93328b0dbc63d9de3b31f22ef74748377eb3bfd3 +Author: Matej Urbančič +Date: Thu Mar 7 21:39:51 2013 +0100 + + Updated Slovenian translation + + po/sl.po | 282 + ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 142 insertions(+), 140 deletions(-) + +commit 0e4fb167c6eb478e0bcdb1cce5dd18f36f3f2656 +Author: Álvaro Peña +Date: Tue Mar 5 17:30:41 2013 +0100 + + Bug 695117 - Almanah doesn't encrypt the database when the application + close + + The "quit_mainloop" event in GApplication isn't used anymore from + GLib 2.32, so moved + the database desconnection stuff, including database encryption if + necessary, to the + "window_removed" event. + + src/application.c | 35 ++++++++++++++++++++++------------- + 1 file changed, 22 insertions(+), 13 deletions(-) + +commit 2a59d692dcdf8789fbb71756c4366099e1066efb +Author: Álvaro Peña +Date: Tue Feb 26 22:52:42 2013 +0100 + + build: Post-release version bump + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit b4c7124958af01deed2839ce10d696dd30a42458 +Author: Álvaro Peña +Date: Tue Feb 26 22:38:01 2013 +0100 + + Development release 0.10.8, road to 0.11 + + NEWS | 31 +++++++++++++++++++++++++++++++ + configure.ac | 2 +- + 2 files changed, 32 insertions(+), 1 deletion(-) + commit b0510858ed7744259f4908d12d312e962ddc61a4 Author: Álvaro Peña -Date: Tue Feb 26 13:18:44 2013 +0100 +Date: Tue Feb 26 13:18:44 2013 +0100 Better margin in the TextView widget instead the text margin @@ -9,7 +676,7 @@ commit d03b8175bb955ae6442804e21b2c8222909b136f Author: Álvaro Peña -Date: Mon Feb 25 17:41:39 2013 +0100 +Date: Mon Feb 25 17:41:39 2013 +0100 Include the entry tags in the search @@ -18,7 +685,7 @@ commit 717a5d3e83ccb5d7a15fe9e392531c0a6dce218d Author: Álvaro Peña -Date: Mon Feb 25 17:34:58 2013 +0100 +Date: Mon Feb 25 17:34:58 2013 +0100 Some tag entry area aesthetic changes @@ -28,7 +695,7 @@ commit ba7ebebf0148d8492786d42c80c358a12bd97d82 Author: Yuri Myasoedov -Date: Wed Feb 20 00:24:51 2013 +0400 +Date: Wed Feb 20 00:24:51 2013 +0400 Updated Russian translation @@ -38,11 +705,11 @@ commit 94ba52aab663f94141be8031f2c28df842d9e335 Author: Мирослав Николић -Date: Tue Feb 19 20:41:05 2013 +0100 +Date: Tue Feb 19 20:41:05 2013 +0100 Updated Serbian translation - po/sr.po | 89 + po/sr.po | 89 ++++++++++++++++++++-------------------------------------- po/sr@latin.po | 89 ++++++++++++++++++++-------------------------------------- @@ -50,7 +717,7 @@ commit befdb9f8d4014c29e3cda8c7bad170e9f4f43585 Author: Daniel Mustieles -Date: Tue Feb 19 12:40:04 2013 +0100 +Date: Tue Feb 19 12:40:04 2013 +0100 Updated Spanish translation @@ -60,7 +727,7 @@ commit 60f8f5d5613ad691e8f84a65a43ca0b10e2687f0 Author: Piotr Drąg -Date: Sat Feb 16 20:37:53 2013 +0100 +Date: Sat Feb 16 20:37:53 2013 +0100 Updated Polish translation @@ -69,7 +736,7 @@ commit 6046c0b707e29cc3898f489bd3ab17494bd92520 Author: Marek Černocký -Date: Fri Feb 15 21:15:06 2013 +0100 +Date: Fri Feb 15 21:15:06 2013 +0100 Updated Czech translation @@ -79,7 +746,7 @@ commit 40793869556f0b0ae1731af7c267a497b086409a Author: Piotr Drąg -Date: Fri Feb 15 13:53:15 2013 +0100 +Date: Fri Feb 15 13:53:15 2013 +0100 Updated Polish translation @@ -89,7 +756,7 @@ commit 370cac00a0fedcf9c7aefdb2115bef72ec34b658 Author: Piotr Drąg -Date: Fri Feb 15 13:50:12 2013 +0100 +Date: Fri Feb 15 13:50:12 2013 +0100 Updated POTFILES.in @@ -99,13 +766,13 @@ commit d43c6959b381b4e6f998ec531a7c2dc64f58534f Merge: 114c4f7 6b66eb3 Author: Álvaro Peña -Date: Fri Feb 15 11:02:47 2013 +0100 +Date: Fri Feb 15 11:02:47 2013 +0100 Merge branch 'tagsupport' commit 6b66eb309edcb5474076bcc328a347b7a9e61e8f Author: Álvaro Peña -Date: Fri Feb 15 10:58:10 2013 +0100 +Date: Fri Feb 15 10:58:10 2013 +0100 Updated PO files @@ -114,17 +781,17 @@ commit 5ebee0904832c7fbe492ecfa1ef1488eb5e1161c Author: Álvaro Peña -Date: Wed Feb 13 13:15:22 2013 +0100 +Date: Wed Feb 13 13:15:22 2013 +0100 Better unfocused window colors for the tags area - data/almanah.css | 15 ++++++++++++++- + data/almanah.css | 15 ++++++++++++++- src/widgets/entry-tags-area.c | 15 +++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) commit 72577d9e523fed7826e5381b4a9206db0a4171d8 Author: Álvaro Peña -Date: Tue Feb 12 13:26:08 2013 +0100 +Date: Tue Feb 12 13:26:08 2013 +0100 Free memory and some whitespace fixes @@ -134,38 +801,38 @@ commit e0297a13ebc251692f386a19073acafe14342ee1 Author: Álvaro Peña -Date: Tue Feb 12 13:22:27 2013 +0100 +Date: Tue Feb 12 13:22:27 2013 +0100 Allow the user to add a tag to a non-saved entry - src/storage-manager.c | 17 +++++++------- + src/storage-manager.c | 17 +++++++------- src/widgets/entry-tags-area.c | 54 ++++++++++++++++++++----------------------- 2 files changed, 33 insertions(+), 38 deletions(-) commit c1ef6e0523ac6bdac46481ec8c5da2ab288a94db Author: Álvaro Peña -Date: Fri Feb 8 13:11:01 2013 +0100 +Date: Fri Feb 8 13:11:01 2013 +0100 EntryTagsArea is an EggWrapBox children, so now the tags are placed dynamically along the widget - data/almanah.ui | 4 +- - src/Makefile.am | 4 + - src/main-window.c | 2 +- + data/almanah.ui | 4 +- + src/Makefile.am | 4 + + src/main-window.c | 2 +- src/widgets/eggwrapbox-enums.c | 70 ++ src/widgets/eggwrapbox-enums.h | 23 + - src/widgets/eggwrapbox.c | 2641 + src/widgets/eggwrapbox.c | 2641 ++++++++++++++++++++++++++++++++++++++++ - src/widgets/eggwrapbox.h | 157 +++ - src/widgets/entry-tags-area.c | 2 +- - src/widgets/entry-tags-area.h | 7 +- + src/widgets/eggwrapbox.h | 157 +++ + src/widgets/entry-tags-area.c | 2 +- + src/widgets/entry-tags-area.h | 7 +- 9 files changed, 2903 insertions(+), 7 deletions(-) commit 4aceb406305ed6dd7edd939a9776eb02c0d86fdc Author: Álvaro Peña -Date: Thu Feb 7 18:12:23 2013 +0100 +Date: Thu Feb 7 18:12:23 2013 +0100 Add the tag selected from the tags completion list to the entry. @@ -174,7 +841,7 @@ commit 2466d33361340b8a64f577ee17a6e3d339dcff13 Author: Álvaro Peña -Date: Thu Feb 7 18:11:20 2013 +0100 +Date: Thu Feb 7 18:11:20 2013 +0100 Show a tooltip when the user moves the pointer over the close tag "button". @@ -184,11 +851,11 @@ commit eba6e082df69ba1f6d8e988cb5ff51b137b5ca3e Author: Álvaro Peña -Date: Wed Feb 6 13:28:35 2013 +0100 +Date: Wed Feb 6 13:28:35 2013 +0100 Return to the entry GtkTextView when the user add a tag - src/main-window.c | 2 + + src/main-window.c | 2 + src/widgets/entry-tags-area.c | 187 +++++++++++++++++++++++++----------------- src/widgets/entry-tags-area.h | 1 + @@ -196,17 +863,17 @@ commit 114c4f78ac9882be51c4154751760bd4fea48403 Author: Álvaro Peña -Date: Wed Feb 6 11:12:54 2013 +0100 +Date: Wed Feb 6 11:12:54 2013 +0100 Update GtkSpell 3 support - configure.ac | 2 +- + configure.ac | 2 +- src/main-window.c | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) commit 5b4e37f6689bff6467bbdf8006ddf8496e76caa7 Author: Yuri Myasoedov -Date: Wed Jan 30 09:27:38 2013 +0400 +Date: Wed Jan 30 09:27:38 2013 +0400 Updated Russian translation @@ -216,7 +883,7 @@ commit f58538ddcc37fb8b7e624892d743098ace8dc7e7 Author: Álvaro Peña -Date: Fri Jan 25 14:25:57 2013 +0100 +Date: Fri Jan 25 14:25:57 2013 +0100 Bug 684412 - Add support for tagging diary entries @@ -228,17 +895,17 @@ The user can't append a tag in an Entry if already has been added. - src/storage-manager.c | 58 +++++++++++++++- - src/storage-manager.h | 1 + + src/storage-manager.c | 58 +++++++++++++++- + src/storage-manager.h | 1 + src/widgets/entry-tags-area.c | 42 +++++++++--- - src/widgets/tag.c | 149 + src/widgets/tag.c | 149 +++++++++++++++++++++++++++++++++++++++--- - src/widgets/tag.h | 5 +- + src/widgets/tag.h | 5 +- 5 files changed, 232 insertions(+), 23 deletions(-) commit 96b90bf60766d65f7e6c4735633a76722db4d55b Author: Álvaro Peña -Date: Thu Jan 24 16:58:40 2013 +0100 +Date: Thu Jan 24 16:58:40 2013 +0100 Bug 684412 - Add support for tagging diary entries @@ -260,26 +927,26 @@ The CSS has been updated to unify the visualization in the entry area. - data/almanah.css | 33 ++++- - data/almanah.ui | 211 +++++++++++++++++++------------- - src/Makefile.am | 8 +- + data/almanah.css | 33 ++++- + data/almanah.ui | 211 +++++++++++++++++++------------- + src/Makefile.am | 8 +- src/almanah-marshal.list | 1 + - src/main-window.c | 12 ++ - src/storage-manager.c | 198 ++++++++++++++++++++++++++++++ - src/storage-manager.h | 5 + + src/main-window.c | 12 ++ + src/storage-manager.c | 198 ++++++++++++++++++++++++++++++ + src/storage-manager.h | 5 + src/widgets/entry-tags-area.c | 256 ++++++++++++++++++++++++++++++++++++++ src/widgets/entry-tags-area.h | 53 ++++++++ src/widgets/tag-entry.c | 186 ++++++++++++++++++++++++++++ src/widgets/tag-entry.h | 52 ++++++++ - src/widgets/tag.c | 278 + src/widgets/tag.c | 278 ++++++++++++++++++++++++++++++++++++++++++ - src/widgets/tag.h | 50 ++++++++ + src/widgets/tag.h | 50 ++++++++ 13 files changed, 1253 insertions(+), 90 deletions(-) commit 03d15de124a9d01b3769ec5fa894520ea10e0108 Author: Rafael Ferreira -Date: Tue Jan 8 23:30:55 2013 -0200 +Date: Tue Jan 8 23:30:55 2013 -0200 Updated Brazilian Portuguese Translation @@ -289,11 +956,11 @@ commit 5c6951bc7ce0c044eed8100f14092daa4c224766 Author: Мирослав Николић -Date: Fri Jan 4 21:52:01 2013 +0100 +Date: Fri Jan 4 21:52:01 2013 +0100 Updated Serbian translation - po/sr.po | 351 + po/sr.po | 351 +++++++++++++++++++++++++++++---------------------------- po/sr@latin.po | 351 +++++++++++++++++++++++++++++---------------------------- @@ -301,7 +968,7 @@ commit d31823dc566592da9793a9fcdbc8cea7a6df8cc5 Author: Fran Diéguez -Date: Thu Dec 27 01:08:37 2012 +0100 +Date: Thu Dec 27 01:08:37 2012 +0100 Updated Galician translations @@ -311,7 +978,7 @@ commit 51c28850ed065ded6f943eea06aabae5f9ca3066 Author: Balázs Úr -Date: Wed Dec 26 16:50:20 2012 +0100 +Date: Wed Dec 26 16:50:20 2012 +0100 Updated Hungarian translation @@ -321,7 +988,7 @@ commit df5950d7365185ba9622fc1af68e885094f8cdff Author: Álvaro Peña -Date: Fri Dec 14 17:52:37 2012 +0100 +Date: Fri Dec 14 17:52:37 2012 +0100 Hide the titlebar when main window is maximized. @@ -330,7 +997,7 @@ commit e481f5abdb46d41ac00ee3393332e92f605b55e7 Author: Matthew Barnes -Date: Thu Dec 13 09:16:58 2012 -0500 +Date: Thu Dec 13 09:16:58 2012 -0500 Bug 687229 - Embed ESourceSelector widget from libedataserverui @@ -341,19 +1008,19 @@ See also: https://mail.gnome.org/archives/distributor-list/2012-December/msg00000.html - configure.ac | 2 +- - src/Makefile.am | 4 + - src/event-factories/calendar-sources.c | 3 +- - src/event-factories/e-cell-renderer-color.c | 237 +++ - src/event-factories/e-cell-renderer-color.h | 75 + + configure.ac | 2 +- + src/Makefile.am | 4 + + src/event-factories/calendar-sources.c | 3 +- + src/event-factories/e-cell-renderer-color.c | 237 +++ + src/event-factories/e-cell-renderer-color.h | 75 + src/event-factories/e-source-selector.c | 2080 +++++++++++++++++++++++++++ - src/event-factories/e-source-selector.h | 137 ++ + src/event-factories/e-source-selector.h | 137 ++ 7 files changed, 2536 insertions(+), 2 deletions(-) commit fea78824cbf68cfea0f218cc31ebc95ef536a53b Author: Daniel Mustieles -Date: Tue Nov 27 17:49:37 2012 +0100 +Date: Tue Nov 27 17:49:37 2012 +0100 Updated Spanish translation @@ -363,7 +1030,7 @@ commit 1a8416b3a101eb10c18086e60257b9f51680dfe9 Author: Andika Triwidada -Date: Tue Nov 27 18:32:28 2012 +0700 +Date: Tue Nov 27 18:32:28 2012 +0700 Updated Indonesian translation @@ -373,7 +1040,7 @@ commit 2041caae063a7f445ca844722a3dc515a22a39f6 Author: Philip Withnall -Date: Mon Nov 26 23:37:20 2012 +0000 +Date: Mon Nov 26 23:37:20 2012 +0000 core: Remove an implicit dependency on libm @@ -386,7 +1053,7 @@ commit fec6ff0932c79d6e142cd1dfb263ce38f425f70a Author: Álvaro Peña -Date: Mon Nov 26 23:17:26 2012 +0100 +Date: Mon Nov 26 23:17:26 2012 +0100 Finished main window re-design. @@ -398,24 +1065,24 @@ [1] https://live.gnome.org/Almanah_Diary/Design#New_Design - data/Makefile.am | 3 +- - data/almanah.css | 29 +++++ - data/almanah.ui | 44 ++----- - data/calendar-button.css | 17 --- - data/calendar-window.css | 4 - - src/Makefile.am | 2 - - src/application.c | 14 +++ - src/main-window.c | 214 + data/Makefile.am | 3 +- + data/almanah.css | 29 +++++ + data/almanah.ui | 44 ++----- + data/calendar-button.css | 17 --- + data/calendar-window.css | 4 - + src/Makefile.am | 2 - + src/application.c | 14 +++ + src/main-window.c | 214 ++++++++++++----------------------- - src/widgets/calendar-button.c | 18 --- - src/widgets/calendar-window.c | 20 ---- + src/widgets/calendar-button.c | 18 --- + src/widgets/calendar-window.c | 20 ---- src/widgets/font-style-menu-action.c | 58 ---------- src/widgets/font-style-menu-action.h | 47 -------- 12 files changed, 127 insertions(+), 343 deletions(-) commit 6e7e1eb2ec8af25d6386c078d77c98f2a89972c3 Author: Marek Černocký -Date: Sat Nov 24 13:39:02 2012 +0100 +Date: Sat Nov 24 13:39:02 2012 +0100 Updated Czech translation @@ -425,7 +1092,7 @@ commit 7d2845567dd1ee51391854805a2c4238c5ff29aa Author: Álvaro Peña -Date: Thu Nov 22 17:46:28 2012 +0100 +Date: Thu Nov 22 17:46:28 2012 +0100 just a syntax error @@ -434,7 +1101,7 @@ commit b807b71708ce59974a0d8c289cb492b00da29007 Author: Matej Urbančič -Date: Thu Nov 22 14:51:10 2012 +0100 +Date: Thu Nov 22 14:51:10 2012 +0100 Updated Slovenian translation @@ -444,7 +1111,7 @@ commit c4e64a0d0c5b8e04520b948464182e5d7f234240 Author: Piotr Drąg -Date: Thu Nov 22 01:32:03 2012 +0100 +Date: Thu Nov 22 01:32:03 2012 +0100 Updated Polish translation @@ -453,7 +1120,7 @@ commit 3b17da47bf3ded0cd00438396a75d6555a293758 Author: Álvaro Peña -Date: Wed Nov 21 23:30:36 2012 +0100 +Date: Wed Nov 21 23:30:36 2012 +0100 Bug 677209 - The CalendarWindow dropdown doesn't displayed in the correct place @@ -466,9 +1133,9 @@ CalendarWindow is calculated with the correct button position. - data/Makefile.am | 1 + + data/Makefile.am | 1 + data/calendar-button.css | 17 +++++++++++++ - src/main-window.c | 1 - + src/main-window.c | 1 - src/widgets/calendar-button.c | 59 +++++++++++++++++++++++-------------------- src/widgets/calendar-window.c | 2 +- @@ -476,7 +1143,7 @@ commit d4adee61a2307e50f9a33240052e7fcbbd04a43e Author: Piotr Drąg -Date: Wed Nov 21 20:55:37 2012 +0100 +Date: Wed Nov 21 20:55:37 2012 +0100 Updated Polish translation @@ -486,7 +1153,7 @@ commit 256b03d095fa534ea46317e1180cd3b300d7a617 Author: Álvaro Peña -Date: Sun Nov 18 18:58:54 2012 +0100 +Date: Sun Nov 18 18:58:54 2012 +0100 core: Port to GMenu @@ -505,24 +1172,24 @@ You can read about the menu reorganization discussion in Bug 676600 https://bugzilla.gnome.org/show_bug.cgi?id=676600. - configure.ac | 2 +- - data/Makefile.am | 1 + + configure.ac | 2 +- + data/Makefile.am | 1 + data/almanah-app-menu.ui | 39 ++++++ - data/almanah.ui | 141 +++------------------ - po/POTFILES.in | 1 + - src/application.c | 251 ++++++++++++++++++++++++++++++++++++- - src/interface.c | 9 ++ - src/interface.h | 1 + - src/main-window.c | 283 + data/almanah.ui | 141 +++------------------ + po/POTFILES.in | 1 + + src/application.c | 251 ++++++++++++++++++++++++++++++++++++- + src/interface.c | 9 ++ + src/interface.h | 1 + + src/main-window.c | 283 ++++++++---------------------------------- - src/main-window.h | 5 +- + src/main-window.h | 5 +- src/widgets/calendar-button.c | 34 +++++ src/widgets/calendar-button.h | 2 + 12 files changed, 408 insertions(+), 361 deletions(-) commit d7caeb443fcedeb1aa7b61e738ba914ff4178393 Author: Rūdolfs Mazurs -Date: Sat Oct 13 00:07:39 2012 +0300 +Date: Sat Oct 13 00:07:39 2012 +0300 Updated Latvian translation @@ -532,7 +1199,7 @@ commit ccaac250ccdb4e22543fd7dded5fafe98c98a171 Author: Fran Diéguez -Date: Fri Oct 12 01:00:54 2012 +0200 +Date: Fri Oct 12 01:00:54 2012 +0200 Updated Galician translations @@ -542,7 +1209,7 @@ commit 29d5c38a4d8f5cc593dba8dd2ca13a567a59dcf7 Author: Marek Černocký -Date: Sun Oct 7 13:32:12 2012 +0200 +Date: Sun Oct 7 13:32:12 2012 +0200 Updated Czech translation @@ -552,7 +1219,7 @@ commit 88a0f92047b3b8c4a880d48028284a6aa76691fb Author: Daniel Mustieles -Date: Sun Sep 30 13:05:13 2012 +0200 +Date: Sun Sep 30 13:05:13 2012 +0200 Updated Spanish translation @@ -562,11 +1229,11 @@ commit 7ae1c5b9721579e3624094101e249f06590bfa59 Author: Мирослав Николић -Date: Sat Sep 29 06:05:24 2012 +0200 +Date: Sat Sep 29 06:05:24 2012 +0200 Updated Serbian translation - po/sr.po | 59 + po/sr.po | 59 +++++++++++++++++++++++++++++++++++----------------------- po/sr@latin.po | 59 +++++++++++++++++++++++++++++++++++----------------------- @@ -574,7 +1241,7 @@ commit 69eac0f34023830fb53819245c807cd29d576ba4 Author: Andika Triwidada -Date: Wed Sep 26 20:09:54 2012 +0700 +Date: Wed Sep 26 20:09:54 2012 +0700 Updated Indonesian translation @@ -584,7 +1251,7 @@ commit 0eb7dfc820c881dcd7baf2677b5ec3144291447f Author: Piotr Drąg -Date: Tue Sep 25 23:56:30 2012 +0200 +Date: Tue Sep 25 23:56:30 2012 +0200 Updated Polish translation @@ -594,7 +1261,7 @@ commit 69a1ad1e003ce9185c5d659acfbb519958c94365 Author: Andrej Žnidaršič -Date: Tue Sep 25 19:29:47 2012 +0200 +Date: Tue Sep 25 19:29:47 2012 +0200 Updated Slovenian translation @@ -603,18 +1270,18 @@ commit a5a0d0eada5c8545828fbb0e07e26af0a5626e78 Author: Álvaro Peña -Date: Tue Sep 25 17:41:17 2012 +0200 +Date: Tue Sep 25 17:41:17 2012 +0200 Bug 680845 - Translatable strings for the time in the events list src/events/calendar-appointment.c | 3 ++- - src/events/calendar-task.c | 3 ++- - src/main-window.c | 7 ++++++- + src/events/calendar-task.c | 3 ++- + src/main-window.c | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) commit 675b601fc99830d71fd7bfb772c4b9a79db184cd Author: Philip Withnall -Date: Tue Sep 25 00:04:03 2012 +0100 +Date: Tue Sep 25 00:04:03 2012 +0100 build: Bump EDS dependency to 3.5.91 @@ -628,7 +1295,7 @@ commit 6929113e60cb45a2d1fb140e1e13ee98bae8303d Author: Álvaro Peña -Date: Thu Sep 20 20:12:43 2012 +0200 +Date: Thu Sep 20 20:12:43 2012 +0200 build: Post-release version bump @@ -637,7 +1304,7 @@ commit 5ae30e17fc16e9d6c0d4434923f4638979fce504 Author: Álvaro Peña -Date: Thu Sep 20 20:07:39 2012 +0200 +Date: Thu Sep 20 20:07:39 2012 +0200 build: Release version 0.10.0 @@ -646,7 +1313,7 @@ commit dc53ed50be550ec75f0648258e194970b269ef49 Author: Chris Leonard -Date: Fri Sep 14 15:24:41 2012 +0100 +Date: Fri Sep 14 15:24:41 2012 +0100 Updated British English translation @@ -656,21 +1323,21 @@ commit ed8c002455c2495e0aed74517893d24b505c8144 Author: Milan Crha -Date: Mon Sep 10 08:19:17 2012 +0200 +Date: Mon Sep 10 08:19:17 2012 +0200 Bug 683570 - Fails to build against evolution-data-server 3.5.91 - configure.ac | 4 +- - src/event-factories/calendar-client.c | 241 +++++++++++------------ - src/event-factories/calendar-client.h | 2 +- + configure.ac | 4 +- + src/event-factories/calendar-client.c | 241 +++++++++++------------ + src/event-factories/calendar-client.h | 2 +- src/event-factories/calendar-sources.c | 341 +++++++++------------------------ - src/events/calendar-task.c | 2 +- + src/events/calendar-task.c | 2 +- 5 files changed, 201 insertions(+), 389 deletions(-) commit 0d3dd10e560063d996a0924ceacd7f1f61fe7422 Author: Milan Crha -Date: Mon Sep 10 08:16:11 2012 +0200 +Date: Mon Sep 10 08:16:11 2012 +0200 Use GTK_PRINT_SETTINGS_OUTPUT_BASENAME only if defined when compiled @@ -679,7 +1346,7 @@ commit 6dbcd0995d839a35cdff202499d51afb5752918a Author: Marek Černocký -Date: Sat Sep 1 18:22:14 2012 +0200 +Date: Sat Sep 1 18:22:14 2012 +0200 Updated Czech translation @@ -689,7 +1356,7 @@ commit 9241763ec34fb6d2d859970140fb5e5460971df8 Author: Philip Withnall -Date: Fri Aug 24 00:29:31 2012 +0100 +Date: Fri Aug 24 00:29:31 2012 +0100 core: Set basename of output file when doing “Print to File” @@ -697,13 +1364,13 @@ See: https://live.gnome.org/GnomeGoals/PrintToFile - configure.ac | 2 +- + configure.ac | 2 +- src/main-window.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) commit 811f47c9dbe1a7352b476fbd45cc92ece6e800a2 Author: Fran Diéguez -Date: Sun Aug 19 22:51:48 2012 +0200 +Date: Sun Aug 19 22:51:48 2012 +0200 Updated Galician translations @@ -713,7 +1380,7 @@ commit 4d359b6c1ad604a41c76741ea36295d3644f1d0e Author: Fran Diéguez -Date: Mon Aug 13 14:22:48 2012 +0200 +Date: Mon Aug 13 14:22:48 2012 +0200 Updated Galician translations @@ -723,7 +1390,7 @@ commit f68c3f84ca52fea39174868f067656ee0f905127 Author: Matej Urbančič -Date: Tue Aug 7 12:16:50 2012 +0200 +Date: Tue Aug 7 12:16:50 2012 +0200 Updated Slovenian translation @@ -732,11 +1399,11 @@ commit 50a5eafef276d270ebe67092b30e9247b8e57d7b Author: Мирослав Николић -Date: Tue Aug 7 08:27:36 2012 +0200 +Date: Tue Aug 7 08:27:36 2012 +0200 Updated Serbian translation - po/sr.po | 80 + po/sr.po | 80 +++++++++++++++++++++++++--------------------------------- po/sr@latin.po | 80 +++++++++++++++++++++++++--------------------------------- @@ -744,22 +1411,22 @@ commit f93cab82dc8a0c905331038e9959a3004b7671da Author: Álvaro Peña -Date: Wed Aug 1 18:16:37 2012 +0200 +Date: Wed Aug 1 18:16:37 2012 +0200 Include the event time as new design suggest (#680845) src/event-factories/calendar.c | 2 +- - src/event.c | 8 ++++++++ - src/event.h | 2 ++ + src/event.c | 8 ++++++++ + src/event.h | 2 ++ src/events/calendar-appointment.c | 15 +++++++++++++++ - src/events/calendar-task.c | 18 +++++++++++++++++- - src/events/calendar-task.h | 2 +- - src/main-window.c | 2 +- + src/events/calendar-task.c | 18 +++++++++++++++++- + src/events/calendar-task.h | 2 +- + src/main-window.c | 2 +- 7 files changed, 45 insertions(+), 4 deletions(-) commit f87ba819b4a5f763bf0a6991a65f6edfd779c09f Author: Daniel Mustieles -Date: Mon Jul 16 16:39:28 2012 +0200 +Date: Mon Jul 16 16:39:28 2012 +0200 Updated Spanish translation @@ -768,7 +1435,7 @@ commit 53a49f5be9ac130091a8ebd72e1460a336417c84 Author: Andika Triwidada -Date: Mon Jul 16 00:21:05 2012 +0700 +Date: Mon Jul 16 00:21:05 2012 +0700 Updated Indonesian translation @@ -778,7 +1445,7 @@ commit 6716935bbb47376c80dc3249790cc7be34d0d9c7 Author: Piotr Drąg -Date: Sun Jul 15 17:44:57 2012 +0200 +Date: Sun Jul 15 17:44:57 2012 +0200 Updated Polish translation @@ -787,7 +1454,7 @@ commit 8e44f523cf903ea05a334fc753465bc1c93d4b3c Author: Álvaro Peña -Date: Mon Jul 9 18:27:18 2012 +0200 +Date: Mon Jul 9 18:27:18 2012 +0200 Deactivate the events expander when no events and show an events counter @@ -798,7 +1465,7 @@ commit 3e0b220d89255503cae17e4332098f0901f69a92 Author: Rūdolfs Mazurs -Date: Wed Jun 20 19:35:18 2012 +0300 +Date: Wed Jun 20 19:35:18 2012 +0300 Updated Latvian translation @@ -808,7 +1475,7 @@ commit 86e9b933afde1b796a47996d0013cd24e40adb49 Author: Matej Urbančič -Date: Fri Jun 8 21:10:45 2012 +0200 +Date: Fri Jun 8 21:10:45 2012 +0200 Updated Slovenian translation @@ -817,7 +1484,7 @@ commit a56f2e750e2c95d8e30f25885e2e429f15931ea1 Author: Bruno Brouard -Date: Sat Jun 2 20:58:07 2012 +0200 +Date: Sat Jun 2 20:58:07 2012 +0200 Updated French translation @@ -827,11 +1494,11 @@ commit 981c2562ad682b58d83efb0f4e4d319c92033038 Author: Мирослав Николић -Date: Fri Jun 1 21:01:56 2012 +0200 +Date: Fri Jun 1 21:01:56 2012 +0200 Updated Serbian translation - po/sr.po | 92 + po/sr.po | 92 ++++++++++++++++++++++++++++++++++++---------------------- po/sr@latin.po | 92 ++++++++++++++++++++++++++++++++++++---------------------- @@ -839,7 +1506,7 @@ commit 01b34fab1bdc839f250dc67e71fe4b85813a05f9 Author: Daniel Mustieles -Date: Fri Jun 1 10:27:28 2012 +0200 +Date: Fri Jun 1 10:27:28 2012 +0200 Updated Spanish translation @@ -848,7 +1515,7 @@ commit 67266ed77838dd17da135c8041115a0bd19afdc5 Author: Piotr Drąg -Date: Thu May 31 20:35:29 2012 +0200 +Date: Thu May 31 20:35:29 2012 +0200 Updated Polish translation @@ -857,21 +1524,21 @@ commit 2ae868ba36ec71298a3101b25f6afe42698bc109 Author: Álvaro Peña -Date: Thu May 31 18:44:46 2012 +0200 +Date: Thu May 31 18:44:46 2012 +0200 Fix the calendar button/window style - data/Makefile.am | 4 +++- + data/Makefile.am | 4 +++- data/calendar-window.css | 4 ++++ - src/interface.c | 9 +++++++++ - src/interface.h | 1 + + src/interface.c | 9 +++++++++ + src/interface.h | 1 + src/widgets/calendar-button.c | 14 +++++++++++--- src/widgets/calendar-window.c | 20 ++++++++++++++++++++ 6 files changed, 48 insertions(+), 4 deletions(-) commit 7e0b3ee0ff44b72109dae8db60a9e7fe4773d263 Author: Matej Urbančič -Date: Mon May 28 14:55:19 2012 +0200 +Date: Mon May 28 14:55:19 2012 +0200 Updated Slovenian translation @@ -881,7 +1548,7 @@ commit a5f0cb83c0222959338f8dec0829dab379fa63d8 Author: Daniel Mustieles -Date: Sun May 27 12:28:54 2012 +0200 +Date: Sun May 27 12:28:54 2012 +0200 Updated Spanish translation @@ -891,7 +1558,7 @@ commit b9704c3788b54a3b4dcbdf5235ee57aa62c658e6 Author: Yuri Myasoedov -Date: Sun May 27 11:38:44 2012 +0400 +Date: Sun May 27 11:38:44 2012 +0400 Updated Russian translation @@ -901,7 +1568,7 @@ commit 363eb52c63163b77c243d7ca4e9c0a55097e5c1f Author: Piotr Drąg -Date: Sat May 26 20:54:36 2012 +0200 +Date: Sat May 26 20:54:36 2012 +0200 Updated Polish translation @@ -911,7 +1578,7 @@ commit a3d78b7061befb3df3fef27a31cdebea6cb79ec1 Author: Álvaro Peña -Date: Sat May 26 19:17:17 2012 +0200 +Date: Sat May 26 19:17:17 2012 +0200 Update maintainers with the alvaropg information @@ -921,14 +1588,14 @@ commit f7a2e0098ad9dca5e7e1741234af8b81cb95e4cc Author: Álvaro Peña -Date: Sat May 26 18:58:41 2012 +0200 +Date: Sat May 26 18:58:41 2012 +0200 Create a date button in the toolbar - data/almanah.ui | 259 +++++++++++++--------------- - po/POTFILES.in | 2 + - src/Makefile.am | 4 + - src/main-window.c | 76 +++++--- + data/almanah.ui | 259 +++++++++++++--------------- + po/POTFILES.in | 2 + + src/Makefile.am | 4 + + src/main-window.c | 76 +++++--- src/widgets/calendar-button.c | 391 ++++++++++++++++++++++++++++++++++++++++++ src/widgets/calendar-button.h | 60 +++++++ @@ -938,7 +1605,7 @@ commit 05185be958f073d444c3517ab9e9543b71ddf0cd Author: Daniel Winzen -Date: Fri May 18 20:19:41 2012 +0200 +Date: Fri May 18 20:19:41 2012 +0200 Updated German translation @@ -948,18 +1615,18 @@ commit 877df0a5c29a47509b35a95c9bcb20244e502e14 Author: Rūdolfs Mazurs -Date: Wed May 16 22:45:36 2012 +0300 +Date: Wed May 16 22:45:36 2012 +0300 Added Latvian translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/lv.po | 643 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 644 insertions(+) commit 3830c9d3c44160abaa4f9fea974649f6b9403124 Author: Bruno Brouard -Date: Sun Apr 22 16:20:22 2012 +0200 +Date: Sun Apr 22 16:20:22 2012 +0200 Updated French translation @@ -969,7 +1636,7 @@ commit 408bcff36919701fd7c1cfc16407a53d14e6e983 Author: Joe Hansen -Date: Sat Apr 21 17:12:02 2012 +0200 +Date: Sat Apr 21 17:12:02 2012 +0200 Updated Danish translation @@ -979,11 +1646,11 @@ commit de42b202f231b607d3b71ec49514c4bb579fc567 Author: Мирослав Николић -Date: Sat Mar 31 15:00:08 2012 +0200 +Date: Sat Mar 31 15:00:08 2012 +0200 Updated Serbian translation - po/sr.po | 309 + po/sr.po | 309 +++++++++++++++++++++++++++++---------------------------- po/sr@latin.po | 309 +++++++++++++++++++++++++++++---------------------------- @@ -991,7 +1658,7 @@ commit dac217eb81b3c1cf06a546dfb83a737fb465958e Author: Philip Withnall -Date: Thu Mar 29 11:16:07 2012 +0100 +Date: Thu Mar 29 11:16:07 2012 +0100 docs: Add a (really) basic security policy to HACKING @@ -1000,7 +1667,7 @@ commit bda7233463cce82daa90d5036ac18e1bc598a28e Author: Philip Withnall -Date: Wed Mar 28 22:28:03 2012 +0100 +Date: Wed Mar 28 22:28:03 2012 +0100 docs: Add some general principles to HACKING @@ -1009,7 +1676,7 @@ commit 817962cc4d4f5b1999bc5aa91d89142479786052 Author: Daniel Mustieles -Date: Wed Mar 28 18:28:02 2012 +0200 +Date: Wed Mar 28 18:28:02 2012 +0200 Updated Spanish translation @@ -1019,7 +1686,7 @@ commit 2818e8eb289bf723d074c75e0e2135605a85d50f Author: Matej Urbančič -Date: Mon Mar 26 14:10:24 2012 +0200 +Date: Mon Mar 26 14:10:24 2012 +0200 Updated Slovenian translation @@ -1029,7 +1696,7 @@ commit 4045ca7ed91fde2f0ec4c607efd71ac0561a0031 Author: Fran Diéguez -Date: Mon Mar 26 12:23:01 2012 +0200 +Date: Mon Mar 26 12:23:01 2012 +0200 Updated Galician translations @@ -1039,7 +1706,7 @@ commit 059179423568c5ef9d00c48fa7e6ae23410ec797 Author: Piotr Drąg -Date: Mon Mar 26 02:25:10 2012 +0200 +Date: Mon Mar 26 02:25:10 2012 +0200 Updated Polish translation @@ -1049,7 +1716,7 @@ commit 4402a3fd6ad6be0693efd2aa104db120394d7852 Author: Marek Černocký -Date: Sun Mar 25 23:52:15 2012 +0200 +Date: Sun Mar 25 23:52:15 2012 +0200 Updated Czech translation @@ -1059,7 +1726,7 @@ commit 97232b1313cadf8ec823ddd33750ca684e36fb97 Author: Philip Withnall -Date: Sun Mar 25 22:44:36 2012 +0100 +Date: Sun Mar 25 22:44:36 2012 +0100 build: Post-release version bump @@ -1068,7 +1735,7 @@ commit 446ffc5bbb4c02b8eaadf598bf42a45d048f10f2 Author: Philip Withnall -Date: Sun Mar 25 22:43:44 2012 +0100 +Date: Sun Mar 25 22:43:44 2012 +0100 build: Release version 0.9.0 @@ -1077,7 +1744,7 @@ commit ff90b56f3c5c86c7d954d6bfb27821ed4b785357 Author: Philip Withnall -Date: Sun Mar 25 22:36:20 2012 +0100 +Date: Sun Mar 25 22:36:20 2012 +0100 build: Re-add MAINTAINERS file @@ -1088,7 +1755,7 @@ commit bb4634640139145ede83f871568a1762f6e8d95f Author: Philip Withnall -Date: Sun Mar 25 22:35:02 2012 +0100 +Date: Sun Mar 25 22:35:02 2012 +0100 build: Update dependencies list in README @@ -1097,7 +1764,7 @@ commit 13f2b0f08096ff4ad9570f65ca2b113fb8143c24 Author: Philip Withnall -Date: Sun Mar 25 22:20:12 2012 +0100 +Date: Sun Mar 25 22:20:12 2012 +0100 l10n: Update British English translation @@ -1107,7 +1774,7 @@ commit 523de8fa86af7cb85298db4f6d03ec4f44a2d281 Author: Philip Withnall -Date: Sun Mar 25 22:17:22 2012 +0100 +Date: Sun Mar 25 22:17:22 2012 +0100 core: Fix viewing results of import operations @@ -1116,7 +1783,7 @@ commit e3c64de7ae46cead5684df0f000cfe8a09d60bae Author: Philip Withnall -Date: Sun Mar 25 22:08:00 2012 +0100 +Date: Sun Mar 25 22:08:00 2012 +0100 core: Fix text export @@ -1129,7 +1796,7 @@ commit 0d09d962a17262fb6550fc68a05f0e75683aa2bd Author: Philip Withnall -Date: Sun Mar 25 22:03:40 2012 +0100 +Date: Sun Mar 25 22:03:40 2012 +0100 core: Fix deserialisation of XML when searching entries @@ -1138,7 +1805,7 @@ commit 471dab3ea999e4716c33f72870b510a70fa588d3 Author: Philip Withnall -Date: Sun Mar 25 11:03:09 2012 +0100 +Date: Sun Mar 25 11:03:09 2012 +0100 core: Work around a GtkBuilder bug with more recent versions of GTK+ @@ -1150,13 +1817,13 @@ src/date-entry-dialog.c | 1 + src/import-export-dialog.c | 2 ++ src/preferences-dialog.c | 1 + - src/search-dialog.c | 1 + + src/search-dialog.c | 1 + src/uri-entry-dialog.c | 1 + 5 files changed, 6 insertions(+) commit 934c42b4c69b46b09e6577389e3e5eb2ab51e211 Author: Philip Withnall -Date: Sun Mar 25 10:25:29 2012 +0100 +Date: Sun Mar 25 10:25:29 2012 +0100 core: Fix punctuation in a tooltip @@ -1165,7 +1832,7 @@ commit 6eb7d62876aea12b565210c110e8b7b96fd65ab0 Author: Philip Withnall -Date: Sun Mar 25 10:25:20 2012 +0100 +Date: Sun Mar 25 10:25:20 2012 +0100 core: Add an icon to the hyperlink button @@ -1174,7 +1841,7 @@ commit 7501b26e7414d95d55f57bd497cc034ba9dfc76c Author: Philip Withnall -Date: Sun Mar 25 10:17:01 2012 +0100 +Date: Sun Mar 25 10:17:01 2012 +0100 Bug 669927 — Save current entry after a timeout @@ -1189,7 +1856,7 @@ commit 34762478a7aa99b0acd95245f9c396f0db666b2b Author: Philip Withnall -Date: Sat Mar 24 23:06:58 2012 +0000 +Date: Sat Mar 24 23:06:58 2012 +0000 core: Use GtkBox instead of Gtk[H|V]Box in the print dialogue @@ -1198,7 +1865,7 @@ commit 542a426082f89e965a22af6e97c4ce06beefa45e Author: Philip Withnall -Date: Sat Mar 24 23:00:12 2012 +0000 +Date: Sat Mar 24 23:00:12 2012 +0000 Bug 671801 — i18n doesn't work @@ -1215,7 +1882,7 @@ commit 81c4ee3a1044f07f6704d9e4de723a30a8c13766 Author: Fran Diéguez -Date: Sat Mar 24 00:14:16 2012 +0100 +Date: Sat Mar 24 00:14:16 2012 +0100 Updated Galician translations @@ -1225,7 +1892,7 @@ commit 54451a3934ce73f1abfad470829c35fd0c7f29fa Author: Bruno Brouard -Date: Wed Mar 21 19:19:04 2012 +0100 +Date: Wed Mar 21 19:19:04 2012 +0100 Updated French translation @@ -1235,11 +1902,11 @@ commit d0f9694c78b9f71dc68b57739e2556380c1524aa Author: Мирослав Николић -Date: Sun Feb 26 20:44:05 2012 +0100 +Date: Sun Feb 26 20:44:05 2012 +0100 Updated Serbian translation - po/sr.po | 127 + po/sr.po | 127 +++++++++++++++++++++++++++++++-------------------------- po/sr@latin.po | 127 +++++++++++++++++++++++++++++++-------------------------- @@ -1247,7 +1914,7 @@ commit 6384f10c69d063656a26cc8fcd2c1103aa92dc3d Author: Philip Withnall -Date: Fri Jan 6 11:22:56 2012 +0000 +Date: Fri Jan 6 11:22:56 2012 +0000 core: Don't call g_thread_init() if we have GLib ≥ 2.31.0 @@ -1256,7 +1923,7 @@ commit 4801c389a96324e477a96624514cbd0bcc92d883 Author: Philip Withnall -Date: Fri Jan 6 11:21:34 2012 +0000 +Date: Fri Jan 6 11:21:34 2012 +0000 core: Fix chaining up of GApplication::startup signal @@ -1265,7 +1932,7 @@ commit c68e562b332c50460bec9a82dfa3f3b30e96eddb Author: Philip Withnall -Date: Fri Jan 6 11:09:43 2012 +0000 +Date: Fri Jan 6 11:09:43 2012 +0000 core: Fix build with --enable-spell-checking @@ -1276,7 +1943,7 @@ commit e8eaacbc52dfa54c081b709738bd21a9b196fc0c Author: Vincent Untz -Date: Fri Jan 6 12:18:41 2012 +0100 +Date: Fri Jan 6 12:18:41 2012 +0100 build: Fix build with encryption support @@ -1289,7 +1956,7 @@ commit 90f6d22a337b9718182c7cc847f9323024b3d0b0 Author: Philip Withnall -Date: Wed Jan 4 17:45:40 2012 +0000 +Date: Wed Jan 4 17:45:40 2012 +0000 build: Re-enable spell checking now that GtkSpell has GTK+ 3 support @@ -1309,7 +1976,7 @@ commit 82e2acbf2bb4d1039732cbcfb2c171ea0eb7e192 Author: Joe Hansen -Date: Mon Jan 2 12:40:55 2012 +0100 +Date: Mon Jan 2 12:40:55 2012 +0100 Updated Danish translation @@ -1319,7 +1986,7 @@ commit 241eb77d4c04f3341a06f113d2bd1fd1e38f10ed Author: Muhammet Kara -Date: Sat Dec 31 21:20:13 2011 +0200 +Date: Sat Dec 31 21:20:13 2011 +0200 [l10n]Updated Turkish translation @@ -1329,53 +1996,53 @@ commit 7a1c288c8296a49a93001ad49a1aab7eb8be6764 Author: Mateusz Kacprzak -Date: Sat Dec 17 22:18:14 2011 +0100 +Date: Sat Dec 17 22:18:14 2011 +0100 Added Polish translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/pl.po | 661 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 662 insertions(+) commit 6bf0229c20f9a5ef92374595ff4d5823f74196f0 Author: Piotr Drąg -Date: Sat Dec 17 22:16:51 2011 +0100 +Date: Sat Dec 17 22:16:51 2011 +0100 Revert "Added Polish translation" This reverts commit 4c5c13f524a000b7ecfcf0bb42a9d18dddeaa577. - po/LINGUAS | 1 - + po/LINGUAS | 1 - po/pl.po | 661 ------------------------------------------------------------- 2 files changed, 662 deletions(-) commit 4c5c13f524a000b7ecfcf0bb42a9d18dddeaa577 Author: Piotr Drąg -Date: Sat Dec 17 22:03:30 2011 +0100 +Date: Sat Dec 17 22:03:30 2011 +0100 Added Polish translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/pl.po | 661 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 662 insertions(+) commit 4b11b928449c8623327694773ead9869603fc802 Author: Kristjan SCHMIDT -Date: Sat Nov 5 09:13:52 2011 +0100 +Date: Sat Nov 5 09:13:52 2011 +0100 Add Esperanto translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/eo.po | 614 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 615 insertions(+) commit 75a4dc552d712fe0d4533370e4937c6f4d200076 Author: Marek Černocký -Date: Wed Nov 2 19:49:38 2011 +0100 +Date: Wed Nov 2 19:49:38 2011 +0100 Updated Czech translation @@ -1385,7 +2052,7 @@ commit f963e70db98854937185e749c1b4dbbe919ca12c Author: Álvaro Peña -Date: Tue Nov 1 21:33:29 2011 +0000 +Date: Tue Nov 1 21:33:29 2011 +0000 core: Move the events list to the bottom of the window @@ -1398,7 +2065,7 @@ commit faf64d1512c139bd2479d2a9893ca7ddc82f4664 Author: Gabor Kelemen -Date: Sat Oct 29 17:35:51 2011 +0200 +Date: Sat Oct 29 17:35:51 2011 +0200 Updated Hungarian translation by Balazs Ur @@ -1408,7 +2075,7 @@ commit 826c6a591a2f11908aff1567129872a7ad138c22 Author: Andrej Žnidaršič -Date: Tue Oct 25 20:36:16 2011 +0200 +Date: Tue Oct 25 20:36:16 2011 +0200 Updated Slovenian translation @@ -1418,7 +2085,7 @@ commit 009d24855bf7df122d9fe4e69ac4c3b4572f6b6c Author: Daniel Mustieles -Date: Tue Oct 25 16:35:52 2011 +0200 +Date: Tue Oct 25 16:35:52 2011 +0200 Updated Spanish translation @@ -1428,7 +2095,7 @@ commit 69c10c8b4fc42ed48ad1c116f90f12015a7be5de Author: Mario Blättermann -Date: Mon Oct 24 23:24:13 2011 +0200 +Date: Mon Oct 24 23:24:13 2011 +0200 [l10n] Updated German translation @@ -1438,13 +2105,13 @@ commit e573eb06c5391a9fa6e4d1029a9957ab44d81589 Author: Álvaro Peña -Date: Mon Oct 24 18:39:31 2011 +0200 +Date: Mon Oct 24 18:39:31 2011 +0200 Bug 662016 — Create a toolbar menu item with the fonts style - data/almanah.ui | 25 +++++++-- - src/Makefile.am | 74 ++++++++++++++------------- - src/main-window.c | 99 + data/almanah.ui | 25 +++++++-- + src/Makefile.am | 74 ++++++++++++++------------- + src/main-window.c | 99 ++++++++++++++++++++++++++++++++++++ src/widgets/font-style-menu-action.c | 58 +++++++++++++++++++++ src/widgets/font-style-menu-action.h | 47 +++++++++++++++++ @@ -1452,18 +2119,18 @@ commit 8b44143df4e844d4c9b4da45186686cf048ebbfa Author: Muhammet Kara -Date: Fri Sep 30 01:31:39 2011 +0300 +Date: Fri Sep 30 01:31:39 2011 +0300 Added Turkish translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/tr.po | 626 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 627 insertions(+) commit 24c6d54c1c9b7211336b4b6779bb16a68d587fec Author: Fran Dieguez -Date: Tue Aug 30 16:58:49 2011 +0200 +Date: Tue Aug 30 16:58:49 2011 +0200 Updated galician translations @@ -1473,7 +2140,7 @@ commit e7743e8b0fefeb884278bb15ddd65bd73c12b3c6 Author: Claude Paroz -Date: Mon Aug 22 09:58:15 2011 +0200 +Date: Mon Aug 22 09:58:15 2011 +0200 Updated French translation @@ -1483,7 +2150,7 @@ commit 233aad655e48c8533f513ff03c5100ef8768c149 Author: Yuri Myasoedov -Date: Fri Jul 29 19:38:10 2011 +0400 +Date: Fri Jul 29 19:38:10 2011 +0400 Updated Russian translation @@ -1493,18 +2160,18 @@ commit ddf428130ffe6a457e6be01f30506cd338115b90 Author: Inaki Larranaga Murgoitio -Date: Thu Jul 28 18:14:15 2011 +0200 +Date: Thu Jul 28 18:14:15 2011 +0200 Added Basque language - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/eu.po | 764 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 765 insertions(+) commit ad6c2ee888d70e936608149426dd2ecfdd497141 Author: Gabriel Speckhahn -Date: Sat Jul 23 09:52:29 2011 -0300 +Date: Sat Jul 23 09:52:29 2011 -0300 Updated Brazilian Portuguese Translation @@ -1514,7 +2181,7 @@ commit 7d19c7b00b8492684c9814bf160f16755f306911 Author: Philip Withnall -Date: Tue Jul 19 08:43:38 2011 +0100 +Date: Tue Jul 19 08:43:38 2011 +0100 build: Fix preferences with --enable-spell-checking and --disable-encryption @@ -1526,7 +2193,7 @@ commit 6ebc71c68709b6cc1f371c6fb3dfa20d6bc39f3d Author: Philip Withnall -Date: Tue Jul 19 08:43:25 2011 +0100 +Date: Tue Jul 19 08:43:25 2011 +0100 core: Remove an extraneous include @@ -1535,7 +2202,7 @@ commit 9a96bcdeb8eaa89943d7f4143c2840341162adaf Author: Philip Withnall -Date: Thu Jul 14 08:51:54 2011 +0100 +Date: Thu Jul 14 08:51:54 2011 +0100 core: Use the correct priority for search progress callbacks @@ -1550,7 +2217,7 @@ commit 4248338b6fa04ece36b9da1f4283c784517cad25 Author: Álvaro Peña -Date: Thu Jul 14 08:43:41 2011 +0100 +Date: Thu Jul 14 08:43:41 2011 +0100 core: Fix resizing the search dialogue @@ -1559,7 +2226,7 @@ commit 85fd0359aab2dd6db26ffbc7ee74a58c0eab0acd Author: Joe Hansen -Date: Wed Jul 13 22:26:04 2011 +0200 +Date: Wed Jul 13 22:26:04 2011 +0200 Updated Danish translation @@ -1569,11 +2236,11 @@ commit 4ad604845c6173d326336e0b142a023eb5656c28 Author: Мирослав Николић -Date: Fri Jul 8 18:08:13 2011 +0200 +Date: Fri Jul 8 18:08:13 2011 +0200 Updated Serbian translation - po/sr.po | 82 + po/sr.po | 82 +++++++++++++++++++++++++++++++++++++--------------------- po/sr@latin.po | 82 +++++++++++++++++++++++++++++++++++++--------------------- @@ -1581,7 +2248,7 @@ commit 0bd90add8c25b0dd977ac87eb3e7bdb1d7474c4e Author: Marek Černocký -Date: Tue Jul 5 15:40:29 2011 +0200 +Date: Tue Jul 5 15:40:29 2011 +0200 Updated Czech translation @@ -1591,7 +2258,7 @@ commit 5758286f0e6dc923034fcc5a26644e3845345b5a Author: Andrej Žnidaršič -Date: Sat Jul 2 20:17:55 2011 +0200 +Date: Sat Jul 2 20:17:55 2011 +0200 Updated Slovenian translation @@ -1601,7 +2268,7 @@ commit 211049803920d01bd6f1de2c969569420cec4eaa Author: Mario Blättermann -Date: Tue Jun 28 21:55:38 2011 +0200 +Date: Tue Jun 28 21:55:38 2011 +0200 [l10n] Updated German translation @@ -1611,7 +2278,7 @@ commit 466e98fec932ac18d9164bfd4a881121d104339d Author: Daniel Mustieles -Date: Tue Jun 28 21:32:34 2011 +0200 +Date: Tue Jun 28 21:32:34 2011 +0200 Updated Spanish translation @@ -1621,7 +2288,7 @@ commit cb8ad21e8c32fdce37359e192a7dc3d387af9558 Author: Álvaro Peña -Date: Mon Jun 27 23:28:41 2011 +0100 +Date: Mon Jun 27 23:28:41 2011 +0100 Bug 647690 — Make search asynchronous @@ -1641,7 +2308,7 @@ commit f72bcc9b8703e44360dd89ca76d35550b3bc9293 Author: Мирослав Николић -Date: Sun May 15 23:57:08 2011 +0200 +Date: Sun May 15 23:57:08 2011 +0200 Added Serbian translation @@ -1651,19 +2318,19 @@ commit 28eee498611bdc07ab52cd59ede0b7398809c232 Author: Мирослав Николић -Date: Sun May 15 23:55:42 2011 +0200 +Date: Sun May 15 23:55:42 2011 +0200 Added Serbian translation - po/LINGUAS | 2 + - po/sr.po | 621 + po/LINGUAS | 2 + + po/sr.po | 621 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr@latin.po | 54 +++++ 3 files changed, 677 insertions(+) commit 95e9bdd85fccc58c0b5e0ea3c05671a28d6743d2 Author: Yuri Myasoedov -Date: Thu May 12 20:15:45 2011 +0400 +Date: Thu May 12 20:15:45 2011 +0400 Updated Russian translation @@ -1673,7 +2340,7 @@ commit 7a436a09f97c3a216191ed443041c0cf5c41c662 Author: Gabor Kelemen -Date: Sat May 7 19:16:35 2011 +0200 +Date: Sat May 7 19:16:35 2011 +0200 Updated Hungarian translation from Balazs Úr @@ -1683,7 +2350,7 @@ commit 37ba1df32ce4e23a35695fb9e5f42272423ef3af Author: Djavan Fagundes -Date: Tue May 3 14:42:28 2011 -0300 +Date: Tue May 3 14:42:28 2011 -0300 Updated Brazilian Portuguese translation @@ -1693,18 +2360,18 @@ commit a4a170bc05d59345f4ce46b2a48f78c9c268a6e7 Author: Daniel Korostil -Date: Tue May 3 19:24:28 2011 +0300 +Date: Tue May 3 19:24:28 2011 +0300 Added uk translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/uk.po | 699 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 700 insertions(+) commit 96f723bbc1f1e89cbf62f807778a04bc83747e00 Author: Andrej Žnidaršič -Date: Wed Apr 27 19:46:14 2011 +0200 +Date: Wed Apr 27 19:46:14 2011 +0200 Updated Slovenian translation @@ -1714,7 +2381,7 @@ commit e205209b688ee0c9fc453c84c7565e454fd01771 Author: Daniel Mustieles -Date: Thu Apr 21 19:33:27 2011 +0200 +Date: Thu Apr 21 19:33:27 2011 +0200 Updated Spanish translation @@ -1724,7 +2391,7 @@ commit 6637789f8f969278c0c54ec6b528e6816019962f Author: Marek Černocký -Date: Thu Apr 21 09:49:44 2011 +0200 +Date: Thu Apr 21 09:49:44 2011 +0200 Updated Czech translation @@ -1734,7 +2401,7 @@ commit 325433a918c4e7b299c2a1542c5d95eea86beb7b Author: Álvaro Peña -Date: Wed Apr 20 16:40:16 2011 +0100 +Date: Wed Apr 20 16:40:16 2011 +0100 Bug 647691 — Make search case-insensitive @@ -1743,7 +2410,7 @@ commit 845985fe959d0be0b47a3e71759fa8b13f482d98 Author: Mario Blättermann -Date: Mon Apr 18 20:28:21 2011 +0200 +Date: Mon Apr 18 20:28:21 2011 +0200 [l10n] Updated German translation @@ -1753,7 +2420,7 @@ commit abb2fab89d83c354f409ca70e69def53ff8fd6de Author: Philip Withnall -Date: Mon Apr 18 18:42:21 2011 +0100 +Date: Mon Apr 18 18:42:21 2011 +0100 build: Bump GTK+ and GIO dependencies to 3.0.0 and 2.28.0 respectively @@ -1764,7 +2431,7 @@ commit 5953fc9358483fe4b95f2eddeb03db52240099b1 Author: Philip Withnall -Date: Mon Apr 18 18:32:35 2011 +0100 +Date: Mon Apr 18 18:32:35 2011 +0100 core: Mark the toolbar as a primary toolbar @@ -1773,7 +2440,7 @@ commit 727d98f1bdf532b7eb7806fb0f752c38c4a74086 Author: Philip Withnall -Date: Mon Apr 18 17:56:59 2011 +0100 +Date: Mon Apr 18 17:56:59 2011 +0100 core: Bind the StorageManager's key to GSettings @@ -1783,7 +2450,7 @@ commit de24162fe156d7f9e54ff30edd3eaa05cf273b32 Author: Philip Withnall -Date: Mon Apr 18 17:53:04 2011 +0100 +Date: Mon Apr 18 17:53:04 2011 +0100 core: Hide the main window while exiting to make things look faster @@ -1792,7 +2459,7 @@ commit 12bdc2f7d2a9a7049c958285be6564f64aa45fe4 Author: Philip Withnall -Date: Mon Apr 18 17:52:55 2011 +0100 +Date: Mon Apr 18 17:52:55 2011 +0100 core: Don't double-free the main window on exiting @@ -1801,7 +2468,7 @@ commit fbee37f024de85384bfedce2edd320548ec6acd0 Author: Philip Withnall -Date: Mon Apr 18 17:42:42 2011 +0100 +Date: Mon Apr 18 17:42:42 2011 +0100 core: Remove spurious debug messages @@ -1810,7 +2477,7 @@ commit fb3b0eddb3a57097712ee494dd04b0fd3867b8ae Author: Philip Withnall -Date: Mon Apr 18 17:41:31 2011 +0100 +Date: Mon Apr 18 17:41:31 2011 +0100 core: Remove unused variables from AlmanahApplication @@ -1819,39 +2486,39 @@ commit 37ae45223aeb2395b8db9d6ce1dcfece1590095c Author: Philip Withnall -Date: Mon Apr 18 17:37:48 2011 +0100 +Date: Mon Apr 18 17:37:48 2011 +0100 core: Move the remaining function from main.c into interface.c This allows us to remove main.h. - configure.ac | 2 +- - src/Makefile.am | 1 - - src/date-entry-dialog.c | 1 - - src/entry.c | 1 - - src/event-manager.c | 1 - - src/event.c | 1 - + configure.ac | 2 +- + src/Makefile.am | 1 - + src/date-entry-dialog.c | 1 - + src/entry.c | 1 - + src/event-manager.c | 1 - + src/event.c | 1 - src/events/calendar-appointment.c | 2 +- - src/events/calendar-task.c | 2 +- - src/export-operation.c | 1 - - src/import-export-dialog.c | 1 - - src/import-operation.c | 1 - - src/interface.c | 28 +++++++++++++++++++++++++++- - src/interface.h | 1 + - src/main-window.c | 1 - - src/main.c | 32 +++----------------------------- - src/main.h | 33 --------------------------------- - src/preferences-dialog.c | 1 - - src/printing.c | 1 - - src/search-dialog.c | 1 - - src/storage-manager.c | 2 +- - src/uri-entry-dialog.c | 1 - - src/widgets/calendar.c | 1 - + src/events/calendar-task.c | 2 +- + src/export-operation.c | 1 - + src/import-export-dialog.c | 1 - + src/import-operation.c | 1 - + src/interface.c | 28 +++++++++++++++++++++++++++- + src/interface.h | 1 + + src/main-window.c | 1 - + src/main.c | 32 +++----------------------------- + src/main.h | 33 --------------------------------- + src/preferences-dialog.c | 1 - + src/printing.c | 1 - + src/search-dialog.c | 1 - + src/storage-manager.c | 2 +- + src/uri-entry-dialog.c | 1 - + src/widgets/calendar.c | 1 - 22 files changed, 35 insertions(+), 81 deletions(-) commit a76942bdfee913ef606879f6998c219877ce14be Author: Philip Withnall -Date: Mon Apr 18 17:23:03 2011 +0100 +Date: Mon Apr 18 17:23:03 2011 +0100 core: Make the XML parser slightly more robust @@ -1860,7 +2527,7 @@ commit 56bec5f5eeb9f0a8497baa186ad7294e9e7f34ff Author: Philip Withnall -Date: Mon Apr 18 17:22:35 2011 +0100 +Date: Mon Apr 18 17:22:35 2011 +0100 core: Only set the last edited date on import if it's valid @@ -1869,7 +2536,7 @@ commit 0d2374f0bd55461b8bb6ca3a234b60fb395c6f32 Author: Philip Withnall -Date: Thu Apr 14 23:48:54 2011 +0100 +Date: Thu Apr 14 23:48:54 2011 +0100 Bug 622193 — Use single instance @@ -1878,41 +2545,41 @@ Closes: bgo#622193 - po/POTFILES.in | 9 +- - src/Makefile.am | 2 + - src/application.c | 372 + po/POTFILES.in | 9 +- + src/Makefile.am | 2 + + src/application.c | 372 ++++++++++++++++++++++++++++++++++++++ - src/application.h | 62 +++++++ - src/date-entry-dialog.c | 1 - - src/event-manager.c | 8 +- - src/event.c | 4 +- - src/event.h | 4 +- + src/application.h | 62 +++++++ + src/date-entry-dialog.c | 1 - + src/event-manager.c | 8 +- + src/event.c | 4 +- + src/event.h | 4 +- src/events/calendar-appointment.c | 11 +- - src/events/calendar-task.c | 11 +- - src/export-operation.c | 59 +++++- - src/export-operation.h | 5 +- - src/import-export-dialog.c | 87 +++++++-- - src/import-export-dialog.h | 3 +- - src/import-operation.c | 65 ++++++- - src/import-operation.h | 5 +- - src/main-window.c | 236 +++++++++++++++++------- - src/main-window.h | 4 +- - src/main.c | 148 +-------------- - src/main.h | 24 --- - src/preferences-dialog.c | 68 ++++++- - src/preferences-dialog.h | 2 +- - src/printing.c | 44 ++--- - src/printing.h | 7 +- - src/search-dialog.c | 29 ++- - src/storage-manager.c | 40 +++- - src/storage-manager.h | 2 +- - src/widgets/calendar.c | 109 ++++++++++- - src/widgets/calendar.h | 7 +- + src/events/calendar-task.c | 11 +- + src/export-operation.c | 59 +++++- + src/export-operation.h | 5 +- + src/import-export-dialog.c | 87 +++++++-- + src/import-export-dialog.h | 3 +- + src/import-operation.c | 65 ++++++- + src/import-operation.h | 5 +- + src/main-window.c | 236 +++++++++++++++++------- + src/main-window.h | 4 +- + src/main.c | 148 +-------------- + src/main.h | 24 --- + src/preferences-dialog.c | 68 ++++++- + src/preferences-dialog.h | 2 +- + src/printing.c | 44 ++--- + src/printing.h | 7 +- + src/search-dialog.c | 29 ++- + src/storage-manager.c | 40 +++- + src/storage-manager.h | 2 +- + src/widgets/calendar.c | 109 ++++++++++- + src/widgets/calendar.h | 7 +- 29 files changed, 1081 insertions(+), 347 deletions(-) commit 5bb69b0b7e70218a62fd7e361ae212ff403f13dd Author: Mario Blättermann -Date: Sun Apr 17 11:10:54 2011 +0200 +Date: Sun Apr 17 11:10:54 2011 +0200 [l10n] Updated German translation @@ -1922,7 +2589,7 @@ commit 6d67d5d014de642d9223819fc098e5e7969cb136 Author: Marek Černocký -Date: Sun Apr 17 10:50:52 2011 +0200 +Date: Sun Apr 17 10:50:52 2011 +0200 Updated Czech translation @@ -1932,7 +2599,7 @@ commit 833d1850bfcd87f0e95802d8c2630194d43854d6 Author: Andrej Žnidaršič -Date: Sat Apr 16 19:38:59 2011 +0200 +Date: Sat Apr 16 19:38:59 2011 +0200 Updated Slovenian translation @@ -1942,7 +2609,7 @@ commit 31367cd8a4cf12edda2a631148919d142d73939f Author: Daniel Mustieles -Date: Fri Apr 15 19:53:30 2011 +0200 +Date: Fri Apr 15 19:53:30 2011 +0200 Updated Spanish translation @@ -1952,7 +2619,7 @@ commit ccc4d67c84c355e7fda359353b3544524b36b5f9 Author: Philip Withnall -Date: Thu Apr 14 22:13:17 2011 +0100 +Date: Thu Apr 14 22:13:17 2011 +0100 core: Fix a version number in a comment @@ -1961,15 +2628,15 @@ commit 3bfc9106408009a745d0bcfa19719911a7bd96ad Author: Philip Withnall -Date: Sat Apr 2 22:16:27 2011 +0100 +Date: Sat Apr 2 22:16:27 2011 +0100 core: Add support for hyperlinks These replace definitions. Closes: bgo#631835 - data/almanah.ui | 76 +++++++++++++++++ - src/Makefile.am | 2 + - src/main-window.c | 167 +++++++++++++++++++++++++++++++++++--- + data/almanah.ui | 76 +++++++++++++++++ + src/Makefile.am | 2 + + src/main-window.c | 167 +++++++++++++++++++++++++++++++++++--- src/uri-entry-dialog.c | 215 +++++++++++++++++++++++++++++++++++++++++++++++++ src/uri-entry-dialog.h | 57 +++++++++++++ @@ -1977,7 +2644,7 @@ commit a90413df6b1edc6a0bb24d938935b0b03d775038 Author: Philip Withnall -Date: Thu Apr 14 00:59:10 2011 +0100 +Date: Thu Apr 14 00:59:10 2011 +0100 core: Add a new XML-based serialisation format which can represent links @@ -1991,15 +2658,15 @@ as they are edited/written. - data/Makefile.am | 3 +- + data/Makefile.am | 3 +- data/entry-2.0.rnc | 30 ++++ - src/entry.c | 395 + src/entry.c | 395 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 421 insertions(+), 7 deletions(-) commit cd4383736bff24dd403cb6ce398ed28680fc57ea Author: Philip Withnall -Date: Thu Apr 14 01:01:37 2011 +0100 +Date: Thu Apr 14 01:01:37 2011 +0100 widgets: Add a GtkTextTag subclass for hyperlinks @@ -2007,15 +2674,15 @@ tags which have their URI as a property. - src/Makefile.am | 4 +- + src/Makefile.am | 4 +- src/widgets/hyperlink-tag.c | 145 ++++++++++++++++++++++++++++++++++++++++++++ - src/widgets/hyperlink-tag.h | 56 +++++++++++++++++ + src/widgets/hyperlink-tag.h | 56 +++++++++++++++++ 3 files changed, 204 insertions(+), 1 deletion(-) commit 050f22244d8586f7dbb5f5f6050fd2e481cb6cce Author: Philip Withnall -Date: Sun Nov 7 16:57:16 2010 +0000 +Date: Sun Nov 7 16:57:16 2010 +0000 core: Remove definition support @@ -2023,36 +2690,36 @@ and will be replaced by a hyperlinking system. Helps: bgo#631835 - data/almanah.ui | 241 ------------------------- - src/Makefile.am | 36 +--- - src/add-definition-dialog.c | 284 ------------------------------ - src/add-definition-dialog.h | 60 ------- + data/almanah.ui | 241 ------------------------- + src/Makefile.am | 36 +--- + src/add-definition-dialog.c | 284 ------------------------------ + src/add-definition-dialog.h | 60 ------- src/definition-manager-window.c | 378 ---------------------------------------- src/definition-manager-window.h | 51 ------ - src/definition.c | 341 + src/definition.c | 341 ------------------------------------ - src/definition.h | 93 ---------- - src/definitions/contact.c | 240 ------------------------- - src/definitions/contact.h | 52 ------ - src/definitions/file.c | 125 ------------- - src/definitions/file.h | 52 ------ - src/definitions/note.c | 138 --------------- - src/definitions/note.h | 52 ------ - src/definitions/uri.c | 140 --------------- - src/definitions/uri.h | 52 ------ - src/import-operation.c | 15 -- - src/interface.c | 51 +----- - src/main-window.c | 188 +------------------- - src/main.c | 4 - - src/main.h | 2 - - src/storage-manager.c | 186 +------------------- - src/storage-manager.h | 8 +- + src/definition.h | 93 ---------- + src/definitions/contact.c | 240 ------------------------- + src/definitions/contact.h | 52 ------ + src/definitions/file.c | 125 ------------- + src/definitions/file.h | 52 ------ + src/definitions/note.c | 138 --------------- + src/definitions/note.h | 52 ------ + src/definitions/uri.c | 140 --------------- + src/definitions/uri.h | 52 ------ + src/import-operation.c | 15 -- + src/interface.c | 51 +----- + src/main-window.c | 188 +------------------- + src/main.c | 4 - + src/main.h | 2 - + src/storage-manager.c | 186 +------------------- + src/storage-manager.h | 8 +- 23 files changed, 14 insertions(+), 2775 deletions(-) commit 74df40837a814d95e11343b16643094968410e59 Author: Philip Withnall -Date: Thu Apr 14 20:38:56 2011 +0100 +Date: Thu Apr 14 20:38:56 2011 +0100 build: Update almanah.doap and drop MAINTAINERS @@ -2067,7 +2734,7 @@ commit 6e3a5a52559dd0cfdfdff0202c69934e0385502e Author: Philip Withnall -Date: Thu Apr 14 19:40:31 2011 +0100 +Date: Thu Apr 14 19:40:31 2011 +0100 build: Post-release version bump @@ -2076,7 +2743,7 @@ commit 83e4080290a7b4ff2d8449bd45865e4dd590ef2b Author: Philip Withnall -Date: Thu Apr 14 19:38:43 2011 +0100 +Date: Thu Apr 14 19:38:43 2011 +0100 build: Release version 0.8.0 @@ -2085,7 +2752,7 @@ commit dc1f299129b6250437119da220cbb8660c376255 Author: Philip Withnall -Date: Thu Apr 14 19:19:31 2011 +0100 +Date: Thu Apr 14 19:19:31 2011 +0100 core: Don't conditionally compile preference dialogue response code @@ -2096,7 +2763,7 @@ commit 7d50e148b2b2eb3f6c6973bdd5ef530b14dcf4f2 Author: Philip Withnall -Date: Thu Apr 14 19:13:21 2011 +0100 +Date: Thu Apr 14 19:13:21 2011 +0100 l10n: Update British English translation @@ -2106,7 +2773,7 @@ commit 8290b2cad580ccbd4a1caa2e235e38ebd34260ac Author: Philip Withnall -Date: Thu Apr 14 19:12:53 2011 +0100 +Date: Thu Apr 14 19:12:53 2011 +0100 build: Add a generated file to POTFILES.skip @@ -2115,7 +2782,7 @@ commit 43768d9a223e769ef8662222b55e2dc6e5a6c48c Author: Philip Withnall -Date: Thu Apr 14 19:09:39 2011 +0100 +Date: Thu Apr 14 19:09:39 2011 +0100 build: Disable spell checking due to GtkSpell not supporting GTK+ 3 @@ -2124,7 +2791,7 @@ commit 9dc2c1fd153ebada2392bc774875ba6a43df217d Author: Philip Withnall -Date: Thu Apr 14 19:05:50 2011 +0100 +Date: Thu Apr 14 19:05:50 2011 +0100 core: Remove some unnecessary debug messages @@ -2134,7 +2801,7 @@ commit b7649d949735b3f532a11d3f450468871e8eadbc Author: Philip Withnall -Date: Wed Apr 13 21:06:29 2011 +0100 +Date: Wed Apr 13 21:06:29 2011 +0100 core: Add support for versioning the formats used by entries in the database @@ -2145,15 +2812,15 @@ given entry. po/POTFILES.in | 1 + - src/entry.c | 90 + src/entry.c | 90 +++++++++++++++++++++++++++++++++++++-------------- - src/entry.h | 11 +++++-- + src/entry.h | 11 +++++-- src/storage-manager.c | 21 +++++++----- 4 files changed, 88 insertions(+), 35 deletions(-) commit de641cd860d41142eb8cfd4e18c8e89c04b40bd7 Author: Philip Withnall -Date: Wed Apr 13 18:42:54 2011 +0100 +Date: Wed Apr 13 18:42:54 2011 +0100 docs: Update README @@ -2162,7 +2829,7 @@ commit 115337df9c2c9ba556962369ed44da296e08fc65 Author: Philip Withnall -Date: Wed Apr 13 18:42:46 2011 +0100 +Date: Wed Apr 13 18:42:46 2011 +0100 docs: Add a HACKING file @@ -2172,7 +2839,7 @@ commit ff62bbb978529faca4b86a9c0eccc33931191ee7 Author: Philip Withnall -Date: Sat Apr 2 17:48:47 2011 +0100 +Date: Sat Apr 2 17:48:47 2011 +0100 build: Remove generated file from git @@ -2182,7 +2849,7 @@ commit ab3dcf36c5738fc3e6f6cb407f91da0f03eee159 Author: Philip Withnall -Date: Sat Apr 2 17:45:48 2011 +0100 +Date: Sat Apr 2 17:45:48 2011 +0100 build: Add some miscellaneous files to MAINTAINERCLEANFILES @@ -2191,7 +2858,7 @@ commit 27fc7138f013d35f93b860a8c003ff9d260db6c0 Author: Philip Withnall -Date: Sat Apr 2 17:40:13 2011 +0100 +Date: Sat Apr 2 17:40:13 2011 +0100 build: Update git.mk from Pango master @@ -2201,7 +2868,7 @@ commit fffad8ad73c17c035c1449654d9e2cc389daf248 Author: Philip Withnall -Date: Tue Jun 29 23:10:54 2010 +0100 +Date: Tue Jun 29 23:10:54 2010 +0100 core: Port to GSettings @@ -2211,24 +2878,24 @@ factory has to remain using GConf for the time being. - configure.ac | 8 ++-- - data/Makefile.am | 29 +++++-------- - data/almanah.convert | 4 ++ - data/almanah.schemas.in | 37 ---------------- + configure.ac | 8 ++-- + data/Makefile.am | 29 +++++-------- + data/almanah.convert | 4 ++ + data/almanah.schemas.in | 37 ---------------- data/org.gnome.almanah.gschema.xml.in.in | 20 +++++++++ - po/POTFILES.in | 2 +- - src/main-window.c | 73 + po/POTFILES.in | 2 +- + src/main-window.c | 73 ++++++++++++++++++++++++++++---- - src/main-window.h | 4 -- - src/main.c | 9 ++-- - src/main.h | 8 +--- - src/preferences-dialog.c | 60 +++----------------------- - src/storage-manager.c | 3 +- + src/main-window.h | 4 -- + src/main.c | 9 ++-- + src/main.h | 8 +--- + src/preferences-dialog.c | 60 +++----------------------- + src/storage-manager.c | 3 +- 12 files changed, 119 insertions(+), 138 deletions(-) commit 3b74ca62870fee382c0b5fe3621148e550c9798c Author: Philip Withnall -Date: Sat Apr 2 15:43:38 2011 +0100 +Date: Sat Apr 2 15:43:38 2011 +0100 core: Use a key file to store window geometry @@ -2239,13 +2906,13 @@ move to GSettings. data/almanah.schemas.in | 55 ---------------- - src/main-window.c | 170 + src/main-window.c | 170 +++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 153 insertions(+), 72 deletions(-) commit a8db5cda3caf294701805e544b76f83bca27a720 Author: Philip Withnall -Date: Sat Apr 2 12:43:57 2011 +0100 +Date: Sat Apr 2 12:43:57 2011 +0100 definitions: Remove unused variable @@ -2254,7 +2921,7 @@ commit 9ce42c639c2ed9781b840a23ab359765d64f9391 Author: Philip Withnall -Date: Sat Apr 2 12:43:19 2011 +0100 +Date: Sat Apr 2 12:43:19 2011 +0100 core: Don't compile encryption-only code when encryption is disabled @@ -2263,7 +2930,7 @@ commit 5d0ad53b3117859162394a026269a4ce42b18e8d Author: Philip Withnall -Date: Sat Apr 2 12:41:21 2011 +0100 +Date: Sat Apr 2 12:41:21 2011 +0100 build: Fix dependency information for almanah-marshal.c @@ -2272,7 +2939,7 @@ commit 999acd3044d95212cd26706a40fdc83772e31188 Author: Gabor Kelemen -Date: Thu Mar 17 22:59:20 2011 +0100 +Date: Thu Mar 17 22:59:20 2011 +0100 Added Hungarian translation by Gyorgy Ballo @@ -2282,7 +2949,7 @@ commit df32e1f793c5682181010e198cbb522407fee1c0 Author: Gabor Kelemen -Date: Thu Mar 17 22:58:59 2011 +0100 +Date: Thu Mar 17 22:58:59 2011 +0100 Added hu to LINGUAS @@ -2291,7 +2958,7 @@ commit 90c0e69a81e8dc67e5a536046556c79017cdc881 Author: Daniel Nylander -Date: Sun Feb 27 18:08:18 2011 +0100 +Date: Sun Feb 27 18:08:18 2011 +0100 Updated Swedish translation @@ -2301,7 +2968,7 @@ commit b0254a9fe124d6d9bef447bd1be34ef478491f62 Author: Aron Xu -Date: Mon Feb 14 03:20:42 2011 +0800 +Date: Mon Feb 14 03:20:42 2011 +0800 Remove wrong plural forms header in zh_CN.po @@ -2310,25 +2977,25 @@ commit df3ab3c2b9ebf8b18558cdd33388b0b1b16d678f Author: Milan Crha -Date: Mon Feb 7 12:18:55 2011 +0100 +Date: Mon Feb 7 12:18:55 2011 +0100 Bug #641481 - Cannot build with gtk3/evolution 2.91.6 - configure.ac | 4 ++-- - src/add-definition-dialog.c | 3 +-- - src/date-entry-dialog.c | 3 +-- + configure.ac | 4 ++-- + src/add-definition-dialog.c | 3 +-- + src/date-entry-dialog.c | 3 +-- src/events/calendar-appointment.c | 2 +- - src/events/calendar-task.c | 2 +- - src/import-export-dialog.c | 2 -- - src/main.c | 27 ++++++++++++++++++++++++++- - src/main.h | 1 + - src/preferences-dialog.c | 14 +++++++++----- - src/search-dialog.c | 3 +-- + src/events/calendar-task.c | 2 +- + src/import-export-dialog.c | 2 -- + src/main.c | 27 ++++++++++++++++++++++++++- + src/main.h | 1 + + src/preferences-dialog.c | 14 +++++++++----- + src/search-dialog.c | 3 +-- 10 files changed, 43 insertions(+), 18 deletions(-) commit ae02e86440bd10b8e3db6556bc5c54492c3b25cb Author: Andika Triwidada -Date: Wed Jan 19 22:54:03 2011 +0700 +Date: Wed Jan 19 22:54:03 2011 +0700 Updated Indonesian translation @@ -2338,7 +3005,7 @@ commit 1be78f56d301f96e38928776a7a7f6148d480a7b Author: George Stefanakis -Date: Thu Jan 13 21:04:05 2011 +0200 +Date: Thu Jan 13 21:04:05 2011 +0200 Updated Greek translation @@ -2348,7 +3015,7 @@ commit 0028b154f777b6edd521a89ff53c6a49185adcd6 Author: Fran Diéguez -Date: Sun Jan 9 15:41:34 2011 +0100 +Date: Sun Jan 9 15:41:34 2011 +0100 Updated Galician translations @@ -2358,7 +3025,7 @@ commit 3d51f8e4e0aea7e5caf6e8075237c1a7a0ac8d53 Author: Jordi Estrada -Date: Sat Dec 25 21:54:56 2010 +0100 +Date: Sat Dec 25 21:54:56 2010 +0100 [l10n]Updated Catalan translation @@ -2368,18 +3035,18 @@ commit 41fd6d87420d51acc53302fb90bafd1262514860 Author: Lucian Adrian Grijincu -Date: Tue Nov 30 16:26:56 2010 +0200 +Date: Tue Nov 30 16:26:56 2010 +0200 Updated Romanian translation - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/ro.po | 761 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 762 insertions(+) commit 01084bd42ad2747cc582274a3988f17bcf23d6f3 Author: Philip Withnall -Date: Mon Nov 22 22:04:52 2010 +0000 +Date: Mon Nov 22 22:04:52 2010 +0000 Don't use IT_PROG_INTLTOOL and AM_GNU_GETTEXT @@ -2390,7 +3057,7 @@ commit 4baa7ae0f8b5d6340c61d15868b0153d06e8ddfc Author: Philip Withnall -Date: Sat Oct 9 00:10:59 2010 +0100 +Date: Sat Oct 9 00:10:59 2010 +0100 Use upstream gettext instead of GLib's gettext @@ -2402,7 +3069,7 @@ commit 5c7c880e24ebeeb9bbb6c0cec693b22c46309de1 Author: Philip Withnall -Date: Fri Aug 27 09:17:30 2010 +0100 +Date: Fri Aug 27 09:17:30 2010 +0100 Check for various required functions and headers in configure.ac @@ -2413,7 +3080,7 @@ commit b745384088cbcd712f68b049cd38c24e2db2bc6c Author: Carlos José Pereira -Date: Thu Aug 19 13:13:40 2010 -0300 +Date: Thu Aug 19 13:13:40 2010 -0300 Updated Brazilian Portuguese Translation @@ -2423,7 +3090,7 @@ commit 17fe76354c49c547c0e7aea276341d5cd9693fc8 Author: YunQiang Su -Date: Fri Jul 30 18:34:43 2010 +0800 +Date: Fri Jul 30 18:34:43 2010 +0800 Update Simplified Chinese translation. @@ -2433,7 +3100,7 @@ commit cb3428e2d019c5b88203480611ca4c069af43bef Author: Claude Paroz -Date: Sun Jul 4 21:44:44 2010 +0200 +Date: Sun Jul 4 21:44:44 2010 +0200 Updated French translation @@ -2443,7 +3110,7 @@ commit d86483b9b45cd0a64fc14125a5f2a335b45fb173 Author: Philip Withnall -Date: Wed Jun 30 23:02:59 2010 +0100 +Date: Wed Jun 30 23:02:59 2010 +0100 Add missing files to POTFILES.in @@ -2452,21 +3119,21 @@ commit 37fff7980a17be5646f902fe0037928380b890e7 Author: Philip Withnall -Date: Wed Jun 30 23:01:23 2010 +0100 +Date: Wed Jun 30 23:01:23 2010 +0100 Bug 623231 — Dutch translation Add a Dutch translation by Heimen . Closes: bgo#623231 - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/nl.po | 754 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 755 insertions(+) commit ee7a625eeeefb53e74f77bfb36352ab41da733bf Author: Philip Withnall -Date: Tue Jun 29 21:47:32 2010 +0100 +Date: Tue Jun 29 21:47:32 2010 +0100 Remove the F-Spot event factory and type @@ -2481,25 +3148,25 @@ This also removes our dependency on the (deprecated) dbus-glib. Closes: bgo#622887 - configure.ac | 2 +- - intltool-extract.in | 875 ------------------------ - intltool-merge.in | 1506 + configure.ac | 2 +- + intltool-extract.in | 875 ------------------------ + intltool-merge.in | 1506 ------------------------------------------ - intltool-update.in | 1166 -------------------------------- - po/Makefile.in.in | 4 +- - po/POTFILES.in | 1 - - src/Makefile.am | 4 - + intltool-update.in | 1166 -------------------------------- + po/Makefile.in.in | 4 +- + po/POTFILES.in | 1 - + src/Makefile.am | 4 - src/event-factories/f-spot.c | 250 ------- src/event-factories/f-spot.h | 52 -- - src/event-factory.h | 3 +- - src/event-manager.c | 2 - + src/event-factory.h | 3 +- + src/event-manager.c | 2 - src/events/f-spot-photo.c | 120 ---- src/events/f-spot-photo.h | 53 -- 13 files changed, 4 insertions(+), 4034 deletions(-) commit 46b3c85e798a8fe78d6e2d153a0128c3a51277c2 Author: Fran Diéguez -Date: Mon Jun 21 11:12:54 2010 +0200 +Date: Mon Jun 21 11:12:54 2010 +0200 Updated Galician translations @@ -2508,7 +3175,7 @@ commit 348c51fad55b44b2a5655c0a5ef665416cadb5ce Author: Philip Withnall -Date: Thu Jun 10 17:44:52 2010 +0100 +Date: Thu Jun 10 17:44:52 2010 +0100 Makefile improvements @@ -2519,7 +3186,7 @@ commit bbfced9af71fd5943e381586739106c8c21dd478 Author: Joe Hansen -Date: Sun May 30 23:16:40 2010 +0200 +Date: Sun May 30 23:16:40 2010 +0200 Updated Danish translation @@ -2529,7 +3196,7 @@ commit 0dc9997e9982c596604b31983aab2fd8ea577c9c Author: Fran Diéguez -Date: Mon May 24 12:56:00 2010 +0200 +Date: Mon May 24 12:56:00 2010 +0200 Updated Galician translations @@ -2539,7 +3206,7 @@ commit f2598064f0acca7a79dc8140a8f3a9bfbef115a3 Author: Philip Withnall -Date: Tue May 18 00:37:44 2010 +0100 +Date: Tue May 18 00:37:44 2010 +0100 Remove import mode @@ -2554,7 +3221,7 @@ commit 17e418195a79541755dc808574deb7924b409cd8 Author: Philip Withnall -Date: Sun May 16 18:30:01 2010 +0100 +Date: Sun May 16 18:30:01 2010 +0100 Add progress reporting to import/export @@ -2564,28 +3231,28 @@ lot more complex. - data/almanah.ui | 14 ++++-- + data/almanah.ui | 14 ++++-- src/export-operation.c | 99 +++++++++++++++++++++++++++++++++++------ - src/export-operation.h | 8 +++- + src/export-operation.h | 8 +++- src/import-export-dialog.c | 108 ++++++++++++++++++++++++++++++++------------- src/import-operation.c | 69 ++++++++++++++++++++--------- - src/import-operation.h | 2 +- - src/main-window.c | 18 ++++---- - src/main.c | 4 -- - src/main.h | 2 - + src/import-operation.h | 2 +- + src/main-window.c | 18 ++++---- + src/main.c | 4 -- + src/main.h | 2 - 9 files changed, 239 insertions(+), 85 deletions(-) commit 2f9fd8078783368beb3744e79c25269a76836503 Author: Philip Withnall -Date: Sun May 16 16:24:02 2010 +0100 +Date: Sun May 16 16:24:02 2010 +0100 Make import/export operations asynchronous - configure.ac | 2 +- - data/almanah.ui | 7 +- - src/Makefile.am | 4 + + configure.ac | 2 +- + data/almanah.ui | 7 +- + src/Makefile.am | 4 + src/export-operation.c | 257 +++++++++++++++++++++ src/export-operation.h | 60 +++++ src/import-export-dialog.c | 558 @@ -2594,12 +3261,12 @@ src/import-operation.c | 510 +++++++++++++++++++++++++++++++++++++++++ src/import-operation.h | 72 ++++++ - src/main.c | 1 + + src/main.c | 1 + 10 files changed, 1004 insertions(+), 478 deletions(-) commit 72702f8d8aaf9ba397993b173805725cbf4526f0 Author: Petr Kovar -Date: Sun May 16 23:58:57 2010 +0200 +Date: Sun May 16 23:58:57 2010 +0200 Update Czech translation by Marek Cernocky @@ -2609,7 +3276,7 @@ commit 00fc6fc5188022b9c5fa0e39077df87d52855836 Author: Mario Blättermann -Date: Sat May 15 22:12:10 2010 +0200 +Date: Sat May 15 22:12:10 2010 +0200 Updated German translation @@ -2619,7 +3286,7 @@ commit d2202414edd78cf9844c54120de7b4dd9ba6fb1a Author: Andrej Žnidaršič -Date: Fri May 14 20:13:22 2010 +0200 +Date: Fri May 14 20:13:22 2010 +0200 Updated Slovenian translation @@ -2629,7 +3296,7 @@ commit 098a0c918a5a99d19736843323fea68f3e34bfb5 Author: Jorge González -Date: Wed May 12 08:16:02 2010 +0200 +Date: Wed May 12 08:16:02 2010 +0200 Updated Spanish translation @@ -2639,7 +3306,7 @@ commit 2c27e8c0324a9a293680db8131dd63bffa4be0c5 Author: Philip Withnall -Date: Tue May 11 13:35:09 2010 +0100 +Date: Tue May 11 13:35:09 2010 +0100 Improve the Import/Export UI @@ -2647,13 +3314,13 @@ change the labels around slightly. Add mnemonics. - data/almanah.ui | 33 ++++++++++++++++++--------------- + data/almanah.ui | 33 ++++++++++++++++++--------------- src/import-export-dialog.c | 25 ++++++++++++++----------- 2 files changed, 32 insertions(+), 26 deletions(-) commit d154b578686a648d842c3a2310090919d9dcf8ae Author: Philip Withnall -Date: Tue May 11 08:38:07 2010 +0100 +Date: Tue May 11 08:38:07 2010 +0100 Minor memory leak fix @@ -2662,7 +3329,7 @@ commit b51c1f504876a127c2df1fcd5794bc2dab6213ab Author: Philip Withnall -Date: Sun May 9 17:21:04 2010 +0100 +Date: Sun May 9 17:21:04 2010 +0100 Fix the dialogue boxes for editing and deleting entries @@ -2671,19 +3338,19 @@ commit ec720ae05db81e0dfca11e37ce365b64a12be152 Author: Philip Withnall -Date: Sun May 9 17:06:14 2010 +0100 +Date: Sun May 9 17:06:14 2010 +0100 Add more AlmanahStorageManager signals - src/main-window.c | 6 ------ - src/storage-manager.c | 53 + src/main-window.c | 6 ------ + src/storage-manager.c | 53 ++++++++++++++++++++++++++++++++++++-------------- src/widgets/calendar.c | 34 ++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 21 deletions(-) commit d3d84a21f0e11750a1fe49f0833cd8dee880d52b Author: Philip Withnall -Date: Sat May 8 23:52:41 2010 +0100 +Date: Sat May 8 23:52:41 2010 +0100 Tidy up of AlmanahStorageManager @@ -2700,7 +3367,7 @@ commit fc00ec9948692fffb966eaaa75bfb6d073932f5b Author: Philip Withnall -Date: Sat May 8 21:13:33 2010 +0100 +Date: Sat May 8 21:13:33 2010 +0100 Use iterators for large database queries @@ -2712,15 +3379,15 @@ interface more responsive for long-running operations. src/import-export-dialog.c | 23 ++-- - src/search-dialog.c | 20 ++-- - src/storage-manager.c | 272 + src/search-dialog.c | 20 ++-- + src/storage-manager.c | 272 ++++++++++++++++++++++++++++++--------------- - src/storage-manager.h | 15 ++- + src/storage-manager.h | 15 ++- 4 files changed, 214 insertions(+), 116 deletions(-) commit 3b2ffefd69cb9e7ce7504eb0ed4ca0e13b6efc8b Author: Philip Withnall -Date: Sat May 8 11:12:50 2010 +0100 +Date: Sat May 8 11:12:50 2010 +0100 Fix misuse of unsigned integers in calendar client @@ -2733,7 +3400,7 @@ commit f49de61e500dfe7f02319ea55b20437f76bf2a1c Author: Philip Withnall -Date: Sun May 2 23:28:53 2010 +0100 +Date: Sun May 2 23:28:53 2010 +0100 Replace null_safe_strcmp() with g_strcmp0() in calendar client @@ -2743,7 +3410,7 @@ commit 6befe7b862f90c0c1dcb8d746134502b0206473a Author: Philip Withnall -Date: Sun May 2 23:27:34 2010 +0100 +Date: Sun May 2 23:27:34 2010 +0100 Fix warnings in calendar client @@ -2753,7 +3420,7 @@ commit 015fdc4e4aa4078856c07b91a3fca545402bf95a Author: Philip Withnall -Date: Sun May 2 23:19:52 2010 +0100 +Date: Sun May 2 23:19:52 2010 +0100 Update calendar sources from gnome-panel trunk @@ -2764,7 +3431,7 @@ commit 76bcead8a663996f3b5d93ecd4cc69ac16bce27f Author: Philip Withnall -Date: Sun May 2 23:08:22 2010 +0100 +Date: Sun May 2 23:08:22 2010 +0100 Add support for storing the date an entry was last edited @@ -2776,18 +3443,18 @@ will have their last-edited date as the modification date of the text file. - src/entry.c | 60 + src/entry.c | 60 +++++++++++++++++++++++++++++++++++++++++++++- - src/entry.h | 3 +++ + src/entry.h | 3 +++ src/import-export-dialog.c | 21 ++++++++++++---- - src/main-window.c | 13 ++++++---- - src/storage-manager.c | 55 + src/main-window.c | 13 ++++++---- + src/storage-manager.c | 55 +++++++++++++++++++++++++++++++++++++----- 5 files changed, 136 insertions(+), 16 deletions(-) commit 6a222b914186f1b1a50b4510563dbb940e84bda0 Author: Philip Withnall -Date: Sun May 2 22:16:05 2010 +0100 +Date: Sun May 2 22:16:05 2010 +0100 Whitespace fixes @@ -2797,7 +3464,7 @@ commit 92d7ddcc07038337b907d55c26e0a7e0d0a03415 Author: Philip Withnall -Date: Sat Apr 24 21:09:11 2010 +0100 +Date: Sat Apr 24 21:09:11 2010 +0100 Ensure the current entry is saved on any change to it @@ -2808,14 +3475,14 @@ saved. data/almanah.ui | 1 - - src/entry.c | 9 +++++--- + src/entry.c | 9 +++++--- src/main-window.c | 62 +++++++++++++++++++++++++++++++++++++------------------ 3 files changed, 48 insertions(+), 24 deletions(-) commit 5d67ce6f892617baa4f05886ae01438453cae13c Author: Petr Kovar -Date: Sun May 2 18:04:51 2010 +0200 +Date: Sun May 2 18:04:51 2010 +0200 Update Czech translation by Marek Cernocky @@ -2824,7 +3491,7 @@ commit 90e9181b3e69926c6932f70524c010b9dfb9ed84 Author: Mario Blättermann -Date: Thu Apr 29 14:28:05 2010 +0200 +Date: Thu Apr 29 14:28:05 2010 +0200 Updated German translation @@ -2834,7 +3501,7 @@ commit 4b22ce8835624ea8c30baa39f27206c352b44ad6 Author: Andrej Žnidaršič -Date: Sun Apr 25 11:24:28 2010 +0200 +Date: Sun Apr 25 11:24:28 2010 +0200 Updated Slovenian translation @@ -2844,7 +3511,7 @@ commit c3e07522af98c27e7e279633ee6a97bb9b1ea957 Author: Petr Kovar -Date: Thu Apr 22 23:45:12 2010 +0200 +Date: Thu Apr 22 23:45:12 2010 +0200 Update Czech translation by Marek Cernocky @@ -2854,7 +3521,7 @@ commit 81585d337abd8a10224e56dbf4682b748f3319b2 Author: Claude Paroz -Date: Thu Apr 22 11:59:55 2010 +0200 +Date: Thu Apr 22 11:59:55 2010 +0200 Updated French translation @@ -2864,7 +3531,7 @@ commit 9dc9566426af101bbce2ed8382b2408befa3d839 Author: Jorge González -Date: Thu Apr 22 08:37:48 2010 +0200 +Date: Thu Apr 22 08:37:48 2010 +0200 Updated Spanish translation @@ -2874,7 +3541,7 @@ commit 3a936981cf1e54654edb96e4c2de3421a998e090 Author: Philip Withnall -Date: Wed Apr 21 21:50:25 2010 +0100 +Date: Wed Apr 21 21:50:25 2010 +0100 Update British English translation @@ -2884,7 +3551,7 @@ commit 6419b5276abcc022da9f59b269754333f4f72d7d Author: Philip Withnall -Date: Wed Apr 21 21:48:55 2010 +0100 +Date: Wed Apr 21 21:48:55 2010 +0100 Add missing translatable file to POTFILES.in @@ -2893,7 +3560,7 @@ commit 3543d868138ac92724bfdf35a8302e3d7f75ef51 Author: Philip Withnall -Date: Wed Apr 21 21:46:16 2010 +0100 +Date: Wed Apr 21 21:46:16 2010 +0100 Fix a signed/unsigned integer comparison @@ -2902,41 +3569,41 @@ commit 446ac9684147a484309ff99ec59d8bb798f01f5f Author: Philip Withnall -Date: Wed Apr 21 21:44:11 2010 +0100 +Date: Wed Apr 21 21:44:11 2010 +0100 Add text file and database export support - data/almanah.ui | 8 +++ + data/almanah.ui | 8 +++ src/import-export-dialog.c | 164 ++++++++++++++++++++++++++++++++++++++++----- - src/main-window.c | 11 +++ - src/main.c | 2 + - src/main.h | 1 + - src/storage-manager.c | 6 ++ - src/storage-manager.h | 2 + + src/main-window.c | 11 +++ + src/main.c | 2 + + src/main.h | 1 + + src/storage-manager.c | 6 ++ + src/storage-manager.h | 2 + 7 files changed, 177 insertions(+), 17 deletions(-) commit ed0aa5669731cda4048f1c68878a3e6d35b90eaa Author: Philip Withnall -Date: Wed Apr 21 20:44:41 2010 +0100 +Date: Wed Apr 21 20:44:41 2010 +0100 Convert import dialogue to import-export dialogue and tidy it up - data/almanah.ui | 53 ++-- - po/POTFILES.in | 2 +- - src/Makefile.am | 4 +- - src/import-dialog.c | 720 + data/almanah.ui | 53 ++-- + po/POTFILES.in | 2 +- + src/Makefile.am | 4 +- + src/import-dialog.c | 720 -------------------------------------------- - src/import-dialog.h | 83 ------ + src/import-dialog.h | 83 ------ src/import-export-dialog.c | 729 +++++++++++++++++++++++++++++++++++++++++++++ src/import-export-dialog.h | 83 ++++++ - src/main-window.c | 4 +- + src/main-window.c | 4 +- 8 files changed, 842 insertions(+), 836 deletions(-) commit 500f4ad3705cbc33d094aaa2902091fcc2087fd7 Author: Christian.Kirbach -Date: Tue Apr 20 17:01:49 2010 +0200 +Date: Tue Apr 20 17:01:49 2010 +0200 Updated German translation @@ -2946,7 +3613,7 @@ commit f1ff0ac736fe0ee319960acaaff47ccfc8a378fd Author: Jorge González -Date: Mon Apr 19 07:26:33 2010 +0200 +Date: Mon Apr 19 07:26:33 2010 +0200 Updated Spanish translation @@ -2955,7 +3622,7 @@ commit c088e79a3199f22e7cf4156d3a26b201ae17ee9d Author: Matej Urbančič -Date: Sun Apr 18 19:43:10 2010 +0200 +Date: Sun Apr 18 19:43:10 2010 +0200 Updated Slovenian translation @@ -2965,7 +3632,7 @@ commit cc3633a704db56900e9960afb1e2c25bcea86e3c Author: Philip Withnall -Date: Sun Apr 18 16:20:52 2010 +0100 +Date: Sun Apr 18 16:20:52 2010 +0100 Ensure spell checking highlights are completely drawn over when changing day @@ -2975,7 +3642,7 @@ commit 84889379de9667256702e87254ba70eefe66dd7b Author: Philip Withnall -Date: Sun Apr 18 16:17:40 2010 +0100 +Date: Sun Apr 18 16:17:40 2010 +0100 Remove spell checking highlighting from printouts @@ -2984,7 +3651,7 @@ commit 23b9be68e261be9f5d9dae0cfa93feede7d4350a Author: Philip Withnall -Date: Sun Apr 18 16:05:29 2010 +0100 +Date: Sun Apr 18 16:05:29 2010 +0100 Highlight important entries in printouts @@ -2995,7 +3662,7 @@ commit 422ab587d117c2ad75cc3061479fa4d96849438a Author: Philip Withnall -Date: Sun Apr 18 15:25:49 2010 +0100 +Date: Sun Apr 18 15:25:49 2010 +0100 Highlight important entries in search results @@ -3007,7 +3674,7 @@ commit ad5ccd5a9ca76d8032e0e4b1d759a18c6daa0157 Author: Philip Withnall -Date: Sun Apr 18 14:25:57 2010 +0100 +Date: Sun Apr 18 14:25:57 2010 +0100 Highlight important entries in the calendar @@ -3017,13 +3684,13 @@ the project. Helps: bgo#572927 - data/almanah.ui | 4 +- - src/Makefile.am | 4 +- - src/interface.c | 24 -------- - src/main-window.c | 31 ++++------ - src/printing.c | 29 ++++------ - src/storage-manager.c | 28 +++++++++ - src/storage-manager.h | 1 + + data/almanah.ui | 4 +- + src/Makefile.am | 4 +- + src/interface.c | 24 -------- + src/main-window.c | 31 ++++------ + src/printing.c | 29 ++++------ + src/storage-manager.c | 28 +++++++++ + src/storage-manager.h | 1 + src/widgets/calendar.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++ src/widgets/calendar.h | 57 +++++++++++++++++++ @@ -3031,7 +3698,7 @@ commit 49db044ccb5ca8f6658043915bf0e69e6a156e35 Author: Philip Withnall -Date: Sun Apr 18 13:28:56 2010 +0100 +Date: Sun Apr 18 13:28:56 2010 +0100 Order search results by descending date @@ -3040,7 +3707,7 @@ commit 7536b548c1d1ac2e8d784c5e43f88123b91fbac5 Author: Andika Triwidada -Date: Sat Apr 3 20:34:02 2010 +0700 +Date: Sat Apr 3 20:34:02 2010 +0700 Updated Indonesian translation @@ -3050,7 +3717,7 @@ commit a40b94ce81a1abbfa6709f9fdbfdf48d9bf86a72 Author: Jorge González -Date: Tue Mar 16 18:18:15 2010 +0100 +Date: Tue Mar 16 18:18:15 2010 +0100 Updated Spanish translation @@ -3060,7 +3727,7 @@ commit 7b5724764a17529e97c22d2db1a701ae75609c5d Author: Joe Hansen -Date: Mon Mar 15 01:02:35 2010 +0100 +Date: Mon Mar 15 01:02:35 2010 +0100 Updated Danish translation @@ -3070,7 +3737,7 @@ commit cd81352e1355e3a71aaaac46915eedf22ce8c68a Author: Bruno Brouard -Date: Thu Mar 11 22:57:31 2010 +0100 +Date: Thu Mar 11 22:57:31 2010 +0100 Updated French translation @@ -3080,7 +3747,7 @@ commit c1000a399c1c3f06d613f39cc3200843d2316304 Author: Philip Withnall -Date: Sat Mar 6 21:20:44 2010 +0000 +Date: Sat Mar 6 21:20:44 2010 +0000 Bug 611889 — A little padding in the textaera would be nice @@ -3092,7 +3759,7 @@ commit 58938b6ad633df5770250646caa469fdc7564060 Author: Leonid Kanter -Date: Sat Mar 6 19:44:41 2010 +0200 +Date: Sat Mar 6 19:44:41 2010 +0200 update Russian translation @@ -3102,7 +3769,7 @@ commit cef3e5241ecaa8a85cf93f048345179abdc17306 Author: Leonid Kanter -Date: Sat Mar 6 19:44:31 2010 +0200 +Date: Sat Mar 6 19:44:31 2010 +0200 update Russian translation @@ -3111,7 +3778,7 @@ commit b43e8f9a43295cbd6151bbab488869b8d912ff62 Author: Fran Diéguez -Date: Fri Mar 5 13:25:29 2010 +0100 +Date: Fri Mar 5 13:25:29 2010 +0100 Updated Galician translation @@ -3121,7 +3788,7 @@ commit 3011690b942171ccbae1a3f7b71459359abe9279 Author: YunQiang Su -Date: Thu Feb 18 10:56:55 2010 +0800 +Date: Thu Feb 18 10:56:55 2010 +0800 Update Simplified Chinese translation. @@ -3131,7 +3798,7 @@ commit f800e824f92a9c45e3e55add5f4faf5ab2a7489a Author: Antonio Fernandes C. Neto -Date: Fri Feb 5 15:53:07 2010 -0300 +Date: Fri Feb 5 15:53:07 2010 -0300 Updated Brazilian Portuguese Translation @@ -3141,7 +3808,7 @@ commit ca72f2c8584efe46bbe77e76f915a1a05fa51c99 Author: Andrej Žnidaršič -Date: Thu Feb 4 19:08:12 2010 +0100 +Date: Thu Feb 4 19:08:12 2010 +0100 Updated Slovenian translation @@ -3151,7 +3818,7 @@ commit bfa63b760074b6930279d1030c4e69671f1b8d0b Author: Mario Blättermann -Date: Thu Feb 4 12:19:39 2010 +0100 +Date: Thu Feb 4 12:19:39 2010 +0100 Updated German translation @@ -3161,7 +3828,7 @@ commit 6fdc88528e147df00656a64612adc4a7fa467b36 Author: Marios Zindilis -Date: Tue Feb 2 08:13:16 2010 -0800 +Date: Tue Feb 2 08:13:16 2010 -0800 Updated Greek translation @@ -3171,7 +3838,7 @@ commit f19479f1a3f2098fb1a3e1e97b3ef8d6d2ac3c96 Author: Marek Černocký -Date: Tue Feb 2 13:16:52 2010 +0100 +Date: Tue Feb 2 13:16:52 2010 +0100 Update Czech translation @@ -3181,7 +3848,7 @@ commit 57147f6fa9a4ea6365d5be3272c9055c0161a0da Author: Philip Withnall -Date: Sun Jan 31 15:25:44 2010 +0000 +Date: Sun Jan 31 15:25:44 2010 +0000 Switch to post-release version incrementing (version 0.8.0) @@ -3190,18 +3857,18 @@ commit 4e6927203eda85d7f09dc71d8aa6f10fa99638f1 Author: Philip Withnall -Date: Sun Jan 31 15:24:09 2010 +0000 +Date: Sun Jan 31 15:24:09 2010 +0000 Release version 0.7.2 - NEWS | 133 + NEWS | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- configure.ac | 2 +- 2 files changed, 123 insertions(+), 12 deletions(-) commit 165a4921093aa035c7ec7646140b56292e3e917a Author: Philip Withnall -Date: Sun Jan 31 14:50:18 2010 +0000 +Date: Sun Jan 31 14:50:18 2010 +0000 Updated British English translation @@ -3211,7 +3878,7 @@ commit fa09f7e5fa538706d71a55f5ba6d5793fb6297bc Author: Philip Withnall -Date: Sun Jan 31 14:47:21 2010 +0000 +Date: Sun Jan 31 14:47:21 2010 +0000 Updated autofoo @@ -3225,7 +3892,7 @@ commit 8095fd51aa194242b3efc3b00ff0e786d272afab Author: Philip Withnall -Date: Sun Jan 31 14:36:11 2010 +0000 +Date: Sun Jan 31 14:36:11 2010 +0000 Improve key selection @@ -3235,13 +3902,13 @@ the dialogue to be resized so that long key names can be seen. See: bgo#607964 - data/almanah.ui | 4 ++++ + data/almanah.ui | 4 ++++ src/preferences-dialog.c | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) commit 89fb23235764e0dcf0963ca13af1f49d98d6b661 Author: Andrej Žnidaršič -Date: Mon Jan 18 16:54:01 2010 +0100 +Date: Mon Jan 18 16:54:01 2010 +0100 Updated Slovenian translation @@ -3251,7 +3918,7 @@ commit 06d0812c8106492037fd414e21f11ee43e47abd8 Author: Petr Kovar -Date: Sun Jan 17 21:48:48 2010 +0100 +Date: Sun Jan 17 21:48:48 2010 +0100 Updated Czech translation by Marek Cernocky @@ -3260,7 +3927,7 @@ commit 3da77e33cfc819d8fd0440cea6dee0d972211a5e Author: Mario Blättermann -Date: Fri Jan 15 16:21:34 2010 +0100 +Date: Fri Jan 15 16:21:34 2010 +0100 Updated German translation @@ -3270,7 +3937,7 @@ commit dc32d5df6b1924d44f3b364cc9e8a1b5351c5665 Author: Joe Hansen -Date: Thu Jan 14 19:10:03 2010 +0100 +Date: Thu Jan 14 19:10:03 2010 +0100 Updated Danish translation @@ -3280,18 +3947,18 @@ commit 3959191f713b76ce071792413bf12656933189a0 Author: Petr Kovar -Date: Tue Jan 12 01:10:51 2010 +0100 +Date: Tue Jan 12 01:10:51 2010 +0100 Add Czech translation by Marek Cernocky - po/LINGUAS | 1 + + po/LINGUAS | 1 + po/cs.po | 715 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 716 insertions(+) commit cc3d870fb058ba78391d78b995919901dbf111c9 Author: Daniel Nylander -Date: Sun Jan 10 15:05:35 2010 +0100 +Date: Sun Jan 10 15:05:35 2010 +0100 Updated Swedish translation @@ -3301,17 +3968,17 @@ commit e1cec6b76161e202d90c7ca79e8685c9e9b4fc08 Author: Philip Withnall -Date: Fri Jan 1 16:12:48 2010 +0000 +Date: Fri Jan 1 16:12:48 2010 +0000 Release version 0.7.1 - NEWS | 3 +++ + NEWS | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) commit 739e88963d908b2fba77b1c2a293b9c267f73137 Author: Philip Withnall -Date: Fri Jan 1 16:06:32 2010 +0000 +Date: Fri Jan 1 16:06:32 2010 +0000 Fix non-Evolution build @@ -3321,7 +3988,7 @@ commit c35bb1978701e5373c8764d61e8cb7c9d223bc6f Author: Andrej Žnidaršič -Date: Fri Jan 1 09:28:17 2010 +0100 +Date: Fri Jan 1 09:28:17 2010 +0100 Updated Slovenian translation @@ -3331,31 +3998,31 @@ commit 9e13df9f3a51d7f2368ace966caaf227308aa0e4 Author: Philip Withnall -Date: Thu Dec 31 12:01:15 2009 +0000 +Date: Thu Dec 31 12:01:15 2009 +0000 Release version 0.7.0 - Makefile.am | 16 +++++++++------- - NEWS | 12 ++++++++++++ - README | 8 ++++++-- - configure.ac | 2 +- + Makefile.am | 16 +++++++++------- + NEWS | 12 ++++++++++++ + README | 8 ++++++-- + configure.ac | 2 +- src/Makefile.am | 16 ++++++++-------- 5 files changed, 36 insertions(+), 18 deletions(-) commit d6b6014060028c79b0b418b396a161ab8f8f8660 Author: Philip Withnall -Date: Thu Dec 31 11:17:09 2009 +0000 +Date: Thu Dec 31 11:17:09 2009 +0000 Change website from tecnocode.co.uk to live.gnome.org - README | 2 +- - almanah.doap | 2 +- + README | 2 +- + almanah.doap | 2 +- src/main-window.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) commit 4188fee3f23791175f6aedc43916462b734f1e72 Author: Philip Withnall -Date: Thu Dec 31 11:02:30 2009 +0000 +Date: Thu Dec 31 11:02:30 2009 +0000 Updated British English translation @@ -3363,25 +4030,25 @@ from earlier testing. - po/en_GB.po | 458 + po/en_GB.po | 458 +++++++++++++++++++++++++++++++++++++++------------------ src/printing.c | 2 +- 2 files changed, 314 insertions(+), 146 deletions(-) commit 165d0d751bf356b84ccc32062f426ca70cf7bf79 Author: Philip Withnall -Date: Thu Dec 31 10:56:52 2009 +0000 +Date: Thu Dec 31 10:56:52 2009 +0000 Makefile and configure.ac cleanup - configure.ac | 2 +- + configure.ac | 2 +- src/Makefile.am | 116 +++++++++++++++++++++++++++----------------------------- 2 files changed, 57 insertions(+), 61 deletions(-) commit 561cab28f9143aa9caf0439190a3315a46ab01db Author: Philip Withnall -Date: Thu Dec 31 10:47:46 2009 +0000 +Date: Thu Dec 31 10:47:46 2009 +0000 Improve appearance of Definition Manager dialogue @@ -3391,16 +4058,16 @@ also been fixed. - data/almanah.ui | 92 + data/almanah.ui | 92 ++++++++++++----------------------------------- src/definitions/contact.c | 6 ++-- src/definitions/file.c | 2 +- - src/definitions/uri.c | 2 +- + src/definitions/uri.c | 2 +- 4 files changed, 28 insertions(+), 74 deletions(-) commit 76f2d742e0f4b4d79f98d581beef169e9f30dd16 Author: Philip Withnall -Date: Sun Dec 27 18:21:13 2009 +0000 +Date: Sun Dec 27 18:21:13 2009 +0000 Don't merge identical entires on import @@ -3409,7 +4076,7 @@ commit 96188339b91b20bc12d4c43e44b187aadf583fd5 Author: Philip Withnall -Date: Tue Dec 22 16:27:21 2009 +0000 +Date: Tue Dec 22 16:27:21 2009 +0000 Bug 594871 — Add line spacing options @@ -3423,32 +4090,32 @@ commit 0d515746d7fb9bc7b4c5a682a727d84ec88f5f9b Author: Philip Withnall -Date: Tue Dec 22 15:15:33 2009 +0000 +Date: Tue Dec 22 15:15:33 2009 +0000 Tidy up build process and hide compilation churn - configure.ac | 46 ++++++++++++++++---------- + configure.ac | 46 ++++++++++++++++---------- src/Makefile.am | 101 ++++++++++++++++++++++++-------------------------------- 2 files changed, 72 insertions(+), 75 deletions(-) commit e16b019fe921a36b751c7462f8866ce7a2f13b24 Author: Philip Withnall -Date: Thu Dec 17 08:45:46 2009 +0000 +Date: Thu Dec 17 08:45:46 2009 +0000 Make Evolution dependency optional Also remove forced -Wall flag. - configure.ac | 11 ++++++++++- + configure.ac | 11 ++++++++++- src/Makefile.am | 28 +++++++++++++++------------- - src/event-factory.h | 3 +++ - src/event-manager.c | 4 ++++ + src/event-factory.h | 3 +++ + src/event-manager.c | 4 ++++ 4 files changed, 32 insertions(+), 14 deletions(-) commit d176ff98cc3d0f74b537b9025c2704c23561b069 Author: Jorge González -Date: Sun Dec 20 17:12:20 2009 +0100 +Date: Sun Dec 20 17:12:20 2009 +0100 Updated Spanish translation @@ -3457,7 +4124,7 @@ commit a9e59b7264971d9c9220ce0da58cb4a95b56387c Author: Joe Hansen -Date: Fri Dec 18 00:12:55 2009 +0100 +Date: Fri Dec 18 00:12:55 2009 +0100 Added Danish translation @@ -3467,7 +4134,7 @@ commit 1901c7cdb1e2dfbe2a0b41bd9aaf75ef9f12abd3 Author: Kenneth Nielsen -Date: Fri Dec 18 00:05:47 2009 +0100 +Date: Fri Dec 18 00:05:47 2009 +0100 Added da to list of languages @@ -3476,7 +4143,7 @@ commit b1bc39bc2b27d3d858d85618f6eddded191f6d48 Author: Carlos Albornoz -Date: Sun Dec 13 12:43:18 2009 +0100 +Date: Sun Dec 13 12:43:18 2009 +0100 Updated Spanish translation @@ -3488,7 +4155,7 @@ commit 159310a33f94021e61383a35759d3c5da8098004 Author: Mario Blättermann -Date: Sat Dec 12 11:49:22 2009 +0100 +Date: Sat Dec 12 11:49:22 2009 +0100 Updated German translation @@ -3498,7 +4165,7 @@ commit b0d81a0c5fc0b27abb805dbb375d5ccdc7604c3a Author: Andre Klapper -Date: Fri Dec 11 18:34:36 2009 +0100 +Date: Fri Dec 11 18:34:36 2009 +0100 Add missing file to POTFILES.in @@ -3507,7 +4174,7 @@ commit 52b30a4d142a4eaae08f2af24eea9d67f40dd473 Author: Andrej Žnidaršič -Date: Fri Nov 27 13:25:41 2009 +0100 +Date: Fri Nov 27 13:25:41 2009 +0100 Updated Slovenian translation @@ -3517,7 +4184,7 @@ commit 727420aaff12e7efa9d0fb7b3c13b6831e2956a9 Author: Daniel Nylander -Date: Tue Nov 10 01:29:29 2009 +0100 +Date: Tue Nov 10 01:29:29 2009 +0100 Updated Swedish translation @@ -3527,7 +4194,7 @@ commit 7af4b9f69373591a3e439f436ac0626ca2e2cfa3 Author: Matej Urbančič -Date: Tue Nov 3 13:47:05 2009 +0100 +Date: Tue Nov 3 13:47:05 2009 +0100 Added sl for Slovenian translation @@ -3536,7 +4203,7 @@ commit 241ad67fc04229322442347fe49c85ed1570d990 Author: Andrej Žnidaršič -Date: Tue Nov 3 13:46:21 2009 +0100 +Date: Tue Nov 3 13:46:21 2009 +0100 Updated Slovenian translation @@ -3546,21 +4213,21 @@ commit 79bfb759a57212d589201467581f30ec3a952d64 Author: Philip Withnall -Date: Mon Oct 26 19:46:37 2009 +0000 +Date: Mon Oct 26 19:46:37 2009 +0000 Bug 599598 — Segmentation fault in debian unstable Fix a crash if initialisation of libgpgme fails, and also change GPGME initialisation so it works for GPGME 1.2.x. Closes: bgo#599598 - configure.ac | 2 ++ + configure.ac | 2 ++ src/storage-manager.c | 15 +++++++++++++-- src/storage-manager.h | 3 ++- 3 files changed, 17 insertions(+), 3 deletions(-) commit 3a74dc4aa7321a90672506a6f487481a8d8c634f Author: Mario Blättermann -Date: Sun Oct 4 19:38:16 2009 +0200 +Date: Sun Oct 4 19:38:16 2009 +0200 Updated German translation @@ -3570,7 +4237,7 @@ commit 412e3431fd98ef685a157eb95d5cd5bec4cb61ab Author: Claude Paroz -Date: Sat Oct 3 12:04:38 2009 +0200 +Date: Sat Oct 3 12:04:38 2009 +0200 Updated French translation @@ -3580,7 +4247,7 @@ commit c50145a822a7f76fc8fbaf0f809bce03ab4dc708 Author: Andika Triwidada -Date: Mon Sep 28 18:41:03 2009 +0700 +Date: Mon Sep 28 18:41:03 2009 +0700 Added id @@ -3590,7 +4257,7 @@ commit 7c93b965f1dc9600acfaa82c4e19533ddd212b71 Author: Andika Triwidada -Date: Mon Sep 28 18:40:29 2009 +0700 +Date: Mon Sep 28 18:40:29 2009 +0700 Added Indonesian Translation @@ -3600,47 +4267,47 @@ commit b4b5ac5793725492444d9bd850e869396132ac26 Author: Philip Withnall -Date: Thu Sep 24 18:00:45 2009 +0100 +Date: Thu Sep 24 18:00:45 2009 +0100 Fix the UI to follow the GNOME HIG - data/almanah.ui | 663 + data/almanah.ui | 663 +++++++++++++++++++++++++---------------------- - src/definitions/uri.c | 4 +- - src/interface.c | 10 - - src/interface.h | 1 - - src/main-window.c | 1 - + src/definitions/uri.c | 4 +- + src/interface.c | 10 - + src/interface.h | 1 - + src/main-window.c | 1 - src/preferences-dialog.c | 3 +- - src/printing.c | 21 +- + src/printing.c | 21 +- 7 files changed, 363 insertions(+), 340 deletions(-) commit 97530ba0ac032ef81892f090030db2aeb971e0ca Author: Philip Withnall -Date: Thu Sep 24 16:08:46 2009 +0100 +Date: Thu Sep 24 16:08:46 2009 +0100 Added import support Text files and other Almanah databases can now be imported to the current database. - data/almanah.ui | 235 ++++++++++++++ - po/Makefile.in.in | 4 +- - po/POTFILES.in | 1 + - src/Makefile.am | 2 + + data/almanah.ui | 235 ++++++++++++++ + po/Makefile.in.in | 4 +- + po/POTFILES.in | 1 + + src/Makefile.am | 2 + src/definition-manager-window.c | 14 +- - src/import-dialog.c | 694 + src/import-dialog.c | 694 ++++++++++++++++++++++++++++++++++++++++ - src/import-dialog.h | 83 +++++ - src/main-window.c | 16 +- - src/main.c | 2 + - src/main.h | 1 + - src/storage-manager.c | 132 ++++++-- - src/storage-manager.h | 3 +- + src/import-dialog.h | 83 +++++ + src/main-window.c | 16 +- + src/main.c | 2 + + src/main.h | 1 + + src/storage-manager.c | 132 ++++++-- + src/storage-manager.h | 3 +- 12 files changed, 1144 insertions(+), 43 deletions(-) commit 68d574378db6588d43236330c8ee6e41070d39e5 Author: Fran Diéguez -Date: Tue Sep 15 23:05:31 2009 +0200 +Date: Tue Sep 15 23:05:31 2009 +0200 Added gl @@ -3649,7 +4316,7 @@ commit b7a78229140843b33c352217255735638acd3d50 Author: Fran Diéguez -Date: Tue Sep 15 23:00:04 2009 +0200 +Date: Tue Sep 15 23:00:04 2009 +0200 Added Galician Translation @@ -3659,7 +4326,7 @@ commit 862d508795347e2f222c85fbe0517d1b4359c3de Author: Kostas Papadimas -Date: Fri Sep 11 19:43:07 2009 +0300 +Date: Fri Sep 11 19:43:07 2009 +0300 Updated Greek translation. @@ -3669,7 +4336,7 @@ commit ed682c932c987e7c27e9c91577963e99d8a4de39 Author: Philip Withnall -Date: Sat Jun 13 15:53:11 2009 +0100 +Date: Sat Jun 13 15:53:11 2009 +0100 Unmark a %X strftime string as translatable @@ -3681,7 +4348,7 @@ commit 351e49c5d44900dc39ce8e419957e7b35b1ba328 Author: Daniel Nylander -Date: Tue Jul 7 13:17:28 2009 +0200 +Date: Tue Jul 7 13:17:28 2009 +0200 Updated Swedish translation @@ -3691,7 +4358,7 @@ commit 63d4703e5e0167e4cd6756358f5de4e2caca7116 Author: Claude Paroz -Date: Sat Jun 13 15:58:01 2009 +0200 +Date: Sat Jun 13 15:58:01 2009 +0200 Updated French translation @@ -3701,7 +4368,7 @@ commit 79afb7532b0db4fb449c362498ca9a092c2052a4 Author: Daniel Nylander -Date: Sat Jun 13 10:49:02 2009 +0200 +Date: Sat Jun 13 10:49:02 2009 +0200 Updated sv translation (Daniel Nylander) @@ -3711,7 +4378,7 @@ commit 68d95226bb7bb77d9f69b2e9b0d26f68a230df65 Author: Aron Xu -Date: Thu May 28 16:00:21 2009 +0800 +Date: Thu May 28 16:00:21 2009 +0800 Added Simplified Chinese translation. @@ -3721,7 +4388,7 @@ commit cdaa34c370ca5f378c91b836bed318d8e883cf27 Author: Aron Xu -Date: Thu May 28 16:00:05 2009 +0800 +Date: Thu May 28 16:00:05 2009 +0800 Added Simplified Chinese translation. @@ -3730,7 +4397,7 @@ commit 7f0a87ed248cd588d8aa5b3d293bd55db49c9f7c Author: Mario Blättermann -Date: Tue May 12 22:09:33 2009 +0200 +Date: Tue May 12 22:09:33 2009 +0200 Updated German translation @@ -3740,7 +4407,7 @@ commit b26ba3aeebc347e7f7f9f040cb8ba499ab986080 Author: Βασίλης Κοντογιάνης -Date: Mon May 11 12:31:37 2009 +0100 +Date: Mon May 11 12:31:37 2009 +0100 Updated Greek translation @@ -3750,36 +4417,36 @@ commit 4d75b8f9807eb1e87eb17b6e9fa1565fc124b98a Author: Philip Withnall -Date: Sun May 10 19:10:41 2009 +0100 +Date: Sun May 10 19:10:41 2009 +0100 Reduce usage of almanah_interface_embolden_label by using Pango attributes - data/almanah.ui | 15 +++++++++++++++ + data/almanah.ui | 15 +++++++++++++++ src/definition-manager-window.c | 4 ---- - src/main-window.c | 4 ---- - src/search-dialog.c | 3 --- + src/main-window.c | 4 ---- + src/search-dialog.c | 3 --- 4 files changed, 15 insertions(+), 11 deletions(-) commit 11eaffdee9e7c78eecb25a798bb44282696c0655 Author: Philip Withnall -Date: Sun May 10 18:54:27 2009 +0100 +Date: Sun May 10 18:54:27 2009 +0100 Bug 572032 – Allow manual date entry - data/almanah.ui | 74 +++++++++++++++++- - src/Makefile.am | 2 + + data/almanah.ui | 74 +++++++++++++++++- + src/Makefile.am | 2 + src/date-entry-dialog.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++ src/date-entry-dialog.h | 57 ++++++++++++++ - src/main-window.c | 18 +++++ - src/main.c | 2 + - src/main.h | 1 + + src/main-window.c | 18 +++++ + src/main.c | 2 + + src/main.h | 1 + 7 files changed, 355 insertions(+), 1 deletion(-) commit 081d79837e10273d778cc376a905b6fce255e229 Author: Philip Withnall -Date: Sun May 10 09:23:52 2009 +0100 +Date: Sun May 10 09:23:52 2009 +0100 Made the text view for entering "note" definitions longer by default @@ -3788,7 +4455,7 @@ commit 55f441eb5e93c8fcfdb76b449c9f30c191d2f4ae Author: Philip Withnall -Date: Sun May 10 09:18:19 2009 +0100 +Date: Sun May 10 09:18:19 2009 +0100 Don't display the Add Definition dialogue for pre-existing definition texts @@ -3798,7 +4465,7 @@ commit 5bcaf504d120e1287d5b11721438eb309633d178 Author: Simos Xenitellis -Date: Fri May 8 17:20:05 2009 +0100 +Date: Fri May 8 17:20:05 2009 +0100 Added el to LINGUAS @@ -3807,7 +4474,7 @@ commit 87b64617aa6ff117ba096df753d8eb20ba5c2201 Author: Vasilis Kontogiannis -Date: Fri May 8 17:18:18 2009 +0100 +Date: Fri May 8 17:18:18 2009 +0100 Added Greek translation @@ -3817,7 +4484,7 @@ commit 63b2a1a3836aa4bb6c5b9bc0acc458843181e3ad Author: Mario Blättermann -Date: Mon May 4 10:12:03 2009 +0200 +Date: Mon May 4 10:12:03 2009 +0200 Updated German translation @@ -3828,7 +4495,7 @@ commit 45cee2421c0c70c8d3964818a70c886755053fa5 Author: Philip Withnall -Date: Sun May 3 17:14:51 2009 +0100 +Date: Sun May 3 17:14:51 2009 +0100 Wrap text when adding a new note definition @@ -3837,7 +4504,7 @@ commit 04dd158392d331c2ac206859e2a005277e53482c Author: Philip Withnall -Date: Sun May 3 17:01:33 2009 +0100 +Date: Sun May 3 17:01:33 2009 +0100 Made adding definitions case-insensitive @@ -3848,13 +4515,13 @@ src/definition-manager-window.c | 53 ++++++++++++++++++++++++++++++++++++++++- - src/main-window.c | 2 +- - src/storage-manager.c | 28 ++++++++++++++++++++-- + src/main-window.c | 2 +- + src/storage-manager.c | 28 ++++++++++++++++++++-- 3 files changed, 79 insertions(+), 4 deletions(-) commit 0b17724a31e91a6ced6763ceddeae6e57c8fbaa9 Author: Philip Withnall -Date: Sun May 3 15:52:55 2009 +0100 +Date: Sun May 3 15:52:55 2009 +0100 Bug 580052 – Not encrypting keeps encrypted database @@ -3866,7 +4533,7 @@ commit 4fb9feb96fc1a20c8e0d259653b224d62e7ebbe5 Author: Philip Withnall -Date: Sun May 3 15:42:40 2009 +0100 +Date: Sun May 3 15:42:40 2009 +0100 Bug 579242 – No error messages for bad keys when closing @@ -3876,16 +4543,16 @@ being printed silently to the console. - src/Makefile.am | 17 ++++++++++++++++ + src/Makefile.am | 17 ++++++++++++++++ src/almanah-marshal.list | 1 + - src/main.c | 35 +++++++++++++++++---------------- - src/storage-manager.c | 50 + src/main.c | 35 +++++++++++++++++---------------- + src/storage-manager.c | 50 +++++++++++++++++++++++++----------------------- 4 files changed, 62 insertions(+), 41 deletions(-) commit dce853f92d564007b1407b5993829e365f149bf7 Author: Philip Withnall -Date: Sun Apr 26 16:17:35 2009 +0100 +Date: Sun Apr 26 16:17:35 2009 +0100 Fixed e-mail address in DOAP file @@ -3894,7 +4561,7 @@ commit 5c5c5c92223b29a44a9dd10746eb1708c2275842 Author: Philip Withnall -Date: Thu Apr 23 17:58:08 2009 +0100 +Date: Thu Apr 23 17:58:08 2009 +0100 Add more debugging on failure to encrypt the database @@ -3903,7 +4570,7 @@ commit 52e30a28b62b297f3ac3774d4cad6b5fdcd78b3e Author: Daniel Nylander -Date: Mon Apr 20 17:37:18 2009 +0200 +Date: Mon Apr 20 17:37:18 2009 +0200 Updated sv translation @@ -3914,7 +4581,7 @@ commit eb4bc7b7d0f434b25698ec92c80b11363cb9201c Author: Philip Withnall -Date: Sun Apr 19 23:56:07 2009 +0100 +Date: Sun Apr 19 23:56:07 2009 +0100 Added .gitignore generation support @@ -3923,58 +4590,58 @@ and also removed the obsolete .bzrignore and .gitignore files. - .bzrignore | 64 ---------------- - .gitignore | 37 --------- - INSTALL | 1 - - Makefile.am | 22 +++++- - data/Makefile.am | 2 + + .bzrignore | 64 ---------------- + .gitignore | 37 --------- + INSTALL | 1 - + Makefile.am | 22 +++++- + data/Makefile.am | 2 + data/icons/16x16/Makefile.am | 2 + data/icons/22x22/Makefile.am | 2 + data/icons/32x32/Makefile.am | 2 + data/icons/48x48/Makefile.am | 2 + data/icons/Makefile.am | 2 + - git.mk | 178 + git.mk | 178 +++++++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 2 + + src/Makefile.am | 2 + 12 files changed, 212 insertions(+), 104 deletions(-) commit 0d02c20d92e3f766c44047b55d39d9481b23543c Author: Philip Withnall -Date: Sun Apr 19 23:45:10 2009 +0100 +Date: Sun Apr 19 23:45:10 2009 +0100 Compiler warning fixes - src/add-definition-dialog.c | 6 ++-- - src/add-definition-dialog.h | 4 +-- + src/add-definition-dialog.c | 6 ++-- + src/add-definition-dialog.h | 4 +-- src/definition-manager-window.c | 9 ++++-- - src/definition.c | 1 - - src/definition.h | 8 +++--- - src/definitions/contact.c | 1 - - src/definitions/file.c | 3 +- - src/definitions/note.c | 3 +- - src/definitions/uri.c | 3 +- - src/entry.c | 1 - + src/definition.c | 1 - + src/definition.h | 8 +++--- + src/definitions/contact.c | 1 - + src/definitions/file.c | 3 +- + src/definitions/note.c | 3 +- + src/definitions/uri.c | 3 +- + src/entry.c | 1 - src/event-factories/calendar.c | 3 +- - src/event-factories/f-spot.c | 1 - - src/event-factory.c | 3 +- - src/event-manager.c | 1 - - src/event.c | 3 +- - src/event.h | 8 +++--- + src/event-factories/f-spot.c | 1 - + src/event-factory.c | 3 +- + src/event-manager.c | 1 - + src/event.c | 3 +- + src/event.h | 8 +++--- src/events/calendar-appointment.c | 3 +- - src/events/calendar-task.c | 3 +- - src/events/f-spot-photo.c | 1 - - src/main-window.c | 35 ++++++++++++++++++----- - src/main.c | 2 +- - src/preferences-dialog.c | 7 ++--- - src/printing.c | 5 ++-- - src/search-dialog.c | 10 +++++-- - src/storage-manager.c | 59 + src/events/calendar-task.c | 3 +- + src/events/f-spot-photo.c | 1 - + src/main-window.c | 35 ++++++++++++++++++----- + src/main.c | 2 +- + src/preferences-dialog.c | 7 ++--- + src/printing.c | 5 ++-- + src/search-dialog.c | 10 +++++-- + src/storage-manager.c | 59 +++++++++++++++++++-------------------- 25 files changed, 100 insertions(+), 83 deletions(-) commit c380c3e5d2b7aeb88e7a46e880882906fb020a76 Author: Philip Withnall -Date: Fri Apr 17 10:43:17 2009 +0100 +Date: Fri Apr 17 10:43:17 2009 +0100 Migrated to git, adding a DOAP file and moving the ChangeLog @@ -3985,21 +4652,21 @@ from the git log in future. - .gitignore | 37 ++ - AUTHORS | 0 - ChangeLog | 1329 + .gitignore | 37 ++ + AUTHORS | 0 + ChangeLog | 1329 --------------------------------------------------- ChangeLog.pre-git | 1361 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile.am | 18 +- - NEWS | 0 - README | 0 - almanah.doap | 16 + - configure.ac | 0 - data/Makefile.am | 0 - src/Makefile.am | 0 - src/interface.c | 0 - src/interface.h | 0 - src/main.c | 0 - src/main.h | 0 + Makefile.am | 18 +- + NEWS | 0 + README | 0 + almanah.doap | 16 + + configure.ac | 0 + data/Makefile.am | 0 + src/Makefile.am | 0 + src/interface.c | 0 + src/interface.h | 0 + src/main.c | 0 + src/main.h | 0 15 files changed, 1431 insertions(+), 1330 deletions(-) diff -Nru almanah-0.10.8/INSTALL almanah-0.11.0/INSTALL --- almanah-0.10.8/INSTALL 2013-02-26 10:19:01.000000000 +0000 +++ almanah-0.11.0/INSTALL 2013-11-30 12:36:39.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff -Nru almanah-0.10.8/Makefile.in almanah-0.11.0/Makefile.in --- almanah-0.10.8/Makefile.in 2013-02-26 21:35:20.000000000 +0000 +++ almanah-0.11.0/Makefile.in 2013-11-30 12:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,11 +78,11 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - compile config.guess config.sub depcomp install-sh ltmain.sh \ - missing +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in COPYING compile config.guess config.sub \ + depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -79,13 +107,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -93,9 +122,30 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -362,8 +412,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -391,14 +441,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -419,31 +468,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -459,12 +490,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -476,15 +502,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -493,18 +515,16 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" - cscope: cscope.files test ! -s cscope.files \ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) - clean-cscope: -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive -cscope.files: clean-cscope cscopelist-recursive cscopelist - -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -610,10 +630,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -646,9 +672,9 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -817,27 +843,24 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-cscope \ - clean-generic clean-libtool cscope cscopelist \ - cscopelist-recursive ctags ctags-recursive dist dist-all \ - dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - 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 \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am 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 mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # Copy all the spec files. Of course, only one is actually used. diff -Nru almanah-0.10.8/NEWS almanah-0.11.0/NEWS --- almanah-0.10.8/NEWS 2013-02-26 12:15:49.000000000 +0000 +++ almanah-0.11.0/NEWS 2013-11-30 12:08:56.000000000 +0000 @@ -1,3 +1,28 @@ +Overview of changes from Almanah 0.10.8 to Almanah 0.11.0 +========================================================= + +Major changes: +* Improved the tagging accesibility. +* Enhanced the diary security. +* Changed the tagging look (new button with a symbolic link in the toolbar and the tag bar shown integrated in the main toolbar). +* Added a new 256x256 icon, that looks better in GNOME Shell. +* Added an AppData file to show a completed information in Software App. + +Update translations: +* Brazilian Portuguese (Enrico Nicoletto, Ramon Brandão, Adorilson Bezerra) +* Czech (Marek Černocký) +* Danish (Joe Hansen) +* French (Alexandre Franke) +* Galician (Fran Diéguez) +* Greek (Dimitris Spingos) +* Hungarian (Balázs Úr) +* Indonesian (Andika Triwidada) +* Latvian (Rūdolfs Mazurs) +* Polish (Piotr Drąg) +* Slovenian (Matej Urbančič) +* Spanish (Daniel Mustieles) +* Serbian (Мирослав Николић) + Overview of changes from Almanah 0.10.0 to Almanah 0.10.8 ========================================================= @@ -29,6 +54,12 @@ * sl (Andrej Žnidaršič and Matej Urbančič) * sr (Мирослав Николић) +Overview of changes from Almanah 0.10.0 to Almanah 0.10.1 +======================================================== + +Bug fixed: +* Bug 695117 - Almanah doesn't encrypt the database when the application close (see https://bugzilla.gnome.org/show_bug.cgi?id=695117) + Overview of changes from Almanah 0.9.0 to Almanah 0.10.0 ======================================================== diff -Nru almanah-0.10.8/aclocal.m4 almanah-0.11.0/aclocal.m4 --- almanah-0.10.8/aclocal.m4 2013-02-26 21:35:17.000000000 +0000 +++ almanah-0.11.0/aclocal.m4 2013-11-30 12:36:35.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.12.2 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, @@ -1624,7 +1625,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1638,7 +1639,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1657,7 +1661,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -8910,7 +8917,7 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9142,24 +9149,37 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR -# Copyright (C) 2002-2012 Free Software Foundation, Inc. + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.12' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.2], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9175,21 +9195,19 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.2])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to # '$srcdir', '$srcdir/..', or '$srcdir/../..'. @@ -9237,14 +9255,12 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. @@ -9270,13 +9286,12 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 17 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -9462,19 +9477,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -9503,7 +9517,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -9539,17 +9553,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 19 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -9562,7 +9580,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -9592,8 +9610,7 @@ dnl Distinguish between old-style and new-style calls. m4_ifval([$2], [AC_DIAGNOSE([obsolete], -[$0: two- and three-arguments forms are deprecated. For more info, see: -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) + [$0: two- and three-arguments forms are deprecated.]) m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], @@ -9647,22 +9664,60 @@ [_AM_DEPENDENCIES([OBJC])], [m4_define([AC_PROG_OBJC], m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -dnl Support for Objective C++ was only introduced in Autoconf 2.65, -dnl but we still cater to Autoconf 2.62. -m4_ifdef([AC_PROG_OBJCXX], -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [_AM_DEPENDENCIES([OBJCXX])], [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -9670,7 +9725,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -9692,14 +9746,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -9715,14 +9767,12 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -9738,14 +9788,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -9788,50 +9836,14 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -9839,11 +9851,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -9856,8 +9867,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= AC_MSG_WARN(['missing' script is too old or missing]) @@ -9866,14 +9877,12 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -9897,15 +9906,77 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- @@ -9982,14 +10053,12 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT @@ -10044,14 +10113,12 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor 'install' (even GNU) is that you can't @@ -10074,14 +10141,12 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -10095,14 +10160,12 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. @@ -10116,76 +10179,114 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff -Nru almanah-0.10.8/compile almanah-0.11.0/compile --- almanah-0.10.8/compile 2013-02-26 10:19:01.000000000 +0000 +++ almanah-0.11.0/compile 2013-11-30 12:36:39.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -112,6 +112,11 @@ lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff -Nru almanah-0.10.8/config.guess almanah-0.11.0/config.guess --- almanah-0.10.8/config.guess 2013-02-26 10:19:01.000000000 +0000 +++ almanah-0.11.0/config.guess 2013-11-30 12:36:39.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-06-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1330,9 +1361,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -259,8 +252,10 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -273,7 +268,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -291,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -370,7 +366,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -389,7 +385,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -788,9 +786,13 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1004,7 +1006,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1019,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,21 +1352,21 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1492,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1586,6 +1589,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru almanah-0.10.8/configure almanah-0.11.0/configure --- almanah-0.10.8/configure 2013-02-26 21:35:18.000000000 +0000 +++ almanah-0.11.0/configure 2013-11-30 12:36:36.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for almanah 0.10.8. +# Generated by GNU Autoconf 2.69 for almanah 0.11.0. # # Report bugs to . # @@ -591,10 +591,10 @@ # Identity of this package. PACKAGE_NAME='almanah' PACKAGE_TARNAME='almanah' -PACKAGE_VERSION='0.10.8' -PACKAGE_STRING='almanah 0.10.8' +PACKAGE_VERSION='0.11.0' +PACKAGE_STRING='almanah 0.11.0' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=almanah' -PACKAGE_URL='http://live.gnome.org/Almanah_Diary' +PACKAGE_URL='http://wiki.gnome.org/Apps/Almanah_Diary' ac_unique_file="src/main.c" # Factoring default headers for most tests. @@ -1404,7 +1404,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures almanah 0.10.8 to adapt to many kinds of systems. +\`configure' configures almanah 0.11.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of almanah 0.10.8:";; + short | recursive ) echo "Configuration of almanah 0.11.0:";; esac cat <<\_ACEOF @@ -1546,7 +1546,7 @@ it to find libraries and programs with nonstandard names/locations. Report bugs to . -almanah home page: . +almanah home page: . _ACEOF ac_status=$? fi @@ -1609,7 +1609,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -almanah configure 0.10.8 +almanah configure 0.11.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2153,7 +2153,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by almanah $as_me 0.10.8, which was +It was created by almanah $as_me 0.11.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2508,6 +2508,9 @@ ac_config_headers="$ac_config_headers config.h" +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3297,6 +3300,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3757,7 +3819,7 @@ -am__api_version='1.12' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -3958,9 +4020,6 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` - if test x"${MISSING+set}" != xset; then case $am_aux_dir in *\ * | *\ *) @@ -3970,8 +4029,8 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 @@ -4274,6 +4333,45 @@ fi +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4296,7 +4394,7 @@ # Define the identity of the package. PACKAGE='almanah' - VERSION='0.10.8' + VERSION='0.11.0' cat >>confdefs.h <<_ACEOF @@ -4336,11 +4434,16 @@ # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4470,6 +4573,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Enable silent build when available (Automake 1.11) # Check whether --enable-silent-rules was given. @@ -5484,131 +5628,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - case `pwd` in *\ * | *\ *) @@ -7889,7 +7908,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7907,7 +7926,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7926,7 +7948,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -17541,7 +17566,7 @@ fi -ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/org.gnome.almanah.gschema.xml.in" +ac_config_files="$ac_config_files Makefile src/Makefile po/Makefile.in data/Makefile data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/256x256/Makefile data/icons/scalable/Makefile data/org.gnome.almanah.gschema.xml.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18097,7 +18122,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by almanah $as_me 0.10.8, which was +This file was extended by almanah $as_me 0.11.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18158,13 +18183,13 @@ $config_commands Report bugs to . -almanah home page: ." +almanah home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -almanah config.status 0.10.8 +almanah config.status 0.11.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18680,6 +18705,8 @@ "data/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/22x22/Makefile" ;; "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;; "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;; + "data/icons/256x256/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/256x256/Makefile" ;; + "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;; "data/org.gnome.almanah.gschema.xml.in") CONFIG_FILES="$CONFIG_FILES data/org.gnome.almanah.gschema.xml.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -19278,7 +19305,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -19329,7 +19356,7 @@ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff -Nru almanah-0.10.8/configure.ac almanah-0.11.0/configure.ac --- almanah-0.10.8/configure.ac 2013-02-26 21:31:50.000000000 +0000 +++ almanah-0.11.0/configure.ac 2013-11-30 11:31:27.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ(2.63) -AC_INIT([almanah],[0.10.8],[https://bugzilla.gnome.org/enter_bug.cgi?product=almanah],[almanah],[http://live.gnome.org/Almanah_Diary]) +AC_INIT([almanah],[0.11.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=almanah],[almanah],[http://wiki.gnome.org/Apps/Almanah_Diary]) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_HEADERS([config.h]) @@ -167,6 +167,8 @@ data/icons/22x22/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile +data/icons/256x256/Makefile +data/icons/scalable/Makefile data/org.gnome.almanah.gschema.xml.in ]) AC_OUTPUT diff -Nru almanah-0.10.8/data/Makefile.am almanah-0.11.0/data/Makefile.am --- almanah-0.10.8/data/Makefile.am 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/data/Makefile.am 2013-10-20 11:57:20.000000000 +0000 @@ -51,16 +51,25 @@ convert_DATA = almanah.convert ############################################################################### +# AppData file +############################################################################### + +appdatadir = $(datadir)/appdata +appdata_DATA = almanah.appdata.xml + +############################################################################### # General ############################################################################### EXTRA_DIST = \ + almanah.appdata.xml.in \ $(ui_DATA) \ $(desktop_in_files) \ $(schemas_in_files) \ $(convert_DATA) \ entry-2.0.rnc CLEANFILES = \ + almanah.appdata.xml \ $(desktop_DATA) \ $(gsettings_SCHEMAS) diff -Nru almanah-0.10.8/data/Makefile.in almanah-0.11.0/data/Makefile.in --- almanah-0.10.8/data/Makefile.in 2013-02-26 21:35:20.000000000 +0000 +++ almanah-0.11.0/data/Makefile.in 2013-11-30 12:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/org.gnome.almanah.gschema.xml.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -75,13 +103,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -114,14 +143,34 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(uidir)" -DATA = $(convert_DATA) $(desktop_DATA) $(ui_DATA) +am__installdirs = "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(convertdir)" \ + "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(uidir)" +DATA = $(appdata_DATA) $(convert_DATA) $(desktop_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -335,9 +384,16 @@ convert_DATA = almanah.convert ############################################################################### +# AppData file +############################################################################### +appdatadir = $(datadir)/appdata +appdata_DATA = almanah.appdata.xml + +############################################################################### # General ############################################################################### EXTRA_DIST = \ + almanah.appdata.xml.in \ $(ui_DATA) \ $(desktop_in_files) \ $(schemas_in_files) \ @@ -345,6 +401,7 @@ entry-2.0.rnc CLEANFILES = \ + almanah.appdata.xml \ $(desktop_DATA) \ $(gsettings_SCHEMAS) @@ -389,6 +446,27 @@ clean-libtool: -rm -rf .libs _libs +install-appdataDATA: $(appdata_DATA) + @$(NORMAL_INSTALL) + @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || 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)$(appdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \ + done + +uninstall-appdataDATA: + @$(NORMAL_UNINSTALL) + @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir) install-convertDATA: $(convert_DATA) @$(NORMAL_INSTALL) @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \ @@ -459,14 +537,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -487,31 +564,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -527,12 +586,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -544,15 +598,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -561,9 +611,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -639,7 +690,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(uidir)"; do \ + for dir in "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(uidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -693,8 +744,8 @@ info-am: -install-data-am: install-convertDATA install-desktopDATA \ - install-uiDATA +install-data-am: install-appdataDATA install-convertDATA \ + install-desktopDATA install-uiDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive @@ -739,30 +790,29 @@ ps-am: -uninstall-am: uninstall-convertDATA uninstall-desktopDATA \ - uninstall-uiDATA +uninstall-am: uninstall-appdataDATA uninstall-convertDATA \ + uninstall-desktopDATA uninstall-uiDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am \ - install-data-am install-strip tags-recursive uninstall-am - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-convertDATA install-data install-data-am \ - install-data-hook install-desktopDATA 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 install-uiDATA installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-convertDATA \ - uninstall-desktopDATA uninstall-hook uninstall-uiDATA +.MAKE: $(am__recursive_targets) install-am install-data-am \ + install-strip uninstall-am + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-appdataDATA install-convertDATA \ + install-data install-data-am install-data-hook \ + install-desktopDATA 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 install-uiDATA \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-appdataDATA \ + uninstall-convertDATA uninstall-desktopDATA uninstall-hook \ + uninstall-uiDATA install-data-hook: update-icon-cache diff -Nru almanah-0.10.8/data/almanah.appdata.xml.in almanah-0.11.0/data/almanah.appdata.xml.in --- almanah-0.10.8/data/almanah.appdata.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.11.0/data/almanah.appdata.xml.in 2013-11-30 12:45:52.000000000 +0000 @@ -0,0 +1,21 @@ + + + almanah.desktop + CC0 + + <_p> + Almanah Diary is an application to allow you to keep a diary of your life. + + <_p> + You can encrypt the diary to preserve your privacy. It has editing + abilities, including text formatting and printing and shows you a lists + of events which happened (on your computer) for each day (such as tasks + and appointments from Evolution). + + + + https://wiki.gnome.org/Apps/Almanah_Diary?action=AttachFile&do=get&target=screenshot-almanah-diary.png + + https://wiki.gnome.org/Apps/Almanah_Diary + alvaropg_at_gmail.com + diff -Nru almanah-0.10.8/data/almanah.css almanah-0.11.0/data/almanah.css --- almanah-0.10.8/data/almanah.css 2013-02-25 16:33:40.000000000 +0000 +++ almanah-0.11.0/data/almanah.css 2013-11-18 20:13:40.000000000 +0000 @@ -1,9 +1,5 @@ AlmanahMainWindow GtkToolbar { - border-style: solid; - border-radius: 0px; border-width: 0px; - border-top-width: 0px; - border-bottom-width: 1px; } AlmanahCalendarButton:active { @@ -13,6 +9,9 @@ border-image: none; border-color: @menu_bg_color; border-radius: 4px 4px 0 0; + + color: @theme_text_color; + text-shadow: none; } AlmanahCalendarButton GtkLabel:active { @@ -28,25 +27,9 @@ background-color: @menu_bg_color; } -AlmanahEntryTagsArea { - background-color: #fff; -} - -AlmanahEntryTagsArea:backdrop { - background-color: @theme_unfocused_base_color; -} - AlmanahTagEntry { color: #aaa; - font-size: 8; - border-width: 0px; - border-style: none; - border-radius: 0px; - margin: 0px; - padding: 10px; - box-shadow: none; - background-color: #fff; - background-image: none; + font-size: 8px; transition: none; } diff -Nru almanah-0.10.8/data/almanah.desktop.in almanah-0.11.0/data/almanah.desktop.in --- almanah-0.10.8/data/almanah.desktop.in 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/data/almanah.desktop.in 2013-10-20 11:57:20.000000000 +0000 @@ -2,6 +2,8 @@ _Name=Almanah Diary _Comment=Keep a personal diary _GenericName=Diary +# TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +_Keywords=diary;journal; Exec=almanah Icon=almanah Terminal=false diff -Nru almanah-0.10.8/data/almanah.ui almanah-0.11.0/data/almanah.ui --- almanah-0.10.8/data/almanah.ui 2013-02-26 10:30:49.000000000 +0000 +++ almanah-0.11.0/data/almanah.ui 2013-11-18 20:13:40.000000000 +0000 @@ -41,6 +41,7 @@ edit-select-date + @@ -100,6 +101,15 @@ + + show-tags + Show tags + Show tags for the current entry + almanah-tags-symbolic + + + + help _Help @@ -223,12 +233,17 @@ + False + True + False True 6 6 0 0 0 + 0 + 6 0 @@ -255,8 +270,10 @@ True True GTK_WRAP_WORD + 6 10 10 + 4 Entry editing area diff -Nru almanah-0.10.8/data/icons/16x16/Makefile.in almanah-0.11.0/data/icons/16x16/Makefile.in --- almanah-0.10.8/data/icons/16x16/Makefile.in 2013-02-26 21:35:20.000000000 +0000 +++ almanah-0.11.0/data/icons/16x16/Makefile.in 2013-11-30 12:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/16x16 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -108,6 +136,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -326,11 +355,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -471,16 +498,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA -include $(top_srcdir)/git.mk diff -Nru almanah-0.10.8/data/icons/22x22/Makefile.in almanah-0.11.0/data/icons/22x22/Makefile.in --- almanah-0.10.8/data/icons/22x22/Makefile.in 2013-02-26 21:35:20.000000000 +0000 +++ almanah-0.11.0/data/icons/22x22/Makefile.in 2013-11-30 12:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/22x22 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -108,6 +136,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -326,11 +355,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -471,16 +498,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA -include $(top_srcdir)/git.mk diff -Nru almanah-0.10.8/data/icons/256x256/Makefile.am almanah-0.11.0/data/icons/256x256/Makefile.am --- almanah-0.10.8/data/icons/256x256/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.11.0/data/icons/256x256/Makefile.am 2013-11-18 20:13:40.000000000 +0000 @@ -0,0 +1,6 @@ +icondir = $(datadir)/icons/hicolor/256x256/apps +icon_DATA = almanah.png + +EXTRA_DIST = $(icon_DATA) almanah.svg + +-include $(top_srcdir)/git.mk diff -Nru almanah-0.10.8/data/icons/256x256/Makefile.in almanah-0.11.0/data/icons/256x256/Makefile.in --- almanah-0.10.8/data/icons/256x256/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.11.0/data/icons/256x256/Makefile.in 2013-11-30 12:36:39.000000000 +0000 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.14 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/icons/256x256 +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(icondir)" +DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ +ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ +EVO_CFLAGS = @EVO_CFLAGS@ +EVO_LIBS = @EVO_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GPGME_CONFIG = @GPGME_CONFIG@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ +SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ +STANDARD_CFLAGS = @STANDARD_CFLAGS@ +STANDARD_LIBS = @STANDARD_LIBS@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +icondir = $(datadir)/icons/hicolor/256x256/apps +icon_DATA = almanah.png +EXTRA_DIST = $(icon_DATA) almanah.svg +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/256x256/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/icons/256x256/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-iconDATA: $(icon_DATA) + @$(NORMAL_INSTALL) + @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || 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)$(icondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ + done + +uninstall-iconDATA: + @$(NORMAL_UNINSTALL) + @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(icondir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-iconDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-iconDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA + + +-include $(top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Binary files /tmp/KWaFNJlxW4/almanah-0.10.8/data/icons/256x256/almanah.png and /tmp/iDxM3Rlnsi/almanah-0.11.0/data/icons/256x256/almanah.png differ diff -Nru almanah-0.10.8/data/icons/256x256/almanah.svg almanah-0.11.0/data/icons/256x256/almanah.svg --- almanah-0.10.8/data/icons/256x256/almanah.svg 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.11.0/data/icons/256x256/almanah.svg 2013-11-18 20:13:40.000000000 +0000 @@ -0,0 +1,482 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Szypulka + + + + + Jakub Szypulka + + + + + Jakub Szypulka + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru almanah-0.10.8/data/icons/32x32/Makefile.in almanah-0.11.0/data/icons/32x32/Makefile.in --- almanah-0.10.8/data/icons/32x32/Makefile.in 2013-02-26 21:35:20.000000000 +0000 +++ almanah-0.11.0/data/icons/32x32/Makefile.in 2013-11-30 12:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/32x32 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -108,6 +136,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -326,11 +355,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -471,16 +498,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA -include $(top_srcdir)/git.mk diff -Nru almanah-0.10.8/data/icons/48x48/Makefile.in almanah-0.11.0/data/icons/48x48/Makefile.in --- almanah-0.10.8/data/icons/48x48/Makefile.in 2013-02-26 21:35:20.000000000 +0000 +++ almanah-0.11.0/data/icons/48x48/Makefile.in 2013-11-30 12:36:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +79,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons/48x48 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -108,6 +136,7 @@ } am__installdirs = "$(DESTDIR)$(icondir)" DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -326,11 +355,9 @@ @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -471,16 +498,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA -include $(top_srcdir)/git.mk diff -Nru almanah-0.10.8/data/icons/Makefile.am almanah-0.11.0/data/icons/Makefile.am --- almanah-0.10.8/data/icons/Makefile.am 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/data/icons/Makefile.am 2013-11-18 20:13:40.000000000 +0000 @@ -1,3 +1,3 @@ -SUBDIRS = 16x16 22x22 32x32 48x48 +SUBDIRS = 16x16 22x22 32x32 48x48 256x256 scalable -include $(top_srcdir)/git.mk diff -Nru almanah-0.10.8/data/icons/Makefile.in almanah-0.11.0/data/icons/Makefile.in --- almanah-0.10.8/data/icons/Makefile.in 2013-02-26 21:35:20.000000000 +0000 +++ almanah-0.11.0/data/icons/Makefile.in 2013-11-30 12:36:40.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,7 +78,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -73,13 +101,14 @@ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -87,9 +116,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -273,7 +322,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = 16x16 22x22 32x32 48x48 +SUBDIRS = 16x16 22x22 32x32 48x48 256x256 scalable all: all-recursive .SUFFIXES: @@ -320,14 +369,13 @@ # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -348,31 +396,13 @@ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -388,12 +418,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -405,15 +430,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -422,9 +443,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -596,23 +618,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - cscopelist cscopelist-recursive ctags ctags-recursive \ - distclean distclean-generic distclean-libtool distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am 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 mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am -include $(top_srcdir)/git.mk diff -Nru almanah-0.10.8/data/icons/scalable/Makefile.am almanah-0.11.0/data/icons/scalable/Makefile.am --- almanah-0.10.8/data/icons/scalable/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.11.0/data/icons/scalable/Makefile.am 2013-10-20 11:57:20.000000000 +0000 @@ -0,0 +1,6 @@ +icondir = $(datadir)/icons/hicolor/scalable/actions +icon_DATA = almanah-tags-symbolic.svg + +EXTRA_DIST = $(icon_DATA) + +-include ($top_srcdir)/git.mk diff -Nru almanah-0.10.8/data/icons/scalable/Makefile.in almanah-0.11.0/data/icons/scalable/Makefile.in --- almanah-0.10.8/data/icons/scalable/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.11.0/data/icons/scalable/Makefile.in 2013-11-30 12:36:40.000000000 +0000 @@ -0,0 +1,517 @@ +# Makefile.in generated by automake 1.14 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = data/icons/scalable +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(icondir)" +DATA = $(icon_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +ENCRYPTION_CFLAGS = @ENCRYPTION_CFLAGS@ +ENCRYPTION_LIBS = @ENCRYPTION_LIBS@ +EVO_CFLAGS = @EVO_CFLAGS@ +EVO_LIBS = @EVO_LIBS@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GPGME_CONFIG = @GPGME_CONFIG@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SPELL_CHECKING_CFLAGS = @SPELL_CHECKING_CFLAGS@ +SPELL_CHECKING_LIBS = @SPELL_CHECKING_LIBS@ +STANDARD_CFLAGS = @STANDARD_CFLAGS@ +STANDARD_LIBS = @STANDARD_LIBS@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +icondir = $(datadir)/icons/hicolor/scalable/actions +icon_DATA = almanah-tags-symbolic.svg +EXTRA_DIST = $(icon_DATA) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/scalable/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/icons/scalable/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-iconDATA: $(icon_DATA) + @$(NORMAL_INSTALL) + @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(icondir)" || 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)$(icondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ + done + +uninstall-iconDATA: + @$(NORMAL_UNINSTALL) + @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(icondir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(icondir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-iconDATA + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-iconDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconDATA + + +-include ($top_srcdir)/git.mk + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru almanah-0.10.8/data/icons/scalable/almanah-tags-symbolic.svg almanah-0.11.0/data/icons/scalable/almanah-tags-symbolic.svg --- almanah-0.10.8/data/icons/scalable/almanah-tags-symbolic.svg 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.11.0/data/icons/scalable/almanah-tags-symbolic.svg 2013-10-20 11:57:20.000000000 +0000 @@ -0,0 +1,81 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff -Nru almanah-0.10.8/debian/changelog almanah-0.11.0/debian/changelog --- almanah-0.10.8/debian/changelog 2013-11-13 13:15:10.000000000 +0000 +++ almanah-0.11.0/debian/changelog 2013-12-02 12:21:13.000000000 +0000 @@ -1,8 +1,14 @@ -almanah (0.10.8-3build1) trusty; urgency=low +almanah (0.11.0-1) unstable; urgency=low - * No-change rebuild for new e-d-s + * Imported Upstream version 0.11.0 + * debian/control: Update Homepage field. + * debian/patches/: + - encrypt_database: Removed, applied upstream + - spellchecking_error: Removed, applied upstream + - desktop_keywords: Removed, applied upstream + * Bump Standards-Version to 3.9.5 (no changes). - -- Iain Lane Wed, 13 Nov 2013 13:15:10 +0000 + -- Angel Abad Mon, 02 Dec 2013 13:21:08 +0100 almanah (0.10.8-3) unstable; urgency=high diff -Nru almanah-0.10.8/debian/control almanah-0.11.0/debian/control --- almanah-0.10.8/debian/control 2013-09-20 15:24:31.000000000 +0000 +++ almanah-0.11.0/debian/control 2013-12-02 10:02:22.000000000 +0000 @@ -15,10 +15,10 @@ libecal1.2-dev (>= 3.6.0), libedataserver1.2-dev (>= 3.6.0), libgtkspell3-3-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Vcs-Git: git://anonscm.debian.org/collab-maint/almanah.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/almanah.git -Homepage: http://live.gnome.org/Almanah_Diary +Homepage: http://wiki.gnome.org/Apps/Almanah_Diary Package: almanah Architecture: any diff -Nru almanah-0.10.8/debian/patches/desktop_keywords almanah-0.11.0/debian/patches/desktop_keywords --- almanah-0.10.8/debian/patches/desktop_keywords 2013-09-20 15:24:31.000000000 +0000 +++ almanah-0.11.0/debian/patches/desktop_keywords 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Add Keywords entry in .desktop file -Author: Angel Abad -Origin: vendor, https://bugzilla.gnome.org/show_bug.cgi?id=700273 - ---- almanah-0.10.8.orig/data/almanah.desktop.in -+++ almanah-0.10.8/data/almanah.desktop.in -@@ -7,6 +7,7 @@ Icon=almanah - Terminal=false - Type=Application - Categories=GTK;Utility; -+Keywords=diary - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=almanah - X-GNOME-Bugzilla-Component=General diff -Nru almanah-0.10.8/debian/patches/encrypt_database almanah-0.11.0/debian/patches/encrypt_database --- almanah-0.10.8/debian/patches/encrypt_database 2013-09-22 16:27:12.000000000 +0000 +++ almanah-0.11.0/debian/patches/encrypt_database 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -Subject: Almanah doesn't encrypt the database when the application close -Author: Alvaro Peña -Orirgin: upstream, https://git.gnome.org/browse/almanah/commit/?id=0e4fb167c6eb478e0bcdb1cce5dd18f36f3f2656 -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=695117 -Reviewed-by: Angel Abad - ---- a/src/application.c -+++ b/src/application.c -@@ -40,7 +40,7 @@ - static void startup (GApplication *application); - static void activate (GApplication *application); - static gint handle_command_line (GApplication *application, GApplicationCommandLine *command_line); --static void quit_main_loop (GApplication *application); -+static void window_removed (GtkApplication *application, GtkWindow *window); - - static void almanah_application_init_actions (AlmanahApplication *self); - -@@ -87,6 +87,7 @@ - { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GApplicationClass *gapplication_class = G_APPLICATION_CLASS (klass); -+ GtkApplicationClass *gtkapplication_class = GTK_APPLICATION_CLASS (klass); - - g_type_class_add_private (klass, sizeof (AlmanahApplicationPrivate)); - -@@ -98,7 +99,8 @@ - gapplication_class->startup = startup; - gapplication_class->activate = activate; - gapplication_class->command_line = handle_command_line; -- gapplication_class->quit_mainloop = quit_main_loop; -+ -+ gtkapplication_class->window_removed = window_removed; - - g_object_class_install_property (gobject_class, PROP_DEBUG, - g_param_spec_boolean ("debug", -@@ -356,7 +358,7 @@ - } - - static void --storage_manager_disconnected_cb (AlmanahStorageManager *self, const gchar *gpgme_error_message, const gchar *warning_message, GApplication *application) -+storage_manager_disconnected_cb (AlmanahStorageManager *self, const gchar *gpgme_error_message, const gchar *warning_message, GtkApplication *application) - { - if (gpgme_error_message != NULL || warning_message != NULL) { - GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, -@@ -373,21 +375,28 @@ - gtk_widget_destroy (dialog); - } - -- /* Chain up to the parent class */ -- G_APPLICATION_CLASS (almanah_application_parent_class)->quit_mainloop (application); -+ /* Allow the end of the applaction */ -+ g_application_release (G_APPLICATION (application)); - } - - static void --quit_main_loop (GApplication *application) -+window_removed (GtkApplication *application, GtkWindow *window) - { -- AlmanahApplicationPrivate *priv = ALMANAH_APPLICATION (application)->priv; -+ /* This would normally result in the end of the application, but we need to close the database connection first -+ to prevent an unencrypted database in the filesystem, and we don't want a bug like that. -+ So, we append a reference to the application when the user close the main window. When the application disconnect -+ from the database, allowing the encryption if necessary, we remove this reference with g_application_release. -+ See: https://bugzilla.gnome.org/show_bug.cgi?id=695117 */ -+ if (ALMANAH_IS_MAIN_WINDOW (window)) { -+ AlmanahApplicationPrivate *priv = ALMANAH_APPLICATION (application)->priv; - -- /* This would normally result in gtk_main_quit() being called, but we need to close the database connection first. */ -- g_signal_connect (priv->storage_manager, "disconnected", (GCallback) storage_manager_disconnected_cb, application); -- almanah_storage_manager_disconnect (priv->storage_manager, NULL); -+ g_application_hold (G_APPLICATION (application)); -+ -+ g_signal_connect (priv->storage_manager, "disconnected", (GCallback) storage_manager_disconnected_cb, application); -+ almanah_storage_manager_disconnect (priv->storage_manager, NULL); -+ } - -- /* Quitting is actually done in storage_manager_disconnected_cb, which is called once -- * the storage manager has encrypted the DB and disconnected from it. */ -+ GTK_APPLICATION_CLASS (almanah_application_parent_class)->window_removed (application, window); - } - - static void diff -Nru almanah-0.10.8/debian/patches/series almanah-0.11.0/debian/patches/series --- almanah-0.10.8/debian/patches/series 2013-09-22 16:28:27.000000000 +0000 +++ almanah-0.11.0/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -encrypt_database -spellchecking_error -desktop_keywords diff -Nru almanah-0.10.8/debian/patches/spellchecking_error almanah-0.11.0/debian/patches/spellchecking_error --- almanah-0.10.8/debian/patches/spellchecking_error 2013-09-20 15:24:31.000000000 +0000 +++ almanah-0.11.0/debian/patches/spellchecking_error 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -Description: Fix spellchecking errors -Author: Angel Abad -Origin: vendor, https://bugzilla.gnome.org/show_bug.cgi?id=700274 - ---- a/src/storage-manager.c -+++ b/src/storage-manager.c -@@ -1457,7 +1457,7 @@ - sqlite3_finalize (statement); - - if (result != SQLITE_DONE) { -- g_debug ("Error quering for tags from database: %s", sqlite3_errmsg (self->priv->connection)); -+ g_debug ("Error querying for tags from database: %s", sqlite3_errmsg (self->priv->connection)); - g_free (tags); - tags = NULL; - } -@@ -1512,7 +1512,7 @@ - } - - if (q_result != SQLITE_DONE) { -- g_debug ("Error quering for a tag from database: %s", sqlite3_errmsg (self->priv->connection)); -+ g_debug ("Error querying for a tag from database: %s", sqlite3_errmsg (self->priv->connection)); - } - - sqlite3_finalize (statement); -@@ -1550,7 +1550,7 @@ - sqlite3_finalize (statement); - - if (result != SQLITE_DONE) { -- g_debug ("Error quering for tags from database: %s", sqlite3_errmsg (self->priv->connection)); -+ g_debug ("Error querying for tags from database: %s", sqlite3_errmsg (self->priv->connection)); - g_free (tags); - tags = NULL; - } diff -Nru almanah-0.10.8/depcomp almanah-0.11.0/depcomp --- almanah-0.10.8/depcomp 2013-02-26 10:19:01.000000000 +0000 +++ almanah-0.11.0/depcomp 2013-11-30 12:36:40.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # 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 @@ -27,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -56,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -74,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -85,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -133,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -142,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -156,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -173,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -199,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -208,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -216,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -246,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -261,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -272,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -341,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -354,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -365,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -445,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -472,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -523,13 +604,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -582,10 +664,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -621,10 +705,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -656,15 +740,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru almanah-0.10.8/missing almanah-0.11.0/missing --- almanah-0.10.8/missing 2013-02-26 10:19:01.000000000 +0000 +++ almanah-0.11.0/missing 2013-11-30 12:36:39.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -29,61 +29,33 @@ exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru almanah-0.10.8/po/POTFILES.in almanah-0.11.0/po/POTFILES.in --- almanah-0.10.8/po/POTFILES.in 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/POTFILES.in 2013-11-18 20:13:40.000000000 +0000 @@ -1,5 +1,6 @@ # List of source files containing translatable strings. [encoding: UTF-8] +data/almanah.appdata.xml.in [type: gettext/glade]data/almanah-app-menu.ui data/almanah.desktop.in [type: gettext/glade]data/almanah.ui @@ -24,4 +25,7 @@ src/widgets/calendar.c src/widgets/calendar-window.c src/widgets/eggwrapbox.c +src/widgets/entry-tags-area.c +src/widgets/tag-accessible.c src/widgets/tag.c +src/widgets/tag-entry.c diff -Nru almanah-0.10.8/po/cs.po almanah-0.11.0/po/cs.po --- almanah-0.10.8/po/cs.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/cs.po 2013-10-20 11:57:20.000000000 +0000 @@ -1,7 +1,6 @@ # Czech translation for almanah. # Copyright (C) 2009, 2010 the author(s) of almanah. # This file is distributed under the same license as the almanah package. -# # Marek Černocký , 2009, 2010, 2011, 2012, 2013. # msgid "" @@ -9,8 +8,8 @@ "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-15 10:07+0000\n" -"PO-Revision-Date: 2013-02-15 21:13+0100\n" +"POT-Creation-Date: 2013-09-04 23:24+0000\n" +"PO-Revision-Date: 2013-09-06 21:03+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "Language: cs\n" @@ -20,8 +19,55 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Gtranslator 2.91.6\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:135 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Diář Almanah je aplikace, ve které si můžete vést poznámky ze svého života." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Diář můžete mít zašifrovaný, abyste si ochránili své soukromí. Má různé " +"editační funkce, včetně formátování textu a tisku, a zobrazí vám seznamu " +"událostí, které se staly, den po dni (podobně jako se zobrazují úkoly a " +"schůzky v aplikaci Evolution)." + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Hledat" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "Př_edvolby" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Importovat" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Exportovat" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "Vy_tisknout diář" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "O diáři _Almanah" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "U_končit" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Diář Almanah" @@ -30,40 +76,14 @@ msgstr "Vést si osobní diář" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Diář" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "ID šifrovacího klíče databáze" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"ID klíče použitého k šifrování a dešifrování databáze v případě, že byla " -"aplikace Almanah sestavená s podporou šifrování. Pokud chcete šifrování " -"databáze zakázat, ponechte pole prázdné." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Jazyk kontroly pravopisu" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "" -"Národní identifikátor jazyka, pro který se má provádět kontrola pravopisu." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Povolená kontrola pravopisu?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Zda je zapnutá kontrola pravopisu záznamů." +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "diář;plánovač;záznamník;" #: ../data/almanah.ui.h:1 msgid "Select Date…" @@ -110,118 +130,128 @@ msgstr "Přepíná, zda je současný záznam označený jako důležitý." #: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Zobrazovat štitky" + +#: ../data/almanah.ui.h:12 +msgid "Show tags for the current entry" +msgstr "Zobrazovat štítky pro aktuální záznam" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "_Nápověda" -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "Přejí_t na dnešek" -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Přejít v diáři na dnešní datum." -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Kalendář" -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Oblast pro úpravu záznamů" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Poslední události" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Seznam posledních událostí" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Hledat záznam" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Hledat" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Seznam výsledků" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Zobrazit záznam" -#: ../data/almanah.ui.h:22 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "např. „14/03/2009“ nebo „14th March 2009“." -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "např. “http://google.cz/” nebo “file:///home/ja/Obrázky/fotka.jpg”." -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Úspěšné záznamy" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Sloučené záznamy" -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Neúspěšné zázmamy" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Seznam výsledků importu" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Hledat" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Př_edvolby" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "ID šifrovacího klíče databáze" -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importovat" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"ID klíče použitého k šifrování a dešifrování databáze v případě, že byla " +"aplikace Almanah sestavená s podporou šifrování. Pokud chcete šifrování " +"databáze zakázat, ponechte pole prázdné." -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportovat" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Jazyk kontroly pravopisu" -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "Vy_tisknout diář" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"Národní identifikátor jazyka, pro který se má provádět kontrola pravopisu." -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "O diáři _Almanah" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Povolená kontrola pravopisu?" -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "U_končit" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Zda je zapnutá kontrola pravopisu záznamů." -#: ../src/application.c:243 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Chyba při otevírání databáze" #. Error loading the CSS -#: ../src/application.c:272 +#: ../src/application.c:275 #, c-format msgid "" "Couldn't load the CSS file '%s'. The interface might not be styled correctly" msgstr "Nelze načíst soubor CSS „%s“. Rozhraní nemusí být správně ostylováno." -#: ../src/application.c:316 +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Zapnout režim ladění" -#: ../src/application.c:333 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -229,24 +259,24 @@ "programu." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Nelze zpracovat přepínače příkazového řádku: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Chyba při šifrování databáze" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:194 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Nelze načíst soubor „%s“ s uživatelským rozhraním" -#: ../src/application.c:532 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -258,7 +288,7 @@ "Free Software Foundation, a to buď ve verzi 3 této licence nebo (dle vaší " "volby) v libovolné novější verzi." -#: ../src/application.c:536 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -270,7 +300,7 @@ "KONKRÉTNÍ ÚČEL. Více podrobností najdete přímo v licenci GNU General Public " "License." -#: ../src/application.c:540 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -279,12 +309,12 @@ "License. Pokud se tak nestalo, podívejte se na ." -#: ../src/application.c:555 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Užitečný diář na hlídání termínů, uloženo %u záznamů." -#: ../src/application.c:559 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -293,11 +323,11 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:577 msgid "translator-credits" msgstr "Marek Černocký " -#: ../src/application.c:571 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Webové stránky Almanah" @@ -406,8 +436,8 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:566 -#: ../src/main-window.c:596 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 #: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e. %B %Y" @@ -459,38 +489,38 @@ "Záznam importován z „%s“:\n" "\n" -#: ../src/main-window.c:570 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Opravdu chcete upravit tento záznam v diáři na %s?" -#: ../src/main-window.c:600 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Opravdu chcete smazat tento záznam v diáři na %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:709 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Neznámá nebo duplicitní textová značka „%s“ v záznamu. Bude se ignorovat." -#: ../src/main-window.c:908 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Chyba při otevírání URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1082 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s v %s" -#: ../src/main-window.c:1161 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "Obsah záznamu nelze načíst" -#: ../src/main-window.c:1326 +#: ../src/main-window.c:1344 msgid "Spelling checker could not be initialized" msgstr "Nelze inicializovat kontrolu pravopisu" @@ -639,14 +669,13 @@ "Nelze spustit dotaz „%s“. Aplikace SQLite poskytla následující chybovou " "zprávu: %s" -#: ../src/storage-manager.c:970 +#: ../src/storage-manager.c:973 msgid "Error deserializing entry into buffer while searching." msgstr "Chyba při deserializaci záznamu do vyrovnávací paměti během hledání." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Důležité!" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Zadání adresy URI" #: ../src/widgets/calendar-button.c:140 #, c-format @@ -658,15 +687,20 @@ msgstr "" "Ze souboru s uživatelským rozhraním nelze načíst objekt okna s kalendářem" +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Důležité!" + #: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Neznámé vstupní zařízení" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +msgid "add tag" +msgstr "přidat štítek" + #. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? #: ../src/widgets/tag.c:400 msgid "Remove tag" -msgstr "Odebrat značku" - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Zadání adresy URI" \ No newline at end of file +msgstr "Odebrat štítek" diff -Nru almanah-0.10.8/po/da.po almanah-0.11.0/po/da.po --- almanah-0.10.8/po/da.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/da.po 2013-10-20 11:57:20.000000000 +0000 @@ -1,8 +1,9 @@ # Danish translation for almanah. -# Copyright (C) 2012 almanah's COPYRIGHT HOLDER +# Copyright (C) 2013 almanah's COPYRIGHT HOLDER # This file is distributed under the same license as the almanah package. -# Joe Hansen (joedalton2@yahoo.dk), 2009, 2010, 2011, 2012. +# Joe Hansen (joedalton2@yahoo.dk), 2009, 2010, 2011, 2012, 2013. # Korrekturlæst Torben Grøn Helligsø, 2010. +# Korrekturlæst Aputsiaq Janussen, 2013. # # entry -> post # @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-21 17:12+0200\n" -"PO-Revision-Date: 2012-04-14 12:42+0000\n" +"POT-Creation-Date: 2013-09-10 23:27+0200\n" +"PO-Revision-Date: 2013-09-10 12:42+0000\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" @@ -20,264 +21,355 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:101 -#: ../src/main-window.c:145 -msgid "Almanah Diary" -msgstr "Almanah - dagbog" +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "Almanah Diary er et program, som du kan bruge som dagbog i dit liv." -#: ../data/almanah.desktop.in.h:2 -msgid "Diary" -msgstr "Dagbog" +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Du kan kryptere dagbogen for at beskytte dit privatliv. Programmet har " +"funktioner til redigering, inklusive tekstformatering og udskrivning, og " +"viser en liste over hændelser (på din computer) for dig om hvad der skete " +"hver dag (såsom opgaver og aftaler fra Evolution)." -#: ../data/almanah.desktop.in.h:3 -msgid "Keep a personal diary" -msgstr "Hold en personlig dagbog" +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Søg" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "Nøgle-id til kryptering af database" +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "_Indstillinger" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "Spell checking enabled?" -msgstr "Stavekontrol slået til?" +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Importer" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Stavekontrollens sprog" +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Eksporter" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"Id på nøglen der bruges til at kryptere og afkryptere databasen, hvis " -"Almanah er blevet bygget med krypteringsunderstøttelse. Efterlad uudfyldt " -"for at slå datakryptering fra." +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Udskriv dagbog" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Om Almanah - dagbog" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Afslut" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "" -"Sprogangivelsen på det sprog som skal bruges til at tjekke stavningen med." +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 +msgid "Almanah Diary" +msgstr "Almanah - dagbog" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Hvorvidt stavekontrol er slået til." +#: ../data/almanah.desktop.in.h:2 +msgid "Keep a personal diary" +msgstr "Hold en personlig dagbog" + +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +msgid "Diary" +msgstr "Dagbog" + +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "dagbog;journal;logbog;" #: ../data/almanah.ui.h:1 -msgid "" -"Add or remove a hyperlink from the currently selected text to a specified " -"URI." -msgstr "" -"Tilføj eller fjern en hyperhenvisning fra den aktuelt valgte tekst til en " -"angivet adresse." +msgid "Select Date…" +msgstr "Vælg dato…" #: ../data/almanah.ui.h:2 -msgid "Add/Remove _Hyperlink" -msgstr "Tilføj/fjern _hyperhenvisning" +msgid "F_ormat" +msgstr "F_ormat" #: ../data/almanah.ui.h:3 -msgid "Calendar" -msgstr "Kalender" +msgid "Toggle whether the currently selected text is bold." +msgstr "Skifter mellem om den aktuelt markeret tekst er fed eller ej." #: ../data/almanah.ui.h:4 -msgid "Change font style for selected text." -msgstr "Skift skriftstil for valgt tekst." +msgid "Toggle whether the currently selected text is italic." +msgstr "Skifter mellem om den aktuelt markeret tekst er kursiv eller ej." #: ../data/almanah.ui.h:5 -msgid "Entry editing area" -msgstr "Postredigeringsområde" +msgid "Toggle whether the currently selected text is underlined." +msgstr "Skifter mellem om den aktuelt markeret tekst er understreget eller ej." #: ../data/almanah.ui.h:6 -msgid "F_ormat" -msgstr "F_ormat" +msgid "Add/Remove _Hyperlink" +msgstr "Tilføj/fjern _hyperhenvisning" -# mislykkede poster #: ../data/almanah.ui.h:7 -msgid "Failed Entries" -msgstr "Poster der mislykkedes" +msgid "" +"Add or remove a hyperlink from the currently selected text to a specified " +"URI." +msgstr "" +"Tilføj eller fjern en hyperhenvisning fra den aktuelt valgte tekst til en " +"angivet adresse." #: ../data/almanah.ui.h:8 -msgid "Font Style" -msgstr "Skriftstil" +msgid "Insert _Time" +msgstr "Indsæt _tid" #: ../data/almanah.ui.h:9 -msgid "Go to _Today" -msgstr "Gå _til I dag" - -#: ../data/almanah.ui.h:10 msgid "I_mportant" msgstr "Vi_gtigt" +#: ../data/almanah.ui.h:10 +msgid "Toggle whether the current entry is marked as important." +msgstr "Skifter mellem om den aktuelle post er markeret som vigtig eller ej." + #: ../data/almanah.ui.h:11 -msgid "Import Results List" -msgstr "Importer resultatliste" +msgid "Show tags" +msgstr "Vis mærker" #: ../data/almanah.ui.h:12 -msgid "Insert _Time" -msgstr "Indsæt _tid" +msgid "Show tags for the current entry" +msgstr "Vis mærker for den aktuelle post" #: ../data/almanah.ui.h:13 -msgid "Jump to the current date in the diary." -msgstr "Gå til den aktuelle dato i dagbogen." +msgid "_Help" +msgstr "_Hjælp" #: ../data/almanah.ui.h:14 -msgid "Merged Entries" -msgstr "Flettede poster" +msgid "Go to _Today" +msgstr "Gå _til I dag" #: ../data/almanah.ui.h:15 -msgid "Past Event List" -msgstr "Tidligere begivenhedsliste" +msgid "Jump to the current date in the diary." +msgstr "Gå til den aktuelle dato i dagbogen." #: ../data/almanah.ui.h:16 -msgid "Past Events" -msgstr "Tidligere begivenheder" +msgid "Calendar" +msgstr "Kalender" #: ../data/almanah.ui.h:17 -msgid "Pr_eferences" -msgstr "_Indstillinger" +msgid "Entry editing area" +msgstr "Postredigeringsområde" #: ../data/almanah.ui.h:18 -msgid "Result List" -msgstr "Resultatliste" +msgid "Past events" +msgstr "Tidligere begivenheder" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 -msgid "Search" -msgstr "Søg" +#: ../data/almanah.ui.h:19 +msgid "Past Event List" +msgstr "Tidligere begivenhedsliste" #: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Søgetekst" -#: ../data/almanah.ui.h:21 -msgid "Select Date…" -msgstr "Vælg dato…" +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Søg" -# Succesfulde poster, poster med succes, vellykkede poster #: ../data/almanah.ui.h:22 -msgid "Successful Entries" -msgstr "Vellykkede poster" +msgid "Result List" +msgstr "Resultatliste" #: ../data/almanah.ui.h:23 -msgid "Toggle whether the current entry is marked as important." -msgstr "Skifter mellem om den aktuelle post er markeret som vigtig eller ej." +msgid "View Entry" +msgstr "Vis post" #: ../data/almanah.ui.h:24 -msgid "Toggle whether the currently selected text is bold." -msgstr "Skifter mellem om den aktuelt markeret tekst er fed eller ej." +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "f.eks. \"14/03/2009\" eller \"14. marts 2009\"." #: ../data/almanah.ui.h:25 -msgid "Toggle whether the currently selected text is italic." -msgstr "Skifter mellem om den aktuelt markeret tekst er kursiv eller ej." +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "" +"f.eks. \"http://google.com/\" eller \"file:///home/me/Photos/photo.jpg\"." +# Succesfulde poster, poster med succes, vellykkede poster #: ../data/almanah.ui.h:26 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Skifter mellem om den aktuelt markeret tekst er understreget eller ej." +msgid "Successful Entries" +msgstr "Vellykkede poster" #: ../data/almanah.ui.h:27 -msgid "View Entry" -msgstr "Vis post" +msgid "Merged Entries" +msgstr "Flettede poster" +# mislykkede poster #: ../data/almanah.ui.h:28 -msgid "_Edit" -msgstr "R_ediger" +msgid "Failed Entries" +msgstr "Poster der mislykkedes" #: ../data/almanah.ui.h:29 -msgid "_Export…" -msgstr "_Eksporter…" - -#: ../data/almanah.ui.h:30 -msgid "_File" -msgstr "_Fil" - -# søg har _S -#: ../data/almanah.ui.h:31 -msgid "_Font Style" -msgstr "S_kriftstil" +msgid "Import Results List" +msgstr "Importer resultatliste" -#: ../data/almanah.ui.h:32 -msgid "_Help" -msgstr "_Hjælp" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "Nøgle-id til kryptering af database" -#: ../data/almanah.ui.h:33 -msgid "_Import…" -msgstr "_Importer…" - -#: ../data/almanah.ui.h:34 -msgid "_Print…" -msgstr "_Udskriv…" - -#: ../data/almanah.ui.h:35 -msgid "_Search…" -msgstr "_Søg…" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"Id på nøglen der bruges til at kryptere og afkryptere databasen, hvis " +"Almanah er blevet bygget med krypteringsunderstøttelse. Efterlad uudfyldt " +"for at slå datakryptering fra." -#: ../data/almanah.ui.h:36 -msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." -msgstr "f.eks. \"14/03/2009\" eller \"14. marts 2009\"." +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Stavekontrollens sprog" -#: ../data/almanah.ui.h:37 -msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." msgstr "" -"f.eks. \"http://google.com/\" eller \"file:///home/me/Photos/photo.jpg\"." +"Sprogangivelsen på det sprog som skal bruges til at tjekke stavningen med." + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Stavekontrol slået til?" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Hvorvidt stavekontrol er slået til." -#: ../src/application.c:205 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Fejl under åbning af database" -#: ../src/application.c:253 +#. Error loading the CSS +#: ../src/application.c:275 +#, c-format +msgid "" +"Couldn't load the CSS file '%s'. The interface might not be styled correctly" +msgstr "" +"Kunne ikke indlæse CSS-filen \"%s\". Grænsefladen er måske ikke korrekt opsat" + +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Slå fejlsøgningstilstand til" -#: ../src/application.c:270 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Håndter din dagbog. Kun en instans af programmet kan være åben ad gangen." #. Print an error -#: ../src/application.c:281 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Kommandolinjetilvalg kunne ikke fortolkes: %s\n" -#: ../src/application.c:300 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Fejl under kryptering af database" -#: ../src/date-entry-dialog.c:72 -msgid "Select Date" -msgstr "Vælg dato" - -#: ../src/date-entry-dialog.c:129 ../src/import-export-dialog.c:168 -#: ../src/import-export-dialog.c:472 ../src/main-window.c:212 -#: ../src/preferences-dialog.c:191 ../src/search-dialog.c:97 -#: ../src/uri-entry-dialog.c:128 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 +#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 +#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "UI-fil \"%s\" kunne ikke indlæses" +#: ../src/application.c:542 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"Almanah er frit software: Du kan distribuere den og/eller ændre den under " +"betingelserne i GNU General Public License som udgivet af the Free Software " +"Foundation, enten version 3 af denne licens, eller (ved dit valg) enhver " +"senere version." + +#: ../src/application.c:546 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Almanah distribueres i håbet om at programmet vil være brugbart, men UDEN " +"NOGEN GARANTI; også uden den underforståede garanti om SALGBARHED eller " +"EGNETHED TIL ET SPECIFIKT FORMÅL. Se GNU General Public License for " +"yderligere detaljer." + +#: ../src/application.c:550 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"Du bør have modtaget en kopi af GNU General Public License sammen med " +"Almanah. Hvis ikke, så se ." + +#: ../src/application.c:565 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "En nyttig dagbog, der gemmer %u poster." + +#: ../src/application.c:569 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Ophavsret © 2008-2009 Philip Withnall" + +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:577 +msgid "translator-credits" +msgstr "" +"Joe Hansen , 2009, 2010, 2011, 2012, 2013.\n" +"\n" +"Dansk-gruppen \n" +"Mere info: http://www.dansk-gruppen.dk" + +#: ../src/application.c:581 +msgid "Almanah Website" +msgstr "Almanahs internetside" + +#: ../src/date-entry-dialog.c:72 +msgid "Select Date" +msgstr "Vælg dato" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." msgstr "Ugyldigt versionsnummer for data %u." -#: ../src/events/calendar-appointment.c:49 +#: ../src/events/calendar-appointment.c:51 msgid "Calendar Appointment" msgstr "Kalenderaftale" -#: ../src/events/calendar-appointment.c:50 +#: ../src/events/calendar-appointment.c:52 msgid "An appointment on an Evolution calendar." msgstr "En aftale i en Evolutionkalender." -#: ../src/events/calendar-appointment.c:119 ../src/events/calendar-task.c:108 +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 msgid "Error launching Evolution" msgstr "Fejl under opstart af Evolution" -#: ../src/events/calendar-task.c:49 +#: ../src/events/calendar-task.c:51 msgid "Calendar Task" msgstr "Kalenderopgave" -#: ../src/events/calendar-task.c:50 +#: ../src/events/calendar-task.c:52 msgid "A task on an Evolution calendar." msgstr "En opgave i en Evolutionkalender." @@ -323,15 +415,6 @@ msgid "Export Entries" msgstr "Eksporter poster" -#. Set the button label -#: ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importer" - -#: ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Eksporter" - #: ../src/import-export-dialog.c:245 msgid "Import failed" msgstr "Import mislykkedes" @@ -355,12 +438,12 @@ #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:590 -#: ../src/main-window.c:620 ../src/main-window.c:1407 ../src/printing.c:263 -#: ../src/search-dialog.c:182 +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e. %B %Y" @@ -411,89 +494,37 @@ "Post importeret fra \"%s\":\n" "\n" -#: ../src/main-window.c:594 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Er du sikker på, at du ønsker at redigere denne dagbogspost for %s?" -#: ../src/main-window.c:624 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Er du sikker på, at du ønsker at slette denne dagbogspost for %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:733 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Ukendt eller duplikeret tekstmærke \"%s\" i post. Ignorerer." -#: ../src/main-window.c:1049 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Fejl under åbning af URI" -#: ../src/main-window.c:1165 -msgid "" -"Almanah is free software: you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation, either version 3 of the License, or (at your option) any later " -"version." -msgstr "" -"Almanah er frit software: Du kan distribuere den og/eller ændre den under " -"betingelserne i GNU General Public License som udgivet af the Free Software " -"Foundation, enten version 3 af denne licens, eller (ved dit valg) enhver " -"senere version." - -#: ../src/main-window.c:1169 -msgid "" -"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." -msgstr "" -"Almanah distribueres i håbet om at programmet vil være brugbart, men UDEN " -"NOGEN GARANTI; også uden den underforståede garanti om SALGBARHED eller " -"EGNETHED TIL ET SPECIFIKT FORMÅL. Se GNU General Public License for " -"yderligere detaljer." - -#: ../src/main-window.c:1173 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"Almanah. If not, see ." -msgstr "" -"Du bør have modtaget en kopi af GNU General Public License sammen med " -"Almanah. Hvis ikke, så se ." - -#: ../src/main-window.c:1188 +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1092 #, c-format -msgid "A helpful diary keeper, storing %u entries." -msgstr "En nyttig dagbog, der gemmer %u poster." - -#: ../src/main-window.c:1192 -msgid "Copyright © 2008-2009 Philip Withnall" -msgstr "Ophavsret © 2008-2009 Philip Withnall" +msgid "%s @ %s" +msgstr "%s @ %s" -#. Translators: please include your names here to be credited for your hard work! -#. * Format: -#. * "Translator name 1 \n" -#. * "Translator name 2 " -#. -#: ../src/main-window.c:1200 -msgid "translator-credits" -msgstr "" -"Joe Hansen , 2009, 2010, 2011.\n" -"\n" -"Dansk-gruppen \n" -"Mere info: http://www.dansk-gruppen.dk" - -#: ../src/main-window.c:1204 -msgid "Almanah Website" -msgstr "Almanahs internetside" - -#: ../src/main-window.c:1434 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "Postindhold kunne ikke indlæses" -#: ../src/main-window.c:1500 +#: ../src/main-window.c:1344 msgid "Spelling checker could not be initialized" msgstr "Stavekontrol kunne ikke startes" @@ -571,32 +602,32 @@ msgstr "Søger…" # GPGME er ikke en højere version end %s -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:275 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME er ikke mindst version %s" -#: ../src/storage-manager.c:268 +#: ../src/storage-manager.c:284 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME understøtter ikke OpenPGP: %s" -#: ../src/storage-manager.c:277 +#: ../src/storage-manager.c:293 #, c-format msgid "Error creating cipher context: %s" msgstr "Fejl under oprettelse af chifferkontekst: %s" -#: ../src/storage-manager.c:306 +#: ../src/storage-manager.c:322 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Fejl under åbning af krypteret databasefil \"%s\": %s" -#: ../src/storage-manager.c:325 +#: ../src/storage-manager.c:341 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Fejl under åbning af ukrypteret databasefil \"%s\": %s" -#: ../src/storage-manager.c:373 +#: ../src/storage-manager.c:389 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -605,27 +636,27 @@ "efterladt som sikkerhedskopi." #. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/storage-manager.c:392 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "Kunne ikke slette den ukrypterede databasefil \"%s\"." -#: ../src/storage-manager.c:417 +#: ../src/storage-manager.c:433 #, c-format msgid "Error decrypting database: %s" msgstr "Fejl under afkryptering af database: %s" -#: ../src/storage-manager.c:451 +#: ../src/storage-manager.c:467 #, c-format msgid "Error getting encryption key: %s" msgstr "Fejl under indlæsning af krypteringsnøgle: %s" -#: ../src/storage-manager.c:472 +#: ../src/storage-manager.c:488 #, c-format msgid "Error encrypting database: %s" msgstr "Fejl under kryptering af database: %s" -#: ../src/storage-manager.c:574 +#: ../src/storage-manager.c:590 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -633,171 +664,44 @@ msgstr "" "Kunne ikke åbne database \"%s\". SQLite kom med den følgende fejlbesked: %s" -#: ../src/storage-manager.c:651 +#: ../src/storage-manager.c:667 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" msgstr "" "Kunne ikke køre forespørgslen \"%s\". SQLite kom med følgende fejlbesked: %s" -#: ../src/storage-manager.c:954 +#: ../src/storage-manager.c:973 msgid "Error deserializing entry into buffer while searching." msgstr "Fejl under afserialisering af post til mellemlager under søgning." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Vigtigt!" - #: ../src/uri-entry-dialog.c:71 msgid "Enter URI" msgstr "Indtast URI" -#~ msgid "View" -#~ msgstr "Vis" - -#~ msgid "View Event" -#~ msgstr "Vis begivenhed" - -#~ msgid "Main window X position" -#~ msgstr "Hovedvindues x-position" - -#~ msgid "Main window Y position" -#~ msgstr "Hovedvindues y-position" - -#~ msgid "Main window height" -#~ msgstr "Hovedvindues højde" - -#~ msgid "Main window maximization" -#~ msgstr "Hovedvindues maksimering" - -#~ msgid "Main window width" -#~ msgstr "Hovedvinduets bredde" - -#~ msgid "The X position of the main window." -#~ msgstr "X-positionen på hovedvinduet." - -#~ msgid "The Y position of the main window." -#~ msgstr "Y-positionen på hovedvinduet." - -#~ msgid "The height of the main window." -#~ msgstr "Højden på hovedvinduet." - -#~ msgid "The width of the main window." -#~ msgstr "Bredden på hovedvinduet." - -#~ msgid "Whether the main window should start maximized." -#~ msgstr "Om hovedvinduet bør være maksimeret ved start." - -#~ msgid "Add a definition for the currently selected text." -#~ msgstr "Tilføj en definition for den aktuelt markerede tekst." - -#~ msgid "Definition Description" -#~ msgstr "Definitionsbeskrivelse" - -#~ msgid "Definition List" -#~ msgstr "Definitionsliste" - -#~ msgid "Definition Type" -#~ msgstr "Definitionstype" - -#~ msgid "Definition type:" -#~ msgstr "Definitionstype:" - -#~ msgid "Nothing selected" -#~ msgstr "Intet valgt" - -#~ msgid "Results:" -#~ msgstr "Resultater:" - -#~ msgid "_Add Definition" -#~ msgstr "_Tilføj definition" - -#~ msgid "_Definitions" -#~ msgstr "_Definitioner" - -#~ msgid "_Remove Definition" -#~ msgstr "Fje_rn definition" - -#~ msgid "_View Definitions" -#~ msgstr "_Vis definitioner" - -#~ msgid "Add Definition" -#~ msgstr "Tilføj definition" - -# hvis det er selve programmet er det F-Spot - fotohåndtering -# uafklaret da ikke fundet i selve programmet. -#~ msgid "F-Spot Photo" -#~ msgstr "F-Spot-billede" - -#~ msgid "A photo stored in F-Spot." -#~ msgstr "Et billede gemt i F-Spot." - -#~ msgid "Error launching F-Spot" -#~ msgstr "Fejl under opstart af F-Spot" - -#~ msgid "Definition Manager" -#~ msgstr "Definitionshåndtering" - -#~ msgid "Are you sure you want to delete the definition for \"%s\"?" -#~ msgstr "Er du sikker på, at du ønsker at slette definitionen for \"%s\"?" - -#~ msgid "Contact" -#~ msgstr "Kontakt" - -#~ msgid "An Evolution contact." -#~ msgstr "En Evolutionkontakt." - -#~ msgid "Select Contact" -#~ msgstr "Vælg kontakt" - -#~ msgid "Error opening contact" -#~ msgstr "Fejl under åbning af kontakt" - -#~ msgid "Error opening Evolution" -#~ msgstr "Fejl under åbning af Evolution" - -#~ msgid "File" -#~ msgstr "Fil" - -#~ msgid "An attached file." -#~ msgstr "En vedhæftet fil." - -#~ msgid "Error opening file" -#~ msgstr "Fejl under åbning af fil" - -#~ msgid "Select File" -#~ msgstr "Vælg fil" - -#~ msgid "Note" -#~ msgstr "Note" - -#~ msgid "A note about an important event." -#~ msgstr "En note om en vigtig begivenhed." - -#~ msgid "URI" -#~ msgstr "URI" - -#~ msgid "A URI of a file or web page." -#~ msgstr "En URI af en fil eller internetside." - -#~ msgid "URI: " -#~ msgstr "URI: " - -#~ msgid "- Manage your diary" -#~ msgstr "- Håndter din dagbog" - -#~ msgid "Select a Folder" -#~ msgstr "Vælg en mappe" - -#~ msgid "Select a File" -#~ msgstr "Vælg en fil" +#: ../src/widgets/calendar-button.c:140 +#, c-format +msgid "UI file \"%s\" could not be loaded: %s" +msgstr "UI-fil \"%s\" kunne ikke indlæses: %s" -#~ msgid "Enable import mode" -#~ msgstr "Slå importtilstand til" +#: ../src/widgets/calendar-button.c:150 +msgid "Can't load calendar window object from UI file" +msgstr "Kan ikke indlæse objekt for kalendervindue fra brugerfladefil" -#~ msgid "Description: " -#~ msgstr "Beskrivelse: " +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Vigtigt!" -#~ msgid "Type: " -#~ msgstr "Type: " +#: ../src/widgets/calendar-window.c:80 +msgid "Unknown input device" +msgstr "Ukendt inputenhed" + +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +msgid "add tag" +msgstr "tilføj mærke" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:400 +msgid "Remove tag" +msgstr "Fjern mærke" diff -Nru almanah-0.10.8/po/el.po almanah-0.11.0/po/el.po --- almanah-0.10.8/po/el.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/el.po 2013-10-20 11:57:20.000000000 +0000 @@ -2,423 +2,468 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Vasilis Kontogiannis , 2009. -# # Μάριος Ζηντίλης , 2010. +# Dimitris Spingos (Δημήτρης Σπίγγος) , 2013. msgid "" msgstr "" "Project-Id-Version: almanah - master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-13 21:02+0200\n" -"PO-Revision-Date: 2011-01-13 21:03+0200\n" -"Last-Translator: Kostas Papadimas \n" -"Language-Team: Greek \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almana" +"h&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-02-15 10:07+0000\n" +"PO-Revision-Date: 2013-04-10 18:01+0300\n" +"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n" +"Language-Team: team@gnome.gr\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" -#: ../data/almanah.desktop.in.h:1 -#: ../src/main-window.c:134 -#: ../src/main.c:112 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 +#: ../src/main-window.c:135 msgid "Almanah Diary" msgstr "Ημερολόγιο Almanah" #: ../data/almanah.desktop.in.h:2 -msgid "Diary" -msgstr "Ημερολόγιο" - -#: ../data/almanah.desktop.in.h:3 msgid "Keep a personal diary" msgstr "Διατήρηση ενός προσωπικού ημερολόγιο" -#: ../data/almanah.schemas.in.h:1 +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +msgid "Diary" +msgstr "Ημερολόγιο" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 msgid "Database encryption key ID" msgstr "Αναγνωριστικό κλειδί κρυπτογράφησης βάσης δεδομένων" -#: ../data/almanah.schemas.in.h:2 -msgid "Main window X position" -msgstr "Θέση X κεντρικού παραθύρου" - -#: ../data/almanah.schemas.in.h:3 -msgid "Main window Y position" -msgstr "Θέση Y κεντρικού παραθύρου" - -#: ../data/almanah.schemas.in.h:4 -msgid "Main window height" -msgstr "Ύψος κεντρικού παραθύρου" - -#: ../data/almanah.schemas.in.h:5 -msgid "Main window maximization" -msgstr "Μεγιστοποίηση κεντρικού παραθύρου" - -#: ../data/almanah.schemas.in.h:6 -msgid "Main window width" -msgstr "Πλάτος κεντρικού παραθύρου" - -#: ../data/almanah.schemas.in.h:7 -msgid "Spell checking enabled?" -msgstr "Είναι ενεργός ο ορθογραφικός έλεγχος;" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"To αναγνωριστικό του κλειδιού προς χρήση για κρυπτογράφηση και " +"αποκρυπτογράφηση της βάσης δεδομένων, σε περίπτωση που το Almanah έχει " +"χτιστεί με υποστήριξη κρυπτογράφησης. Αφήστε κενό για απενεργοποίηση " +"κρυπτογράφησης της βάσης δεδομένων." -#: ../data/almanah.schemas.in.h:8 +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 msgid "Spell checking language" msgstr "Γλώσσα ορθογραφικού ελέγχου" -#: ../data/almanah.schemas.in.h:9 -msgid "The ID of the key to use to encrypt and decrypt the database, if Almanah has been built with encryption support. Leave blank to disable database encryption." -msgstr "To αναγνωριστικό του κλειδιού προς χρήση για κρυπτογράφηση και αποκρυπτογράφηση της βάσης δεδομένων, σε περίπτωση που το Almanah έχει χτιστεί με υποστήριξη κρυπτογράφησης. Αφήστε κενό για απενεργοποίηση κρυπτογράφησης της βάσης δεδομένων." - -#: ../data/almanah.schemas.in.h:10 -msgid "The X position of the main window." -msgstr "Η θέση X του κεντρικού παραθύρου." - -#: ../data/almanah.schemas.in.h:11 -msgid "The Y position of the main window." -msgstr "Η θέση Y του κεντρικού παραθύρου." - -#: ../data/almanah.schemas.in.h:12 -msgid "The height of the main window." -msgstr "Το Ύψος του κεντρικού παραθύρου." - -#: ../data/almanah.schemas.in.h:13 +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 msgid "The locale specifier of the language in which to check entry spellings." -msgstr "Ο τοπικός προσδιορισμός της γλώσσας στην οποία ελέγχεται η ορθογραφία εισαγωγής." +msgstr "" +"Ο τοπικός προσδιορισμός της γλώσσας στην οποία ελέγχεται η ορθογραφία " +"εισαγωγής." -#: ../data/almanah.schemas.in.h:14 -msgid "The width of the main window." -msgstr "Το πλάτος του κεντρικού παραθύρου." +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Είναι ενεργός ο ορθογραφικός έλεγχος;" -#: ../data/almanah.schemas.in.h:15 +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 msgid "Whether spell checking of entries is enabled." msgstr "Εάν ο ορθογραφικός έλεγχος των καταχωρίσεων είναι ενεργός." -#: ../data/almanah.schemas.in.h:16 -msgid "Whether the main window should start maximized." -msgstr "Εάν το κεντρικό παράθυρο θα μπορούσε να ξεκινάει μεγιστοποιημένο." - #: ../data/almanah.ui.h:1 -msgid "Add a definition for the currently selected text." -msgstr "Προσθήκη ενός ορισμού για το τρέχον επιλεγμένο κείμενο." +msgid "Select Date…" +msgstr "Επιλογή ημερομηνίας…" #: ../data/almanah.ui.h:2 -msgid "Calendar" -msgstr "Ημερολόγιο" +msgid "F_ormat" +msgstr "Μ_ορφή" #: ../data/almanah.ui.h:3 -msgid "Definition Description" -msgstr "Περιγραφή ορισμών" +msgid "Toggle whether the currently selected text is bold." +msgstr "Εναλλαγή μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως έντονο." #: ../data/almanah.ui.h:4 -msgid "Definition List" -msgstr "Λίστα ορισμών" +msgid "Toggle whether the currently selected text is italic." +msgstr "" +"Εναλλαγή της μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως πλαγιαστό." #: ../data/almanah.ui.h:5 -msgid "Definition Type" -msgstr "Τύπος ορισμού" +msgid "Toggle whether the currently selected text is underlined." +msgstr "" +"Εναλλαγή της μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως " +"υπογραμμισμένο." #: ../data/almanah.ui.h:6 -msgid "Definition type:" -msgstr "Τύπος ορισμού:" +msgid "Add/Remove _Hyperlink" +msgstr "Προσθήκη/αφαίρεση _υπερσυνδέσμου" #: ../data/almanah.ui.h:7 -msgid "Entry editing area" -msgstr "Περιοχή επεξεργασίας καταχώρισης" +#| msgid "Remove the definition from the currently selected text." +msgid "" +"Add or remove a hyperlink from the currently selected text to a specified " +"URI." +msgstr "" +"Προσθήκη ή αφαίρεση υπερσυνδέσμου από το τρέχον επιλεγμένο κείμενο σε μια " +"συγκεκριμένη URI." #: ../data/almanah.ui.h:8 -msgid "F_ormat" -msgstr "Μ_ορφή" +msgid "Insert _Time" +msgstr "Εισαγωγή ώ_ρας" #: ../data/almanah.ui.h:9 -msgid "Failed Entries" -msgstr "Αποτυχημένες καταχωρήσεις" +msgid "I_mportant" +msgstr "Σ_ημαντικό" #: ../data/almanah.ui.h:10 -msgid "Go to _Today" -msgstr "Πήγαινε στο _Σήμερα" +msgid "Toggle whether the current entry is marked as important." +msgstr "Εναλλαγής σημείωσης της τρέχουσας καταχώρησης ως σημαντικής." #: ../data/almanah.ui.h:11 -msgid "I_mportant" -msgstr "Σ_ημαντικό" +msgid "_Help" +msgstr "_Βοήθεια" #: ../data/almanah.ui.h:12 -msgid "Import Results List" -msgstr "Εισαγωγής λίστας αποτελεσμάτων" +msgid "Go to _Today" +msgstr "Πήγαινε στο _Σήμερα" #: ../data/almanah.ui.h:13 -msgid "Insert _Time" -msgstr "Εισαγωγή _ώρας" - -#: ../data/almanah.ui.h:14 msgid "Jump to the current date in the diary." msgstr "Μετάβαση στην τρέχουσα ημερομηνία στο ημερολόγιο." +#: ../data/almanah.ui.h:14 +msgid "Calendar" +msgstr "Ημερολόγιο" + #: ../data/almanah.ui.h:15 -msgid "Merged Entries" -msgstr "Συγχωνευμένες καταχωρήσεις" +msgid "Entry editing area" +msgstr "Περιοχή επεξεργασίας καταχώρισης" #: ../data/almanah.ui.h:16 -#: ../src/definition-manager-window.c:246 -msgid "Nothing selected" -msgstr "Δεν έχει επιλεχτεί τίποτα" +#| msgid "Past Events" +msgid "Past events" +msgstr "Προηγούμενα συμβάντα" #: ../data/almanah.ui.h:17 msgid "Past Event List" msgstr "Κατάλογος προηγούμενου γεγονότος" #: ../data/almanah.ui.h:18 -msgid "Past Events" -msgstr "Προηγούμενα γεγονότα" +msgid "Search entry" +msgstr "Αναζήτηση καταχώρισης" -#: ../data/almanah.ui.h:19 -msgid "Pr_eferences" -msgstr "Προτιμήσ_εις" +#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +msgid "Search" +msgstr "Αναζήτηση" #: ../data/almanah.ui.h:20 -msgid "Remove the definition from the currently selected text." -msgstr "Αφαίρεση της καταχώρησης από το τρέχον επιλεγμένο κείμενο." - -#: ../data/almanah.ui.h:21 msgid "Result List" msgstr "Λίστα αποτελέσματος" +#: ../data/almanah.ui.h:21 +msgid "View Entry" +msgstr "Προβολή καταχώρισης" + #: ../data/almanah.ui.h:22 -msgid "Results:" -msgstr "Αποτελέσματα:" +msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." +msgstr "π.χ. \"14/03/2009\" ή \"14 Μαρτίου 2009\"." #: ../data/almanah.ui.h:23 -#: ../src/search-dialog.c:61 -msgid "Search" -msgstr "Αναζήτηση" +msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." +msgstr "π.χ. “http://google.com/” ή “file:///home/me/Photos/photo.jpg”." #: ../data/almanah.ui.h:24 -msgid "Search entry" -msgstr "Αναζήτηση καταχώρισης" +msgid "Successful Entries" +msgstr "Επιτυχημένες καταχωρήσεις" #: ../data/almanah.ui.h:25 -msgid "Select Date…" -msgstr "Επιλογή ημερομηνίας..." +msgid "Merged Entries" +msgstr "Συγχωνευμένες καταχωρήσεις" #: ../data/almanah.ui.h:26 -msgid "Successful Entries" -msgstr "Επιτυχημένες καταχωρήσεις" +msgid "Failed Entries" +msgstr "Αποτυχημένες καταχωρήσεις" #: ../data/almanah.ui.h:27 -msgid "Toggle whether the current entry is marked as important." -msgstr "Εναλλαγής σημείωσης της τρέχουσας καταχώρησης ως σημαντικής." +msgid "Import Results List" +msgstr "Εισαγωγής λίστας αποτελεσμάτων" -#: ../data/almanah.ui.h:28 -msgid "Toggle whether the currently selected text is bold." -msgstr "Εναλλαγή μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως έντονο." +#: ../data/almanah-app-menu.ui.h:1 +#| msgid "Search" +msgid "_Search" +msgstr "_Αναζήτηση" -#: ../data/almanah.ui.h:29 -msgid "Toggle whether the currently selected text is italic." -msgstr "Εναλλαγή της μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως πλαγιαστό." +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "Προτιμήσ_εις" -#: ../data/almanah.ui.h:30 -msgid "Toggle whether the currently selected text is underlined." -msgstr "Εναλλαγή της μορφοποίησης του τρέχοντος επιλεγμένου κειμένου ως υπογραμμισμένο." +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "Ε_ισαγωγή" -#: ../data/almanah.ui.h:31 -msgid "View" -msgstr "Προβολή" +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "Ε_ξαγωγή" -#: ../data/almanah.ui.h:32 -msgid "View Entry" -msgstr "Προβολή καταχώρισης" +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Εκτύπωση ημερολογίου" + +#: ../data/almanah-app-menu.ui.h:6 +#| msgid "Almanah Diary" +msgid "_About Almanah Diary" +msgstr "_Περί του ημερολογίου Almanah" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "Έ_ξοδος" -#: ../data/almanah.ui.h:33 -msgid "View Event" -msgstr "Προβολή γεγονότος" - -#: ../data/almanah.ui.h:34 -msgid "_Add Definition" -msgstr "_Προσθήκη ορισμού" - -#: ../data/almanah.ui.h:35 -msgid "_Definitions" -msgstr "_Ορισμοί" - -#: ../data/almanah.ui.h:36 -msgid "_Edit" -msgstr "_Επεξεργασία" - -#: ../data/almanah.ui.h:37 -msgid "_Export…" -msgstr "_Εξαγωγή..." - -#: ../data/almanah.ui.h:38 -msgid "_File" -msgstr "_Αρχείο" +#: ../src/application.c:243 +msgid "Error opening database" +msgstr "Σφάλμα ανοίγματος βάσης δεδομένων" -#: ../data/almanah.ui.h:39 -msgid "_Help" -msgstr "_Βοήθεια" +#. Error loading the CSS +#: ../src/application.c:272 +#, c-format +msgid "" +"Couldn't load the CSS file '%s'. The interface might not be styled correctly" +msgstr "" +"Αδύνατη η φόρτωση του αρχείου CSS '%s'. Η διεπαφή μπορεί να μην έχει σωστή " +"τεχνοτροπία" -#: ../data/almanah.ui.h:40 -msgid "_Import…" -msgstr "Ε_ισαγωγή..." - -#: ../data/almanah.ui.h:41 -msgid "_Print…" -msgstr "Εκτύ_πωση" - -#: ../data/almanah.ui.h:42 -msgid "_Remove Definition" -msgstr "_Διαγραφή ορισμού" - -#: ../data/almanah.ui.h:43 -msgid "_Search…" -msgstr "_Αναζήτηση..." - -#: ../data/almanah.ui.h:44 -msgid "_View Definitions" -msgstr "_Προβολή ορισμών" +#: ../src/application.c:316 +msgid "Enable debug mode" +msgstr "Ενεργοποίηση κατάστασης εκσφαλμάτωσης" -#: ../data/almanah.ui.h:45 -msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." -msgstr "π.χ. \"14/03/2009\" ή \"14 Μαρτίου 2009\"." +#: ../src/application.c:333 +msgid "" +"Manage your diary. Only one instance of the program may be open at any time." +msgstr "" +"Διαχείριση του ημερολογίου σας. Μόνο ένα στιγμιότυπο του προγράμματος μπορεί " +"να ανοιχθεί οποτεδήποτε." + +#. Print an error +#: ../src/application.c:344 +#, c-format +#| msgid "Command-line options could not be parsed" +msgid "Command line options could not be parsed: %s\n" +msgstr "Οι επιλογές της γραμμής εντολών δεν μπορούν να αναλυθούν: %s\n" -#: ../src/add-definition-dialog.c:82 -msgid "Add Definition" -msgstr "Προσθήκη ορισμού" - -#: ../src/add-definition-dialog.c:164 -#: ../src/date-entry-dialog.c:131 -#: ../src/import-export-dialog.c:112 -#: ../src/import-export-dialog.c:415 -#: ../src/definition-manager-window.c:132 -#: ../src/main-window.c:171 -#: ../src/preferences-dialog.c:143 -#: ../src/search-dialog.c:87 +#: ../src/application.c:363 +msgid "Error encrypting database" +msgstr "Σφάλμα κρυπτογράφησης βάσης δεδομένων" + +#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 +#: ../src/main-window.c:194 ../src/preferences-dialog.c:191 +#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Το αρχείο UI \"%s\" δεν μπορεί να φορτωθεί" -#: ../src/date-entry-dialog.c:74 +#: ../src/application.c:532 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"Το Almanah είναι ένα ελεύθερο λογισμικό: μπορείτε να το επαναδιανέμεται και/" +"ή να το τροποποιήσετε σύμφωνα με τους όρους GNU General Public License όπως " +"δημοσιοποιήθηκαν από Ίδρυμα Ελεύθερου Λογισμικού, είτε η έκδοση 3 της " +"άδειας, ή (κατά επιλογή σας) αποιαδήποτε μεταγενέστερη έκδοση." + +#: ../src/application.c:536 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Το Almanah διανέμεται με την ελπίδα ότι θα είναι χρήσιμο, αλλά ΧΩΡΙΣ ΚΑΜΙΑ " +"ΕΓΓΥΗΣΗ, χωρίς καν την συνεπαγόμενη εγγύηση ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή " +"ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΙΔΙΚΟ ΣΚΟΠΟ. Δείτε τη GNU Geneal Public License για " +"περισσότερες λεπτομέρειες." + +#: ../src/application.c:540 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"Πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Public License σύμφωνα " +"με το Almanah. Αν όχι , δείτε ." + +#: ../src/application.c:555 +#, c-format +#| msgid "A helpful diary keeper, storing %u entries and %u definitions." +msgid "A helpful diary keeper, storing %u entries." +msgstr "Μια χρήσιμη διατήρηση ημερολογίου, που αποθηκεύει %u καταχωρίσεις." + +#: ../src/application.c:559 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Πνευματικά δικαιώματα © 2008-2009 Philip Withnall" + +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:567 +msgid "translator-credits" +msgstr "" +"Ελληνική μεταφραστική ομάδα GNOME\n" +" Δημήτρης Σπίγγος \n" +" Βασίλης Κοντογιάννης ,\n" +" \n" +"Για περισσότερες πληροφορίες, επισκεφθείτε την σελίδα http://www.gnome.gr/" + +#: ../src/application.c:571 +msgid "Almanah Website" +msgstr "Ιστοσελίδα Almanah" + +#: ../src/date-entry-dialog.c:72 msgid "Select Date" msgstr "Επιλογή ημερομηνίας" -#: ../src/events/calendar-appointment.c:49 +#: ../src/entry.c:303 +#, c-format +msgid "Invalid data version number %u." +msgstr "Άκυρος αριθμός έκδοσης δεδομένων %u." + +#: ../src/events/calendar-appointment.c:51 msgid "Calendar Appointment" msgstr "Ημερολογιακή συνάντηση" -#: ../src/events/calendar-appointment.c:50 +#: ../src/events/calendar-appointment.c:52 msgid "An appointment on an Evolution calendar." -msgstr "Μία συνάντηση σε ημερολόγιο εξέλιξης." +msgstr "Μία συνάντηση σε ημερολόγιο Evolution." + +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" -#: ../src/events/calendar-appointment.c:120 -#: ../src/events/calendar-task.c:109 +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 msgid "Error launching Evolution" msgstr "Σφάλμα εκκίνησης Evolution" -#: ../src/events/calendar-task.c:49 +#: ../src/events/calendar-task.c:51 msgid "Calendar Task" msgstr "Εργασία ημερολογίου" -#: ../src/events/calendar-task.c:50 +#: ../src/events/calendar-task.c:52 msgid "A task on an Evolution calendar." msgstr "Μία εργασία στο ημερολόγιο του Evolution." -#: ../src/export-operation.c:46 -#: ../src/import-operation.c:46 +#: ../src/export-operation.c:45 ../src/import-operation.c:45 msgid "Text Files" msgstr "Αρχεία κειμένου" -#: ../src/export-operation.c:47 -msgid "Select a _folder to export the entries to as text files, one per entry, with names in the format 'yyyy-mm-dd', and no extension. All entries will be exported, unencrypted in plain text format." -msgstr "Επιλέξτε ένα _φάκελο για να εξάγετε τις καταχωρήσεις ως αρχείο κειμένου, ένα ανά καταχώρηση, με τα ονόματα στην μορφή 'yyyy-mm-dd', χωρίς κατάληξη. Όλες οι καταχωρήσεις θα εξαχθούν, χωρίς κωδικοποίηση σε μορφή απολού κειμένου." +#: ../src/export-operation.c:46 +msgid "" +"Select a _folder to export the entries to as text files, one per entry, with " +"names in the format 'yyyy-mm-dd', and no extension. All entries will be " +"exported, unencrypted in plain text format." +msgstr "" +"Επιλέξτε ένα _φάκελο για να εξάγετε τις καταχωρήσεις ως αρχείο κειμένου, ένα " +"ανά καταχώρηση, με τα ονόματα στην μορφή 'yyyy-mm-dd', χωρίς κατάληξη. Όλες " +"οι καταχωρήσεις θα εξαχθούν, χωρίς κωδικοποίηση σε μορφή απολού κειμένου." -#: ../src/export-operation.c:51 -#: ../src/import-operation.c:51 +#: ../src/export-operation.c:50 ../src/import-operation.c:50 msgid "Database" msgstr "Βάση δεδομένων" -#: ../src/export-operation.c:52 -msgid "Select a _filename for a complete copy of the unencrypted Almanah Diary database to be given." -msgstr "Διαλέξτε ένα όνομα αρχείου για να κάνετε μια πλήρη αντιγραφή, χωρίς κωδικοποίηση, της βάση δεδομένων του ημερολογίου Almanah " +#: ../src/export-operation.c:51 +msgid "" +"Select a _filename for a complete copy of the unencrypted Almanah Diary " +"database to be given." +msgstr "" +"Διαλέξτε ένα ό_νομα αρχείου για να κάνετε μια πλήρη αντιγραφή, χωρίς " +"κωδικοποίηση, της βάση δεδομένων του ημερολογίου Almanah." -#: ../src/import-export-dialog.c:145 +#: ../src/import-export-dialog.c:202 msgid "Import _mode: " -msgstr "Λειτουργία _εισαγωγής:" +msgstr "Λειτουργία _εισαγωγής: " -#: ../src/import-export-dialog.c:145 +#: ../src/import-export-dialog.c:202 msgid "Export _mode: " -msgstr "Λειτουργία ε_ξαγωγής:" +msgstr "Λειτουργία ε_ξαγωγής: " #. Set the window title -#: ../src/import-export-dialog.c:148 +#: ../src/import-export-dialog.c:205 msgid "Import Entries" msgstr "Εισαγωγή καταχωρήσεων" -#: ../src/import-export-dialog.c:148 +#: ../src/import-export-dialog.c:205 msgid "Export Entries" msgstr "Εξαγωγή καταχωρήσεων" -#. Set the button label -#: ../src/import-export-dialog.c:151 -msgid "_Import" -msgstr "Ε_ισαγωγή" - -#: ../src/import-export-dialog.c:151 -msgid "_Export" -msgstr "Ε_ξαγωγή" - -#: ../src/import-export-dialog.c:188 +#: ../src/import-export-dialog.c:245 msgid "Import failed" msgstr "Η εισαγωγή απέτυχε" -#: ../src/import-export-dialog.c:226 +#: ../src/import-export-dialog.c:283 msgid "Export failed" msgstr "Η εξαγωγή απέτυχε" -#: ../src/import-export-dialog.c:239 +#: ../src/import-export-dialog.c:296 msgid "Export successful" msgstr "Επιτυχής εξαγωγή" -#: ../src/import-export-dialog.c:240 +#: ../src/import-export-dialog.c:297 msgid "The diary was successfully exported." msgstr "Το ημερολόγιο εξήχθη επιτυχώς." -#: ../src/import-export-dialog.c:389 +#: ../src/import-export-dialog.c:445 msgid "Import Results" msgstr "Αποτελέσματα εισαγωγής" #. Translators: This is a strftime()-format string for the dates displayed in import results. #. Translators: This is a strftime()-format string for the date to display when asking about editing a diary entry. #. Translators: This is a strftime()-format string for the date to display when asking about deleting a diary entry. -#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. -#: ../src/import-export-dialog.c:482 -#: ../src/main-window.c:394 -#: ../src/main-window.c:419 -#: ../src/main-window.c:1058 -#: ../src/printing.c:263 -#: ../src/search-dialog.c:161 +#. Translators: This is a strftime()-format string for the date displayed at the top of the main window. +#: ../src/import-export-dialog.c:539 ../src/main-window.c:566 +#: ../src/main-window.c:596 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" -#: ../src/import-operation.c:47 -msgid "Select a _folder containing text files, one per entry, with names in the format 'yyyy-mm-dd', and no extension. Any and all such files will be imported." -msgstr "Επιλέξτε ένα φάκελο που περιέχει αρχεία κειμένου, ένα για κάθε καταχώρηση, με ονόματα της μορφής «yyyy-mm-dd» και χωρίς επέκταση. Όλα αυτά τα αρχεία θα εισαχθούν." +#: ../src/import-operation.c:46 +msgid "" +"Select a _folder containing text files, one per entry, with names in the " +"format 'yyyy-mm-dd', and no extension. Any and all such files will be " +"imported." +msgstr "" +"Επιλέξτε ένα _φάκελο που περιέχει αρχεία κειμένου, ένα για κάθε καταχώριση, " +"με ονόματα της μορφής 'yyyy-mm-dd' και χωρίς επέκταση. Όλα αυτά τα αρχεία θα " +"εισαχθούν." -#: ../src/import-operation.c:52 +#: ../src/import-operation.c:51 msgid "Select a database _file created by Almanah Diary to import." -msgstr "Επιλέξτε για εισαγωγή ένα αρχείο που δημιουργήθηκε από το Almanah Diary." +msgstr "" +"Επιλέξτε ένα _αρχείο μιας βάσης δεδομένων που δημιουργήθηκε από το " +"ημερολόγιο Almanah για εισαγωγή." -#: ../src/import-operation.c:199 +#: ../src/import-operation.c:248 #, c-format msgid "Error deserializing imported entry into buffer: %s" -msgstr "Σφάλμα αποσειριοποίησης εισαγόμενης καταχώρησης στην ενδιάμεση μνήμη: %s" +msgstr "" +"Σφάλμα αποσειριοποίησης εισαγόμενης καταχώρησης στην ενδιάμεση μνήμη: %s" -#: ../src/import-operation.c:215 +#: ../src/import-operation.c:264 #, c-format -msgid "Error deserializing existing entry into buffer; overwriting with imported entry: %s" -msgstr "Σφάλμα αποσειριοποίησης υφιστάμενης καταχώρησης στην ενδιάμεση μνήμη. Αντικατάσταση με την εισαγόμενη καταχώρηση: %s" +msgid "" +"Error deserializing existing entry into buffer; overwriting with imported " +"entry: %s" +msgstr "" +"Σφάλμα αποσειριοποίησης υφιστάμενης καταχώρισης στην ενδιάμεση μνήμη· " +"αντικατάσταση με την εισαγόμενη καταχώριση: %s" #. Append some header text for the imported entry #. Translators: This text is appended to an existing entry when an entry is being imported to the same date. #. * The imported entry is appended to this text. -#: ../src/import-operation.c:256 +#: ../src/import-operation.c:305 #, c-format msgid "" "\n" @@ -428,192 +473,77 @@ msgstr "" "\n" "\n" -"Η καταχώρηση εισήχθηκε από το «%s»:\n" +"Η καταχώρηση εισήχθηκε από το \"%s\":\n" "\n" -#: ../src/definition-manager-window.c:72 -msgid "Definition Manager" -msgstr "Διαχείριση ορισμών" - -#: ../src/definition-manager-window.c:203 -#, c-format -msgid "Are you sure you want to delete the definition for \"%s\"?" -msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τον ορισμό για \"%s\";" - -#: ../src/definitions/contact.c:53 -msgid "Contact" -msgstr "Επαφή" - -#: ../src/definitions/contact.c:54 -msgid "An Evolution contact." -msgstr "Μία επαφή του Evolution." - -#: ../src/definitions/contact.c:73 -msgid "Select Contact" -msgstr "Επιλογή επαφής" - -#: ../src/definitions/contact.c:103 -#: ../src/definitions/contact.c:224 -msgid "Error opening contact" -msgstr "Σφάλμα ανοίγματος επαφής" - -#: ../src/definitions/contact.c:136 -msgid "Error opening Evolution" -msgstr "Σφάλμα ανοίγματος Evolution" - -#: ../src/definitions/file.c:48 -msgid "File" -msgstr "Αρχείο" - -#: ../src/definitions/file.c:49 -msgid "An attached file." -msgstr "Συνημμένο αρχείο." - -#: ../src/definitions/file.c:74 -msgid "Error opening file" -msgstr "Σφάλμα ανοίγματος αρχείου" - -#: ../src/definitions/file.c:93 -msgid "Select File" -msgstr "Επιλογή αρχείου" - -#: ../src/definitions/note.c:49 -msgid "Note" -msgstr "Σημείωση" - -#: ../src/definitions/note.c:50 -msgid "A note about an important event." -msgstr "Μία σημείωση για ένα σοβαρό γεγονός." - -#: ../src/definitions/uri.c:50 -msgid "URI" -msgstr "URI" - -#: ../src/definitions/uri.c:51 -msgid "A URI of a file or web page." -msgstr " URI αρχείου ή ιστοσελίδας" - -#: ../src/definitions/uri.c:76 -msgid "Error opening URI" -msgstr "Σφάλμα ανοίγματος URI" - -#: ../src/definitions/uri.c:99 -msgid "URI: " -msgstr "URI:" - -#: ../src/main-window.c:398 +#: ../src/main-window.c:570 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" -msgstr "Είστε σίγουροι ότι θέλετε να επεξεργαστείτε αυτή την καταχώριση του ημερολογίου για %s;" +msgstr "" +"Είστε σίγουροι ότι θέλετε να επεξεργαστείτε αυτή την καταχώριση του " +"ημερολογίου για %s;" -#: ../src/main-window.c:423 +#: ../src/main-window.c:600 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" -msgstr "Είστε σίγουρος ότι θέλετε να σβήσετε αυτή την καταχώριση του ημερολογίου για %s;" +msgstr "" +"Είστε σίγουρος ότι θέλετε να σβήσετε αυτή την καταχώριση του ημερολογίου για " +"%s;" #. Print a warning about the unknown tag -#: ../src/main-window.c:610 +#: ../src/main-window.c:709 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." -msgstr "Άγνωστη ή διπλότυπη ετικέτα κειμένου \"%s\" στην καταχώριση. Αγνόηση" - -#: ../src/main-window.c:891 -msgid "Almanah is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version." -msgstr "Το Almanah είναι ένα ελεύθερο λογισμικό: μπορείτε να το επαναδιανέμεται και/ή να το τροποποιήσετε σύμφωνα με τους όρους GNU General Public License όπως δημοσιοποιήθηκαν από Ίδρυμα Ελεύθερου Λογισμικού, είτε η έκδοση 3 της άδειας, ή (κατά επιλογή σας) αποιαδήποτε μεταγενέστερη έκδοση." +msgstr "Άγνωστη ή διπλότυπη ετικέτα κειμένου \"%s\" στην καταχώριση. Παράβλεψη." -#: ../src/main-window.c:895 -msgid "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." -msgstr "Το Almanah διανέμεται με την ελπίδα ότι θα είναι χρήσιμο, αλλά ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ, χωρίς καν την συνεπαγόμενη εγγύηση ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΙΔΙΚΟ ΣΚΟΠΟ. Δείτε τη GNU Geneal Public License για περισσότερες λεπτομέρειες." - -#: ../src/main-window.c:899 -msgid "You should have received a copy of the GNU General Public License along with Almanah. If not, see ." -msgstr "Πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Public License σύμφωνα με το Almanah. Αν όχι , δείτε ." +#: ../src/main-window.c:908 +msgid "Error opening URI" +msgstr "Σφάλμα ανοίγματος URI" -#: ../src/main-window.c:910 +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1082 #, c-format -msgid "A helpful diary keeper, storing %u entries and %u definitions." -msgstr "Μια εφαρμογή διατήρησης ημερολογίου, όπου αποθηκεύει %u καταχωρίσεις και %u ορισμούς." - -#: ../src/main-window.c:916 -msgid "Copyright © 2008-2009 Philip Withnall" -msgstr "Πνευματικά δικαιώματα © 2008-2009 Philip Withnall" +msgid "%s @ %s" +msgstr "%s @ %s" -#. Translators: please include your names here to be credited for your hard work! -#. * Format: -#. * "Translator name 1 \n" -#. * "Translator name 2 " -#. -#: ../src/main-window.c:924 -msgid "translator-credits" -msgstr "" -"Ελληνική μεταφραστική ομάδα GNOME\n" -" Βασίλης Κοντογιάννης , 2009\n" -"\n" -"Για περισσότερες πληροφορίες, επισκεφθείτε την σελίδα http://www.gnome.gr/" - -#: ../src/main-window.c:928 -msgid "Almanah Website" -msgstr "Ιστοσελίδα Almanah" - -#: ../src/main-window.c:1085 +#: ../src/main-window.c:1161 msgid "Entry content could not be loaded" msgstr "Το περιεχόμενο της καταχώρισης δε μπορεί να φορτωθεί" -#: ../src/main.c:38 -msgid "Error encrypting database" -msgstr "Σφάλμα κρυπτογράφησης βάσης δεδομένων" - -#: ../src/main.c:99 -msgid "Enable debug mode" -msgstr "Ενεργοποίηση κατάστασης εκσφαλμάτωσης" - -#. Options -#: ../src/main.c:116 -msgid "- Manage your diary" -msgstr "- Διαχείριση του ημερολογίου σου" - -#: ../src/main.c:126 -msgid "Command-line options could not be parsed" -msgstr "Επιλογές γραμμής εντολών δεν μπορούν να αναλυθούν" - -#: ../src/main.c:157 -msgid "Error opening database" -msgstr "Σφάλμα ανοίγματος βάσης δεδομένων" +#: ../src/main-window.c:1326 +msgid "Spelling checker could not be initialized" +msgstr "Ο ορθογράφος δε μπόρεσε να αρχικοποιηθεί" -#: ../src/preferences-dialog.c:79 +#: ../src/preferences-dialog.c:91 msgid "Almanah Preferences" msgstr "Προτιμήσεις Almanah" #. Grab our child widgets -#: ../src/preferences-dialog.c:168 +#: ../src/preferences-dialog.c:217 msgid "Encryption key: " -msgstr "Κλειδί κρυπτογράφησης:" +msgstr "Κλειδί κρυπτογράφησης: " -#: ../src/preferences-dialog.c:173 +#: ../src/preferences-dialog.c:222 msgid "None (don't encrypt)" msgstr "Κανένα (να μην κρυπτογραφηθεί)" -#: ../src/preferences-dialog.c:197 +#: ../src/preferences-dialog.c:246 msgid "New _Key" msgstr "Νέο _κλειδί" #. Set up the "Enable spell checking" check button -#: ../src/preferences-dialog.c:204 +#: ../src/preferences-dialog.c:253 msgid "Enable _spell checking" msgstr "Ενεργοποίηση ελέγχου _ορθογραφίας" -#: ../src/preferences-dialog.c:234 +#: ../src/preferences-dialog.c:279 msgid "Error saving the encryption key" msgstr "Σφάλμα αποθήκευσης κλειδιού κρυπτογράφησης" -#: ../src/preferences-dialog.c:253 +#: ../src/preferences-dialog.c:298 msgid "Error opening Seahorse" msgstr "Σφάλμα ανοίγματος εφαρμογής Seahorse" -#: ../src/preferences-dialog.c:291 -msgid "Spelling checker could not be initialized" -msgstr "Ο ορθογράφος δε μπόρεσε να αρχικοποιηθεί" - #: ../src/printing.c:277 msgid "This entry is marked as important." msgstr "Αυτή ή καταχώρηση έχει χαρακτηριστεί ως σημαντική." @@ -635,75 +565,271 @@ msgid "Line spacing:" msgstr "Απόσταση γραμμών:" -#: ../src/storage-manager.c:257 +#: ../src/search-dialog.c:223 +msgid "Search canceled." +msgstr "Η αναζήτηση ακυρώθηκε." + +#. Translators: This is an error message wrapper for when searches encounter an error. The placeholder is for an error message. +#: ../src/search-dialog.c:226 +#, c-format +msgid "Error: %s" +msgstr "Σφάλμα: %s" + +#. Success! +#: ../src/search-dialog.c:231 +#, c-format +msgid "Found %d entry:" +msgid_plural "Found %d entries:" +msgstr[0] "Βρέθηκε %d καταχώριση:" +msgstr[1] "Βρέθηκαν %d καταχωρίσεις:" + +#: ../src/search-dialog.c:280 +#| msgid "_Search…" +msgid "Searching…" +msgstr "Αναζήτηση…" + +#: ../src/storage-manager.c:275 #, c-format msgid "GPGME is not at least version %s" msgstr "Το GPGME είναι κάτω από την ελάχιστη έκδοση %s" -#: ../src/storage-manager.c:266 +#: ../src/storage-manager.c:284 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "Το GPGME δεν υποστηρίζει το OpenPGP: %s" -#: ../src/storage-manager.c:275 +#: ../src/storage-manager.c:293 #, c-format msgid "Error creating cipher context: %s" msgstr "Σφάλμα ανοίγματος κρυπτογραφημένου περιβάλλοντος: %s" -#: ../src/storage-manager.c:304 +#: ../src/storage-manager.c:322 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Σφάλμα ανοίγματος κρυπτογραφημένου αρχείου βάσης δεδομένων \"%s\": %s" -#: ../src/storage-manager.c:323 +#: ../src/storage-manager.c:341 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Σφάλμα ανοίγματος απλού αρχείου βάσης δεδομένων \"%s\": %s" -#: ../src/storage-manager.c:371 -msgid "The encrypted database is empty. The plain database file has been left undeleted as backup." -msgstr "Η κρυπτογραφημένη βάση δεδομένων είναι άδεια. Το απλό αρχείο βάσης δεδομένων παραμένει για χρήση ως αντιγράφου ασφαλείας." +#: ../src/storage-manager.c:389 +msgid "" +"The encrypted database is empty. The plain database file has been left " +"undeleted as backup." +msgstr "" +"Η κρυπτογραφημένη βάση δεδομένων είναι άδεια. Το απλό αρχείο βάσης δεδομένων " +"παραμένει για χρήση ως αντιγράφου ασφαλείας." #. Delete the plain file -#: ../src/storage-manager.c:374 +#: ../src/storage-manager.c:392 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "Αδυναμία διαγραφής απλού αρχείου βάσης δεδομένων \"%s\"." -#: ../src/storage-manager.c:415 +#: ../src/storage-manager.c:433 #, c-format msgid "Error decrypting database: %s" msgstr "Σφάλμα αποκρυπτογράφησης βάσης δεδομένων: %s" -#: ../src/storage-manager.c:449 +#: ../src/storage-manager.c:467 #, c-format msgid "Error getting encryption key: %s" msgstr "Σφάλμα ανάκτησης κλειδιού κρυπτογράφησης: %s" -#: ../src/storage-manager.c:470 +#: ../src/storage-manager.c:488 #, c-format msgid "Error encrypting database: %s" msgstr "Σφάλμα κρυπτογράφησης βάσης δεδομένων: %s" -#: ../src/storage-manager.c:572 +#: ../src/storage-manager.c:590 #, c-format -msgid "Could not open database \"%s\". SQLite provided the following error message: %s" -msgstr "Δεν μπορεί να ανοίξει την βάση δεδομένων \"%s\". Το SQLite παρήγαγε το παρακάτω μήνυμα σφάλματος: %s" +msgid "" +"Could not open database \"%s\". SQLite provided the following error message: " +"%s" +msgstr "" +"Δεν μπορεί να ανοίξει την βάση δεδομένων \"%s\". Το SQLite παρήγαγε το " +"παρακάτω μήνυμα σφάλματος: %s" -#: ../src/storage-manager.c:647 +#: ../src/storage-manager.c:667 #, c-format -msgid "Could not run query \"%s\". SQLite provided the following error message: %s" -msgstr "Δεν μπορεί να εκτελέσει το ερώτημα \"%s\". To SQLite παρήγαγε το παρακάτω μήνυμα σφάλματος: %s" +msgid "" +"Could not run query \"%s\". SQLite provided the following error message: %s" +msgstr "" +"Δεν μπορεί να εκτελέσει το ερώτημα \"%s\". To SQLite παρήγαγε το παρακάτω " +"μήνυμα σφάλματος: %s" -#: ../src/storage-manager.c:964 +#: ../src/storage-manager.c:970 msgid "Error deserializing entry into buffer while searching." -msgstr "Σφάλμα αποσειριοποίησης εισαγωγής στην ενδιάμεση μνήμη κατά την αναζήτηση." +msgstr "" +"Σφάλμα αποσειριοποίησης εισαγωγής στην ενδιάμεση μνήμη κατά την αναζήτηση." #. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:116 +#: ../src/widgets/calendar.c:176 msgid "Important!" msgstr "Σημαντικό!" +#: ../src/widgets/calendar-button.c:140 +#, c-format +#| msgid "UI file \"%s\" could not be loaded" +msgid "UI file \"%s\" could not be loaded: %s" +msgstr "Το αρχείο UI \"%s\" δεν μπορεί να φορτωθεί: %s" + +#: ../src/widgets/calendar-button.c:150 +msgid "Can't load calendar window object from UI file" +msgstr "Αδύνατη η φόρτωση αντικειμένου παραθύρου ημερολογίου από αρχείο UI" + +#: ../src/widgets/calendar-window.c:80 +msgid "Unknown input device" +msgstr "Άγνωστη συσκευή εισόδου" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:400 +msgid "Remove tag" +msgstr "Αφαίρεση ετικέτας" + +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Εισαγωγή URI" + +#~ msgid "Main window X position" +#~ msgstr "Θέση X κεντρικού παραθύρου" + +#~ msgid "Main window Y position" +#~ msgstr "Θέση Y κεντρικού παραθύρου" + +#~ msgid "Main window height" +#~ msgstr "Ύψος κεντρικού παραθύρου" + +#~ msgid "Main window maximization" +#~ msgstr "Μεγιστοποίηση κεντρικού παραθύρου" + +#~ msgid "Main window width" +#~ msgstr "Πλάτος κεντρικού παραθύρου" + +#~ msgid "The X position of the main window." +#~ msgstr "Η θέση X του κεντρικού παραθύρου." + +#~ msgid "The Y position of the main window." +#~ msgstr "Η θέση Y του κεντρικού παραθύρου." + +#~ msgid "The height of the main window." +#~ msgstr "Το Ύψος του κεντρικού παραθύρου." + +#~ msgid "The width of the main window." +#~ msgstr "Το πλάτος του κεντρικού παραθύρου." + +#~ msgid "Whether the main window should start maximized." +#~ msgstr "Εάν το κεντρικό παράθυρο θα μπορούσε να ξεκινάει μεγιστοποιημένο." + +#~ msgid "Add a definition for the currently selected text." +#~ msgstr "Προσθήκη ενός ορισμού για το τρέχον επιλεγμένο κείμενο." + +#~ msgid "Definition Description" +#~ msgstr "Περιγραφή ορισμών" + +#~ msgid "Definition List" +#~ msgstr "Λίστα ορισμών" + +#~ msgid "Definition Type" +#~ msgstr "Τύπος ορισμού" + +#~ msgid "Definition type:" +#~ msgstr "Τύπος ορισμού:" + +#~ msgid "Nothing selected" +#~ msgstr "Δεν έχει επιλεχτεί τίποτα" + +#~ msgid "Results:" +#~ msgstr "Αποτελέσματα:" + +#~ msgid "View" +#~ msgstr "Προβολή" + +#~ msgid "View Event" +#~ msgstr "Προβολή γεγονότος" + +#~ msgid "_Add Definition" +#~ msgstr "_Προσθήκη ορισμού" + +#~ msgid "_Definitions" +#~ msgstr "_Ορισμοί" + +#~ msgid "_Edit" +#~ msgstr "_Επεξεργασία" + +#~ msgid "_Export…" +#~ msgstr "_Εξαγωγή..." + +#~ msgid "_File" +#~ msgstr "_Αρχείο" + +#~ msgid "_Import…" +#~ msgstr "Ε_ισαγωγή..." + +#~ msgid "_Print…" +#~ msgstr "Εκτύ_πωση" + +#~ msgid "_Remove Definition" +#~ msgstr "_Διαγραφή ορισμού" + +#~ msgid "_View Definitions" +#~ msgstr "_Προβολή ορισμών" + +#~ msgid "Add Definition" +#~ msgstr "Προσθήκη ορισμού" + +#~ msgid "Definition Manager" +#~ msgstr "Διαχείριση ορισμών" + +#~ msgid "Are you sure you want to delete the definition for \"%s\"?" +#~ msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τον ορισμό για \"%s\";" + +#~ msgid "Contact" +#~ msgstr "Επαφή" + +#~ msgid "An Evolution contact." +#~ msgstr "Μία επαφή του Evolution." + +#~ msgid "Select Contact" +#~ msgstr "Επιλογή επαφής" + +#~ msgid "Error opening contact" +#~ msgstr "Σφάλμα ανοίγματος επαφής" + +#~ msgid "Error opening Evolution" +#~ msgstr "Σφάλμα ανοίγματος Evolution" + +#~ msgid "File" +#~ msgstr "Αρχείο" + +#~ msgid "An attached file." +#~ msgstr "Συνημμένο αρχείο." + +#~ msgid "Error opening file" +#~ msgstr "Σφάλμα ανοίγματος αρχείου" + +#~ msgid "Select File" +#~ msgstr "Επιλογή αρχείου" + +#~ msgid "Note" +#~ msgstr "Σημείωση" + +#~ msgid "A note about an important event." +#~ msgstr "Μία σημείωση για ένα σοβαρό γεγονός." + +#~ msgid "URI" +#~ msgstr "URI" + +#~ msgid "A URI of a file or web page." +#~ msgstr " URI αρχείου ή ιστοσελίδας" + +#~ msgid "URI: " +#~ msgstr "URI:" + +#~ msgid "- Manage your diary" +#~ msgstr "- Διαχείριση του ημερολογίου σου" + #~ msgid "F-Spot Photo" #~ msgstr "Φωτογραφία F-Spot" diff -Nru almanah-0.10.8/po/es.po almanah-0.11.0/po/es.po --- almanah-0.10.8/po/es.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/es.po 2013-11-24 16:24:23.000000000 +0000 @@ -11,8 +11,8 @@ "Project-Id-Version: diary.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-15 10:07+0000\n" -"PO-Revision-Date: 2013-02-19 12:22+0100\n" +"POT-Creation-Date: 2013-11-17 17:58+0000\n" +"PO-Revision-Date: 2013-11-20 13:30+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "Language: \n" @@ -22,8 +22,56 @@ "X-Generator: Gtranslator 2.91.5\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:135 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Diario Almanah es una aplicación que le permite mantener un diario de su " +"vida." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Puede cifrar el diario para preservar su privacidad. Tiene capacidad de " +"edición, incluyendo formateado del texto e impresión y muestra una lista de " +"eventos que han ocurrido (en su equipo) para cada día (igual que las tareas " +"y las citas de Evolution)." + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Buscar" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "Prefere_ncias" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Importar" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Exportar" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_imprimir diario" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "A_cerca del Diario Almanah" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Salir" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Diario Almanah" @@ -32,41 +80,14 @@ msgstr "Mantenga un diario personal" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Diario" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "ID de la clave de cifrado de la base de datos" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"La ID de la clave usada para cifrar y descifrar la base de datos, si Almanah " -"se ha construido con soporte de cifrado. Déjelo en blanco para desactivar e " -"cifrado de la base de datos." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Revisión ortográfica de idiomas" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "" -"La configuración local específica del idioma en el cual se comprobará la " -"ortografía de las entradas." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "¿Activar revisión ortográfica?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "La corrección ortográfica de las entradas está activada." +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "diario;" #: ../data/almanah.ui.h:1 msgid "Select Date…" @@ -113,108 +134,119 @@ msgstr "Cambiar si la entrada actual es marcada como importante." #: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Mostrar etiquetas" + +#: ../data/almanah.ui.h:12 +msgid "Show tags for the current entry" +msgstr "Mostrar etiquetas para la entrada actual" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "Ay_uda" -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "Ir a _hoy" -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Saltar a la fecha actual en el diario." -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Calendario" -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Área de edición de entrada" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Eventos pasados" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Lista de eventos pasados" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Buscar" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Buscar" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Lista de resultados" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Ver entrada" -#: ../data/almanah.ui.h:22 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "ej. «14/03/2009» o «14 de marzo 2009»." -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "ej. “http://google.com/” o “file:///home/yo/Fotos/foto.jpg”." -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Entradas exitosas" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Entradas combinadas" -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Entradas fallidas" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Importar lista de resultados" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Buscar" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Prefere_ncias" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "ID de la clave de cifrado de la base de datos" -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importar" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"La ID de la clave usada para cifrar y descifrar la base de datos, si Almanah " +"se ha construido con soporte de cifrado. Déjelo en blanco para desactivar e " +"cifrado de la base de datos." -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportar" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Revisión ortográfica de idiomas" -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_imprimir diario" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"La configuración local específica del idioma en el cual se comprobará la " +"ortografía de las entradas." -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "A_cerca del Diario Almanah" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "¿Activar revisión ortográfica?" -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Salir" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "La corrección ortográfica de las entradas está activada." -#: ../src/application.c:243 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Error al abrir la base de datos" #. Error loading the CSS -#: ../src/application.c:272 +#: ../src/application.c:275 #, c-format msgid "" "Couldn't load the CSS file '%s'. The interface might not be styled correctly" @@ -222,11 +254,11 @@ "No se pudo cargar el archivo CSS «%s». Es posible que la interfaz no se " "muestre correctamente." -#: ../src/application.c:316 +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Activar modo de depuración" -#: ../src/application.c:333 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -234,24 +266,24 @@ "tiempo." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "No se pudieron analizar las opciones de la línea de comandos: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Error al cifrar la base de datos: %s" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:194 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "No se pudo cargar el archivo de interfaz de usuario «%s»" -#: ../src/application.c:532 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -263,7 +295,7 @@ "Software Foundation; tanto en la versión 3 de la Licencia como (a su " "elección) cualquier versión posterior." -#: ../src/application.c:536 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -275,7 +307,7 @@ "PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Publica General para más " "detalles." -#: ../src/application.c:540 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -283,12 +315,12 @@ "Debería haber recibido una copia de la Licencia Pública General GNU junto " "con Almanah. Si no la recibió, consulte ." -#: ../src/application.c:555 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Un diario útil, almacenando %u entradas." -#: ../src/application.c:559 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -297,13 +329,13 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:577 msgid "translator-credits" msgstr "" "Jorge González , 2008, 2010\n" "Carlos Albornoz , 2009" -#: ../src/application.c:571 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Página web de Almanah" @@ -342,11 +374,11 @@ msgid "A task on an Evolution calendar." msgstr "Una tarea en el calendario de Evolution." -#: ../src/export-operation.c:45 ../src/import-operation.c:45 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Archivos de texto" -#: ../src/export-operation.c:46 +#: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " "names in the format 'yyyy-mm-dd', and no extension. All entries will be " @@ -356,11 +388,11 @@ "una por entrada, uno por entrada, con nombres en formato «aaaa-mm-dd», y sin " "extensión. Cualquiera y todos los archivos parecidos serán importados." -#: ../src/export-operation.c:50 ../src/import-operation.c:50 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "Base de datos" -#: ../src/export-operation.c:51 +#: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." @@ -368,6 +400,12 @@ "Seleccionar un _archivo para completar la copia de la base de datos no " "cifrada del Diario Almanah." +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +#| msgid "Error opening encrypted database file \"%s\": %s" +msgid "Error changing exported file permissions: %s" +msgstr "Error al cambiar los permisos del archivo exportado: %s" + #: ../src/import-export-dialog.c:202 msgid "Import _mode: " msgstr "_Modo importar: " @@ -411,8 +449,8 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:566 -#: ../src/main-window.c:596 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 #: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e de %B de %Y" @@ -463,38 +501,38 @@ "Entrada importada desde \"%s\":\n" "\n" -#: ../src/main-window.c:570 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "¿Está seguro de que quiere editar esta entrada del diario para %s?" -#: ../src/main-window.c:600 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "¿Está seguro de que quiere borrar esta entrada del diario para %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:709 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Etiqueta de texto «%s» desconocida o duplicada en la entrada. Ignorando." -#: ../src/main-window.c:908 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Error abriendo URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1082 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s - %s" -#: ../src/main-window.c:1161 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "No se pudo cargar el contenido de la entrada: %s" -#: ../src/main-window.c:1326 +#: ../src/main-window.c:1348 msgid "Spelling checker could not be initialized" msgstr "No se pudo inicializar el corrector ortográfico: %s" @@ -571,32 +609,32 @@ msgid "Searching…" msgstr "Buscando…" -#: ../src/storage-manager.c:275 +#: ../src/storage-manager.c:276 #, c-format msgid "GPGME is not at least version %s" msgstr "La versión de GPGME no es al menos la %s" -#: ../src/storage-manager.c:284 +#: ../src/storage-manager.c:285 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME no soporta OpenPGP: %s" -#: ../src/storage-manager.c:293 +#: ../src/storage-manager.c:294 #, c-format msgid "Error creating cipher context: %s" msgstr "Error al crear el contexto de cifrado: %s" -#: ../src/storage-manager.c:322 +#: ../src/storage-manager.c:323 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Error al abrir el archivo cifrado de la base de datos «%s»: %s" -#: ../src/storage-manager.c:341 +#: ../src/storage-manager.c:342 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Error al abrir el archivo plano de la base de datos «%s»: %s" -#: ../src/storage-manager.c:389 +#: ../src/storage-manager.c:390 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -605,27 +643,47 @@ "ha dejado como copia de seguridad." #. Delete the plain file -#: ../src/storage-manager.c:392 +#: ../src/storage-manager.c:393 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "No se pudo borrar el archivo plano de la base de datos «%s»." -#: ../src/storage-manager.c:433 +#: ../src/storage-manager.c:434 #, c-format msgid "Error decrypting database: %s" msgstr "Error al descifrar la base de datos: %s" -#: ../src/storage-manager.c:467 +#: ../src/storage-manager.c:468 #, c-format msgid "Error getting encryption key: %s" msgstr "Error al obtener la clave de cifrado: %s" -#: ../src/storage-manager.c:488 +#: ../src/storage-manager.c:489 #, c-format msgid "Error encrypting database: %s" msgstr "Error al cifrar la base de datos: %s" -#: ../src/storage-manager.c:590 +#: ../src/storage-manager.c:549 +#, c-format +#| msgid "Error opening plain database file \"%s\": %s" +msgid "Error changing database backup file permissions: %s" +msgstr "" +"Error al cambiar los permisos del archivo de respaldo de la base de datos: %s" + +#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#, c-format +#| msgid "Error opening plain database file \"%s\": %s" +msgid "Error changing database file permissions: %s" +msgstr "Error al cambiar los permisos del archivo de la base de datos: %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#, c-format +#| msgid "Error opening plain database file \"%s\": %s" +msgid "Error backing up file ‘%s’: %s" +msgstr "Error al crear el archivo de respaldo «%s»: %s" + +#: ../src/storage-manager.c:620 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -634,7 +692,7 @@ "No se pudo abrir la base de datos «%s». SQLite proporcionó el siguiente " "mensaje de error: %s" -#: ../src/storage-manager.c:667 +#: ../src/storage-manager.c:704 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" @@ -642,14 +700,13 @@ "No se pudo ejecutar la consulta «%s». SQLite proporcionó el siguiente mensaje " "de error: %s" -#: ../src/storage-manager.c:970 +#: ../src/storage-manager.c:1010 msgid "Error deserializing entry into buffer while searching." msgstr "Error al deserializar la entrada en el búfer mientras se buscaba." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Importante" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Introducir URI" #: ../src/widgets/calendar-button.c:140 #, c-format @@ -661,18 +718,37 @@ msgstr "" "No se puede cargar el objeto de ventana de calendario desde el archivo de IU" +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Importante" + #: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Dispositivo de entrada desconocido" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "añadir etiqueta" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Escriba la etiqueta y pulse Intro para guardarla" + +#: ../src/widgets/tag-accessible.c:165 +#| msgid "Show tags for the current entry" +msgid "Remove the tag from the entry" +msgstr "Quitar la etiqueta de la entrada" + #. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? -#: ../src/widgets/tag.c:400 +#: ../src/widgets/tag.c:416 msgid "Remove tag" msgstr "Quitar etiqueta" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Introducir URI" +#: ../src/widgets/tag-entry.c:85 +#| msgid "Search entry" +msgid "Tag entry" +msgstr "Etiquetar entrada" #~ msgid "_File" #~ msgstr "_Archivo" diff -Nru almanah-0.10.8/po/fr.po almanah-0.11.0/po/fr.po --- almanah-0.10.8/po/fr.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/fr.po 2013-10-20 11:57:20.000000000 +0000 @@ -8,23 +8,55 @@ # Yannick Tailliez , 2008. # Robert-André Mauchin , 2008. # Pierre Lemaire , 2008. +# Alain Lojewski , 2013. # msgid "" msgstr "" "Project-Id-Version: almanah HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-05-31 16:45+0000\n" -"PO-Revision-Date: 2012-06-02 20:57+0200\n" -"Last-Translator: Pierre Henry \n" +"POT-Creation-Date: 2013-03-07 20:40+0000\n" +"PO-Revision-Date: 2013-03-10 07:30+0100\n" +"Last-Translator: Alain Lojewski \n" "Language-Team: GNOME French Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" +"X-Generator: Poedit 1.5.4\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:101 -#: ../src/main-window.c:149 +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Rechercher" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "Préfér_ences" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Importer" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Exporter" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Imprimer le journal" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "À _propos de Journal Almanah" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Quitter" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 +#: ../src/main-window.c:135 msgid "Almanah Diary" msgstr "Journal Almanah" @@ -32,97 +64,36 @@ msgid "Keep a personal diary" msgstr "Tenir un journal personnel" -#: ../data/almanah.desktop.in.h:3 +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 msgid "Diary" msgstr "Journal" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "Identifiant de la clé de chiffrement de la base de données" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"L'identifiant de la clé à utiliser pour chiffrer et déchiffrer la base de " -"données, pour le cas où Almanah a été compilé avec la prise en charge du " -"chiffrement. Le laisser vide pour désactiver le chiffrement de la base de " -"données." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Langue pour la vérification orthographique" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "" -"Indication de la langue à utiliser pour la vérification orthographique des " -"entrées." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Vérification orthographique activée ?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "" -"Indique si la correction orthographique est activée dans les zones de saisie." - #: ../data/almanah.ui.h:1 -msgid "_File" -msgstr "_Fichier" - -#: ../data/almanah.ui.h:2 -msgid "_Import…" -msgstr "_Importer…" - -#: ../data/almanah.ui.h:3 -msgid "_Export…" -msgstr "_Exporter…" - -#: ../data/almanah.ui.h:4 -msgid "_Print…" -msgstr "_Imprimer…" - -#: ../data/almanah.ui.h:5 -msgid "_Edit" -msgstr "É_dition" - -#: ../data/almanah.ui.h:6 msgid "Select Date…" -msgstr "Sélectionner la date..." +msgstr "Sélectionner la date…" -#: ../data/almanah.ui.h:7 -msgid "_Search…" -msgstr "_Rechercher..." - -#: ../data/almanah.ui.h:8 -msgid "Pr_eferences" -msgstr "_Préférences" - -#: ../data/almanah.ui.h:9 +#: ../data/almanah.ui.h:2 msgid "F_ormat" msgstr "F_ormat" -#: ../data/almanah.ui.h:10 +#: ../data/almanah.ui.h:3 msgid "Toggle whether the currently selected text is bold." msgstr "Indique si le texte actuellement sélectionné est en gras." -#: ../data/almanah.ui.h:11 +#: ../data/almanah.ui.h:4 msgid "Toggle whether the currently selected text is italic." msgstr "Indique si le texte actuellement sélectionné est en italique." -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:5 msgid "Toggle whether the currently selected text is underlined." msgstr "Indique si le texte actuellement sélectionné est souligné." -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:6 msgid "Add/Remove _Hyperlink" -msgstr "Ajoute/enlève un _hyperlien" +msgstr "Ajouter/enlèver un _hyperlien" -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:7 msgid "" "Add or remove a hyperlink from the currently selected text to a specified " "URI." @@ -130,157 +101,256 @@ "Ajoute ou enlève un hyperlien du texte actuellement sélectionné vers un URI " "donné." -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:8 msgid "Insert _Time" msgstr "Insérer l'_heure" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:9 msgid "I_mportant" msgstr "I_mportant" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:10 msgid "Toggle whether the current entry is marked as important." msgstr "Indique si l'élément actuel est marqué comme important." -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:11 msgid "_Help" msgstr "Aid_e" -#: ../data/almanah.ui.h:19 +#: ../data/almanah.ui.h:12 msgid "Go to _Today" msgstr "Aller à _aujourd'hui" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:13 msgid "Jump to the current date in the diary." -msgstr "Saute à la date actuelle de l'agenda." - -#: ../data/almanah.ui.h:21 -msgid "Font Style" -msgstr "Style de la police" - -#: ../data/almanah.ui.h:22 -msgid "Change font style for selected text." -msgstr "Modifier le style de la police pour le texte sélectionné." +msgstr "Saute à la date actuelle du journal." -#: ../data/almanah.ui.h:23 -msgid "_Font Style" -msgstr "_Style de la police" - -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:14 msgid "Calendar" msgstr "Calendrier" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:15 msgid "Entry editing area" msgstr "Zone de saisie des entrées" -#: ../data/almanah.ui.h:26 -msgid "Past Events" +#: ../data/almanah.ui.h:16 +msgid "Past events" msgstr "Événements passés" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:17 msgid "Past Event List" msgstr "Liste des événements passés" -#: ../data/almanah.ui.h:28 +#: ../data/almanah.ui.h:18 msgid "Search entry" msgstr "Zone de saisie de la recherche" -#: ../data/almanah.ui.h:29 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 msgid "Search" msgstr "Rechercher" -#: ../data/almanah.ui.h:30 +#: ../data/almanah.ui.h:20 msgid "Result List" msgstr "Liste des résultats" -#: ../data/almanah.ui.h:31 +#: ../data/almanah.ui.h:21 msgid "View Entry" msgstr "Afficher l'élément" -#: ../data/almanah.ui.h:32 +#: ../data/almanah.ui.h:22 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "par ex. « 14/03/2009 » ou « 14 mars 2009 »." -#: ../data/almanah.ui.h:33 +#: ../data/almanah.ui.h:23 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." -msgstr "par ex. « http://google.com/ » ou « file:///home/moi/Photos/photo.jpg »." +msgstr "" +"par ex. « http://google.com/ » ou « file:///home/moi/Photos/photo.jpg »." -#: ../data/almanah.ui.h:34 +#: ../data/almanah.ui.h:24 msgid "Successful Entries" msgstr "Éléments corrects" -#: ../data/almanah.ui.h:35 +#: ../data/almanah.ui.h:25 msgid "Merged Entries" msgstr "Éléments fusionnés" -#: ../data/almanah.ui.h:36 +#: ../data/almanah.ui.h:26 msgid "Failed Entries" msgstr "Éléments non importés" -#: ../data/almanah.ui.h:37 +#: ../data/almanah.ui.h:27 msgid "Import Results List" msgstr "Liste des résultats de l'importation" -#: ../src/application.c:205 +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "Identifiant de la clé de chiffrement de la base de données" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"L'identifiant de la clé à utiliser pour chiffrer et déchiffrer la base de " +"données, pour le cas où Almanah a été compilé avec la prise en charge du " +"chiffrement. Le laisser vide pour désactiver le chiffrement de la base de " +"données." + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Langue pour la vérification orthographique" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"Indication de la langue à utiliser pour la vérification orthographique des " +"entrées." + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Vérification orthographique activée ?" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "" +"Indique si la correction orthographique est activée dans les zones de saisie." + +#: ../src/application.c:243 msgid "Error opening database" msgstr "Erreur lors de l'ouverture de la base de données" -#: ../src/application.c:253 +#. Error loading the CSS +#: ../src/application.c:272 +#, c-format +msgid "" +"Couldn't load the CSS file '%s'. The interface might not be styled correctly" +msgstr "" +"Impossible de charger le fichier CSS « %s ». Il se peut que l'interface ne " +"soit pas correctement agencée" + +#: ../src/application.c:316 msgid "Enable debug mode" msgstr "Activer le mode de débogage" -#: ../src/application.c:270 +#: ../src/application.c:333 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Gérer votre journal. Une seule instance du programme peut être lancée " -"simultanément." +"n'importe quand." #. Print an error -#: ../src/application.c:281 +#: ../src/application.c:344 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Les options de la ligne de commande n'ont pas pu être analysées : %s\n" -#: ../src/application.c:300 +#: ../src/application.c:363 msgid "Error encrypting database" msgstr "Erreur lors du chiffrement de la base de données" -#: ../src/date-entry-dialog.c:72 -msgid "Select Date" -msgstr "Sélectionner la date" - -#: ../src/date-entry-dialog.c:129 ../src/import-export-dialog.c:168 -#: ../src/import-export-dialog.c:472 ../src/main-window.c:217 -#: ../src/preferences-dialog.c:191 ../src/search-dialog.c:97 -#: ../src/uri-entry-dialog.c:128 +#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 +#: ../src/main-window.c:194 ../src/preferences-dialog.c:191 +#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Le fichier d'interface « %s » n'a pas pu être chargé" +#: ../src/application.c:532 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"Almanah est un logiciel libre ; vous pouvez le redistribuer et/ou le " +"modifier au titre des clauses de la Licence Publique Générale GNU, telle que " +"publiée par la Free Software Foundation ; soit la version 3 de la Licence, " +"ou (à votre discrétion) une version ultérieure quelconque." + +#: ../src/application.c:536 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Almanah est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE " +"GARANTIE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE " +"CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. Voir la Licence Publique Générale " +"GNU pour plus de détails." + +#: ../src/application.c:540 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU " +"avec Almanah. Si ce n'est pas le cas, consultez ." + +#: ../src/application.c:555 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "Un organisateur de journal personnel bien utile, stockant %u entrées." + +#: ../src/application.c:559 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Copyright © 2008-2009 Philip Withnall" + +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:567 +msgid "translator-credits" +msgstr "" +"Philip Withnall \n" +"Jean-François Martin \n" +"Claude Paroz \n" +"Yannick Tailliez \n" +"Robert-André Mauchin \n" +"Pierre Lemaire " + +#: ../src/application.c:571 +msgid "Almanah Website" +msgstr "Site Web d'Almanah" + +#: ../src/date-entry-dialog.c:72 +msgid "Select Date" +msgstr "Sélectionner la date" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." msgstr "Numéro de version des données %u non valide." -#: ../src/events/calendar-appointment.c:49 +#: ../src/events/calendar-appointment.c:51 msgid "Calendar Appointment" -msgstr "Rendez-vous de calendrier" +msgstr "Rendez-vous de Agenda" -#: ../src/events/calendar-appointment.c:50 +#: ../src/events/calendar-appointment.c:52 msgid "An appointment on an Evolution calendar." msgstr "Un rendez-vous dans un calendrier Evolution." -#: ../src/events/calendar-appointment.c:119 ../src/events/calendar-task.c:108 +#. Translators: This is a time string with the format hh:mm +#: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 +#, c-format +msgid "%.2d:%.2d" +msgstr "%.2d:%.2d" + +#: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 msgid "Error launching Evolution" msgstr "Erreur lors du lancement d'Evolution" -#: ../src/events/calendar-task.c:49 +#: ../src/events/calendar-task.c:51 msgid "Calendar Task" -msgstr "Tâche de calendrier" +msgstr "Tâche de Agenda" -#: ../src/events/calendar-task.c:50 +#: ../src/events/calendar-task.c:52 msgid "A task on an Evolution calendar." msgstr "Une tâche dans un calendrier Evolution." @@ -296,7 +366,7 @@ msgstr "" "Choisissez un _dossier afin d'y exporter les articles sous forme de fichiers " "texte, un par article. Les noms de fichier sont créés selon le modèle « aaaa-" -"mm-jj », sans extension. Tous les articles seront exportés dans un format " +"mm-jj », sans extension. Tous les articles sont exportés dans un format " "texte brut, non chiffré." #: ../src/export-operation.c:50 ../src/import-operation.c:50 @@ -328,15 +398,6 @@ msgid "Export Entries" msgstr "Exporter les éléments" -#. Set the button label -#: ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importer" - -#: ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exporter" - #: ../src/import-export-dialog.c:245 msgid "Import failed" msgstr "L'importation a échoué" @@ -363,9 +424,9 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:593 -#: ../src/main-window.c:623 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:317 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:566 +#: ../src/main-window.c:596 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A %e %B %Y" @@ -382,7 +443,7 @@ #: ../src/import-operation.c:51 msgid "Select a database _file created by Almanah Diary to import." msgstr "" -"Choisissez un _fichier de base de données créé par Journal Almanah afin de " +"Choisissez un _fichier base de données créé par Journal Almanah afin de " "l'importer." #: ../src/import-operation.c:248 @@ -416,94 +477,37 @@ "Élément importé de « %s » :\n" "\n" -#: ../src/main-window.c:597 +#: ../src/main-window.c:570 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Voulez-vous vraiment modifier cette entrée de journal du %s ?" -#: ../src/main-window.c:627 +#: ../src/main-window.c:600 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Voulez-vous vraiment supprimer cette entrée de journal du %s ?" #. Print a warning about the unknown tag -#: ../src/main-window.c:736 +#: ../src/main-window.c:709 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." -msgstr "" -"L'étiquette texte « %s » de l'entrée est inconnue ou en deux exemplaires. " -"Ignorée." +msgstr "Étiquette texte « %s » de l'entrée inconnue ou en double. Ignorée." -#: ../src/main-window.c:1052 +#: ../src/main-window.c:908 msgid "Error opening URI" msgstr "Erreur lors de l'ouverture de l'URI" -#: ../src/main-window.c:1168 -msgid "" -"Almanah is free software: you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation, either version 3 of the License, or (at your option) any later " -"version." -msgstr "" -"Almanah est un logiciel libre ; vous pouvez le redistribuer et/ou le " -"modifier au titre des clauses de la Licence Publique Générale GNU, telle que " -"publiée par la Free Software Foundation ; soit la version 3 de la Licence, " -"ou (à votre discrétion) une version ultérieure quelconque." - -#: ../src/main-window.c:1172 -msgid "" -"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." -msgstr "" -"Almanah est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE " -"GARANTIE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE " -"CONFORMITÉ À UNE UTILISATION PARTICULIÈRE. Voir la Licence Publique Générale " -"GNU pour plus de détails." - -#: ../src/main-window.c:1176 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"Almanah. If not, see ." -msgstr "" -"Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU " -"avec Almanah. Si ce n'est pas le cas, consultez ." - -#: ../src/main-window.c:1191 +#. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place +#: ../src/main-window.c:1082 #, c-format -msgid "A helpful diary keeper, storing %u entries." -msgstr "Un organisateur de journal personnel bien utile, stockant %u entrées." - -#: ../src/main-window.c:1195 -msgid "Copyright © 2008-2009 Philip Withnall" -msgstr "Copyright © 2008-2009 Philip Withnall" - -#. Translators: please include your names here to be credited for your hard work! -#. * Format: -#. * "Translator name 1 \n" -#. * "Translator name 2 " -#. -#: ../src/main-window.c:1203 -msgid "translator-credits" -msgstr "" -"Philip Withnall \n" -"Jean-François Martin \n" -"Claude Paroz \n" -"Yannick Tailliez \n" -"Robert-André Mauchin \n" -"Pierre Lemaire " +msgid "%s @ %s" +msgstr "%s @ %s" -#: ../src/main-window.c:1207 -msgid "Almanah Website" -msgstr "Site Web d'Almanah" - -#: ../src/main-window.c:1439 +#: ../src/main-window.c:1161 msgid "Entry content could not be loaded" msgstr "Le contenu de l'entrée n'a pas pu être chargé" -#: ../src/main-window.c:1534 +#: ../src/main-window.c:1326 msgid "Spelling checker could not be initialized" msgstr "Le correcteur orthographique n'a pas pu être initialisé" @@ -580,36 +584,36 @@ msgid "Searching…" msgstr "Recherche en cours…" -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:275 #, c-format msgid "GPGME is not at least version %s" -msgstr "GPGME n'est pas au moins à la version %s" +msgstr "La version de GPGME est inférieure à %s" -#: ../src/storage-manager.c:268 +#: ../src/storage-manager.c:284 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME ne prend pas en charge OpenPGP : %s" -#: ../src/storage-manager.c:277 +#: ../src/storage-manager.c:293 #, c-format msgid "Error creating cipher context: %s" msgstr "Erreur lors de la création du contexte de chiffrement : %s" -#: ../src/storage-manager.c:306 +#: ../src/storage-manager.c:322 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "" -"Erreur lors de l'ouverture du fichier chiffré de la base de données « %s » : %" -"s" +"Erreur lors de l'ouverture du fichier chiffré de la base de données « %s » : " +"%s" -#: ../src/storage-manager.c:325 +#: ../src/storage-manager.c:341 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "" -"Erreur lors de l'ouverture du fichier en clair de la base de données « %s » : " -"%s" +"Erreur lors de l'ouverture du fichier en clair de la base de données " +"« %s » : %s" -#: ../src/storage-manager.c:373 +#: ../src/storage-manager.c:389 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -618,28 +622,28 @@ "n'a pas été supprimé et est disponible comme sauvegarde." #. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/storage-manager.c:392 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "" "Impossible de supprimer le fichier en clair de la base de données « %s »." -#: ../src/storage-manager.c:417 +#: ../src/storage-manager.c:433 #, c-format msgid "Error decrypting database: %s" msgstr "Erreur lors du déchiffrement de la base de données : %s" -#: ../src/storage-manager.c:451 +#: ../src/storage-manager.c:467 #, c-format msgid "Error getting encryption key: %s" msgstr "Erreur lors de l'obtention de la clé de chiffrement : %s" -#: ../src/storage-manager.c:472 +#: ../src/storage-manager.c:488 #, c-format msgid "Error encrypting database: %s" msgstr "Erreur lors du chiffrement de la base de données : %s" -#: ../src/storage-manager.c:574 +#: ../src/storage-manager.c:590 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -648,7 +652,7 @@ "Impossible d'ouvrir la base de données « %s ». SQLite a fourni le message " "d'erreur suivant : %s" -#: ../src/storage-manager.c:651 +#: ../src/storage-manager.c:667 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" @@ -656,43 +660,37 @@ "Impossible de lancer la requête « %s ». SQLite a fourni le message d'erreur " "suivant : %s" -#: ../src/storage-manager.c:954 +#: ../src/storage-manager.c:973 msgid "Error deserializing entry into buffer while searching." msgstr "" "Erreur lors de la désérialisation de l'entrée dans le tampon pendant la " "recherche." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Important !" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Saisissez l'URI" -#: ../src/widgets/calendar-button.c:135 +#: ../src/widgets/calendar-button.c:140 #, c-format msgid "UI file \"%s\" could not be loaded: %s" msgstr "Le fichier d'interface « %s » n'a pas pu être chargé : %s" -#: ../src/widgets/calendar-button.c:145 +#: ../src/widgets/calendar-button.c:150 msgid "Can't load calendar window object from UI file" msgstr "" -"Impossible de charger l'objet fenêtre du calendrier à partir du " -"fichier d'interface" +"Impossible de charger l'objet fenêtre du calendrier à partir du fichier " +"d'interface" -#. Error loading the CSS -#: ../src/widgets/calendar-window.c:63 -#, c-format -msgid "" -"Couldn't load the CSS file '%s' for calendar window. The interface might not " -"be styled correctly" -msgstr "" -"Impossible de charger le fichier CSS « %s » pour la fenêtre du " -"calendrier. Il se peut que l'interface ne soit pas correctement " -"agencée." +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Important !" -#: ../src/widgets/calendar-window.c:100 +#: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Périphérique d'entrée inconnu" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Saisissez l'URI" +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:400 +msgid "Remove tag" +msgstr "Supprimer l'étiquette" diff -Nru almanah-0.10.8/po/gl.po almanah-0.11.0/po/gl.po --- almanah-0.10.8/po/gl.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/gl.po 2013-10-20 11:57:20.000000000 +0000 @@ -8,13 +8,13 @@ # Xosé M. Lamas , 2011. # Oscar Blanco , 2012. # Leandro Regueiro , 2012. -# Fran Dieguez , 2012. +# Fran Dieguez , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 01:07+0100\n" -"PO-Revision-Date: 2012-12-27 01:08+0200\n" +"POT-Creation-Date: 2013-09-13 00:46+0200\n" +"PO-Revision-Date: 2013-09-13 00:48+0200\n" "Last-Translator: Fran Dieguez \n" "Language-Team: gnome-l10n-gl@gnome.org\n" "Language: gl\n" @@ -25,8 +25,56 @@ "X-Generator: Virtaal 0.7.1\n" "X-Poedit-Language: Galician\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:133 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"O diario de Almanah é un aplicativo que lle permite manter un diario da súa " +"vida." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Pode cifrar o diario para preservar a súa privacidade. Ten características " +"para edición, incluíndo o formatado e impresión de texto e móstralle unha " +"lista dos eventos que aconteceron (no seu computador) para cada día (como " +"tarefas e notas de Evolution)." + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Buscar" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "Pr_eferencias" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "I_mportar" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Exportar" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Imprimir diario" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Sobre o Diario Almanah" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Saír" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Diario Almanah" @@ -35,40 +83,14 @@ msgstr "Manteña un diario persoal" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Diario" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "ID da chave de cifrado da base de datos" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"O ID da chave a empregar no cifrado e descifrado da base de datos, se " -"Almanah foi compilado con compatibilidade de cifrado. Deixar en branco para " -"desactivar o cifrado da base de datos." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Idioma da comprobación ortográfica" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "" -"O especificador de idioma da lingua na cal quere comprobar a ortografía." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Desexa activar a comprobación ortográfica?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Indica se a comprobación ortográfica está activada." +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "diario;" #: ../data/almanah.ui.h:1 msgid "Select Date…" @@ -115,108 +137,118 @@ msgstr "Alternar se a entrada actual está marcada como importante." #: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Mostrar etiquetas" + +#: ../data/almanah.ui.h:12 +msgid "Show tags for the current entry" +msgstr "Mostra as etiquetas para a entrada actual" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "_Axuda" -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "Ir ao día de _hoxe" -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Ir á data actual no diario." -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Calendario" -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Área de edición da entrada" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Actividades pasadas" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Lista de actividades pasadas" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Buscar a entrada" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Buscar" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Lista de resultados" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Visualizar a entrada" -#: ../data/almanah.ui.h:22 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "p.ex. «14/03/2009» ou «14 Marzo 2009»." -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "ex. “http://google.com/” ou “file:///home/me/Photos/photo.jpg”." -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Entradas correctas" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Entradas combinadas" -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Entradas fallidas" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Importar a lista de resultados" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Buscar" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Pr_eferencias" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "ID da chave de cifrado da base de datos" -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "I_mportar" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"O ID da chave a empregar no cifrado e descifrado da base de datos, se " +"Almanah foi compilado con compatibilidade de cifrado. Deixar en branco para " +"desactivar o cifrado da base de datos." -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportar" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Idioma da comprobación ortográfica" -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Imprimir diario" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"O especificador de idioma da lingua na cal quere comprobar a ortografía." -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_Sobre o Diario Almanah" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Desexa activar a comprobación ortográfica?" -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Saír" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Indica se a comprobación ortográfica está activada." -#: ../src/application.c:243 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Produciuse un erro ao abrir a base de datos" #. Error loading the CSS -#: ../src/application.c:272 +#: ../src/application.c:275 #, c-format msgid "" "Couldn't load the CSS file '%s'. The interface might not be styled correctly" @@ -224,35 +256,35 @@ "Non foi posíbel cargar o ficheiro de CSS «%s». É posíbel que a interface non " "se mostre correctamente." -#: ../src/application.c:316 +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Activar o modo de depuración" -#: ../src/application.c:333 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Xestione o seu diario. Só é posíbel abrir unha instancia do programa á vez." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Non foi posíbel analizar as opcións da liña de ordes: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Produciuse un erro ao cifrar a base de datos" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:191 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Non foi posíbel cargar o ficheiro da IU «%s»" -#: ../src/application.c:532 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -263,7 +295,7 @@ "os termos da Licenza Pública de GNU publicada pola Free Software Foundation, " "na versión 3 da licenza ou calquera versión posterior." -#: ../src/application.c:536 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -275,7 +307,7 @@ "A UN PROPÓSITO ESPECÍFICO. Olle a Licenza Pública Xeral de GNU para obter " "máis información." -#: ../src/application.c:540 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -283,12 +315,12 @@ "Debería recibir unha copia da Licenza Pública Xeral de GNU xunto co Almanah. " "Se non é así olle ." -#: ../src/application.c:555 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Un xestor de diario moi útil, que almacena %u entradas." -#: ../src/application.c:559 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -297,7 +329,7 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:577 msgid "translator-credits" msgstr "" "Leandro Regueiro , 2012\n" @@ -308,7 +340,7 @@ "Proxecto Trasno - Tradución de software libre ao galego , 1999-2012" -#: ../src/application.c:571 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Sitio web de Almanah" @@ -416,8 +448,8 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:555 -#: ../src/main-window.c:585 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 #: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e de %B de %Y" @@ -468,39 +500,39 @@ "Importouse unha entrada desde «%s»\n" "\n" -#: ../src/main-window.c:559 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Está seguro que quere editar esta entrada do diario para %s?" -#: ../src/main-window.c:589 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Está seguro que quere eliminar esta entrada do diario para %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:698 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Detectouse unha etiqueta de texto «%s» descoñecida ou duplicada na entrada. " "Ignorándoa." -#: ../src/main-window.c:897 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Produciuse un erro ao abrir o URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1071 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1150 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "Non foi posíbel cargar o contido da entrada" -#: ../src/main-window.c:1312 +#: ../src/main-window.c:1344 msgid "Spelling checker could not be initialized" msgstr "Non foi posíbel inicializar a comprobación ortográfica" @@ -577,35 +609,35 @@ msgid "Searching…" msgstr "_Buscando…" -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:275 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME non é cando menos a versión %s" -#: ../src/storage-manager.c:268 +#: ../src/storage-manager.c:284 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME non é compatíbel con OpenPGP: %s" -#: ../src/storage-manager.c:277 +#: ../src/storage-manager.c:293 #, c-format msgid "Error creating cipher context: %s" msgstr "Produciuse un erro ao crear o contexto de cifrado: %s" -#: ../src/storage-manager.c:306 +#: ../src/storage-manager.c:322 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "" "Produciuse un erro ao abrir o ficheiro da base de datos cifrada «%s»: %s" -#: ../src/storage-manager.c:325 +#: ../src/storage-manager.c:341 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "" "Produciuse un erro ao abrir o ficheiro da base de datos en texto plano «%s»: " "%s" -#: ../src/storage-manager.c:373 +#: ../src/storage-manager.c:389 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -614,28 +646,28 @@ "base de datos en texto plano como copia de seguranza." #. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/storage-manager.c:392 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "" "Non foi posíbel eliminar o ficheiro da base de datos en texto plano «%s»." -#: ../src/storage-manager.c:417 +#: ../src/storage-manager.c:433 #, c-format msgid "Error decrypting database: %s" msgstr "Produciuse un erro ao descifrar a base de datos: %s" -#: ../src/storage-manager.c:451 +#: ../src/storage-manager.c:467 #, c-format msgid "Error getting encryption key: %s" msgstr "Produciuse un erro ao obter a chave de cifrado: %s" -#: ../src/storage-manager.c:472 +#: ../src/storage-manager.c:488 #, c-format msgid "Error encrypting database: %s" msgstr "Produciuse un erro ao cifrar a base de datos: %s" -#: ../src/storage-manager.c:574 +#: ../src/storage-manager.c:590 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -644,7 +676,7 @@ "Non foi posíbel abrir a base de datos «%s». SQLite devolveu o seguinte " "mensaxe de erro: %s" -#: ../src/storage-manager.c:651 +#: ../src/storage-manager.c:667 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" @@ -652,14 +684,13 @@ "Non foi posíbel executar a consulta «%s». SQLite devolveu a seguinte mensaxe " "de erro: %s" -#: ../src/storage-manager.c:954 +#: ../src/storage-manager.c:973 msgid "Error deserializing entry into buffer while searching." msgstr "Produciuse un erro ao deserializar a entrada no búfer ao buscar." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Importante" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Introducir URI" #: ../src/widgets/calendar-button.c:140 #, c-format @@ -671,13 +702,23 @@ msgstr "" "Non é posíbel cargar o obxecto de xanela do calendario desde o ficheiro da UI" +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Importante" + #: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Dispositivo de entrada descoñecido" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Introducir URI" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +msgid "add tag" +msgstr "engadir etiqueta" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:400 +msgid "Remove tag" +msgstr "Eliminar etiqueta" #~ msgid "_File" #~ msgstr "_Ficheiro" diff -Nru almanah-0.10.8/po/hu.po almanah-0.11.0/po/hu.po --- almanah-0.10.8/po/hu.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/hu.po 2013-10-20 11:57:20.000000000 +0000 @@ -4,14 +4,14 @@ # # György Balló , 2011. # Gabor Kelemen , 2011. -# Balázs Úr , 2011, 2012. +# Balázs Úr , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-26 22:18+0000\n" -"PO-Revision-Date: 2012-12-26 16:49+0100\n" +"POT-Creation-Date: 2013-09-04 23:24+0000\n" +"PO-Revision-Date: 2013-09-10 00:00+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: \n" @@ -21,8 +21,56 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.2\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:133 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Az Almanah napló egy olyan alkalmazás, amely lehetővé teszi az élete " +"naplójának vezetését." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Titkosíthatja a naplót az adatvédelem megőrzéséhez. Rendelkezik módosítási " +"képességgel, beleértve a szövegformázást és a nyomtatást, valamint " +"megjeleníti azon események listáját, amelyek (a számítógépén) az adott " +"napokon történtek (úgymint feladatok és találkozók az Evolution programból)." + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Keresés" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "Beá_llítások" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Importálás" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Exportálás" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Napló nyomtatása" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "Az Almanah napló né_vjegye" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Kilépés" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Almanah napló" @@ -31,39 +79,14 @@ msgstr "Személyes napló vezetése" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Napló" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "Adatbázis-titkosítási kulcs azonosítója" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"Az adatbázis titkosításához és visszafejtéséhez használt kulcs azonosítója, " -"ha az Almanah titkosítási támogatással került fordításra. Az adatbázis " -"titkosításának letiltásához hagyja ezt a mezőt üresen." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Helyesírás-ellenőrzés nyelve" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "A nyelv, amin a bejegyzések helyesírása ellenőrzésre kerül." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Helyesírás-ellenőrzés engedélyezve?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "A bejegyzések helyesírás-ellenőrzése engedélyezve legyen-e?" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "napló;folyóirat;" #: ../data/almanah.ui.h:1 msgid "Select Date…" @@ -110,146 +133,154 @@ msgstr "Fontosnak jelöli a jelenlegi bejegyzést." #: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Címkék megjelenítése" + +#: ../data/almanah.ui.h:12 +#| msgid "Jump to the current date in the diary." +msgid "Show tags for the current entry" +msgstr "Címkék megjelenítése a jelenlegi bejegyzéshez" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "_Súgó" -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "Ugrás a _mai napra" -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Ugrás az aktuális napra a naplóban." -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Naptár" -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Bejegyzésszerkesztési terület" -#: ../data/almanah.ui.h:16 -#| msgid "Past Events" +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Legutóbbi események" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Legutóbbi események listája" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Bejegyzés keresése" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Keresés" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Eredménylista" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Bejegyzés megjelenítése" -#: ../data/almanah.ui.h:22 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "például: „2009/03/14” vagy „2009. március 14.”." -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "például: „http://google.com/” vagy „file:///home/én/Képek/kép.jpg”." -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Sikeres bejegyzések" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Egyesített bejegyzések" -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Sikertelen bejegyzések" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Eredmények listájának importálása" -#: ../data/almanah-app-menu.ui.h:1 -#| msgid "Search" -msgid "_Search" -msgstr "_Keresés" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Beá_llítások" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "Adatbázis-titkosítási kulcs azonosítója" -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importálás" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"Az adatbázis titkosításához és visszafejtéséhez használt kulcs azonosítója, " +"ha az Almanah titkosítási támogatással került fordításra. Az adatbázis " +"titkosításának letiltásához hagyja ezt a mezőt üresen." -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportálás" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Helyesírás-ellenőrzés nyelve" -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Napló nyomtatása" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "A nyelv, amin a bejegyzések helyesírása ellenőrzésre kerül." -#: ../data/almanah-app-menu.ui.h:6 -#| msgid "Almanah Diary" -msgid "_About Almanah Diary" -msgstr "Az Almanah napló né_vjegye" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Helyesírás-ellenőrzés engedélyezve?" -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Kilépés" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "A bejegyzések helyesírás-ellenőrzése engedélyezve legyen-e?" -#: ../src/application.c:243 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Hiba történt az adatbázis megnyitásakor" #. Error loading the CSS -#: ../src/application.c:272 +#: ../src/application.c:275 #, c-format msgid "" "Couldn't load the CSS file '%s'. The interface might not be styled correctly" msgstr "" -"Nem tölthető be a CSS fájl: „%s”. A felület valószínűleg nem megfelelő stílusú" +"Nem tölthető be a CSS fájl: „%s”. A felület valószínűleg nem megfelelő " +"stílusú" -#: ../src/application.c:316 +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Hibakereső üzemmód bekapcsolása" -#: ../src/application.c:333 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Személyes napló kezelése. Egyszerre csak egy példányban futtatható a program." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "A parancssori kapcsolók nem értelmezhetők: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Hiba az adatbázis titkosításakor" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:191 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "A(z) „%s” UI fájl nem tölthető be" -#: ../src/application.c:532 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -260,7 +291,7 @@ "Software Foundation által kiadott GNU General Public License harmadik (vagy " "bármely későbbi) változatában foglaltak alapján." -#: ../src/application.c:536 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -272,7 +303,7 @@ "alkalmas-e a KÖZREADÁSRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További " "részletekért tanulmányozza a GNU GPL licencet." -#: ../src/application.c:540 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -280,12 +311,12 @@ "Az Almanah programhoz a GNU General Public License egy példánya is jár, ha " "nem kapta meg, itt elolvashatja: ." -#: ../src/application.c:555 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Egy hasznos naplóíró, amely %u bejegyzést tárol." -#: ../src/application.c:559 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -294,11 +325,11 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:577 msgid "translator-credits" msgstr "Balló György " -#: ../src/application.c:571 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Az Almanah webhelye" @@ -407,8 +438,8 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:555 -#: ../src/main-window.c:585 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 #: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%Y. %B %e. %A" @@ -459,39 +490,39 @@ "Bejegyzés importálva innen: „%s”, tartalma:\n" "\n" -#: ../src/main-window.c:559 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Biztosan szeretné szerkeszteni ezt a naplóbejegyzést ehhez: %s?" -#: ../src/main-window.c:589 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Biztosan szeretné törölni ezt a naplóbejegyzést ehhez: %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:698 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Ismeretlen vagy kettőzött szövegcímke a bejegyzésben: „%s”. Figyelmen kívül " "hagyva." -#: ../src/main-window.c:897 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Hiba az URI megnyitásakor" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1071 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1150 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "A bejegyzés tartalma nem tölthető be" -#: ../src/main-window.c:1312 +#: ../src/main-window.c:1344 msgid "Spelling checker could not be initialized" msgstr "Nem sikerült inicializálni a helyesírás-ellenőrzőt" @@ -568,32 +599,32 @@ msgid "Searching…" msgstr "Keresés…" -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:275 #, c-format msgid "GPGME is not at least version %s" msgstr "A GPGME verziója nincs legalább %s" -#: ../src/storage-manager.c:268 +#: ../src/storage-manager.c:284 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "A GPGME nem támogatja az OpenPGP-t: %s" -#: ../src/storage-manager.c:277 +#: ../src/storage-manager.c:293 #, c-format msgid "Error creating cipher context: %s" msgstr "Hiba a rejtjelező kontextus létrehozásakor: %s" -#: ../src/storage-manager.c:306 +#: ../src/storage-manager.c:322 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Hiba a(z) „%s” titkosított adatbázisfájl megnyitásakor: %s" -#: ../src/storage-manager.c:325 +#: ../src/storage-manager.c:341 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Hiba a(z) „%s” sima adatbázisfájl megnyitásakor: %s" -#: ../src/storage-manager.c:373 +#: ../src/storage-manager.c:389 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -602,27 +633,27 @@ "nem került törlésre." #. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/storage-manager.c:392 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "A(z) „%s” sima adatbázisfájl nem törölhető." -#: ../src/storage-manager.c:417 +#: ../src/storage-manager.c:433 #, c-format msgid "Error decrypting database: %s" msgstr "Hiba az adatbázis visszafejtésekor: %s" -#: ../src/storage-manager.c:451 +#: ../src/storage-manager.c:467 #, c-format msgid "Error getting encryption key: %s" msgstr "Hiba a titkosítási kulcs lekérésekor: %s" -#: ../src/storage-manager.c:472 +#: ../src/storage-manager.c:488 #, c-format msgid "Error encrypting database: %s" msgstr "Hiba az adatbázis titkosításakor: %s" -#: ../src/storage-manager.c:574 +#: ../src/storage-manager.c:590 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -631,7 +662,7 @@ "A(z) „%s” adatbázis nem nyitható meg. Az SQLite a következő hibaüzenetet " "szolgáltatta: %s" -#: ../src/storage-manager.c:651 +#: ../src/storage-manager.c:667 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" @@ -639,18 +670,16 @@ "A(z) „%s” lekérdezés nem futtatható. Az SQLite a következő hibaüzenetet " "szolgáltatta: %s" -#: ../src/storage-manager.c:954 +#: ../src/storage-manager.c:973 msgid "Error deserializing entry into buffer while searching." msgstr "Hiba a bejegyzés pufferbe történő visszafejtésekor keresés közben." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Fontos!" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Adjon meg egy URI-t" #: ../src/widgets/calendar-button.c:140 #, c-format -#| msgid "UI file \"%s\" could not be loaded" msgid "UI file \"%s\" could not be loaded: %s" msgstr "A(z) „%s” UI fájl nem tölthető be: %s" @@ -658,13 +687,23 @@ msgid "Can't load calendar window object from UI file" msgstr "Nem lehet betölteni naptár ablak objektumot UI fájlból" +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Fontos!" + #: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Ismeretlen beviteli eszköz" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Adjon meg egy URI-t" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +msgid "add tag" +msgstr "címke hozzáadása" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:400 +msgid "Remove tag" +msgstr "Címke eltávolítása" #~ msgid "Change font style for selected text" #~ msgstr "A kijelölt szöveg betűkészletének megváltoztatása" diff -Nru almanah-0.10.8/po/id.po almanah-0.11.0/po/id.po --- almanah-0.10.8/po/id.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/id.po 2013-10-20 11:57:20.000000000 +0000 @@ -1,15 +1,15 @@ # Translation of almanah into Indonesian # Copyright (C) 2009 THE almanah'S COPYRIGHT HOLDER # This file is distributed under the same license as the almanah package. -# Andika Triwidada , 2009-2012. +# Andika Triwidada , 2009-2013. # msgid "" msgstr "" "Project-Id-Version: almanah master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-26 22:18+0000\n" -"PO-Revision-Date: 2012-11-27 18:31+0700\n" +"POT-Creation-Date: 2013-09-04 23:24+0000\n" +"PO-Revision-Date: 2013-10-04 22:24+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: GNOME Indonesian Translation Team \n" "Language: id_ID\n" @@ -18,10 +18,58 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-SourceCharset: UTF-8\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.5.7\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:133 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Buku Harian Almanah adalah aplikasi untuk mencatat buku harian kehidupan " +"Anda." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Anda dapat menyandikan buku harian untuk menjaga privasi Anda. Ini memiliki " +"kemampuan penyuntingan, termasuk pemformatan teks dan menampilkan daftar " +"peristiwa yang terjadi (pada komputer Anda) untuk setiap hari (seperti " +"misalnya tugas dan janji temu dari Evolution)." + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Cari" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "Pr_eferensi" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Impor" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Ekspor" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Cetak buku harian" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "Tent_ang Buku Harian Almanah" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Keluar" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Buku Harian Almanah" @@ -30,39 +78,14 @@ msgstr "Simpan buku harian pribadi" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Buku Harian" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "ID kunci penyandian basis data" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"ID dari kunci untuk menyandikan dan membongkar sandi basis data, bila " -"Almanah telah dibangun dengan dukungan penyandian. Biarkan kosong untuk " -"mematikan penyandian basis data." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Bahasa pemeriksaan ejaan" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "Nama locale bahasa untuk memeriksa ejaan entri." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Pemeriksaan ejaan diaktifkan?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Apakah pemeriksaan ejaan entri diaktifkan." +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "buku harian;jurnal;" #: ../data/almanah.ui.h:1 msgid "Select Date…" @@ -109,108 +132,117 @@ msgstr "Jungkit apakah entri kini ditandai sebagai penting." #: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Tampilkan tag" + +#: ../data/almanah.ui.h:12 +msgid "Show tags for the current entry" +msgstr "Tampilkan tag untuk entri saat ini" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "Ba_ntuan" -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "Lihat _Hari Ini" -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Lompat ke tanggal kini di buku harian." -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Kalender" -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Wilayah penyuntingan entri" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Kejadian lampau" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Daftar Kejadian Lalu" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Cari entri" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Cari" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Daftar Hasil" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Tilik Entri" -#: ../data/almanah.ui.h:22 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "mis. \"14/03/2009\" atau \"14 Maret 2009\"." -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "mis. \"http://google.com/\" atau \"file:///home/me/Photos/photo.jpg\"." -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Entri Sukses" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Entri Tergabung" -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Entri Gagal" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Daftar Hasil Impor" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Cari" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Pr_eferensi" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "ID kunci penyandian basis data" -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Impor" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"ID dari kunci untuk menyandikan dan membongkar sandi basis data, bila " +"Almanah telah dibangun dengan dukungan penyandian. Biarkan kosong untuk " +"mematikan penyandian basis data." -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Ekspor" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Bahasa pemeriksaan ejaan" -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Cetak buku harian" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "Nama locale bahasa untuk memeriksa ejaan entri." -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "Tent_ang Buku Harian Almanah" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Pemeriksaan ejaan diaktifkan?" -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Keluar" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Apakah pemeriksaan ejaan entri diaktifkan." -#: ../src/application.c:243 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Galat membuka basis data" #. Error loading the CSS -#: ../src/application.c:272 +#: ../src/application.c:275 #, c-format msgid "" "Couldn't load the CSS file '%s'. The interface might not be styled correctly" @@ -218,11 +250,11 @@ "Tak bisa memuat berkas CSS '%s'. Antar muka mungkin tak ditata gayanya " "secara benar" -#: ../src/application.c:316 +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Aktifkan moda awakutu" -#: ../src/application.c:333 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -230,24 +262,24 @@ "suatu saat." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Opsi baris perintah tak dapat diurai: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Galat menyandikan basis data" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:191 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Berkas UI \"%s\" tak dapat dimuat" -#: ../src/application.c:532 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -259,7 +291,7 @@ "dipublikasikan oleh Free Software Foundation, apakah Lisensi versi 3 atau " "(sesuai pilihan Anda) versi selanjutnya." -#: ../src/application.c:536 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -271,7 +303,7 @@ "KECOCOKAN UNTUK TUJUAN TERTENTU sekalipun. Lihat GNU General Public License " "untuk rincian lebih lanjut." -#: ../src/application.c:540 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -279,12 +311,12 @@ "Anda mestinya menerima salinan GNU General Public License bersamaan dengan " "Almanah. Jika tidak, lihat ." -#: ../src/application.c:555 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Penyimpan buku harian yang penuh bantuan, menyimpan %u entri." -#: ../src/application.c:559 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Hak Cipta © 2008-2009 Philip Withnall" @@ -293,11 +325,11 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:577 msgid "translator-credits" -msgstr "Andika Triwidada , 2009-2012" +msgstr "Andika Triwidada , 2009-2013" -#: ../src/application.c:571 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Situs Web Almanah" @@ -405,8 +437,8 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:555 -#: ../src/main-window.c:585 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 #: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -457,37 +489,37 @@ "Entri diimpor dari \"%s\":\n" "\n" -#: ../src/main-window.c:559 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Anda yakin ingin menyunting entri buku harian ini bagi %s?" -#: ../src/main-window.c:589 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Anda yakin ingin menghapus entri buku harian ini bagi %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:698 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Tag teks tak dikenal atau berganda \"%s\" dalam entri. Diabaikan." -#: ../src/main-window.c:897 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Galat membuka URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1071 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1150 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "Isi entri tak dapat dimuat" -#: ../src/main-window.c:1312 +#: ../src/main-window.c:1344 msgid "Spelling checker could not be initialized" msgstr "Pemeriksa ejaan tak dapat diinisialisasi" @@ -563,32 +595,32 @@ msgid "Searching…" msgstr "Mencari…" -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:275 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME kurang dari versi minimal %s" -#: ../src/storage-manager.c:268 +#: ../src/storage-manager.c:284 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME tak mendukung OpenPGP: %s" -#: ../src/storage-manager.c:277 +#: ../src/storage-manager.c:293 #, c-format msgid "Error creating cipher context: %s" msgstr "Galat membuat konteks cipher: %s" -#: ../src/storage-manager.c:306 +#: ../src/storage-manager.c:322 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Galat membuka berkas basis data tersandi \"%s\": %s" -#: ../src/storage-manager.c:325 +#: ../src/storage-manager.c:341 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Galat membuka berkas basis data polos \"%s\": %s" -#: ../src/storage-manager.c:373 +#: ../src/storage-manager.c:389 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -597,27 +629,27 @@ "dihapus sebagai cadangan." #. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/storage-manager.c:392 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "Tak bisa menghapus berkas basis data polos \"%s\"." -#: ../src/storage-manager.c:417 +#: ../src/storage-manager.c:433 #, c-format msgid "Error decrypting database: %s" msgstr "Galat membongkar sandi basis data: %s" -#: ../src/storage-manager.c:451 +#: ../src/storage-manager.c:467 #, c-format msgid "Error getting encryption key: %s" msgstr "Galat memperoleh kunci penyandian: %s" -#: ../src/storage-manager.c:472 +#: ../src/storage-manager.c:488 #, c-format msgid "Error encrypting database: %s" msgstr "Galat menyandikan basis data: %s" -#: ../src/storage-manager.c:574 +#: ../src/storage-manager.c:590 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -625,21 +657,20 @@ msgstr "" "Tak bisa membuka basis data \"%s\". SQLite memberikan pesan galat berikut: %s" -#: ../src/storage-manager.c:651 +#: ../src/storage-manager.c:667 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" msgstr "" "Tak bisa menjalankan query \"%s\". SQLite memberikan pesan galat berikut: %s" -#: ../src/storage-manager.c:954 +#: ../src/storage-manager.c:973 msgid "Error deserializing entry into buffer while searching." msgstr "Galat deserialisasi entri ke dalam penyangga ketika mencari." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Penting!" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Masukkan URI" #: ../src/widgets/calendar-button.c:140 #, c-format @@ -650,11 +681,20 @@ msgid "Can't load calendar window object from UI file" msgstr "Tak bisa memuat objek jendela kalender dari berkas UI" +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Penting!" + #: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Perangkat masukan tak dikenal" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Masukkan URI" - +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +msgid "add tag" +msgstr "tambah tag" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:400 +msgid "Remove tag" +msgstr "Hapus tag" diff -Nru almanah-0.10.8/po/lv.po almanah-0.11.0/po/lv.po --- almanah-0.10.8/po/lv.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/lv.po 2013-10-20 11:57:20.000000000 +0000 @@ -1,13 +1,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Rūdolfs Mazurs , 2012. +# Rūdolfs Mazurs , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-13 00:06+0300\n" -"PO-Revision-Date: 2012-10-13 00:07+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=almanah&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-09-04 23:24+0000\n" +"PO-Revision-Date: 2013-09-21 23:31+0300\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" "Language: lv\n" @@ -16,211 +17,247 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:101 -#: ../src/main-window.c:151 -msgid "Almanah Diary" -msgstr "Almanah dienasgrāmata" - -#: ../data/almanah.desktop.in.h:2 -msgid "Keep a personal diary" -msgstr "Turēt personīgo dienasgrāmatu" - -#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/main-window.c:305 -msgid "Diary" -msgstr "Dienasgrāmata" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "Datubāzes šifrēšanas atslēgas ID" +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Almanah dienasgrāmata ir lietotne, kurā var pierakstīt savas dzīves " +"dienasgrāmatu." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +#: ../data/almanah.appdata.xml.in.h:2 msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." msgstr "" -"ID atslēgai, ko izmantot datubāzes šifrēšanai un atšifrēšanai, ja Almanah ir " -"būvēts ar šifrēšanas atbalstu. Atstājiet tukšu, lai deaktivētu šifrēšanu." +"Jūs varat šifrēt dienasgrāmatu, lai nodrošinātu tās privātumu. Tajā ir " +"rediģēšanas iespējas, teksta formatēšana un drukāšana. Tāpat tajā var redzēt " +"katras dienas notikumus uz datora, piemēram, uzdevumi un tikšanās no " +"Evolution." -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Pareizrakstības pārbaudes valoda" +#: ../data/almanah-app-menu.ui.h:1 +#| msgid "Search" +msgid "_Search" +msgstr "_Meklēt" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "Valodas kods, kurai veikt ieraksta pareizrakstības pārbaudi." +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "I_estatījumi" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Pareizrakstības pārbaude ir aktivēta?" +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Importēt" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Vai ierakstu pareizrakstības pārbaude ir aktivēta." +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Eksportēt" -#: ../data/almanah.ui.h:1 -msgid "_File" -msgstr "_Fails" +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Drukāt dienasgrāmatu" + +#: ../data/almanah-app-menu.ui.h:6 +#| msgid "Almanah Diary" +msgid "_About Almanah Diary" +msgstr "Par _Almanah dienasgrāmatu" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "I_ziet" -#: ../data/almanah.ui.h:2 -msgid "_Import…" -msgstr "_Importēt…" +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 +msgid "Almanah Diary" +msgstr "Almanah dienasgrāmata" -#: ../data/almanah.ui.h:3 -msgid "_Export…" -msgstr "_Eksportēt…" +#: ../data/almanah.desktop.in.h:2 +msgid "Keep a personal diary" +msgstr "Turēt personīgo dienasgrāmatu" -#: ../data/almanah.ui.h:4 -msgid "_Print…" -msgstr "_Drukāt..." +#. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 +msgid "Diary" +msgstr "Dienasgrāmata" -#: ../data/almanah.ui.h:5 -msgid "_Edit" -msgstr "R_ediģēt" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "dienasgrāmata;žurnāls;" -#: ../data/almanah.ui.h:6 +#: ../data/almanah.ui.h:1 msgid "Select Date…" msgstr "Izvēlieties datumu…" -#: ../data/almanah.ui.h:7 -msgid "_Search…" -msgstr "_Meklēt…" - -#: ../data/almanah.ui.h:8 -msgid "Pr_eferences" -msgstr "I_estatījumi" - -#: ../data/almanah.ui.h:9 +#: ../data/almanah.ui.h:2 msgid "F_ormat" msgstr "F_ormāts" -#: ../data/almanah.ui.h:10 +#: ../data/almanah.ui.h:3 msgid "Toggle whether the currently selected text is bold." msgstr "Pārslēgt, vai pašlaik izvēlētais teksts ir treknrakstā." -#: ../data/almanah.ui.h:11 +#: ../data/almanah.ui.h:4 msgid "Toggle whether the currently selected text is italic." msgstr "Pārslēgt, vai pašlaik izvēlētais teksts ir slīprakstā." -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:5 msgid "Toggle whether the currently selected text is underlined." msgstr "Pārslēgt, vai pašlaik izvēlētais teksts ir pasvītrots." -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:6 msgid "Add/Remove _Hyperlink" msgstr "Pievienot/izņemt _hipersaiti" -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:7 msgid "" "Add or remove a hyperlink from the currently selected text to a specified " "URI." msgstr "" "Pievienot vai izņemt hipersaiti no pašlaik izvēlētā teksta uz norādīto URI," -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:8 msgid "Insert _Time" msgstr "Ievie_tot laiku" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:9 msgid "I_mportant" msgstr "_Svarīgs" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:10 msgid "Toggle whether the current entry is marked as important." msgstr "Pārslēgt, vai tekošais ieraksts ir atzīmēts kā svarīgs." -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Rādīt birkas" + +#: ../data/almanah.ui.h:12 +#| msgid "Jump to the current date in the diary." +msgid "Show tags for the current entry" +msgstr "Rādīt pašreizējā ieraksta birkas" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "_Palīdzība" -#: ../data/almanah.ui.h:19 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "Ie_t uz šodienu" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Lēkt uz pašreizējo datumu dienasgrāmatā." -#: ../data/almanah.ui.h:21 -msgid "Font Style" -msgstr "Fonta stils" - -#: ../data/almanah.ui.h:22 -msgid "Change font style for selected text." -msgstr "Mainīt izvēlētā teksta fonta stilu." - -#: ../data/almanah.ui.h:23 -msgid "_Font Style" -msgstr "_Fonta stils" - -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Kalendārs" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Ieraksta rediģēšanas laukums" -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Pagātnes notikumi" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Pagātnes notikumu saraksts" -#: ../data/almanah.ui.h:28 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Meklēt ierakstu" -#: ../data/almanah.ui.h:29 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Meklēt" -#: ../data/almanah.ui.h:30 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Rezultātu saraksts" -#: ../data/almanah.ui.h:31 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Skatīt ierakstu" -#: ../data/almanah.ui.h:32 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "piem., \"14.03.2009\" vai \"14. marts 2009\"." -#: ../data/almanah.ui.h:33 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "piem., “http://google.com/” vai “file:///home/me/Photos/photo.jpg”." -#: ../data/almanah.ui.h:34 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Veiksmīgi ieraksti" -#: ../data/almanah.ui.h:35 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Pārvaldītie ieraksti" -#: ../data/almanah.ui.h:36 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Neizdevušies ieraksti" -#: ../data/almanah.ui.h:37 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Importēšanas rezultātu saraksts" -#: ../src/application.c:205 +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "Datubāzes šifrēšanas atslēgas ID" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"ID atslēgai, ko izmantot datubāzes šifrēšanai un atšifrēšanai, ja Almanah ir " +"būvēts ar šifrēšanas atbalstu. Atstājiet tukšu, lai deaktivētu šifrēšanu." + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Pareizrakstības pārbaudes valoda" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "Valodas kods, kurai veikt ieraksta pareizrakstības pārbaudi." + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Pareizrakstības pārbaude ir aktivēta?" + +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Vai ierakstu pareizrakstības pārbaude ir aktivēta." + +#: ../src/application.c:246 msgid "Error opening database" msgstr "Kļūda, atverot datubāzi" -#: ../src/application.c:253 +#. Error loading the CSS +#: ../src/application.c:275 +#, c-format +#| msgid "" +#| "Couldn't load the CSS file '%s' for calendar window. The interface might " +#| "not be styled correctly" +msgid "" +"Couldn't load the CSS file '%s'. The interface might not be styled correctly" +msgstr "" +"Nevarēja ielādēt CSS failu “%s”. Iespējams, ka saskarnei " +"nebūs pareizs stils" + +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Aktivēt atkļūdošanas režīmu" -#: ../src/application.c:270 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -228,27 +265,79 @@ "programmas instance." #. Print an error -#: ../src/application.c:281 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Neizdevās parsēt komandrindas opcijas: %s\n" -#: ../src/application.c:300 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Kļūda, šifrējot datubāzi" -#: ../src/date-entry-dialog.c:72 -msgid "Select Date" -msgstr "Izvēlieties datumu" - -#: ../src/date-entry-dialog.c:129 ../src/import-export-dialog.c:168 -#: ../src/import-export-dialog.c:472 ../src/main-window.c:219 -#: ../src/preferences-dialog.c:191 ../src/search-dialog.c:97 -#: ../src/uri-entry-dialog.c:128 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 +#: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 +#: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Nevarēja ielādēt “%s” UI failu" +#: ../src/application.c:542 +msgid "" +"Almanah is free software: you can redistribute it and/or modify it under the " +"terms of the GNU General Public License as published by the Free Software " +"Foundation, either version 3 of the License, or (at your option) any later " +"version." +msgstr "" +"Almanah ir brīvā programmatūra: jūs varat izplatīt un/vai modificēt to " +"saskaņā ar GNU Vispārējās Publiskās Licences 3. vai kādas vēlākas versijas " +"noteikumiem." + +#: ../src/application.c:546 +msgid "" +"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " +"details." +msgstr "" +"Almanah tiek izplatīts ar cerību, ka tas būs noderīgs. Tas tiek izplatīts " +"BEZ jebkādas garantijas vai iekļautas ražotāja atbildības par šo produktu. " +"Sīkāku informāciju meklējiet GNU Vispārējās Publiskās Licences tekstā." + +#: ../src/application.c:550 +msgid "" +"You should have received a copy of the GNU General Public License along with " +"Almanah. If not, see ." +msgstr "" +"Jums vajadzēja saņemt GNU Vispārējo Publisko Licenci ar Almanah. Ja nē, " +"skatiet ." + +#: ../src/application.c:565 +#, c-format +msgid "A helpful diary keeper, storing %u entries." +msgstr "Noderīgs dienasgrāmatas turētājs, glabā %u ierakstus." + +#: ../src/application.c:569 +msgid "Copyright © 2008-2009 Philip Withnall" +msgstr "Autortiesības © 2008-2009 Philip Withnall" + +#. Translators: please include your names here to be credited for your hard work! +#. * Format: +#. * "Translator name 1 \n" +#. * "Translator name 2 " +#. +#: ../src/application.c:577 +msgid "translator-credits" +msgstr "Rūdolfs Mazurs " + +#: ../src/application.c:581 +msgid "Almanah Website" +msgstr "Almanah tīmekļa vietne" + +#: ../src/date-entry-dialog.c:72 +msgid "Select Date" +msgstr "Izvēlieties datumu" + #: ../src/entry.c:303 #, c-format msgid "Invalid data version number %u." @@ -323,15 +412,6 @@ msgid "Export Entries" msgstr "Eksportēt ierakstus" -#. Set the button label -#: ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importēt" - -#: ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Eksportēt" - #: ../src/import-export-dialog.c:245 msgid "Import failed" msgstr "Importēšana neizdevās" @@ -358,9 +438,9 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:603 -#: ../src/main-window.c:633 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:317 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -409,89 +489,37 @@ "Ieraksts importēts no “%s”:\n" "\n" -#: ../src/main-window.c:607 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Vai tiešām vēlaties rediģēt %s dienasgrāmatas ierakstu?" -#: ../src/main-window.c:637 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Vai tiešām vēlaties dzēst %s dienasgrāmatas ierakstu?" #. Print a warning about the unknown tag -#: ../src/main-window.c:746 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Nezināma vai dublējoša teksta birka “%s” ierakstā. Ignorē." -#: ../src/main-window.c:1062 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Kļūda, atverot URI" -#: ../src/main-window.c:1178 -msgid "" -"Almanah is free software: you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation, either version 3 of the License, or (at your option) any later " -"version." -msgstr "" -"Almanah ir brīvā programmatūra: jūs varat izplatīt un/vai modificēt to " -"saskaņā ar GNU Vispārējās Publiskās Licences 3. vai kādas vēlākas versijas " -"noteikumiem." - -#: ../src/main-window.c:1182 -msgid "" -"Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." -msgstr "" -"Almanah tiek izplatīts ar cerību, ka tas būs noderīgs. Tas tiek izplatīts " -"BEZ jebkādas garantijas vai iekļautas ražotāja atbildības par šo produktu. " -"Sīkāku informāciju meklējiet GNU Vispārējās Publiskās Licences tekstā." - -#: ../src/main-window.c:1186 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"Almanah. If not, see ." -msgstr "" -"Jums vajadzēja saņemt GNU Vispārējo Publisko Licenci ar Almanah. Ja nē, " -"skatiet ." - -#: ../src/main-window.c:1201 -#, c-format -msgid "A helpful diary keeper, storing %u entries." -msgstr "Noderīgs dienasgrāmatas turētājs, glabā %u ierakstus." - -#: ../src/main-window.c:1205 -msgid "Copyright © 2008-2009 Philip Withnall" -msgstr "Autortiesības © 2008-2009 Philip Withnall" - -#. Translators: please include your names here to be credited for your hard work! -#. * Format: -#. * "Translator name 1 \n" -#. * "Translator name 2 " -#. -#: ../src/main-window.c:1213 -msgid "translator-credits" -msgstr "Rūdolfs Mazurs " - -#: ../src/main-window.c:1217 -msgid "Almanah Website" -msgstr "Almanah tīmekļa vietne" - #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1390 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1469 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "Nevarēja ielādēt ieraksta saturu" -#: ../src/main-window.c:1564 +#: ../src/main-window.c:1344 msgid "Spelling checker could not be initialized" msgstr "Nevarēja inicializēt pareizrakstības pārbaudi" @@ -569,32 +597,32 @@ msgid "Searching…" msgstr "Meklē..." -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:275 #, c-format msgid "GPGME is not at least version %s" msgstr "GPGME nav jaunākā versija %s" -#: ../src/storage-manager.c:268 +#: ../src/storage-manager.c:284 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME neatbalsta OpenPGP — %s" -#: ../src/storage-manager.c:277 +#: ../src/storage-manager.c:293 #, c-format msgid "Error creating cipher context: %s" msgstr "Kļūda, izveidojot cipher kontekstu — %s" -#: ../src/storage-manager.c:306 +#: ../src/storage-manager.c:322 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Kļūda, atverot šifrētu datubāzes failu “%s” — %s" -#: ../src/storage-manager.c:325 +#: ../src/storage-manager.c:341 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Kļūda, atverot atvērta teksta datubāzes failu “%s” — %s" -#: ../src/storage-manager.c:373 +#: ../src/storage-manager.c:389 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -603,27 +631,27 @@ "kopija." #. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/storage-manager.c:392 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "Nevarēja izdzēst atklāta teksta datubāzes failu “%s”." -#: ../src/storage-manager.c:417 +#: ../src/storage-manager.c:433 #, c-format msgid "Error decrypting database: %s" msgstr "Kļūda, atšifrējot datubāzi — %s" -#: ../src/storage-manager.c:451 +#: ../src/storage-manager.c:467 #, c-format msgid "Error getting encryption key: %s" msgstr "Kļūda, saņemot šifrēšanas atslēgu — %s" -#: ../src/storage-manager.c:472 +#: ../src/storage-manager.c:488 #, c-format msgid "Error encrypting database: %s" msgstr "Kļūda, šifrējot datubāzi — %s" -#: ../src/storage-manager.c:574 +#: ../src/storage-manager.c:590 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -631,46 +659,71 @@ msgstr "" "Neizdevās atvērt datubāzi “%s”. SQLite deva sekojošo kļūdas ziņojumu: %s" -#: ../src/storage-manager.c:651 +#: ../src/storage-manager.c:667 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" msgstr "" "Neizdevās palaist vaicājumu “%s”. SQLite deva sekojošo kļūdas ziņojumu: %s" -#: ../src/storage-manager.c:954 +#: ../src/storage-manager.c:973 msgid "Error deserializing entry into buffer while searching." msgstr "Kļūda, deserializējot ierakstu buferī, veicot meklēšanu." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Svarīgi!" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Ievadiet URI" -#: ../src/widgets/calendar-button.c:135 +#: ../src/widgets/calendar-button.c:140 #, c-format msgid "UI file \"%s\" could not be loaded: %s" msgstr "Nevarēja ielādēt “%s” UI failu — %s" -#: ../src/widgets/calendar-button.c:145 +#: ../src/widgets/calendar-button.c:150 msgid "Can't load calendar window object from UI file" msgstr "Nevar ielādēt kalendāra loga objektu no UI faila" -#. Error loading the CSS -#: ../src/widgets/calendar-window.c:63 -#, c-format -msgid "" -"Couldn't load the CSS file '%s' for calendar window. The interface might not " -"be styled correctly" -msgstr "" -"Nevarēja ielādēt CSS failu “%s” kalendāra logam. Iespējams, ka saskarnei " -"nebūs pareizs stils" +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Svarīgi!" -#: ../src/widgets/calendar-window.c:100 +#: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Nezināma ievades ierīce" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Ievadiet URI" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +msgid "add tag" +msgstr "pievienot birku" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:400 +msgid "Remove tag" +msgstr "Izņemt birku" + +#~ msgid "_File" +#~ msgstr "_Fails" + +#~ msgid "_Import…" +#~ msgstr "_Importēt…" + +#~ msgid "_Export…" +#~ msgstr "_Eksportēt…" + +#~ msgid "_Print…" +#~ msgstr "_Drukāt..." + +#~ msgid "_Edit" +#~ msgstr "R_ediģēt" + +#~ msgid "_Search…" +#~ msgstr "_Meklēt…" + +#~ msgid "Font Style" +#~ msgstr "Fonta stils" + +#~ msgid "Change font style for selected text." +#~ msgstr "Mainīt izvēlētā teksta fonta stilu." +#~ msgid "_Font Style" +#~ msgstr "_Fonta stils" diff -Nru almanah-0.10.8/po/pl.po almanah-0.11.0/po/pl.po --- almanah-0.10.8/po/pl.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/pl.po 2013-11-18 20:13:40.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: almanah\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-16 20:37+0100\n" -"PO-Revision-Date: 2013-02-16 20:38+0100\n" +"POT-Creation-Date: 2013-11-17 18:58+0100\n" +"PO-Revision-Date: 2013-11-17 19:00+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -24,6 +24,24 @@ "X-Poedit-Language: Polish\n" "X-Poedit-Country: Poland\n" +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Pamiętnik Almanah to program umożliwiający prowadzenie osobistego dziennika." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Program wyświetla listę wydarzeń (na komputerze) dla każdego dnia (np. " +"zadania i spotkania z programu Evolution) oraz posiada funkcje redagowania, " +"takie jak formatowanie tekstu i drukowanie. Można także zaszyfrować " +"pamiętnik, aby strzec swojej prywatności." + #: ../data/almanah-app-menu.ui.h:1 msgid "_Search" msgstr "Wy_szukaj" @@ -53,8 +71,8 @@ msgid "_Quit" msgstr "Za_kończ" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:135 +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Pamiętnik Almanah" @@ -63,10 +81,15 @@ msgstr "Prowadzenie osobistego pamiętnika" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Pamiętnik" +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "pamiętnik;dziennik;" + #: ../data/almanah.ui.h:1 msgid "Select Date…" msgstr "Wybierz datę…" @@ -112,73 +135,81 @@ msgstr "Przełącza, czy bieżący wpis jest oznaczony jako ważny." #: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Wyświetlanie etykiet" + +#: ../data/almanah.ui.h:12 +msgid "Show tags for the current entry" +msgstr "Wyświetla etykiety dla bieżącego wpisu" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "Pomo_c" -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "Bieżący _dzień" -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Przechodzi do bieżącej daty w pamiętniku." -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Kalendarz" -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Obszar modyfikowania wpisów" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Przeszłe wydarzenia" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Lista przeszłych wydarzeń" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Przeszukaj wpis" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Wyszukaj" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Lista wyników" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Wyświetl wpis" -#: ../data/almanah.ui.h:22 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "np. \"14/03/2009\" lub \"14 marca 2009\"." -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "np. \"http://google.pl/\" lub \"file:///home/ja/Zdjęcia/zdjęcie.jpg\"." # pozycja na liście wyników importowania -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Pomyślnie zaimportowane wpisy" # pozycja na liście wyników importowania -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Połączone wpisy" # pozycja na liście wyników importowania -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Nie powiodło się importowanie wpisów" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Lista wyników importowania" @@ -212,23 +243,23 @@ msgid "Whether spell checking of entries is enabled." msgstr "Określa, czy sprawdzanie pisowni we wpisach jest włączone." -#: ../src/application.c:243 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Błąd podczas otwierania bazy danych" #. Error loading the CSS -#: ../src/application.c:272 +#: ../src/application.c:275 #, c-format msgid "" "Couldn't load the CSS file '%s'. The interface might not be styled correctly" msgstr "" "Nie można wczytać pliku CSS \"%s\". Interfejs może wyglądać niepoprawnie" -#: ../src/application.c:316 +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Włącza tryb debugowania" -#: ../src/application.c:333 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -236,24 +267,24 @@ "otwarta w danym momencie." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Opcje wiersza poleceń nie mogły zostać przetworzone: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Błąd podczas szyfrowania bazy danych" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:194 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Nie można wczytać pliku interfejsu użytkownika \"%s\"" -#: ../src/application.c:532 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -265,7 +296,7 @@ "przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według " "wersji trzeciej tej Licencji lub którejś z późniejszych wersji." -#: ../src/application.c:536 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -277,7 +308,7 @@ "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU." -#: ../src/application.c:540 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -286,12 +317,12 @@ "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie " "- proszę odwiedzić stronę internetową ." -#: ../src/application.c:555 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Pomocny zarządca pamiętnika, przechowuje %u wpisów." -#: ../src/application.c:559 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -300,14 +331,14 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:577 msgid "translator-credits" msgstr "" "Mateusz Kacprzak , 2011\n" "Piotr Drąg , 2012-2013\n" "Aviary.pl , 2011-2013" -#: ../src/application.c:571 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Witryna programu Almanah" @@ -332,7 +363,7 @@ #: ../src/events/calendar-appointment.c:89 ../src/events/calendar-task.c:90 #, c-format msgid "%.2d:%.2d" -msgstr "%.2d:%.2d" +msgstr "%.2d∶%.2d" #: ../src/events/calendar-appointment.c:135 ../src/events/calendar-task.c:125 msgid "Error launching Evolution" @@ -346,12 +377,12 @@ msgid "A task on an Evolution calendar." msgstr "Zadanie w kalendarzu programu Evolution." -#: ../src/export-operation.c:45 ../src/import-operation.c:45 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Pliki tekstowe" # instrukcja w oknie eksportu -#: ../src/export-operation.c:46 +#: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " "names in the format 'yyyy-mm-dd', and no extension. All entries will be " @@ -362,12 +393,12 @@ "rozszerzenia. Wszystkie wpisy zostaną wyeksportowane, niezaszyfrowane, jako " "zwykłe pliki tekstowe." -#: ../src/export-operation.c:50 ../src/import-operation.c:50 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "Baza danych" # instrukcja w oknie eksportu -#: ../src/export-operation.c:51 +#: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." @@ -375,6 +406,11 @@ "Proszę wybrać _nazwę dla kompletnej, niezaszyfrowanej kopii bazy danych " "pamiętnika Almanah." +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "Błąd podczas zmieniania uprawnień wyeksportowanego pliku: %s" + #: ../src/import-export-dialog.c:202 msgid "Import _mode: " msgstr "_Tryb importu: " @@ -418,8 +454,8 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:566 -#: ../src/main-window.c:596 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 #: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -472,37 +508,37 @@ "Wpis zaimportowany z \"%s\":\n" "\n" -#: ../src/main-window.c:570 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Na pewno zmienić ten wpis pamiętnika z %s?" -#: ../src/main-window.c:600 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Na pewno usunąć ten wpis pamiętnika z %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:709 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Nieznana lub powtarzająca się etykieta \"%s\" we wpisie. Ignorowanie." -#: ../src/main-window.c:908 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Błąd podczas otwierania adresu URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1082 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s o %s" -#: ../src/main-window.c:1161 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "Nie można wczytać treści wpisu" -#: ../src/main-window.c:1326 +#: ../src/main-window.c:1348 msgid "Spelling checker could not be initialized" msgstr "Nie można uruchomić sprawdzania pisowni" @@ -580,32 +616,32 @@ msgid "Searching…" msgstr "Wyszukiwanie…" -#: ../src/storage-manager.c:275 +#: ../src/storage-manager.c:276 #, c-format msgid "GPGME is not at least version %s" msgstr "Biblioteka GPGME nie jest w wersji co najmniej %s" -#: ../src/storage-manager.c:284 +#: ../src/storage-manager.c:285 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "Biblioteka GPGME nie obsługuje standardu OpenPGP: %s" -#: ../src/storage-manager.c:293 +#: ../src/storage-manager.c:294 #, c-format msgid "Error creating cipher context: %s" msgstr "Błąd podczas tworzenia kontekstu szyfrowania: %s" -#: ../src/storage-manager.c:322 +#: ../src/storage-manager.c:323 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Błąd podczas otwierania zaszyfrowanego pliku bazy danych \"%s\": %s" -#: ../src/storage-manager.c:341 +#: ../src/storage-manager.c:342 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Błąd podczas otwierania pliku bazy danych \"%s\": %s" -#: ../src/storage-manager.c:389 +#: ../src/storage-manager.c:390 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -614,27 +650,44 @@ "pozostawiono jako kopię zapasową." #. Delete the plain file -#: ../src/storage-manager.c:392 +#: ../src/storage-manager.c:393 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "Nie można usunąć pliku bazy danych \"%s\"." -#: ../src/storage-manager.c:433 +#: ../src/storage-manager.c:434 #, c-format msgid "Error decrypting database: %s" msgstr "Błąd podczas deszyfrowania bazy danych: %s" -#: ../src/storage-manager.c:467 +#: ../src/storage-manager.c:468 #, c-format msgid "Error getting encryption key: %s" msgstr "Błąd podczas pobierania klucza szyfrującego: %s" -#: ../src/storage-manager.c:488 +#: ../src/storage-manager.c:489 #, c-format msgid "Error encrypting database: %s" msgstr "Błąd podczas szyfrowania bazy danych: %s" -#: ../src/storage-manager.c:590 +#: ../src/storage-manager.c:549 +#, c-format +msgid "Error changing database backup file permissions: %s" +msgstr "" +"Błąd podczas zmieniania uprawnień pliku kopii zapasowej bazy danych: %s" + +#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "Błąd podczas zmieniania uprawnień pliku bazy danych: %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#, c-format +msgid "Error backing up file ‘%s’: %s" +msgstr "Błąd podczas tworzenia kopii zapasowej pliku \"%s\": %s" + +#: ../src/storage-manager.c:620 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -643,7 +696,7 @@ "Nie można otworzyć bazy danych \"%s\". Biblioteka SQLite wysłała następujący " "komunikat o błędzie: %s" -#: ../src/storage-manager.c:667 +#: ../src/storage-manager.c:704 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" @@ -651,7 +704,7 @@ "Nie można wykonać zapytania \"%s\". Biblioteka SQLite wysłała następujący " "komunikat o błędzie: %s" -#: ../src/storage-manager.c:970 +#: ../src/storage-manager.c:1010 msgid "Error deserializing entry into buffer while searching." msgstr "Błąd podczas rozszeregowywania wpisu do bufora podczas wyszukiwania." @@ -679,7 +732,23 @@ msgid "Unknown input device" msgstr "Nieznane urządzenie wejściowe" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "dodaj etykietę" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Proszę napisać etykietę i nacisnąć klawisz Enter, aby ją zapisać" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "Usuwa etykietę z wpisu" + #. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? -#: ../src/widgets/tag.c:400 +#: ../src/widgets/tag.c:416 msgid "Remove tag" msgstr "Usuń etykietę" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "Nadaj etykietę wpisowi" diff -Nru almanah-0.10.8/po/pt_BR.po almanah-0.11.0/po/pt_BR.po --- almanah-0.10.8/po/pt_BR.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/pt_BR.po 2013-11-28 20:12:27.000000000 +0000 @@ -1,33 +1,85 @@ -# Brazilian Portuguese translation of Diary. -# Copyright (C) 2008-2010 Free Software Foundation, Inc. +# Brazilian Portuguese translation of Almanah. +# Copyright (C) 2008-2013 Free Software Foundation, Inc. # This file is distributed under the same license as the almanah package. # Fabrício Godoy , 2008. # Fábio Nogueira , 2008. # Taylon Silmer , 2008. # Vladimir Melo , 2008. -# Antonio Fernandes C. Neto , 2009. +# Antonio Fernandes C. Neto , 2009,2013. # Carlos José Pereira , 2010. # Gabriel Speckhahn , 2011. # Rafael Ferreira , 2012, 2013. +# Adorilson Bezerra , 2013. +# Ramon Brandão , 2013. +# Enrico Nicoletto , 2013. +# msgid "" msgstr "" -"Project-Id-Version: Diary\n" +"Project-Id-Version: Almanah\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-27 16:49+0000\n" -"PO-Revision-Date: 2012-12-09 23:12-0300\n" -"Last-Translator: Rafael Ferreira \n" +"POT-Creation-Date: 2013-11-17 18:01+0000\n" +"PO-Revision-Date: 2013-11-19 19:36-0300\n" +"Last-Translator: Enrico Nicoletto \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Virtaal 0.7.0\n" +"X-Generator: Poedit 1.5.7\n" "X-Project-Style: gnome\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:133 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"O diário Almanah é um aplicativo que lhe permite manter um diário da sua " +"vida." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Você pode criptografar o diário para preservar sua privacidade. Possui " +"alguns recursos de edição, incluindo formatação de texto e impressão, também " +"mostra a você uma lista de eventos que aconteceram (no seu computador) para " +"cada dia (como tarefas e compromissos do Evolution)." + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Pesquisar" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "Pr_eferências" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Importar" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Exportar" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Imprimir diário" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_Sobre o Diário Almanah" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Sair" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Diário Almanah" @@ -36,45 +88,18 @@ msgstr "Mantenha um diário pessoal" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Diário" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "ID da chave de criptografia da base de dados" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"A ID da chave usada para criptografar e descriptografar a base de dados, se " -"o Almanah tiver sido compilado com suporte a criptografia. Deixe em branco " -"para desabilitar a criptografia da base de dados." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Idioma para verificação ortográfica" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "" -"O especificador de localização do idioma que verifica as ortografias de " -"entrada." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "A verificação ortográfica está habilitada?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Se a verificação ortográfica de entradas está habilitada." +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "diário;blog;" #: ../data/almanah.ui.h:1 msgid "Select Date…" -msgstr "Selecionar data..." +msgstr "Selecionar data…" #: ../data/almanah.ui.h:2 msgid "F_ormat" @@ -117,108 +142,119 @@ msgstr "Define se a entrada atual é marcada como importante." #: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Mostrar etiquetas" + +#: ../data/almanah.ui.h:12 +msgid "Show tags for the current entry" +msgstr "Mostra etiquetas para a entrada atual" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "Aj_uda" -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "Ir para _hoje" -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Vai para a data atual no diário." -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Calendário" -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Área de edição de entrada" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Últimos eventos" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Lista dos últimos eventos" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Pesquisar entrada" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Pesquisar" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Lista de resultado" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Ver entrada" -#: ../data/almanah.ui.h:22 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." -msgstr "exemplo \"14/03/2009\" ou \"14 de março de 2009\"." +msgstr "ex: \"14/03/2009\" ou \"14 de março de 2009\"." -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." -msgstr "ex: “http://google.com/” ou “file:///home/me/Photos/photo.jpg”." +msgstr "ex: “http://google.com/” ou “file:///home/eu/Fotos/foto.jpg”." -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Entradas com sucesso" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Entradas mescladas" -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Entradas que falharam" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Lista de resultado da importação" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Pesquisar" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "Pr_eferências" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "ID da chave de criptografia da base de dados" -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Importar" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"A ID da chave usada para criptografar e descriptografar a base de dados, se " +"o Almanah tiver sido compilado com suporte a criptografia. Deixe em branco " +"para desabilitar a criptografia da base de dados." -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Exportar" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Verificação ortográfica para o idioma" -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Imprimir diário" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "" +"O especificador de localização do idioma que verifica as ortografias de " +"entrada." -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_Sobre o Diário Almanah" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "A verificação ortográfica está habilitada?" -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Sair" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Se a verificação ortográfica de entradas está habilitada." -#: ../src/application.c:243 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Erro ao abrir o banco de dados" #. Error loading the CSS -#: ../src/application.c:272 +#: ../src/application.c:275 #, c-format msgid "" "Couldn't load the CSS file '%s'. The interface might not be styled correctly" @@ -226,11 +262,11 @@ "Não foi possível carregar o arquivo CSS \"%s\". A interface pode não estar " "configurada com estilo corretamente." -#: ../src/application.c:316 +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Habilitar o modo de depuração" -#: ../src/application.c:333 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -238,24 +274,24 @@ "cada vez." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Não foi possível analisar as opções da linha de comando: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Erro ao criptografar o banco de dados" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:191 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" -msgstr "Arquivo de interface de usuário \"%s\" não pôde ser carregado" +msgstr "Não foi possível carregar o arquivo de interface gráfica \"%s\"" -#: ../src/application.c:532 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -267,7 +303,7 @@ "publicada pela Free Software Foundation, tanto na versão 3 da licença, " "quanto (a seu critério) qualquer versão posterior." -#: ../src/application.c:536 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -279,21 +315,21 @@ "UM PROPÓSITO EM PARTICULAR. Veja a Licença Pública Geral GNU (GNU General " "Public License) para mais detalhes." -#: ../src/application.c:540 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." msgstr "" "Você deve ter recebido uma cópia da Licença Pública Geral GNU (GNU General " -"Public License) junto com o Almanah; se não, consulte ." +"Public License) junto com o Almanah. Caso contrário, consulte ." -#: ../src/application.c:555 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Um criador de diário útil, armazenando %u entradas." -#: ../src/application.c:559 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Copyright © 2008-2009 Philip Withnall" @@ -302,18 +338,18 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:577 msgid "translator-credits" msgstr "" "Fabrício Godoy \n" "Fábio Nogueira \n" "Taylon Silmer \n" "Vladimir Melo \n" -"Antonio Fernandes C. Neto \n" +"Antonio Fernandes C. Neto \n" "Carlos José Pereira \n" "Rafael Ferreira " -#: ../src/application.c:571 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Site do Almanah" @@ -352,11 +388,11 @@ msgid "A task on an Evolution calendar." msgstr "Uma tarefa em um calendário do Evolution." -#: ../src/export-operation.c:45 ../src/import-operation.c:45 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Arquivos de texto" -#: ../src/export-operation.c:46 +#: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " "names in the format 'yyyy-mm-dd', and no extension. All entries will be " @@ -366,11 +402,11 @@ "entrada, com nomes no formato 'aaaa-mm-dd' e sem extensão. Todas as entradas " "serão exportadas sem criptografia, no formato de texto puro." -#: ../src/export-operation.c:50 ../src/import-operation.c:50 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "Banco de dados" -#: ../src/export-operation.c:51 +#: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." @@ -378,6 +414,11 @@ "Selecione um nome de ar_quivo onde será gerada uma cópia completa e sem " "criptografia da base de dados do Diário Almanah." +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "Erro ao alterar permissões dos arquivos exportados: %s" + #: ../src/import-export-dialog.c:202 msgid "Import _mode: " msgstr "_Modo de importação: " @@ -421,8 +462,8 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:555 -#: ../src/main-window.c:585 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 #: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e de %B de %Y" @@ -473,40 +514,40 @@ "Entrada importada para \"%s\":\n" "\n" -#: ../src/main-window.c:559 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Você tem certeza que quer editar essa entrada de diário para %s?" -#: ../src/main-window.c:589 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Você tem certeza que quer excluir essa entrada de diário para %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:698 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "" "Etiqueta de texto \"%s\" desconhecida ou duplicada na entrada. Ignorando." -#: ../src/main-window.c:897 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Erro ao abrir a URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1071 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1150 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" -msgstr "O conteúdo da entrada não pôde ser carregado" +msgstr "Não foi possível carregar o conteúdo de entrada" -#: ../src/main-window.c:1312 +#: ../src/main-window.c:1348 msgid "Spelling checker could not be initialized" -msgstr "O verificador ortográfico não pôde ser inicializado" +msgstr "Não foi possível inicializar a verificação ortográfica" #: ../src/preferences-dialog.c:91 msgid "Almanah Preferences" @@ -581,32 +622,32 @@ msgid "Searching…" msgstr "Pesquisando…" -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:276 #, c-format msgid "GPGME is not at least version %s" msgstr "O GPGME não está na versão mínima %s" -#: ../src/storage-manager.c:268 +#: ../src/storage-manager.c:285 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "O GPGME não tem suporte a OpenPGP: %s" -#: ../src/storage-manager.c:277 +#: ../src/storage-manager.c:294 #, c-format msgid "Error creating cipher context: %s" msgstr "Erro ao criar o contexto cifrado: %s" -#: ../src/storage-manager.c:306 +#: ../src/storage-manager.c:323 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Erro ao abrir o arquivo de banco de dados criptografado em \"%s\": %s" -#: ../src/storage-manager.c:325 +#: ../src/storage-manager.c:342 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Erro ao abrir o arquivo de banco de dados em \"%s\": %s" -#: ../src/storage-manager.c:373 +#: ../src/storage-manager.c:390 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -615,27 +656,43 @@ "desfeito como backup." #. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/storage-manager.c:393 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "Não foi possível excluir o arquivo de banco de dados em \"%s\"." -#: ../src/storage-manager.c:417 +#: ../src/storage-manager.c:434 #, c-format msgid "Error decrypting database: %s" msgstr "Erro ao descriptografar o banco de dados: %s" -#: ../src/storage-manager.c:451 +#: ../src/storage-manager.c:468 #, c-format msgid "Error getting encryption key: %s" msgstr "Erro ao obter a chave de criptografia: %s" -#: ../src/storage-manager.c:472 +#: ../src/storage-manager.c:489 #, c-format msgid "Error encrypting database: %s" msgstr "Erro ao criptografar o banco de dados: %s" -#: ../src/storage-manager.c:574 +#: ../src/storage-manager.c:549 +#, c-format +msgid "Error changing database backup file permissions: %s" +msgstr "Erro ao alterar permissões dos arquivos backup do banco de dados: %s" + +#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "Erro ao alterar permissões dos arquivos de banco de dados: %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#, c-format +msgid "Error backing up file ‘%s’: %s" +msgstr "Erro ao fazer backup do arquivo \"%s\": %s" + +#: ../src/storage-manager.c:620 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -644,7 +701,7 @@ "Não foi possível abrir o banco de dados em \"%s\". O SQLite retornou a " "seguinte mensagem de erro: %s" -#: ../src/storage-manager.c:651 +#: ../src/storage-manager.c:704 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" @@ -652,172 +709,51 @@ "Não foi possível executar a consulta \"%s\". O SQLite retornou a seguinte " "mensagem de erro: %s" -#: ../src/storage-manager.c:954 +#: ../src/storage-manager.c:1010 msgid "Error deserializing entry into buffer while searching." msgstr "Erro ao desserializar entrada dentro do buffer durante a pesquisa." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Importante!" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Digite o URI" #: ../src/widgets/calendar-button.c:140 #, c-format msgid "UI file \"%s\" could not be loaded: %s" -msgstr "O arquivo de interface de usuário \"%s\" não pôde ser carregado: %s" +msgstr "Não foi possível carregar arquivo de interface gráfica \"%s\": %s" #: ../src/widgets/calendar-button.c:150 msgid "Can't load calendar window object from UI file" msgstr "" -"Não é possível carregar objeto janela de calendário do arquivo de interface " -"de usuário" +"Não foi possível carregar objeto da janela de calendário do arquivo de " +"interface gráfica" + +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Importante!" #: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Dispositivo de entrada desconhecido" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Inserir URI" - -#~ msgid "View" -#~ msgstr "Ver" - -#~ msgid "View Event" -#~ msgstr "Ver evento" - -#~ msgid "_Edit" -#~ msgstr "_Editar" - -#~ msgid "_Export…" -#~ msgstr "E_xportar..." - -#~ msgid "_File" -#~ msgstr "_Arquivo" - -#~ msgid "_Import…" -#~ msgstr "_Importar..." - -#~ msgid "_Print…" -#~ msgstr "_Imprimir..." - -#~ msgid "_Search…" -#~ msgstr "_Pesquisar..." - -#~ msgid "Results:" -#~ msgstr "Resultados:" - -#~ msgid "Main window X position" -#~ msgstr "Posição X da janela principal" - -#~ msgid "Main window Y position" -#~ msgstr "Posição Y da janela principal" - -#~ msgid "Main window height" -#~ msgstr "Altura da janela principal" - -#~ msgid "Main window maximization" -#~ msgstr "Maximização da janela principal" - -#~ msgid "Main window width" -#~ msgstr "Largura da janela principal" - -#~ msgid "The X position of the main window." -#~ msgstr "A posição X da janela principal." - -#~ msgid "The Y position of the main window." -#~ msgstr "A posição Y da janela principal." - -#~ msgid "The height of the main window." -#~ msgstr "A altura da janela principal." - -#~ msgid "The width of the main window." -#~ msgstr "A largura da janela principal." - -#~ msgid "Whether the main window should start maximized." -#~ msgstr "Se a janela principal deve ou não iniciar maximizada." - -#~ msgid "Add a definition for the currently selected text." -#~ msgstr "Adicionar uma definição para o atual texto selecionado." - -#~ msgid "Definition Description" -#~ msgstr "Descrição da definição" - -#~ msgid "Definition List" -#~ msgstr "Lista de definição" - -#~ msgid "Definition Type" -#~ msgstr "Tipo de definição" - -#~ msgid "Definition type:" -#~ msgstr "Tipo de definição:" - -#~ msgid "Nothing selected" -#~ msgstr "Nada selecionado" - -#~ msgid "_Add Definition" -#~ msgstr "_Adicionar definição" - -#~ msgid "_Definitions" -#~ msgstr "_Definições" - -#~ msgid "_Remove Definition" -#~ msgstr "_Remover definição" - -#~ msgid "_View Definitions" -#~ msgstr "_Ver definições" - -#~ msgid "Add Definition" -#~ msgstr "Adicionar definição" - -#~ msgid "Definition Manager" -#~ msgstr "Gerenciador de definições" - -#~ msgid "Are you sure you want to delete the definition for \"%s\"?" -#~ msgstr "" -#~ "Você tem certeza que quer excluir essa definição de diário para \"%s\"?" - -#~ msgid "Contact" -#~ msgstr "Contato" - -#~ msgid "An Evolution contact." -#~ msgstr "Um contato do Evolution." - -#~ msgid "Select Contact" -#~ msgstr "Selecionar contato" - -#~ msgid "Error opening contact" -#~ msgstr "Erro ao abrir o contato" - -#~ msgid "Error opening Evolution" -#~ msgstr "Erro ao abrir o Evolution" - -#~ msgid "File" -#~ msgstr "Arquivo" - -#~ msgid "An attached file." -#~ msgstr "Um arquivo anexado." - -#~ msgid "Error opening file" -#~ msgstr "Erro ao abrir o arquivo" - -#~ msgid "Select File" -#~ msgstr "Selecionar arquivo" - -#~ msgid "Note" -#~ msgstr "Nota" - -#~ msgid "A note about an important event." -#~ msgstr "Uma nota sobre um evento importante." - -#~ msgid "URI" -#~ msgstr "URI" - -#~ msgid "A URI of a file or web page." -#~ msgstr "Um URI de um arquivo ou página Web." - -#~ msgid "URI: " -#~ msgstr "URI: " - -#~ msgid "- Manage your diary" -#~ msgstr "- Gerencie seu diário" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:166 +msgid "add tag" +msgstr "Adicionar etiqueta" + +#: ../src/widgets/entry-tags-area.c:101 +msgid "Write the tag and press enter to save it" +msgstr "Escreva a etiqueta e pressione enter para salvá-la" + +#: ../src/widgets/tag-accessible.c:165 +msgid "Remove the tag from the entry" +msgstr "Remove a etiqueta da entrada" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:416 +msgid "Remove tag" +msgstr "Remover etiqueta" + +#: ../src/widgets/tag-entry.c:85 +msgid "Tag entry" +msgstr "Entrada da etiqueta" diff -Nru almanah-0.10.8/po/sl.po almanah-0.11.0/po/sl.po --- almanah-0.10.8/po/sl.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/sl.po 2013-11-10 12:35:58.000000000 +0000 @@ -2,27 +2,73 @@ # Copyright (C) 2009 almanah's COPYRIGHT HOLDER # This file is distributed under the same license as the almanah package. # -# Andrej Žnidaršič , 2009 - 2010. +# Andrej Žnidaršič , 2009-2010. +# Matej Urbančič , 2010-2013 # msgid "" msgstr "" "Project-Id-Version: almanah master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=almanah&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-22 00:32+0000\n" -"PO-Revision-Date: 2012-11-22 14:44+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almanah&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-10-31 01:20+0000\n" +"PO-Revision-Date: 2013-11-02 11:41+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" -"%100==4 ? 3 : 0);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: Poedit 1.5.4\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "" +"Snevnik Almanah je program, ki omogoča pisanje dnevnika vašega življenja." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Dnevnik je mogoče šifrirati in s tem ohraniti zasebnost. Omogoča urejanje " +"oblikovanja in tiskanje, pokaže sezname dogodkov (ki so zabeleženi " +"digitalno) za vsak dan (na primer naloge in sestanki, povzeti iz programa " +"Evolution)" + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Poišči" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "_Možnosti" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Uvozi" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Izvozi" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Natisni dnevnik" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_O osebnem dnevniku" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Končaj" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 #: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Almanah dnevnik" @@ -32,39 +78,14 @@ msgstr "Pišite osebni dnevnik" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:258 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Dnevnik" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "ID šifrirnega ključa podatkovne zbirke" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"ID ključa za šifriranje in dešifriranje zbirke podatkov programa Almanah v " -"primeru, da je bil program preveden s podporo za šifriranje. Prazno polje " -"pomeni, da podatki ne bodo šifrirani." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Jezik črkovanja" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "Krajevno določilo jezika v katerem naj bo prevedeno črkovanje vnosa." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Ali naj bo črkovanja omogočeno?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Ali naj bo preverjanje črkovanja omogočeno." +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "blog;dnevnik;časopis;" #: ../data/almanah.ui.h:1 msgid "Select Date…" @@ -111,147 +132,153 @@ msgstr "Preklopi oznako trenutnega vnosa kot pomembno." #: ../data/almanah.ui.h:11 -msgid "_Help" -msgstr "Pomo_č" +msgid "Show tags" +msgstr "Prikaži oznake" #: ../data/almanah.ui.h:12 -msgid "Go to _Today" -msgstr "Pojdi na _današnji dan" +msgid "Show tags for the current entry" +msgstr "Pokaži oznake za trenutni izbor" #: ../data/almanah.ui.h:13 -msgid "Jump to the current date in the diary." -msgstr "Skoči na trenutni datum v dnevniku." +msgid "_Help" +msgstr "Pomo_č" #: ../data/almanah.ui.h:14 -msgid "Font Style" -msgstr "Slog pisave" +msgid "Go to _Today" +msgstr "Pojdi na _današnji dan" #: ../data/almanah.ui.h:15 -msgid "Change font style for selected text." -msgstr "Spremeni sloga pisave za izbrano besedilo." +msgid "Jump to the current date in the diary." +msgstr "Skoči na trenutni datum v dnevniku." #: ../data/almanah.ui.h:16 -msgid "_Font Style" -msgstr "_Slog pisave" - -#: ../data/almanah.ui.h:17 msgid "Calendar" msgstr "Koledar" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Območje urejanje vnosa" -#: ../data/almanah.ui.h:19 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Pretekli dogodki" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Seznam preteklih dogodkov" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Iskanje vnosa" -#: ../data/almanah.ui.h:22 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Iskanje" -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Seznam rezultatov" -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Ogled vnosa" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "na primer: \"14. marec 2009\" ali \"14.3.2009\"." -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "na primer “http://google.com/” ali “file:///home/me/Photos/photo.jpg”." -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Uspešni vnosi" -#: ../data/almanah.ui.h:28 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Združeni vnosi" -#: ../data/almanah.ui.h:29 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Spodleteli vnosi" -#: ../data/almanah.ui.h:30 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Seznam rezultatov uvoza" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Poišči" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "_Možnosti" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "ID šifrirnega ključa podatkovne zbirke" -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Uvozi" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"ID ključa za šifriranje in dešifriranje zbirke podatkov programa Almanah v " +"primeru, da je bil program preveden s podporo za šifriranje. Prazno polje " +"pomeni, da podatki ne bodo šifrirani." -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Izvozi" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Jezik črkovanja" -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Natisni dnevnik" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "Krajevno določilo jezika v katerem naj bo prevedeno črkovanje vnosa." -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_O osebnem dnevniku" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Ali naj bo črkovanja omogočeno?" -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Končaj" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Ali naj bo preverjanje črkovanja omogočeno." -#: ../src/application.c:241 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Napaka med odpiranjem podatkovne zbirke" -#: ../src/application.c:302 +#. Error loading the CSS +#: ../src/application.c:275 +#, c-format +msgid "" +"Couldn't load the CSS file '%s'. The interface might not be styled correctly" +msgstr "" +"Datoteke CSS '%s' ni mogoče naložiti. Vmesnik morda ne bo oblikovan do " +"popolnosti." + +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Omogoči razhroščevalni način" -#: ../src/application.c:319 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" "Upravljajte svoj dnevnik. Hkrati lahko odprete le en primerek programa." #. Print an error -#: ../src/application.c:330 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Možnosti ukazne vrstice ni mogoče razčleniti: %s\n" -#: ../src/application.c:349 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Napaka med šifriranjem podatkovne zbirke" -#: ../src/application.c:395 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:198 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Uporabniškega vmesnika datoteke \"%s\" ni mogoče naložiti" -#: ../src/application.c:518 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -263,7 +290,7 @@ "kot ga je objavila ustanova Free Software Foundation; bodisi različice 2 ali " "(po vaši izbiri) katerekoli poznejše različice." -#: ../src/application.c:522 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -274,7 +301,7 @@ "JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA " "DOLOČEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License." -#: ../src/application.c:526 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -282,12 +309,12 @@ "Skupaj s programom bi morali dobiti tudi kopijo GNU splošne javne licence. V " "primeru, da je niste, si oglejte ." -#: ../src/application.c:541 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Priročen dnevnik, shranjuje %u vnosov." -#: ../src/application.c:545 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Zasluge © 2008-2009 Philip Withnall" @@ -296,11 +323,11 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:553 +#: ../src/application.c:577 msgid "translator-credits" msgstr "Andrej Žnidaršič " -#: ../src/application.c:557 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Spletna stran Almanah" @@ -339,11 +366,11 @@ msgid "A task on an Evolution calendar." msgstr "Naloga v koledarju Evolution." -#: ../src/export-operation.c:45 ../src/import-operation.c:45 +#: ../src/export-operation.c:47 ../src/import-operation.c:45 msgid "Text Files" msgstr "Besedilne datoteke" -#: ../src/export-operation.c:46 +#: ../src/export-operation.c:48 msgid "" "Select a _folder to export the entries to as text files, one per entry, with " "names in the format 'yyyy-mm-dd', and no extension. All entries will be " @@ -353,11 +380,11 @@ "obliki 'yyyy-mm-dd' in brez pripon. Vsi vnosi bodo izvoženi nešifrirani v " "obliki običajnega besedila." -#: ../src/export-operation.c:50 ../src/import-operation.c:50 +#: ../src/export-operation.c:52 ../src/import-operation.c:50 msgid "Database" msgstr "Podatkovna zbirka" -#: ../src/export-operation.c:51 +#: ../src/export-operation.c:53 msgid "" "Select a _filename for a complete copy of the unencrypted Almanah Diary " "database to be given." @@ -365,6 +392,11 @@ "Izberite _ime datoteke za celotno kopijo nešifrirane podatkovne zbirke " "dnevnika Almanah." +#: ../src/export-operation.c:256 ../src/export-operation.c:313 +#, c-format +msgid "Error changing exported file permissions: %s" +msgstr "Napaka spreminjanja dovoljenj izvožene datoteke: %s" + #: ../src/import-export-dialog.c:202 msgid "Import _mode: " msgstr "_Način uvoza: " @@ -408,9 +440,9 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:568 -#: ../src/main-window.c:598 ../src/printing.c:263 ../src/search-dialog.c:182 -#: ../src/widgets/calendar-button.c:327 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e. %m. %Y" @@ -458,37 +490,37 @@ "Vnos uvožen iz \"%s\":\n" "\n" -#: ../src/main-window.c:572 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Ali ste prepričani, da želite urejati dnevniški vnos za %s?" -#: ../src/main-window.c:602 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Ali ste prepričani, da želite izbrisati dnevniški vnos za %s?" #. Print a warning about the unknown tag -#: ../src/main-window.c:711 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Neznana ali podvojena oznaka \"%s\" v vnosu. Oznaka je prezrta." -#: ../src/main-window.c:910 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Napaka med odpiranjem URI" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1177 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s @ %s" -#: ../src/main-window.c:1256 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "Vsebine vnosa ni mogoče naložiti" -#: ../src/main-window.c:1380 +#: ../src/main-window.c:1344 msgid "Spelling checker could not be initialized" msgstr "Preverjanja črkovanja ni mogoče zagnati" @@ -567,32 +599,32 @@ msgid "Searching…" msgstr "Iskanje ..." -#: ../src/storage-manager.c:259 +#: ../src/storage-manager.c:276 #, c-format msgid "GPGME is not at least version %s" msgstr "Različica GPGME ni vsaj različice %s" -#: ../src/storage-manager.c:268 +#: ../src/storage-manager.c:285 #, c-format msgid "GPGME doesn't support OpenPGP: %s" msgstr "GPGME ne podpira OpenPGP: %s" -#: ../src/storage-manager.c:277 +#: ../src/storage-manager.c:294 #, c-format msgid "Error creating cipher context: %s" msgstr "Napaka ustvarjanja vsebine cifre: %s" -#: ../src/storage-manager.c:306 +#: ../src/storage-manager.c:323 #, c-format msgid "Error opening encrypted database file \"%s\": %s" msgstr "Napaka odpiranja šifrirane datoteke podatkovne zbirke \"%s\": %s" -#: ../src/storage-manager.c:325 +#: ../src/storage-manager.c:342 #, c-format msgid "Error opening plain database file \"%s\": %s" msgstr "Napaka odpiranja besedilne podatkovne zbirke \"%s\": %s" -#: ../src/storage-manager.c:373 +#: ../src/storage-manager.c:390 msgid "" "The encrypted database is empty. The plain database file has been left " "undeleted as backup." @@ -601,27 +633,43 @@ "ohranjena kot varnostna kopija." #. Delete the plain file -#: ../src/storage-manager.c:376 +#: ../src/storage-manager.c:393 #, c-format msgid "Could not delete plain database file \"%s\"." msgstr "Besedilne podatkovne zbirke \"%s\" ni mogoče izbrisati." -#: ../src/storage-manager.c:417 +#: ../src/storage-manager.c:434 #, c-format msgid "Error decrypting database: %s" msgstr "Napaka dešifriranja podatkovne zbirke: %s" -#: ../src/storage-manager.c:451 +#: ../src/storage-manager.c:468 #, c-format msgid "Error getting encryption key: %s" msgstr "Napaka pridobivanja šifrirnega ključa: %s" -#: ../src/storage-manager.c:472 +#: ../src/storage-manager.c:489 #, c-format msgid "Error encrypting database: %s" msgstr "Napaka med šifriranjem podatkovne zbirke: %s" -#: ../src/storage-manager.c:574 +#: ../src/storage-manager.c:549 +#, c-format +msgid "Error changing database backup file permissions: %s" +msgstr "Napaka spreminjanja dovoljenj datoteke varnostne kopije: %s" + +#: ../src/storage-manager.c:571 ../src/storage-manager.c:627 +#, c-format +msgid "Error changing database file permissions: %s" +msgstr "Napaka spreminjanja dovoljenj datoteke podatkovne zbirke: %s" + +#. Translators: the first parameter is a filename, the second is an error message. +#: ../src/storage-manager.c:583 ../src/storage-manager.c:611 +#, c-format +msgid "Error backing up file ‘%s’: %s" +msgstr "Napaka ustvarjanja varnostne kopije datoteke ‘%s’: %s" + +#: ../src/storage-manager.c:620 #, c-format msgid "" "Could not open database \"%s\". SQLite provided the following error message: " @@ -630,7 +678,7 @@ "Podatkovne zbirke \"%s\" ni mogoče odpreti. SQLite poroča naslednje poročilo " "o napaki: %s" -#: ../src/storage-manager.c:651 +#: ../src/storage-manager.c:704 #, c-format msgid "" "Could not run query \"%s\". SQLite provided the following error message: %s" @@ -638,41 +686,50 @@ "Poizvedbe \"%s\" ni mogoče zagnati. SQLite poroča naslednje poročilo o " "napaki: %s" -#: ../src/storage-manager.c:954 +#: ../src/storage-manager.c:1010 msgid "Error deserializing entry into buffer while searching." msgstr "Napaka med ločitvijo vnosa iz zaporedja v medpomnilnik med iskanjem." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Pomembno!" - -#. Error loading the CSS -#: ../src/widgets/calendar-button.c:134 ../src/widgets/calendar-window.c:63 -#, c-format -msgid "" -"Couldn't load the CSS file '%s'. The interface might not be styled correctly" -msgstr "" -"Datoteke CSS '%s' ni mogoče naložiti. Vmesnik morda ne bo oblikovan do " -"popolnosti." +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Vnesite URI" -#: ../src/widgets/calendar-button.c:158 +#: ../src/widgets/calendar-button.c:140 #, c-format msgid "UI file \"%s\" could not be loaded: %s" msgstr "Uporabniškega vmesnika \"%s\" ni mogoče naložiti: %s" -#: ../src/widgets/calendar-button.c:168 +#: ../src/widgets/calendar-button.c:150 msgid "Can't load calendar window object from UI file" msgstr "" "Ni mogoče naložiti predmeta okna koledarja iz datoteke uporabniškega vmesnika" -#: ../src/widgets/calendar-window.c:100 +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Pomembno!" + +#: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Neznana vhodna naprava" -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Vnesite URI" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +msgid "add tag" +msgstr "dodaj oznako" + +#. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? +#: ../src/widgets/tag.c:400 +msgid "Remove tag" +msgstr "Odstrani oznako" + +#~ msgid "Font Style" +#~ msgstr "Slog pisave" + +#~ msgid "Change font style for selected text." +#~ msgstr "Spremeni sloga pisave za izbrano besedilo." + +#~ msgid "_Font Style" +#~ msgstr "_Slog pisave" #~ msgid "_File" #~ msgstr "_Datoteka" diff -Nru almanah-0.10.8/po/sr.po almanah-0.11.0/po/sr.po --- almanah-0.10.8/po/sr.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/sr.po 2013-10-20 11:57:20.000000000 +0000 @@ -7,8 +7,8 @@ "Project-Id-Version: almanah\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almana" "h&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-15 10:07+0000\n" -"PO-Revision-Date: 2013-02-19 20:38+0200\n" +"POT-Creation-Date: 2013-09-04 23:24+0000\n" +"PO-Revision-Date: 2013-09-08 07:42+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -19,8 +19,54 @@ "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:135 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "Алманах је програм који вам омогућава да водите дневник вашег живота." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Можете да шифрујете дневник да бисте очували вашу приватност. Има " +"способности уређивања, укључујући обликовање текста и штампање, и приказује " +"вам спискове догађаја (на вашем рачунару) за сваки дан (као што су задаци и " +"састанци из Еволуције)." + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Тражи" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "_Поставке" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Увези" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Извези" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Штампај дневник" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_О дневнику Алманах" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Изађи" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Дневник Алманах" @@ -29,39 +75,14 @@ msgstr "Водите лични дневник" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Дневник" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "ИБ кључа шифровања базе података" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"ИД кључа који се користи за шифровање и дешифровање базе података, ако је " -"Алманах изграђен са подршком за шифровање. Оставите празно да онемогућите " -"шифровање базе података." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Језик провере писања" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "Шифра језика за који ће се вршити провера писања." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Провера писања је укључена?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Ако је изабрано, вршиће се провера приликом писања." +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "дневник;записник;" #: ../data/almanah.ui.h:1 msgid "Select Date…" @@ -107,110 +128,120 @@ msgstr "Одредите да ли је тренутни унос означен као важан." #: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Прикажи ознаке" + +#: ../data/almanah.ui.h:12 +#| msgid "Jump to the current date in the diary." +msgid "Show tags for the current entry" +msgstr "Прикажите ознаке за текући унос" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "По_моћ" -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "_Иди на данашње" -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Пребаците се на текући датум у дневнику." -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Календар" -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Област за уређивање уноса" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Прошли догађаји" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Списак прошлих догађаја" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Унос претраге" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Потражи" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Списак резултата" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Прикажи унос" -#: ../data/almanah.ui.h:22 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "нпр. „16.07.2033“ или „16. јул 2033.“." -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "" "нпр. „http://google.com/“ или „датотека:///лична_фасцикла/Марко/фотографије/" "слика.jpg“." -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Успешни уноси" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Спојени уноси" -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Неуспели уноси" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Списак резултата увожења" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Тражи" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "_Поставке" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "ИБ кључа шифровања базе података" -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Увези" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"ИД кључа који се користи за шифровање и дешифровање базе података, ако је " +"Алманах изграђен са подршком за шифровање. Оставите празно да онемогућите " +"шифровање базе података." -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Извези" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Језик провере писања" -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Штампај дневник" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "Шифра језика за који ће се вршити провера писања." -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_О дневнику Алманах" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Провера писања је укључена?" -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Изађи" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Ако је изабрано, вршиће се провера приликом писања." -#: ../src/application.c:243 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Грешка приликом отварања базе података" #. Error loading the CSS -#: ../src/application.c:272 +#: ../src/application.c:275 #, c-format msgid "" "Couldn't load the CSS file '%s'. The interface might not be styled correctly" @@ -218,11 +249,11 @@ "Не могу да учитам ЦСС датотеку „%s“. Сучеље не може бити исправно " "стилизовано." -#: ../src/application.c:316 +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Укључује режим за исправљање грешака" -#: ../src/application.c:333 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -230,24 +261,24 @@ "исто време." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Опције линије наредби не могу бити обрађене: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Грешка приликом шифровања базе података" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:194 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Не могу да учитам датотеку корисничког сучеља „%s“" -#: ../src/application.c:532 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -259,7 +290,7 @@ "софтвера, било верзије 3 лиценце или (по вашем избору) било које новије " "верзије." -#: ../src/application.c:536 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -270,7 +301,7 @@ "чак и без примењене гаранције ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ " "НАМЕНИ. Погледајте Гнуову општу јавну лиценцу за више детаља." -#: ../src/application.c:540 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -278,12 +309,12 @@ "Треба да сте примили примерак Гнуове опште јавне лиценце уз Алманах. Ако " "нисте, погледајте ." -#: ../src/application.c:555 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Користан чувар дневника, садржи %u уносa." -#: ../src/application.c:559 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Ауторска права © 2008-2009 Филип Витнал" @@ -292,11 +323,11 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:577 msgid "translator-credits" msgstr " Мирослав Николић, miroslavnikolic@rocketmail.com" -#: ../src/application.c:571 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Веб страница Алманаха" @@ -404,8 +435,8 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:566 -#: ../src/main-window.c:596 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 #: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -455,37 +486,37 @@ "Унос је увежен из „%s“:\n" "\n" -#: ../src/main-window.c:570 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Да ли сте сигурни да желите да уредите овај унос дневника за „%s“?" -#: ../src/main-window.c:600 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Да ли сте сигурни да желите да обришете овај унос дневника за „%s“?" #. Print a warning about the unknown tag -#: ../src/main-window.c:709 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Непозната или дуплирана ознака текста „%s“ у уносу. Занемарујем." -#: ../src/main-window.c:908 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Грешка приликом отварања адресе" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1082 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s у %s" -#: ../src/main-window.c:1161 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "Садржај уноса не може бити учитан" -#: ../src/main-window.c:1326 +#: ../src/main-window.c:1344 msgid "Spelling checker could not be initialized" msgstr "Провера писања не може бити започета" @@ -635,14 +666,13 @@ "Не могу да покренем упит „%s“. СКуЛајт је обезбедио следећу поруку о грешци: " "%s" -#: ../src/storage-manager.c:970 +#: ../src/storage-manager.c:973 msgid "Error deserializing entry into buffer while searching." msgstr "Грешка у рашчлањивању уноса у баферу током претраживања." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Важно!" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Унесите адресу" #: ../src/widgets/calendar-button.c:140 #, c-format @@ -654,15 +684,20 @@ msgstr "" "Не могу да учитам објекат прозора календара из датотеке корисничког сучеља" +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Важно!" + #: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Непознат улазни уређај" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +msgid "add tag" +msgstr "додај ознаку" + #. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? #: ../src/widgets/tag.c:400 msgid "Remove tag" msgstr "Уклоните ознаку" - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Унесите адресу" diff -Nru almanah-0.10.8/po/sr@latin.po almanah-0.11.0/po/sr@latin.po --- almanah-0.10.8/po/sr@latin.po 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/po/sr@latin.po 2013-10-20 11:57:20.000000000 +0000 @@ -7,8 +7,8 @@ "Project-Id-Version: almanah\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=almana" "h&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-15 10:07+0000\n" -"PO-Revision-Date: 2013-02-19 20:38+0200\n" +"POT-Creation-Date: 2013-09-04 23:24+0000\n" +"PO-Revision-Date: 2013-09-08 07:42+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -19,8 +19,54 @@ "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" -#: ../data/almanah.desktop.in.h:1 ../src/application.c:129 -#: ../src/main-window.c:135 +#: ../data/almanah.appdata.xml.in.h:1 +msgid "" +"Almanah Diary is an application to allow you to keep a diary of your life." +msgstr "Almanah je program koji vam omogućava da vodite dnevnik vašeg života." + +#: ../data/almanah.appdata.xml.in.h:2 +msgid "" +"You can encrypt the diary to preserve your privacy. It has editing " +"abilities, including text formatting and printing and shows you a lists of " +"events which happened (on your computer) for each day (such as tasks and " +"appointments from Evolution)." +msgstr "" +"Možete da šifrujete dnevnik da biste očuvali vašu privatnost. Ima " +"sposobnosti uređivanja, uključujući oblikovanje teksta i štampanje, i prikazuje " +"vam spiskove događaja (na vašem računaru) za svaki dan (kao što su zadaci i " +"sastanci iz Evolucije)." + +#: ../data/almanah-app-menu.ui.h:1 +msgid "_Search" +msgstr "_Traži" + +#: ../data/almanah-app-menu.ui.h:2 +msgid "Pr_eferences" +msgstr "_Postavke" + +#. Set the button label +#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 +msgid "_Import" +msgstr "_Uvezi" + +#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 +msgid "_Export" +msgstr "_Izvezi" + +#: ../data/almanah-app-menu.ui.h:5 +msgid "_Print diary" +msgstr "_Štampaj dnevnik" + +#: ../data/almanah-app-menu.ui.h:6 +msgid "_About Almanah Diary" +msgstr "_O dnevniku Almanah" + +#: ../data/almanah-app-menu.ui.h:7 +msgid "_Quit" +msgstr "_Izađi" + +#: ../data/almanah.desktop.in.h:1 ../src/application.c:132 +#: ../src/main-window.c:136 msgid "Almanah Diary" msgstr "Dnevnik Almanah" @@ -29,39 +75,14 @@ msgstr "Vodite lični dnevnik" #. Translators: This is the default name of the PDF/PS/SVG file the diary is printed to if "Print to File" is chosen. -#: ../data/almanah.desktop.in.h:3 ../src/application.c:260 +#: ../data/almanah.desktop.in.h:3 ../src/application.c:263 msgid "Diary" msgstr "Dnevnik" -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 -msgid "Database encryption key ID" -msgstr "IB ključa šifrovanja baze podataka" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 -msgid "" -"The ID of the key to use to encrypt and decrypt the database, if Almanah has " -"been built with encryption support. Leave blank to disable database " -"encryption." -msgstr "" -"ID ključa koji se koristi za šifrovanje i dešifrovanje baze podataka, ako je " -"Almanah izgrađen sa podrškom za šifrovanje. Ostavite prazno da onemogućite " -"šifrovanje baze podataka." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 -msgid "Spell checking language" -msgstr "Jezik provere pisanja" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 -msgid "The locale specifier of the language in which to check entry spellings." -msgstr "Šifra jezika za koji će se vršiti provera pisanja." - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 -msgid "Spell checking enabled?" -msgstr "Provera pisanja je uključena?" - -#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 -msgid "Whether spell checking of entries is enabled." -msgstr "Ako je izabrano, vršiće se provera prilikom pisanja." +#. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! +#: ../data/almanah.desktop.in.h:5 +msgid "diary;journal;" +msgstr "dnevnik;zapisnik;" #: ../data/almanah.ui.h:1 msgid "Select Date…" @@ -107,110 +128,120 @@ msgstr "Odredite da li je trenutni unos označen kao važan." #: ../data/almanah.ui.h:11 +msgid "Show tags" +msgstr "Prikaži oznake" + +#: ../data/almanah.ui.h:12 +#| msgid "Jump to the current date in the diary." +msgid "Show tags for the current entry" +msgstr "Prikažite oznake za tekući unos" + +#: ../data/almanah.ui.h:13 msgid "_Help" msgstr "Po_moć" -#: ../data/almanah.ui.h:12 +#: ../data/almanah.ui.h:14 msgid "Go to _Today" msgstr "_Idi na današnje" -#: ../data/almanah.ui.h:13 +#: ../data/almanah.ui.h:15 msgid "Jump to the current date in the diary." msgstr "Prebacite se na tekući datum u dnevniku." -#: ../data/almanah.ui.h:14 +#: ../data/almanah.ui.h:16 msgid "Calendar" msgstr "Kalendar" -#: ../data/almanah.ui.h:15 +#: ../data/almanah.ui.h:17 msgid "Entry editing area" msgstr "Oblast za uređivanje unosa" -#: ../data/almanah.ui.h:16 +#: ../data/almanah.ui.h:18 msgid "Past events" msgstr "Prošli događaji" -#: ../data/almanah.ui.h:17 +#: ../data/almanah.ui.h:19 msgid "Past Event List" msgstr "Spisak prošlih događaja" -#: ../data/almanah.ui.h:18 +#: ../data/almanah.ui.h:20 msgid "Search entry" msgstr "Unos pretrage" -#: ../data/almanah.ui.h:19 ../src/search-dialog.c:69 +#: ../data/almanah.ui.h:21 ../src/search-dialog.c:69 msgid "Search" msgstr "Potraži" -#: ../data/almanah.ui.h:20 +#: ../data/almanah.ui.h:22 msgid "Result List" msgstr "Spisak rezultata" -#: ../data/almanah.ui.h:21 +#: ../data/almanah.ui.h:23 msgid "View Entry" msgstr "Prikaži unos" -#: ../data/almanah.ui.h:22 +#: ../data/almanah.ui.h:24 msgid "e.g. \"14/03/2009\" or \"14th March 2009\"." msgstr "npr. „16.07.2033“ ili „16. jul 2033.“." -#: ../data/almanah.ui.h:23 +#: ../data/almanah.ui.h:25 msgid "e.g. “http://google.com/” or “file:///home/me/Photos/photo.jpg”." msgstr "" "npr. „http://google.com/“ ili „datoteka:///lična_fascikla/Marko/fotografije/" "slika.jpg“." -#: ../data/almanah.ui.h:24 +#: ../data/almanah.ui.h:26 msgid "Successful Entries" msgstr "Uspešni unosi" -#: ../data/almanah.ui.h:25 +#: ../data/almanah.ui.h:27 msgid "Merged Entries" msgstr "Spojeni unosi" -#: ../data/almanah.ui.h:26 +#: ../data/almanah.ui.h:28 msgid "Failed Entries" msgstr "Neuspeli unosi" -#: ../data/almanah.ui.h:27 +#: ../data/almanah.ui.h:29 msgid "Import Results List" msgstr "Spisak rezultata uvoženja" -#: ../data/almanah-app-menu.ui.h:1 -msgid "_Search" -msgstr "_Traži" - -#: ../data/almanah-app-menu.ui.h:2 -msgid "Pr_eferences" -msgstr "_Postavke" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:1 +msgid "Database encryption key ID" +msgstr "IB ključa šifrovanja baze podataka" -#. Set the button label -#: ../data/almanah-app-menu.ui.h:3 ../src/import-export-dialog.c:208 -msgid "_Import" -msgstr "_Uvezi" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:2 +msgid "" +"The ID of the key to use to encrypt and decrypt the database, if Almanah has " +"been built with encryption support. Leave blank to disable database " +"encryption." +msgstr "" +"ID ključa koji se koristi za šifrovanje i dešifrovanje baze podataka, ako je " +"Almanah izgrađen sa podrškom za šifrovanje. Ostavite prazno da onemogućite " +"šifrovanje baze podataka." -#: ../data/almanah-app-menu.ui.h:4 ../src/import-export-dialog.c:208 -msgid "_Export" -msgstr "_Izvezi" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:3 +msgid "Spell checking language" +msgstr "Jezik provere pisanja" -#: ../data/almanah-app-menu.ui.h:5 -msgid "_Print diary" -msgstr "_Štampaj dnevnik" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:4 +msgid "The locale specifier of the language in which to check entry spellings." +msgstr "Šifra jezika za koji će se vršiti provera pisanja." -#: ../data/almanah-app-menu.ui.h:6 -msgid "_About Almanah Diary" -msgstr "_O dnevniku Almanah" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:5 +msgid "Spell checking enabled?" +msgstr "Provera pisanja je uključena?" -#: ../data/almanah-app-menu.ui.h:7 -msgid "_Quit" -msgstr "_Izađi" +#: ../data/org.gnome.almanah.gschema.xml.in.in.h:6 +msgid "Whether spell checking of entries is enabled." +msgstr "Ako je izabrano, vršiće se provera prilikom pisanja." -#: ../src/application.c:243 +#: ../src/application.c:246 msgid "Error opening database" msgstr "Greška prilikom otvaranja baze podataka" #. Error loading the CSS -#: ../src/application.c:272 +#: ../src/application.c:275 #, c-format msgid "" "Couldn't load the CSS file '%s'. The interface might not be styled correctly" @@ -218,11 +249,11 @@ "Ne mogu da učitam CSS datoteku „%s“. Sučelje ne može biti ispravno " "stilizovano." -#: ../src/application.c:316 +#: ../src/application.c:319 msgid "Enable debug mode" msgstr "Uključuje režim za ispravljanje grešaka" -#: ../src/application.c:333 +#: ../src/application.c:336 msgid "" "Manage your diary. Only one instance of the program may be open at any time." msgstr "" @@ -230,24 +261,24 @@ "isto vreme." #. Print an error -#: ../src/application.c:344 +#: ../src/application.c:347 #, c-format msgid "Command line options could not be parsed: %s\n" msgstr "Opcije linije naredbi ne mogu biti obrađene: %s\n" -#: ../src/application.c:363 +#: ../src/application.c:366 msgid "Error encrypting database" msgstr "Greška prilikom šifrovanja baze podataka" -#: ../src/application.c:409 ../src/date-entry-dialog.c:129 +#: ../src/application.c:419 ../src/date-entry-dialog.c:129 #: ../src/import-export-dialog.c:168 ../src/import-export-dialog.c:472 -#: ../src/main-window.c:194 ../src/preferences-dialog.c:191 +#: ../src/main-window.c:195 ../src/preferences-dialog.c:191 #: ../src/search-dialog.c:97 ../src/uri-entry-dialog.c:128 #, c-format msgid "UI file \"%s\" could not be loaded" msgstr "Ne mogu da učitam datoteku korisničkog sučelja „%s“" -#: ../src/application.c:532 +#: ../src/application.c:542 msgid "" "Almanah is free software: you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -259,7 +290,7 @@ "softvera, bilo verzije 3 licence ili (po vašem izboru) bilo koje novije " "verzije." -#: ../src/application.c:536 +#: ../src/application.c:546 msgid "" "Almanah is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -270,7 +301,7 @@ "čak i bez primenjene garancije TRŽIŠNE VREDNOSTI ili PRILAGOĐENOSTI ODREĐENOJ " "NAMENI. Pogledajte Gnuovu opštu javnu licencu za više detalja." -#: ../src/application.c:540 +#: ../src/application.c:550 msgid "" "You should have received a copy of the GNU General Public License along with " "Almanah. If not, see ." @@ -278,12 +309,12 @@ "Treba da ste primili primerak Gnuove opšte javne licence uz Almanah. Ako " "niste, pogledajte ." -#: ../src/application.c:555 +#: ../src/application.c:565 #, c-format msgid "A helpful diary keeper, storing %u entries." msgstr "Koristan čuvar dnevnika, sadrži %u unosa." -#: ../src/application.c:559 +#: ../src/application.c:569 msgid "Copyright © 2008-2009 Philip Withnall" msgstr "Autorska prava © 2008-2009 Filip Vitnal" @@ -292,11 +323,11 @@ #. * "Translator name 1 \n" #. * "Translator name 2 " #. -#: ../src/application.c:567 +#: ../src/application.c:577 msgid "translator-credits" msgstr " Miroslav Nikolić, miroslavnikolic@rocketmail.com" -#: ../src/application.c:571 +#: ../src/application.c:581 msgid "Almanah Website" msgstr "Veb stranica Almanaha" @@ -404,8 +435,8 @@ #. Translators: This is a strftime()-format string for the date displayed above each printed entry. #. Translators: This is a strftime()-format string for the dates displayed in search results. #. Translators: This is a strftime()-format string for the date displayed at the top of the main window. -#: ../src/import-export-dialog.c:539 ../src/main-window.c:566 -#: ../src/main-window.c:596 ../src/printing.c:263 ../src/search-dialog.c:182 +#: ../src/import-export-dialog.c:539 ../src/main-window.c:567 +#: ../src/main-window.c:597 ../src/printing.c:263 ../src/search-dialog.c:182 #: ../src/widgets/calendar-button.c:309 msgid "%A, %e %B %Y" msgstr "%A, %e %B %Y" @@ -455,37 +486,37 @@ "Unos je uvežen iz „%s“:\n" "\n" -#: ../src/main-window.c:570 +#: ../src/main-window.c:571 #, c-format msgid "Are you sure you want to edit this diary entry for %s?" msgstr "Da li ste sigurni da želite da uredite ovaj unos dnevnika za „%s“?" -#: ../src/main-window.c:600 +#: ../src/main-window.c:601 #, c-format msgid "Are you sure you want to delete this diary entry for %s?" msgstr "Da li ste sigurni da želite da obrišete ovaj unos dnevnika za „%s“?" #. Print a warning about the unknown tag -#: ../src/main-window.c:709 +#: ../src/main-window.c:710 #, c-format msgid "Unknown or duplicate text tag \"%s\" in entry. Ignoring." msgstr "Nepoznata ili duplirana oznaka teksta „%s“ u unosu. Zanemarujem." -#: ../src/main-window.c:908 +#: ../src/main-window.c:918 msgid "Error opening URI" msgstr "Greška prilikom otvaranja adrese" #. Translators: this is an event source name (like Calendar appointment) and the time when the event takes place -#: ../src/main-window.c:1082 +#: ../src/main-window.c:1092 #, c-format msgid "%s @ %s" msgstr "%s u %s" -#: ../src/main-window.c:1161 +#: ../src/main-window.c:1171 msgid "Entry content could not be loaded" msgstr "Sadržaj unosa ne može biti učitan" -#: ../src/main-window.c:1326 +#: ../src/main-window.c:1344 msgid "Spelling checker could not be initialized" msgstr "Provera pisanja ne može biti započeta" @@ -635,14 +666,13 @@ "Ne mogu da pokrenem upit „%s“. SKuLajt je obezbedio sledeću poruku o grešci: " "%s" -#: ../src/storage-manager.c:970 +#: ../src/storage-manager.c:973 msgid "Error deserializing entry into buffer while searching." msgstr "Greška u raščlanjivanju unosa u baferu tokom pretraživanja." -#. Translators: This is the detail string for important days as displayed in the calendar. -#: ../src/widgets/calendar.c:176 -msgid "Important!" -msgstr "Važno!" +#: ../src/uri-entry-dialog.c:71 +msgid "Enter URI" +msgstr "Unesite adresu" #: ../src/widgets/calendar-button.c:140 #, c-format @@ -654,15 +684,20 @@ msgstr "" "Ne mogu da učitam objekat prozora kalendara iz datoteke korisničkog sučelja" +#. Translators: This is the detail string for important days as displayed in the calendar. +#: ../src/widgets/calendar.c:176 +msgid "Important!" +msgstr "Važno!" + #: ../src/widgets/calendar-window.c:80 msgid "Unknown input device" msgstr "Nepoznat ulazni uređaj" +#: ../src/widgets/entry-tags-area.c:100 ../src/widgets/tag-entry.c:162 +msgid "add tag" +msgstr "dodaj oznaku" + #. Looks like gtk_widget_set_tooltip_text don't works here, even in the init... ? #: ../src/widgets/tag.c:400 msgid "Remove tag" msgstr "Uklonite oznaku" - -#: ../src/uri-entry-dialog.c:71 -msgid "Enter URI" -msgstr "Unesite adresu" diff -Nru almanah-0.10.8/src/Makefile.am almanah-0.11.0/src/Makefile.am --- almanah-0.10.8/src/Makefile.am 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/src/Makefile.am 2013-11-18 20:13:40.000000000 +0000 @@ -48,6 +48,8 @@ widgets/entry-tags-area.c \ widgets/hyperlink-tag.c \ widgets/hyperlink-tag.h \ + widgets/tag-accessible.c \ + widgets/tag-accessible.h \ widgets/tag.c \ widgets/tag.h \ widgets/tag-entry.c \ diff -Nru almanah-0.10.8/src/Makefile.in almanah-0.11.0/src/Makefile.in --- almanah-0.10.8/src/Makefile.in 2013-02-26 21:35:20.000000000 +0000 +++ almanah-0.11.0/src/Makefile.in 2013-11-30 12:36:40.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.2 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -73,7 +101,7 @@ @ENCRYPTION_TRUE@ preferences-dialog.h subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -101,10 +129,11 @@ widgets/eggwrapbox.h widgets/eggwrapbox.c \ widgets/eggwrapbox-enums.h widgets/eggwrapbox-enums.c \ widgets/entry-tags-area.h widgets/entry-tags-area.c \ - widgets/hyperlink-tag.c widgets/hyperlink-tag.h widgets/tag.c \ - widgets/tag.h widgets/tag-entry.c widgets/tag-entry.h \ - event-factories/calendar.c event-factories/calendar.h \ - event-factories/calendar-client.c \ + widgets/hyperlink-tag.c widgets/hyperlink-tag.h \ + widgets/tag-accessible.c widgets/tag-accessible.h \ + widgets/tag.c widgets/tag.h widgets/tag-entry.c \ + widgets/tag-entry.h event-factories/calendar.c \ + event-factories/calendar.h event-factories/calendar-client.c \ event-factories/calendar-client.h \ event-factories/calendar-debug.h \ event-factories/calendar-sources.c \ @@ -148,6 +177,7 @@ widgets/almanah-eggwrapbox-enums.$(OBJEXT) \ widgets/almanah-entry-tags-area.$(OBJEXT) \ widgets/almanah-hyperlink-tag.$(OBJEXT) \ + widgets/almanah-tag-accessible.$(OBJEXT) \ widgets/almanah-tag.$(OBJEXT) \ widgets/almanah-tag-entry.$(OBJEXT) $(am__objects_3) \ $(am__objects_4) @@ -203,6 +233,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -375,9 +422,10 @@ widgets/eggwrapbox.h widgets/eggwrapbox.c \ widgets/eggwrapbox-enums.h widgets/eggwrapbox-enums.c \ widgets/entry-tags-area.h widgets/entry-tags-area.c \ - widgets/hyperlink-tag.c widgets/hyperlink-tag.h widgets/tag.c \ - widgets/tag.h widgets/tag-entry.c widgets/tag-entry.h \ - $(am__append_1) $(am__append_2) + widgets/hyperlink-tag.c widgets/hyperlink-tag.h \ + widgets/tag-accessible.c widgets/tag-accessible.h \ + widgets/tag.c widgets/tag.h widgets/tag-entry.c \ + widgets/tag-entry.h $(am__append_1) $(am__append_2) almanah_CPPFLAGS = \ -DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ @@ -461,10 +509,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -485,7 +535,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -518,6 +569,8 @@ widgets/$(DEPDIR)/$(am__dirstamp) widgets/almanah-hyperlink-tag.$(OBJEXT): widgets/$(am__dirstamp) \ widgets/$(DEPDIR)/$(am__dirstamp) +widgets/almanah-tag-accessible.$(OBJEXT): widgets/$(am__dirstamp) \ + widgets/$(DEPDIR)/$(am__dirstamp) widgets/almanah-tag.$(OBJEXT): widgets/$(am__dirstamp) \ widgets/$(DEPDIR)/$(am__dirstamp) widgets/almanah-tag-entry.$(OBJEXT): widgets/$(am__dirstamp) \ @@ -553,6 +606,7 @@ events/$(DEPDIR)/$(am__dirstamp) events/almanah-calendar-task.$(OBJEXT): events/$(am__dirstamp) \ events/$(DEPDIR)/$(am__dirstamp) + almanah$(EXEEXT): $(almanah_OBJECTS) $(almanah_DEPENDENCIES) $(EXTRA_almanah_DEPENDENCIES) @rm -f almanah$(EXEEXT) $(AM_V_CCLD)$(almanah_LINK) $(almanah_OBJECTS) $(almanah_LDADD) $(LIBS) @@ -599,6 +653,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-eggwrapbox.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-entry-tags-area.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-hyperlink-tag.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-tag-accessible.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-tag-entry.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@widgets/$(DEPDIR)/almanah-tag.Po@am__quote@ @@ -976,6 +1031,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-hyperlink-tag.obj `if test -f 'widgets/hyperlink-tag.c'; then $(CYGPATH_W) 'widgets/hyperlink-tag.c'; else $(CYGPATH_W) '$(srcdir)/widgets/hyperlink-tag.c'; fi` +widgets/almanah-tag-accessible.o: widgets/tag-accessible.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-tag-accessible.o -MD -MP -MF widgets/$(DEPDIR)/almanah-tag-accessible.Tpo -c -o widgets/almanah-tag-accessible.o `test -f 'widgets/tag-accessible.c' || echo '$(srcdir)/'`widgets/tag-accessible.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-tag-accessible.Tpo widgets/$(DEPDIR)/almanah-tag-accessible.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/tag-accessible.c' object='widgets/almanah-tag-accessible.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-tag-accessible.o `test -f 'widgets/tag-accessible.c' || echo '$(srcdir)/'`widgets/tag-accessible.c + +widgets/almanah-tag-accessible.obj: widgets/tag-accessible.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-tag-accessible.obj -MD -MP -MF widgets/$(DEPDIR)/almanah-tag-accessible.Tpo -c -o widgets/almanah-tag-accessible.obj `if test -f 'widgets/tag-accessible.c'; then $(CYGPATH_W) 'widgets/tag-accessible.c'; else $(CYGPATH_W) '$(srcdir)/widgets/tag-accessible.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-tag-accessible.Tpo widgets/$(DEPDIR)/almanah-tag-accessible.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='widgets/tag-accessible.c' object='widgets/almanah-tag-accessible.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -c -o widgets/almanah-tag-accessible.obj `if test -f 'widgets/tag-accessible.c'; then $(CYGPATH_W) 'widgets/tag-accessible.c'; else $(CYGPATH_W) '$(srcdir)/widgets/tag-accessible.c'; fi` + widgets/almanah-tag.o: widgets/tag.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(almanah_CPPFLAGS) $(CPPFLAGS) $(almanah_CFLAGS) $(CFLAGS) -MT widgets/almanah-tag.o -MD -MP -MF widgets/$(DEPDIR)/almanah-tag.Tpo -c -o widgets/almanah-tag.o `test -f 'widgets/tag.c' || echo '$(srcdir)/'`widgets/tag.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) widgets/$(DEPDIR)/almanah-tag.Tpo widgets/$(DEPDIR)/almanah-tag.Po @@ -1122,26 +1191,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1153,15 +1211,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1170,9 +1224,10 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -1334,19 +1389,19 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool cscopelist ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-data \ - install-data-am 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 maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am 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 maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS almanah-marshal.h: almanah-marshal.list diff -Nru almanah-0.10.8/src/application.c almanah-0.11.0/src/application.c --- almanah-0.10.8/src/application.c 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/src/application.c 2013-10-20 11:57:20.000000000 +0000 @@ -31,6 +31,7 @@ #include "printing.h" #include "search-dialog.h" #include "storage-manager.h" +#include "interface.h" static void constructed (GObject *object); static void dispose (GObject *object); @@ -40,7 +41,7 @@ static void startup (GApplication *application); static void activate (GApplication *application); static gint handle_command_line (GApplication *application, GApplicationCommandLine *command_line); -static void quit_main_loop (GApplication *application); +static void window_removed (GtkApplication *application, GtkWindow *window); static void almanah_application_init_actions (AlmanahApplication *self); @@ -87,6 +88,7 @@ { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GApplicationClass *gapplication_class = G_APPLICATION_CLASS (klass); + GtkApplicationClass *gtkapplication_class = GTK_APPLICATION_CLASS (klass); g_type_class_add_private (klass, sizeof (AlmanahApplicationPrivate)); @@ -98,7 +100,8 @@ gapplication_class->startup = startup; gapplication_class->activate = activate; gapplication_class->command_line = handle_command_line; - gapplication_class->quit_mainloop = quit_main_loop; + + gtkapplication_class->window_removed = window_removed; g_object_class_install_property (gobject_class, PROP_DEBUG, g_param_spec_boolean ("debug", @@ -356,7 +359,7 @@ } static void -storage_manager_disconnected_cb (AlmanahStorageManager *self, const gchar *gpgme_error_message, const gchar *warning_message, GApplication *application) +storage_manager_disconnected_cb (AlmanahStorageManager *self, const gchar *gpgme_error_message, const gchar *warning_message, GtkApplication *application) { if (gpgme_error_message != NULL || warning_message != NULL) { GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, @@ -373,21 +376,28 @@ gtk_widget_destroy (dialog); } - /* Chain up to the parent class */ - G_APPLICATION_CLASS (almanah_application_parent_class)->quit_mainloop (application); + /* Allow the end of the applaction */ + g_application_release (G_APPLICATION (application)); } static void -quit_main_loop (GApplication *application) +window_removed (GtkApplication *application, GtkWindow *window) { - AlmanahApplicationPrivate *priv = ALMANAH_APPLICATION (application)->priv; + /* This would normally result in the end of the application, but we need to close the database connection first + to prevent an unencrypted database in the filesystem, and we don't want a bug like that. + So, we append a reference to the application when the user close the main window. When the application disconnect + from the database, allowing the encryption if necessary, we remove this reference with g_application_release. + See: https://bugzilla.gnome.org/show_bug.cgi?id=695117 */ + if (ALMANAH_IS_MAIN_WINDOW (window)) { + AlmanahApplicationPrivate *priv = ALMANAH_APPLICATION (application)->priv; - /* This would normally result in gtk_main_quit() being called, but we need to close the database connection first. */ - g_signal_connect (priv->storage_manager, "disconnected", (GCallback) storage_manager_disconnected_cb, application); - almanah_storage_manager_disconnect (priv->storage_manager, NULL); + g_application_hold (G_APPLICATION (application)); + + g_signal_connect (priv->storage_manager, "disconnected", (GCallback) storage_manager_disconnected_cb, application); + almanah_storage_manager_disconnect (priv->storage_manager, NULL); + } - /* Quitting is actually done in storage_manager_disconnected_cb, which is called once - * the storage manager has encrypted the DB and disconnected from it. */ + GTK_APPLICATION_CLASS (almanah_application_parent_class)->window_removed (application, window); } static void diff -Nru almanah-0.10.8/src/export-operation.c almanah-0.11.0/src/export-operation.c --- almanah-0.10.8/src/export-operation.c 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/src/export-operation.c 2013-11-10 12:35:58.000000000 +0000 @@ -18,8 +18,10 @@ */ #include +#include #include #include +#include #include #include "export-operation.h" @@ -213,7 +215,7 @@ almanah_storage_manager_iter_init (&iter); while ((entry = almanah_storage_manager_get_entries (self->priv->storage_manager, &iter)) != NULL) { GDate date; - gchar *filename, *content; + gchar *filename, *content, *path; GFile *file; GtkTextIter start_iter, end_iter; @@ -245,11 +247,26 @@ break; } - /* Progress callback */ - progress_idle_callback (progress_callback, progress_user_data, &date); + g_free (content); + + /* Ensure the file is only readable to the current user. */ + path = g_file_get_path (file); + if (g_chmod (path, 0600) != 0) { + g_set_error (&child_error, G_IO_ERROR, G_IO_ERROR_FAILED, + _("Error changing exported file permissions: %s"), + g_strerror (errno)); + + g_object_unref (file); + g_free (path); + + break; + } g_object_unref (file); - g_free (content); + g_free (path); + + /* Progress callback */ + progress_idle_callback (progress_callback, progress_user_data, &date); /* Clear the buffer. */ gtk_text_buffer_delete (buffer, &start_iter, &end_iter); @@ -279,6 +296,7 @@ { GFile *source; gboolean success; + gchar *destination_path; /* We ignore the progress callbacks, since this is a fairly fast operation, and it exports all the entries at once. */ @@ -288,6 +306,16 @@ /* Copy the current database to that location */ success = g_file_copy (source, destination, G_FILE_COPY_OVERWRITE, cancellable, NULL, NULL, error); + /* Ensure the backup is only readable to the current user. */ + destination_path = g_file_get_path (destination); + if (success == TRUE && g_chmod (destination_path, 0600) != 0) { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + _("Error changing exported file permissions: %s"), + g_strerror (errno)); + success = FALSE; + } + + g_free (destination_path); g_object_unref (source); return success; diff -Nru almanah-0.10.8/src/main-window.c almanah-0.11.0/src/main-window.c --- almanah-0.10.8/src/main-window.c 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/src/main-window.c 2013-11-18 20:13:40.000000000 +0000 @@ -74,6 +74,7 @@ void mw_delete_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); void mw_insert_time_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); void mw_important_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); +void mw_show_tags_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); void mw_select_date_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); void mw_jump_to_today_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); void mw_old_entries_activate_cb (GtkAction *action, AlmanahMainWindow *main_window); @@ -243,7 +244,7 @@ /* We don't use g_settings_bind() because enabling spell checking could fail, and we need to show an error dialogue */ priv->spell_checking_enabled_changed_id = g_signal_connect (priv->settings, "changed::spell-checking-enabled", - (GCallback) spell_checking_enabled_changed_cb, main_window); + (GCallback) spell_checking_enabled_changed_cb, main_window); #endif /* ENABLE_SPELL_CHECKING */ /* Set up text formatting. It's important this is done after setting up GtkSpell, so that we know whether to @@ -830,6 +831,15 @@ } void +mw_show_tags_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) +{ + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) + gtk_widget_show (GTK_WIDGET (main_window->priv->entry_tags_area)); + else + gtk_widget_hide (GTK_WIDGET (main_window->priv->entry_tags_area)); +} + +void mw_select_date_activate_cb (GtkAction *action, AlmanahMainWindow *main_window) { AlmanahDateEntryDialog *dialog = almanah_date_entry_dialog_new (); @@ -1243,6 +1253,10 @@ toolbar = GTK_TOOLBAR (gtk_builder_get_object (builder, "almanah_mw_toolbar")); manager = GTK_UI_MANAGER (gtk_builder_get_object (builder, "almanah_ui_manager")); + /* Accel */ + gtk_window_add_accel_group (GTK_WINDOW (main_window), + gtk_ui_manager_get_accel_group (manager)); + /* Allow drag the window using the toolbar */ gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (toolbar)), GTK_STYLE_CLASS_MENUBAR); gtk_toolbar_set_icon_size (toolbar, GTK_ICON_SIZE_MENU); @@ -1294,7 +1308,15 @@ gtk_tool_item_set_expand (tool_item, TRUE); gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); + /* Show/hide tags: future "side pane", for photos and other elements */ + tool_item = gtk_toggle_tool_button_new (); + gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_item), GTK_ACTION (gtk_builder_get_object (builder, "almanah_ui_show_tags"))); + gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); + /* Menu button with the common GNOME applications style (Nautilus, Epiphany, ...) */ + tool_item = gtk_separator_tool_item_new (); + gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (tool_item), FALSE); + gtk_container_add (GTK_CONTAINER (toolbar), GTK_WIDGET (tool_item)); tool_item = gtk_tool_item_new (); button = gtk_menu_button_new (); popup = gtk_ui_manager_get_widget (manager, "/almanah_mw_menu_button"); diff -Nru almanah-0.10.8/src/storage-manager.c almanah-0.11.0/src/storage-manager.c --- almanah-0.10.8/src/storage-manager.c 2013-02-25 16:36:51.000000000 +0000 +++ almanah-0.11.0/src/storage-manager.c 2013-11-10 12:35:58.000000000 +0000 @@ -18,6 +18,7 @@ */ #include +#include #include #include #include @@ -525,11 +526,12 @@ } #endif /* ENABLE_ENCRYPTION */ -static void -back_up_file (const gchar *filename) +static gboolean +back_up_file (const gchar *filename, GError **error) { GFile *original_file, *backup_file; gchar *backup_filename; + gboolean retval = TRUE; /* Make a backup of the encrypted database file */ original_file = g_file_new_for_path (filename); @@ -537,10 +539,22 @@ backup_file = g_file_new_for_path (backup_filename); g_free (backup_filename); - g_file_copy_async (original_file, backup_file, G_FILE_COPY_OVERWRITE, G_PRIORITY_DEFAULT, NULL, NULL, NULL, NULL, NULL); + if (g_file_copy (original_file, backup_file, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, error) == FALSE) { + retval = FALSE; + } + + /* Ensure the backup is only readable to the current user. */ + if (g_chmod (backup_filename, 0600) != 0 && errno != ENOENT) { + g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_CREATING_CONTEXT, + _("Error changing database backup file permissions: %s"), + g_strerror (errno)); + retval = FALSE; + } g_object_unref (original_file); g_object_unref (backup_file); + + return retval; } gboolean @@ -548,16 +562,27 @@ { #ifdef ENABLE_ENCRYPTION struct stat encrypted_db_stat, plaintext_db_stat; + GError *child_error = NULL; g_stat (self->priv->filename, &encrypted_db_stat); + if (g_chmod (self->priv->filename, 0600) != 0 && errno != ENOENT) { + g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_CREATING_CONTEXT, + _("Error changing database file permissions: %s"), + g_strerror (errno)); + return FALSE; + } + /* If we're decrypting, don't bother if the cipher file doesn't exist (i.e. the database hasn't yet been created), or is empty * (i.e. corrupt). */ if (g_file_test (self->priv->filename, G_FILE_TEST_IS_REGULAR) == TRUE && encrypted_db_stat.st_size > 0) { - GError *child_error = NULL; - /* Make a backup of the encrypted database file */ - back_up_file (self->priv->filename); + back_up_file (self->priv->filename, &child_error); + if (child_error != NULL) { + /* Translators: the first parameter is a filename, the second is an error message. */ + g_warning (_("Error backing up file ‘%s’: %s"), self->priv->filename, child_error->message); + g_clear_error (&child_error); + } g_stat (self->priv->plain_filename, &plaintext_db_stat); @@ -580,7 +605,12 @@ self->priv->decrypted = TRUE; #else /* Make a backup of the plaintext database file */ - back_up_file (self->priv->plain_filename); + back_up_file (self->priv->plain_filename, &child_error); + if (child_error != NULL) { + /* Translators: the first parameter is a filename, the second is an error message. */ + g_warning (_("Error backing up file ‘%s’: %s"), self->priv->plain_filename, child_error->message); + g_clear_error (&child_error); + } self->priv->decrypted = FALSE; #endif /* ENABLE_ENCRYPTION */ @@ -592,6 +622,13 @@ return FALSE; } + if (g_chmod (self->priv->plain_filename, 0600) != 0 && errno != ENOENT) { + g_set_error (error, ALMANAH_STORAGE_MANAGER_ERROR, ALMANAH_STORAGE_MANAGER_ERROR_CREATING_CONTEXT, + _("Error changing database file permissions: %s"), + g_strerror (errno)); + return FALSE; + } + /* Can't hurt to create the tables now */ create_tables (self); @@ -1457,7 +1494,7 @@ sqlite3_finalize (statement); if (result != SQLITE_DONE) { - g_debug ("Error quering for tags from database: %s", sqlite3_errmsg (self->priv->connection)); + g_debug ("Error querying for tags from database: %s", sqlite3_errmsg (self->priv->connection)); g_free (tags); tags = NULL; } @@ -1512,7 +1549,7 @@ } if (q_result != SQLITE_DONE) { - g_debug ("Error quering for a tag from database: %s", sqlite3_errmsg (self->priv->connection)); + g_debug ("Error querying for a tag from database: %s", sqlite3_errmsg (self->priv->connection)); } sqlite3_finalize (statement); @@ -1550,7 +1587,7 @@ sqlite3_finalize (statement); if (result != SQLITE_DONE) { - g_debug ("Error quering for tags from database: %s", sqlite3_errmsg (self->priv->connection)); + g_debug ("Error querying for tags from database: %s", sqlite3_errmsg (self->priv->connection)); g_free (tags); tags = NULL; } diff -Nru almanah-0.10.8/src/widgets/entry-tags-area.c almanah-0.11.0/src/widgets/entry-tags-area.c --- almanah-0.10.8/src/widgets/entry-tags-area.c 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/src/widgets/entry-tags-area.c 2013-11-18 20:13:40.000000000 +0000 @@ -17,6 +17,8 @@ * along with Almanah. If not, see . */ +#include + #include "entry-tags-area.h" #include "entry.h" #include "tag.h" @@ -42,7 +44,7 @@ static void almanah_entry_tags_area_finalize (GObject *object); static void almanah_entry_tags_area_load_tags (AlmanahEntryTagsArea *self); static void almanah_entry_tags_area_update (AlmanahEntryTagsArea *self); -static gint almanah_entry_tags_area_draw (GtkWidget *widget, cairo_t *cr); +static void almanah_entry_tags_area_show (GtkWidget *widget); static void almanah_entry_tags_area_add_tag (AlmanahEntryTagsArea *self, const gchar *tag); /* Signals */ @@ -64,7 +66,7 @@ gobject_class->set_property = almanah_entry_tags_area_set_property; gobject_class->finalize = almanah_entry_tags_area_finalize; - widget_class->draw = almanah_entry_tags_area_draw; + widget_class->show = almanah_entry_tags_area_show; g_object_class_install_property (gobject_class, PROP_ENTRY, g_param_spec_object ("entry", @@ -95,7 +97,8 @@ /* The tag entry widget */ self->priv->tag_entry = g_object_new (ALMANAH_TYPE_TAG_ENTRY, NULL); - gtk_entry_set_text (GTK_ENTRY (self->priv->tag_entry), "add tag"); + gtk_entry_set_text (GTK_ENTRY (self->priv->tag_entry), _("add tag")); + gtk_widget_set_tooltip_text (GTK_WIDGET (self->priv->tag_entry), _("Write the tag and press enter to save it")); gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->priv->tag_entry)); g_signal_connect (self->priv->tag_entry, "activate", G_CALLBACK (tag_entry_activate_cb), self); } @@ -185,21 +188,13 @@ gtk_container_foreach (GTK_CONTAINER (self), (GtkCallback) entry_tags_area_remove_foreach_cb, self); } -static gint -almanah_entry_tags_area_draw (GtkWidget *widget, cairo_t *cr) +static void +almanah_entry_tags_area_show (GtkWidget *widget) { - gint width, height; - GtkStyleContext *context; - - /* All GtkContainer objects don't draw anything, so just draw the background using current style */ - - context = gtk_widget_get_style_context (widget); - width = gtk_widget_get_allocated_width (widget); - height = gtk_widget_get_allocated_height (widget); - - gtk_render_background (context, cr, 0, 0, width, height); + AlmanahEntryTagsArea *self = ALMANAH_ENTRY_TAGS_AREA (widget); - return GTK_WIDGET_CLASS (almanah_entry_tags_area_parent_class)->draw (widget, cr); + gtk_widget_show (GTK_WIDGET (self->priv->tag_entry)); + GTK_WIDGET_CLASS (almanah_entry_tags_area_parent_class)->show (widget); } static void diff -Nru almanah-0.10.8/src/widgets/tag-accessible.c almanah-0.11.0/src/widgets/tag-accessible.c --- almanah-0.10.8/src/widgets/tag-accessible.c 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.11.0/src/widgets/tag-accessible.c 2013-11-18 20:13:40.000000000 +0000 @@ -0,0 +1,168 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* + * Almanah + * Copyright (C) Álvaro Peña 2013 + * + * Almanah is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Almanah is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Almanah. If not, see . + */ + +#include + +#include "tag-accessible.h" +#include "tag.h" + +struct _AlmanahTagAccessiblePrivate +{ + gint test; +}; + +static void almanah_tag_accessible_initialize (AtkObject *obj, gpointer data); + +static const gchar* almanah_tag_accessible_get_name (AtkObject *accessible); + +static void almanah_tag_accessible_atk_action_iface_init (AtkActionIface *iface); +gboolean almanah_tag_accessible_atk_action_do_action (AtkAction *action, gint i); +gint almanah_tag_accessible_atk_action_get_n_actions (AtkAction *action); +const gchar* almanah_tag_accessible_atk_action_get_description (AtkAction *action, gint i); +const gchar* almanah_tag_accessible_atk_action_get_name (AtkAction *action, gint i); +const gchar* almanah_tag_accessible_atk_action_get_keybinding (AtkAction *action, gint i); +gboolean almanah_tag_accessible_atk_action_set_description (AtkAction *action, gint i, const gchar *desc); +const gchar* almanah_tag_accessible_atk_action_get_localized_name (AtkAction *action, gint i); + +G_DEFINE_TYPE_WITH_CODE (AlmanahTagAccessible, almanah_tag_accessible, GTK_TYPE_WIDGET_ACCESSIBLE, + G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, almanah_tag_accessible_atk_action_iface_init)) + +static void +almanah_tag_accessible_class_init (AlmanahTagAccessibleClass *klass) +{ + AtkObjectClass *class = ATK_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (AlmanahTagAccessiblePrivate)); + + class->get_name = almanah_tag_accessible_get_name; + class->initialize = almanah_tag_accessible_initialize; +} + +static void +almanah_tag_accessible_init (AlmanahTagAccessible *self) +{ +} + +static void +almanah_tag_accessible_initialize (AtkObject *obj, gpointer data) +{ + GtkWidget *widget; + + ATK_OBJECT_CLASS (almanah_tag_accessible_parent_class)->initialize (obj, data); + + obj->role = ATK_ROLE_DRAWING_AREA; +} + +/* Code adapted from gtklabelaccessible in GTK+ project */ +static const gchar* +almanah_tag_accessible_get_name (AtkObject *accessible) +{ + const gchar *name; + + g_return_val_if_fail (ALMANAH_IS_TAG_ACCESSIBLE (accessible), NULL); + + name = ATK_OBJECT_CLASS (almanah_tag_accessible_parent_class)->get_name (accessible); + if (name != NULL) + return name; + else { + /* Get the text on the tag */ + GtkWidget *widget; + + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); + g_return_val_if_fail (widget != NULL, NULL); + g_return_val_if_fail (ALMANAH_IS_TAG (widget), NULL); + + return almanah_tag_get_tag (ALMANAH_TAG (widget)); + } +} + +static void +almanah_tag_accessible_atk_action_iface_init (AtkActionIface *iface) +{ + iface->do_action = almanah_tag_accessible_atk_action_do_action; + iface->get_n_actions = almanah_tag_accessible_atk_action_get_n_actions; + iface->get_description = almanah_tag_accessible_atk_action_get_description; + iface->get_name = almanah_tag_accessible_atk_action_get_name; + iface->get_keybinding = almanah_tag_accessible_atk_action_get_keybinding; + iface->set_description = almanah_tag_accessible_atk_action_set_description; + iface->get_localized_name = almanah_tag_accessible_atk_action_get_localized_name; +} + +gboolean +almanah_tag_accessible_atk_action_do_action (AtkAction *action, gint i) +{ + GtkWidget *widget; + + widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (action)); + g_return_val_if_fail (widget != NULL, FALSE); + + if (i == 0) { + almanah_tag_remove (ALMANAH_TAG (widget)); + return TRUE; + } else + return FALSE; +} + +gint +almanah_tag_accessible_atk_action_get_n_actions (AtkAction *action) +{ + return 1; +} + +const gchar* +almanah_tag_accessible_atk_action_get_description (AtkAction *action, gint i) +{ + if (i == 0) + return "Remove the tag from the entry"; + else + return NULL; +} + +const gchar* +almanah_tag_accessible_atk_action_get_name (AtkAction *action, gint i) +{ + if (i == 0) + return "remove"; + else + return NULL; +} + +const gchar* +almanah_tag_accessible_atk_action_get_keybinding (AtkAction *action, gint i) +{ + if (i == 0) + return "R;;"; + else + return NULL; +} + +gboolean +almanah_tag_accessible_atk_action_set_description (AtkAction *action, gint i, const gchar *desc) +{ + return FALSE; +} + +const gchar* +almanah_tag_accessible_atk_action_get_localized_name (AtkAction *action, gint i) +{ + if (i == 0) + return _("Remove the tag from the entry"); + else + return NULL; +} diff -Nru almanah-0.10.8/src/widgets/tag-accessible.h almanah-0.11.0/src/widgets/tag-accessible.h --- almanah-0.10.8/src/widgets/tag-accessible.h 1970-01-01 00:00:00.000000000 +0000 +++ almanah-0.11.0/src/widgets/tag-accessible.h 2013-11-18 20:13:40.000000000 +0000 @@ -0,0 +1,51 @@ +/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +/* + * Almanah + * Copyright (C) Álvaro Peña 2013 + * + * Almanah is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Almanah is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Almanah. If not, see . + */ + +#ifndef ALMANAH_TAG_ACCESSIBLE_H +#define ALMANAH_TAG_ACCESSIBLE_H + +#include +#include + +G_BEGIN_DECLS + +#define ALMANAH_TYPE_TAG_ACCESSIBLE (almanah_tag_accessible_get_type ()) +#define ALMANAH_TAG_ACCESSIBLE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_TAG_ACCESSIBLE, AlmanahTagAccessible)) +#define ALMANAH_TAG_ACCESSIBLE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_TAG_ACCESSIBLE, AlmanahTagAccessibleClass)) +#define ALMANAH_IS_TAG_ACCESSIBLE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_TAG_ACCESSIBLE)) +#define ALMANAH_IS_TAG_ACCESSIBLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_TAG_ACCESSIBLE)) +#define ALMANAH_TAG_ACCESSIBLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_TAG_ACCESSIBLE, AlmanahTagAccessibleClass)) + +typedef struct _AlmanahTagAccessiblePrivate AlmanahTagAccessiblePrivate; + +typedef struct { + GtkWidgetAccessible parent; + + AlmanahTagAccessiblePrivate *priv; +} AlmanahTagAccessible; + +typedef struct { + GtkWidgetAccessibleClass parent; +} AlmanahTagAccessibleClass; + +GType almanah_tag_accessible_get_type (void) G_GNUC_CONST; + +G_END_DECLS + +#endif /* !ALMANAH_TAG_ACCESSIBLE_H */ diff -Nru almanah-0.10.8/src/widgets/tag-entry.c almanah-0.11.0/src/widgets/tag-entry.c --- almanah-0.10.8/src/widgets/tag-entry.c 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/src/widgets/tag-entry.c 2013-11-18 20:13:40.000000000 +0000 @@ -10,139 +10,142 @@ * * Almanah is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Almanah. If not, see . + * along with Almanah. If not, see . */ +#include #include #include "tag-entry.h" #include "storage-manager.h" enum { - PROP_STORAGE_MANAGER = 1 + PROP_STORAGE_MANAGER = 1 }; struct _AlmanahTagEntryPrivate { - GtkListStore *tags_store; - AlmanahStorageManager *storage_manager; + GtkListStore *tags_store; + AlmanahStorageManager *storage_manager; }; -static void almanah_tag_entry_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); -static void almanah_tag_entry_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); -static void almanah_tag_entry_finalize (GObject *object); -static void almanah_tag_entry_update_tags (AlmanahTagEntry *tag_entry); +static void almanah_tag_entry_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec); +static void almanah_tag_entry_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec); +static void almanah_tag_entry_finalize (GObject *object); +static void almanah_tag_entry_update_tags (AlmanahTagEntry *tag_entry); static void almanah_tag_entry_get_preferred_width (GtkWidget *widget, gint *minimum, gint *natural); -gboolean almanah_tag_entry_focus_out_event (GtkWidget *self, GdkEventFocus *event); -gboolean almanah_tag_entry_focus_in_event (GtkWidget *self, GdkEventFocus *event); -gboolean almanah_tag_entry_match_selected (GtkEntryCompletion *widget, GtkTreeModel *model, GtkTreeIter *iter, AlmanahTagEntry *self); +gboolean almanah_tag_entry_focus_out_event (GtkWidget *self, GdkEventFocus *event); +gboolean almanah_tag_entry_focus_in_event (GtkWidget *self, GdkEventFocus *event); +gboolean almanah_tag_entry_match_selected (GtkEntryCompletion *widget, GtkTreeModel *model, GtkTreeIter *iter, AlmanahTagEntry *self); G_DEFINE_TYPE (AlmanahTagEntry, almanah_tag_entry, GTK_TYPE_ENTRY) static void almanah_tag_entry_class_init (AlmanahTagEntryClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (klass); - g_type_class_add_private (klass, sizeof (AlmanahTagEntryPrivate)); + g_type_class_add_private (klass, sizeof (AlmanahTagEntryPrivate)); - gobject_class->get_property = almanah_tag_entry_get_property; - gobject_class->set_property = almanah_tag_entry_set_property; - gobject_class->finalize = almanah_tag_entry_finalize; + gobject_class->get_property = almanah_tag_entry_get_property; + gobject_class->set_property = almanah_tag_entry_set_property; + gobject_class->finalize = almanah_tag_entry_finalize; gtkwidget_class->focus_out_event = almanah_tag_entry_focus_out_event; gtkwidget_class->focus_in_event = almanah_tag_entry_focus_in_event; gtkwidget_class->get_preferred_width = almanah_tag_entry_get_preferred_width; - g_object_class_install_property (gobject_class, PROP_STORAGE_MANAGER, - g_param_spec_object ("storage-manager", - "Storage manager", "The storage manager whose entries should be listed.", - ALMANAH_TYPE_STORAGE_MANAGER, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_STORAGE_MANAGER, + g_param_spec_object ("storage-manager", + "Storage manager", "The storage manager whose entries should be listed.", + ALMANAH_TYPE_STORAGE_MANAGER, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } static void almanah_tag_entry_init (AlmanahTagEntry *self) { - GtkEntryCompletion *completion; + GtkEntryCompletion *completion; + AtkObject *self_atk_object; self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_TAG_ENTRY, AlmanahTagEntryPrivate); - self->priv->tags_store = gtk_list_store_new (1, G_TYPE_STRING); - completion = gtk_entry_completion_new (); - gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (self->priv->tags_store)); - gtk_entry_completion_set_text_column (completion, 0); - gtk_entry_set_completion (GTK_ENTRY (self), completion); + self->priv->tags_store = gtk_list_store_new (1, G_TYPE_STRING); + completion = gtk_entry_completion_new (); + gtk_entry_completion_set_model (completion, GTK_TREE_MODEL (self->priv->tags_store)); + gtk_entry_completion_set_text_column (completion, 0); + gtk_entry_set_completion (GTK_ENTRY (self), completion); g_signal_connect (completion, "match-selected", G_CALLBACK (almanah_tag_entry_match_selected), self); - gtk_entry_set_has_frame (GTK_ENTRY (self), FALSE); + self_atk_object = gtk_widget_get_accessible (GTK_WIDGET (self)); + atk_object_set_name (self_atk_object, _("Tag entry")); } static void almanah_tag_entry_finalize (GObject *object) { - AlmanahTagEntryPrivate *priv = ALMANAH_TAG_ENTRY (object)->priv; + AlmanahTagEntryPrivate *priv = ALMANAH_TAG_ENTRY (object)->priv; - g_clear_object (&priv->storage_manager); + g_clear_object (&priv->storage_manager); - G_OBJECT_CLASS (almanah_tag_entry_parent_class)->finalize (object); + G_OBJECT_CLASS (almanah_tag_entry_parent_class)->finalize (object); } static void almanah_tag_entry_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { - AlmanahTagEntryPrivate *priv = ALMANAH_TAG_ENTRY (object)->priv; + AlmanahTagEntryPrivate *priv = ALMANAH_TAG_ENTRY (object)->priv; - switch (property_id) { - case PROP_STORAGE_MANAGER: - g_value_set_object (value, priv->storage_manager); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } + switch (property_id) { + case PROP_STORAGE_MANAGER: + g_value_set_object (value, priv->storage_manager); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } } static void almanah_tag_entry_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { - AlmanahTagEntryPrivate *priv = ALMANAH_TAG_ENTRY (object)->priv; + AlmanahTagEntryPrivate *priv = ALMANAH_TAG_ENTRY (object)->priv; - switch (property_id) { - case PROP_STORAGE_MANAGER: - g_clear_object (&priv->storage_manager); - priv->storage_manager = ALMANAH_STORAGE_MANAGER (g_value_get_object (value)); - g_object_ref (priv->storage_manager); - almanah_tag_entry_update_tags (ALMANAH_TAG_ENTRY (object)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; - } + switch (property_id) { + case PROP_STORAGE_MANAGER: + g_clear_object (&priv->storage_manager); + priv->storage_manager = ALMANAH_STORAGE_MANAGER (g_value_get_object (value)); + g_object_ref (priv->storage_manager); + almanah_tag_entry_update_tags (ALMANAH_TAG_ENTRY (object)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } } static void almanah_tag_entry_update_tags (AlmanahTagEntry *tag_entry) { - GList *tags; - GtkTreeIter iter; - AlmanahTagEntryPrivate *priv = tag_entry->priv; - - gtk_list_store_clear (priv->tags_store); - tags = almanah_storage_manager_get_tags (priv->storage_manager); - while (tags) { - gtk_list_store_append (priv->tags_store, &iter); - gtk_list_store_set (priv->tags_store, &iter, 0, tags->data, -1); + GList *tags; + GtkTreeIter iter; + AlmanahTagEntryPrivate *priv = tag_entry->priv; + + gtk_list_store_clear (priv->tags_store); + tags = almanah_storage_manager_get_tags (priv->storage_manager); + while (tags) { + gtk_list_store_append (priv->tags_store, &iter); + gtk_list_store_set (priv->tags_store, &iter, 0, tags->data, -1); - tags = g_list_next (tags); - } + tags = g_list_next (tags); + } - if (tags) - g_list_free (tags); + if (tags) + g_list_free (tags); } static void @@ -154,13 +157,13 @@ /* Just a bad hack... @TODO: set the width to a maximun number of characters, using the pango layout */ *minimum = m_width - 100; - *natural = n_width - 100; + *natural = n_width - 50; } gboolean almanah_tag_entry_focus_out_event (GtkWidget *self, GdkEventFocus *event) { - gtk_entry_set_text (GTK_ENTRY (self), "add tag"); + gtk_entry_set_text (GTK_ENTRY (self), _("add tag")); return FALSE; } @@ -189,12 +192,12 @@ void almanah_tag_entry_set_storage_manager (AlmanahTagEntry *tag_entry, AlmanahStorageManager *storage_manager) { - GValue storage_value = G_VALUE_INIT; + GValue storage_value = G_VALUE_INIT; - g_return_if_fail (ALMANAH_IS_TAG_ENTRY (tag_entry)); - g_return_if_fail (ALMANAH_IS_STORAGE_MANAGER (storage_manager)); + g_return_if_fail (ALMANAH_IS_TAG_ENTRY (tag_entry)); + g_return_if_fail (ALMANAH_IS_STORAGE_MANAGER (storage_manager)); - g_value_init (&storage_value, G_TYPE_OBJECT); + g_value_init (&storage_value, G_TYPE_OBJECT); g_value_set_object (&storage_value, storage_manager); g_object_set_property (G_OBJECT (tag_entry), "storage-manager", &storage_value); g_value_unset (&storage_value); diff -Nru almanah-0.10.8/src/widgets/tag.c almanah-0.11.0/src/widgets/tag.c --- almanah-0.10.8/src/widgets/tag.c 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/src/widgets/tag.c 2013-11-18 20:13:40.000000000 +0000 @@ -22,6 +22,7 @@ #include #include "tag.h" +#include "tag-accessible.h" #define PADDING_TOP 1 #define PADDING_BOTTOM 1 @@ -106,6 +107,8 @@ 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + + gtk_widget_class_set_accessible_type (widget_class, ALMANAH_TYPE_TAG_ACCESSIBLE); } static void @@ -114,7 +117,10 @@ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_TAG, AlmanahTagPrivate); g_signal_connect (G_OBJECT (self), "draw", G_CALLBACK (almanah_tag_draw), NULL); - gtk_widget_add_events (GTK_WIDGET (self), GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); + gtk_widget_add_events (GTK_WIDGET (self), + GDK_POINTER_MOTION_MASK + | GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK); gdk_rgba_parse (&self->priv->text_color, "#936835"); gdk_rgba_parse (&self->priv->strock_color, "#ECB447"); @@ -125,6 +131,8 @@ self->priv->close_highlighted = FALSE; self->priv->close_pressed = FALSE; + + gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE); } static void @@ -286,8 +294,8 @@ /* Get the tag dimensions */ gtk_widget_get_preferred_width (widget, &width, NULL); - width = width - SHADOW_RIGHT; gtk_widget_get_preferred_height (widget, &height, NULL); + width = width - SHADOW_RIGHT; height = height - SHADOW_BOTTOM; /* Some coordinates */ @@ -384,6 +392,14 @@ cairo_line_to (cr, priv->close_x, y_origin + middle_height + (CLOSE_BUTTON / 2)); cairo_stroke (cr); + /* Focus */ + if (gtk_widget_has_focus (widget)) + gtk_render_focus (gtk_widget_get_style_context (widget), + cr, + 0, 0, + gtk_widget_get_allocated_width (widget), + gtk_widget_get_allocated_height (widget)); + return FALSE; } @@ -412,7 +428,6 @@ NULL)); } - const gchar * almanah_tag_get_tag (AlmanahTag *tag_widget) { @@ -420,3 +435,11 @@ return tag_widget->priv->tag; } + +void +almanah_tag_remove (AlmanahTag *tag_widget) +{ + g_return_val_if_fail (ALMANAH_IS_TAG (tag_widget), NULL); + + g_signal_emit (tag_widget, tag_signals[SIGNAL_REMOVE], 0); +} diff -Nru almanah-0.10.8/src/widgets/tag.h almanah-0.11.0/src/widgets/tag.h --- almanah-0.10.8/src/widgets/tag.h 2013-02-25 16:26:20.000000000 +0000 +++ almanah-0.11.0/src/widgets/tag.h 2013-11-18 20:13:40.000000000 +0000 @@ -42,9 +42,10 @@ GtkDrawingAreaClass parent; } AlmanahTagClass; -GType almanah_tag_get_type (void) G_GNUC_CONST; -GtkWidget *almanah_tag_new (const gchar *tag); -const gchar *almanah_tag_get_tag (AlmanahTag *tag_widget); +GType almanah_tag_get_type (void) G_GNUC_CONST; +GtkWidget *almanah_tag_new (const gchar *tag); +const gchar *almanah_tag_get_tag (AlmanahTag *tag_widget); +void almanah_tag_remove (AlmanahTag *tag_widget); G_END_DECLS