diff -Nru ristretto-0.3.2/ChangeLog ristretto-0.3.4/ChangeLog --- ristretto-0.3.2/ChangeLog 2012-01-07 08:52:15.000000000 +0000 +++ ristretto-0.3.4/ChangeLog 2012-01-28 06:39:30.000000000 +0000 @@ -1,3 +1,570 @@ +commit 9beba6d57c15cc79ba2e823f855825d89120f42d +Author: Stephan Arts +Date: Sat Jan 28 07:37:57 2012 +0100 + + Version-bump & NEWS update + +commit 12d545685acd7fd268c8813fb54ac01238de2cdb +Author: Chipong Luo +Date: Sat Jan 28 07:16:31 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f06f13f629917534dc65fcc87f5f04c34e14277e +Author: Stephan Arts +Date: Sat Jan 28 07:28:32 2012 +0100 + + Make sure a value is returned + +commit 686f66f0f0dc7a67503e76facbfb2de3488c8f43 +Author: Praveen Illa +Date: Fri Jan 27 16:43:01 2012 +0100 + + l10n: Added Telugu Translation + + New status: 102 messages complete with 0 fuzzies and 35 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b0e7dee2e349d70d4ed14d57f6d05365f4c3b347 +Author: Nuno Miguel +Date: Fri Jan 27 19:10:30 2012 +0100 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 84133924d8ed253bf3762c57d9a051fec1e15fa6 +Author: Stephan Arts +Date: Thu Jan 26 17:48:55 2012 +0100 + + Update NEWS + +commit 8cdb689bb286106c48d36023e860d159bf48ce54 +Author: Stephan Arts +Date: Thu Jan 26 07:54:51 2012 +0100 + + Fix --slideshow and --fullscreen cli options + +commit 2e0805e4d1e8152e4272a97175107522bc58c190 +Author: Stephan Arts +Date: Thu Jan 26 07:53:00 2012 +0100 + + Round rendering of image to whole pixels (Bug #8317) + +commit 9c41e517bcb039e4d9351071a416506fcf6f44cc +Author: Stephan Arts +Date: Sun Jan 22 15:33:19 2012 +0100 + + Cleanup code a little + +commit 324ce06c98523157c26400895fe06bcfb050eba0 +Author: Stephan Arts +Date: Sun Jan 22 10:00:36 2012 +0100 + + Remove nonsense from README + +commit 5c8515cb964f10dff55f3ca9c53c33834e4b8360 +Author: Algimantas Margevičius +Date: Sun Jan 22 07:50:37 2012 +0100 + + l10n: Updated Lithuanian (lt) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 29ede9c3ee5fecf528f9f533e520e48c1c498800 +Author: Algimantas Margevičius +Date: Sun Jan 22 07:38:58 2012 +0100 + + l10n: Added Lithuanian language + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b83213cfce8531f938326d341cfa8bd16119bebc +Author: Andres Sanchez +Date: Sat Jan 21 14:33:33 2012 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 91% + + New status: 125 messages complete with 10 fuzzies and 2 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b904b8efc67b0bc748df43f001ecb9281a522353 +Author: Stephan Arts +Date: Fri Jan 20 23:55:03 2012 +0100 + + Update NEWS + +commit 8f0573eb552cf55a6802271b4a55f977488d6962 +Author: Stephan Arts +Date: Fri Jan 20 23:54:10 2012 +0100 + + generate changelog on make dist + +commit 376161d46aeac4395982f3356d8147b6ac80128c +Author: Stephan Arts +Date: Fri Jan 20 23:53:50 2012 +0100 + + Bump version + +commit 98c8f040614897f54b60d7f04cfa0b9c8a585053 +Author: Stephan Arts +Date: Fri Jan 20 23:49:48 2012 +0100 + + Update scale when box-zoom is used to change the scale + +commit 9f644a39ba6c67f8c882cbd1aa6bd06c7e766b2a +Author: Benoit THIBAUD +Date: Fri Jan 20 23:15:13 2012 +0100 + + l10n: Updated French (fr) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6ce7bed2e7c59fc552c406f3123569e31b7f786d +Author: Benoit THIBAUD +Date: Fri Jan 20 23:14:20 2012 +0100 + + l10n: Updated French (fr) translation to 100% + + New status: 34 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 40e0865362a3c6f1ec7462c43b4efa375efe5b69 +Author: Cheng-Chia Tseng +Date: Thu Jan 19 17:07:42 2012 +0100 + + l10n: Updates to Chinese (Taiwan) translation + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 614b93aa685dede94b07d39e1414ba6bef65ddef +Author: Sergio Marques +Date: Tue Jan 17 18:00:25 2012 +0100 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 54b049272b61e69a7869ea213701a7bf7a581835 +Author: Carles Muñoz Gorriz +Date: Sun Jan 15 18:21:41 2012 +0100 + + l10n: Updated Catalan (Valencian) (ca) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a0ad06d2298bfa02519dbd1ac73ed5b268cb7840 +Author: Stephan Arts +Date: Sat Jan 14 18:54:19 2012 +0100 + + Update NEWS + +commit 1afe420b865ef8f86f26090462e9217fe789089a +Author: Stephan Arts +Date: Sat Jan 14 18:53:39 2012 +0100 + + Fix bug #8343, (do not use symbols from gtk+ > 2.20) + +commit a2e8a9c9e22077c792197fda56709c24f013ab16 +Author: Stephan Arts +Date: Sat Jan 14 17:39:08 2012 +0100 + + Update version number + +commit 928e0d8ff6ccd743d9660f18d57712f38a3969c9 +Author: Stephan Arts +Date: Sat Jan 14 17:37:17 2012 +0100 + + Update NEWS + +commit 228347cee87601ec6c8a068df3d2afc46327885d +Author: Stephan Arts +Date: Sat Jan 14 16:48:48 2012 +0100 + + Revert "Simplify launch_help" + + This reverts commit aa74058f8c7b53fcb0ef4956c8d7f2ec4aee4242. + + Conflicts: + + src/util.c + +commit 2ab305e4c618dace30d27eaa0a66c090e1bd6ef3 +Author: Stephan Arts +Date: Sat Jan 14 16:47:12 2012 +0100 + + Revert "Remove docs submodule" + + This reverts commit 30031ef8f300ee2e6b8a1df2ab18fdcbe6328949. + +commit 01e85682edf4ab91488baab57028deda1bb47a99 +Author: Stephan Arts +Date: Sat Jan 14 16:46:46 2012 +0100 + + Revert "Remove docs from autogen.sh" + + This reverts commit e8937cd89c5299d3215708f2df5df3e20b14b11e. + +commit f268fdc32beafc1959b6d02f4fc454745bbc04c7 +Author: Stephan Arts +Date: Sat Jan 14 16:46:25 2012 +0100 + + Revert "Cleanup DOCDIR and RISTRETTO_HELP_LOCATION" + + This reverts commit 06cfd28df55a2a43868297bfddb57d276714d153. + +commit 40aabfdbed1006c59e8db1b7d79971b6991d4b82 +Author: Milen Milev +Date: Fri Jan 13 20:44:35 2012 +0100 + + l10n: Updated Bulgarian (bg) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 444e9ebabbfd5d71552a71143a2213a1a7aa2ffe +Author: Leandro Regueiro +Date: Thu Jan 12 18:04:27 2012 +0100 + + l10n: Updated Galician (gl) translation to 94% + + New status: 130 messages complete with 0 fuzzies and 7 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7c43a783d63f075933aea605a0b77b6edd09b163 +Author: Pjotr Anon +Date: Wed Jan 11 19:41:29 2012 +0100 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d832567bf1c31971a8ad95a8f13f7b33b05bf464 +Author: Michał Olber +Date: Wed Jan 11 14:55:49 2012 +0100 + + l10n: Updated Polish (pl) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 06cfd28df55a2a43868297bfddb57d276714d153 +Author: Stephan Arts +Date: Tue Jan 10 19:25:24 2012 +0100 + + Cleanup DOCDIR and RISTRETTO_HELP_LOCATION + +commit f79dc47bbb975b9fa144004035baea5667a2c4eb +Author: Stephan Arts +Date: Tue Jan 10 18:42:08 2012 +0100 + + Update version + +commit 98ed9c4aaf67ae4b4d1a62356e93b5bbef81c54b +Author: Stephan Arts +Date: Tue Jan 10 18:35:53 2012 +0100 + + Update version number + +commit 7be33f8cf72c96baf366358c1aeb52aa5e68866d +Author: Stephan Arts +Date: Tue Jan 10 18:34:17 2012 +0100 + + Update NEWS + +commit 8f6a7aff8c6cfffb79770fa3736151d1d05d73d9 +Author: Stephan Arts +Date: Mon Jan 9 21:45:08 2012 +0100 + + Remove 0.5 offset, not needed for pixbufs + +commit a0c87bfac2db5a04bfa0aaf87a73339ef6d5d819 +Author: Aleksandr Ponomarenko +Date: Mon Jan 9 21:00:03 2012 +0100 + + l10n: Updated Russian (ru) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 924a116ea9470a4f1593a7e683a157f030923671 +Author: Thomas Schütz +Date: Mon Jan 9 20:21:02 2012 +0100 + + l10n: Updated German (de) translation to 97% + + New status: 133 messages complete with 4 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 05eaade8b1a69955563e2515c7fe8b3f721ffa63 +Author: Thomas Schütz +Date: Mon Jan 9 20:13:07 2012 +0100 + + l10n: Updated German (de) translation to 97% + + New status: 133 messages complete with 4 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 06af45560b1be8edf572ae788aaa85433ea10d0b +Author: Thomas Schütz +Date: Mon Jan 9 20:00:21 2012 +0100 + + l10n: Updated German (de) translation to 97% + + New status: 133 messages complete with 4 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e8937cd89c5299d3215708f2df5df3e20b14b11e +Author: Stephan Arts +Date: Mon Jan 9 18:36:08 2012 +0100 + + Remove docs from autogen.sh + +commit 28fca6c5b35a9cd35726675f50f463cc84893183 +Author: Olexandr +Date: Mon Jan 9 15:59:12 2012 +0100 + + l10n: Updated Ukrainian (uk) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 00d43737eb0a55fc84d9a4e912c3be5d212d795b +Author: Tomáš Vadina +Date: Mon Jan 9 10:51:54 2012 +0100 + + l10n: Updated Slovak (sk) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5bd5c459d7e0c496749b0356d8f66576dde66d01 +Author: Chipong Luo +Date: Mon Jan 9 03:54:49 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a7930b8d1d9852d62b00ffafb91e484837eb0059 +Author: Chipong Luo +Date: Mon Jan 9 03:51:06 2012 +0100 + + l10n: Updated Chinese (China) (zh_CN) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 0411aef38fb14a0061443a49fe0d8d20fbc313f6 +Author: Gabor Kelemen +Date: Mon Jan 9 02:09:34 2012 +0100 + + l10n: Updated Hungarian (hu) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 3145a547bd120603c21353a524fef584c09ab7d2 +Author: Michal Várady +Date: Mon Jan 9 00:47:40 2012 +0100 + + l10n: Updated Czech (cs) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 38228d82f324661fbdb2be7c03cdcf77e883f316 +Author: Jeff Bailes +Date: Mon Jan 9 00:40:05 2012 +0100 + + l10n: Updated English (United Kingdom) (en_GB) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 77a6799f1399ce74c288430fde9f049b67396169 +Author: Sergio Marques +Date: Sun Jan 8 23:13:26 2012 +0100 + + l10n: Updated Portuguese (pt) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b4986b3260493a4a23594a2f2c6cc9134deb0fbc +Author: Thomas Schütz +Date: Sun Jan 8 21:56:17 2012 +0100 + + l10n: Updated German (de) translation to 97% + + New status: 133 messages complete with 4 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2ed855cc17e56df329a8bb2ec34259c802e11e96 +Author: Henrique P. Machado +Date: Sun Jan 8 21:47:42 2012 +0100 + + l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 732a2e6640aedf63d1489d8506ebe4e5c1b71ab5 +Author: Piarres Beobide +Date: Sun Jan 8 21:45:01 2012 +0100 + + l10n: Updated Basque (eu) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 8de1008628d8894e6669908e4b6295e9a035fb83 +Author: Per Kongstad +Date: Sun Jan 8 21:27:13 2012 +0100 + + l10n: Updated Danish (da) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit b34ee1b052e7829576a5136df11a3b3864ddf831 +Author: Thomas Schütz +Date: Sun Jan 8 20:38:12 2012 +0100 + + l10n: Updated German (de) translation to 97% + + New status: 133 messages complete with 4 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e5ae9ec0e94f7dfc225f44176a4623a28e194df1 +Author: Cristian Marchi +Date: Sun Jan 8 18:32:40 2012 +0100 + + l10n: Updated Italian (it) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6de01d67b32a6413e07c83685103aeb874157439 +Author: Mișu Moldovan +Date: Sun Jan 8 17:25:24 2012 +0100 + + l10n: Updated Romanian (ro) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 5bc8329bfe8a5fd6f29061fe5c55d7bcac07581f +Author: Pjotr Anon +Date: Sun Jan 8 15:10:14 2012 +0100 + + l10n: Updated Dutch (Flemish) (nl) translation to 100% + + New status: 137 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 247712607e891c578338b1e390aa52a2be03bb8b +Author: Stephan Arts +Date: Sun Jan 8 14:04:24 2012 +0100 + + Use correct docs-URL + +commit 7dab45079d93bb8a39ce4e5fff59ceb1fd229da5 +Author: Jeff Bailes +Date: Sun Jan 8 13:53:25 2012 +0100 + + l10n: Updated English (United Kingdom) (en_GB) translation to 100% + + New status: 135 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit a939061479ab20a28622176d8ecc08d2a5ca99a2 +Author: Stephan Arts +Date: Sun Jan 8 13:32:52 2012 +0100 + + Add missing file thumbnailer.c to POTFILES.in + - Regenerate .po files + +commit aa74058f8c7b53fcb0ef4956c8d7f2ec4aee4242 +Author: Stephan Arts +Date: Sun Jan 8 13:28:59 2012 +0100 + + Simplify launch_help + +commit 30031ef8f300ee2e6b8a1df2ab18fdcbe6328949 +Author: Stephan Arts +Date: Sun Jan 8 13:25:21 2012 +0100 + + Remove docs submodule + + - (see xfce4-dev m/l about details regarding docs.xfce.org) + +commit 6ff4e7779f0c867dc01a81c5b651fe59bd2d29d8 +Author: Stephan Arts +Date: Sun Jan 8 13:00:14 2012 +0100 + + Change URL to new docs-format + +commit 5cc340fda92675578f9f6dc8ef3e16605ecabaaa +Author: Stephan Arts +Date: Sat Jan 7 09:53:35 2012 +0100 + + Update README + +commit b81122b291dc3f29263a60c4614e06487dc478b0 +Author: Stephan Arts +Date: Sat Jan 7 09:52:42 2012 +0100 + + Update ChangeLog + commit c8f9c5f1c416a916bb0c344eca531febb82cf00f Author: Stephan Arts Date: Sat Jan 7 09:45:25 2012 +0100 @@ -239,6 +806,13 @@ Add some comments +commit c0bedba5401662cbebfd4108014fcc95e0972029 +Merge: d3680c1 daa75c3 +Author: Stephan Arts +Date: Sun Dec 18 22:16:05 2011 +0100 + + Merge branch 'master' of ssh://git.xfce.org/apps/ristretto + commit d3680c14335f023a19efd20edac22044d600191f Author: Eric Koegel Date: Sun Dec 18 21:05:51 2011 +0300 @@ -844,6 +1418,16 @@ update ja.po +commit c481d3090f2a138d2e70774e38e87582b9e9216f +Merge: bfb2196 8a17e42 +Author: Stephan Arts +Date: Mon Nov 21 07:44:20 2011 +0100 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + + Conflicts: + po/ja.po + commit bfb2196a8045c48e77c4135aeeae9f778a8b6e1b Author: Stephan Arts Date: Mon Nov 21 07:42:40 2011 +0100 @@ -1275,6 +1859,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit f6fd6ef40f9407de77359647e2dab1e582d32bd9 +Merge: e904e3d 5f3edba +Author: Stephan Arts +Date: Sun Nov 6 10:23:26 2011 +0100 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit e904e3d3cbefd715e4ebdce9bcb6ba86e55d8c71 Author: Stephan Arts Date: Sun Nov 6 10:23:13 2011 +0100 @@ -1417,6 +2008,13 @@ Update docs +commit b9f529af33f7a15ada179de086c2b3d5250a3898 +Merge: 986ca3d f4f64b6 +Author: Stephan Arts +Date: Thu Nov 3 10:42:56 2011 +0100 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 986ca3d80cca5a4874d7350cab6210a26a9ed943 Author: Stephan Arts Date: Thu Nov 3 10:40:19 2011 +0100 @@ -2692,6 +3290,13 @@ Update .po files +commit 02be3c95c1caf226bdd59a09f9871a2e7ab207dc +Merge: bd819d9 68151bc +Author: Stephan Arts +Date: Sun Sep 25 19:27:43 2011 +0200 + + Merge branch 'stephan/properties-dialog' + commit 68151bcb4be5d47922459582ea684bc56e9e1c71 Author: Stephan Arts Date: Sun Sep 25 19:27:04 2011 +0200 @@ -2730,6 +3335,13 @@ Add skeleton code for a built-in and fallback properties dialog +commit 09df735fbdf4ea6022d2d3043e5cc6ec85c06cc7 +Merge: b8b96b4 38a2c77 +Author: Stephan Arts +Date: Thu Sep 22 22:48:03 2011 +0200 + + Merge branch 'stephan/properties-dialog' of ssh://git.xfce.org/git/apps/ristretto into stephan/properties-dialog + commit b8b96b487974663850f31c761ac54c849c8d719a Author: Stephan Arts Date: Wed Sep 21 21:20:58 2011 +0200 @@ -2844,6 +3456,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit 2cef1b10772a4026217f42eff010b076b36062ed +Merge: 17a69b9 40f77e3 +Author: Stephan Arts +Date: Sun Sep 18 19:32:54 2011 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 17a69b951475e968b19f298e1ec4ed6625c17d1c Author: Stephan Arts Date: Sun Sep 18 19:32:27 2011 +0200 @@ -2927,6 +3546,13 @@ Remove the 'debug' monitor +commit aab6f6dea569d2303d4d492c291d43c61fc83c48 +Merge: a031362 2cb0e1e +Author: Stephan Arts +Date: Wed Sep 14 10:00:05 2011 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit a031362da05f095839974168018c8262735c831d Author: Stephan Arts Date: Wed Sep 14 09:56:48 2011 +0200 @@ -3031,6 +3657,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit d49403232239a237999046a392c431b1a17d8def +Merge: c505ffd a661b6a +Author: Stephan Arts +Date: Thu Sep 8 19:12:45 2011 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit c505ffdccfe0deb6fbd991dca8e1dde058938bb9 Author: Stephan Arts Date: Thu Sep 8 19:09:55 2011 +0200 @@ -3169,6 +3802,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit 7bfe4bd9736d26be578547ff30c0fb056dec47c7 +Merge: 6d37d2c 2c77b0a +Author: Stephan Arts +Date: Sat Aug 27 14:38:48 2011 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 6d37d2c5f58d5f28d5282b3a93bbf95245865175 Author: Stephan Arts Date: Sat Aug 27 13:17:39 2011 +0200 @@ -3207,6 +3847,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit e7d2a9082e66526ab245a030fd5da9fc83e913b1 +Merge: 3e06278 3608c0d +Author: Stephan Arts +Date: Fri Aug 26 18:53:58 2011 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 3608c0d8f9a46877f1ab5e32cacaea272c0d15a2 Author: Yarema aka Knedlyk Date: Thu Aug 25 09:52:49 2011 +0200 @@ -3217,6 +3864,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit 3e06278be9c49c0810c790cb8aa860cf2a9e2743 +Merge: 2633f96 54ec53f +Author: Stephan Arts +Date: Wed Aug 24 21:26:13 2011 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 54ec53f1fa0e94d3ce8bf76af581dd6b53a53056 Author: Sergio Marques Date: Wed Aug 24 15:56:40 2011 +0200 @@ -3263,6 +3917,13 @@ Clear TODO file +commit 787034c57cdd3d56c2b587f3623b4dd802c8ff9f +Merge: 5b93f4d 2bf2296 +Author: Stephan Arts +Date: Tue Aug 23 22:58:07 2011 +0200 + + fix conflicts with da and de translation files + commit 5b93f4d94389e36053d2cbc4e7e98ca86e279892 Author: Stephan Arts Date: Tue Aug 23 22:54:39 2011 +0200 @@ -3339,6 +4000,13 @@ Make sure running transactions are cleaned-up when image_viewer_set_file is set to NULL; +commit f1a26170f59df02ec1763c74302141c0a80596ba +Merge: 5170889 f2228f0 +Author: Stephan Arts +Date: Sat Aug 20 10:18:56 2011 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit f2228f083f20fa9da6fc4eb7f3edb636025aa9e7 Author: Cristian Marchi Date: Fri Aug 19 08:46:22 2011 +0200 @@ -3349,6 +4017,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit 5170889a75fc1aae2dd4e25eba53038bd744844a +Merge: 36c19aa e459466 +Author: Stephan Arts +Date: Thu Aug 18 20:25:22 2011 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit e459466a1044f2b49e20119c5fda990b72f52ca4 Author: 玉堂 白鹤 Date: Wed Aug 17 18:08:35 2011 +0200 @@ -3454,6 +4129,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit 4af531812f9c6e2223b0f28bcaf3c022940fd672 +Merge: 54ca779 08545aa +Author: Stephan Arts +Date: Thu Aug 11 22:29:08 2011 +0200 + + Merge branch 'uri-base' + commit 08545aad35a36bd89f10510ff113bb369d68c588 Author: Stephan Arts Date: Thu Aug 11 22:28:43 2011 +0200 @@ -3522,6 +4204,13 @@ Update .po files +commit fe81869de83d6e88046328cd7069b09b8c3a6674 +Merge: c070a41 610a068 +Author: Stephan Arts +Date: Tue Aug 9 20:36:19 2011 +0200 + + Merge branch 'uri-base' + commit 610a0686255b44abf4894ee3aca2e90650a10454 Author: Stephan Arts Date: Tue Aug 9 20:35:33 2011 +0200 @@ -3534,6 +4223,13 @@ Add tooltip with delete button +commit c070a4151dbdb4165d6ad51caad6531268812edb +Merge: c846c7b db13518 +Author: Stephan Arts +Date: Tue Aug 9 19:37:41 2011 +0200 + + Merge branch 'uri-base' + commit db13518863fd0ca214d236aa64a5525776606d21 Author: Stephan Arts Date: Mon Aug 8 22:19:34 2011 +0200 @@ -3736,6 +4432,13 @@ Add image-viewer class, making the design of ristretto less complicated (Step 1) +commit 0e51051ddfe0ebb75a74e3eb0bfec22192840fe6 +Merge: 4a55b2e d52a814 +Author: Stephan Arts +Date: Sat Aug 6 12:04:20 2011 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 4a55b2e637d3fa83188a4a4952486ed9eb3c0af0 Author: Stephan Arts Date: Sat Aug 6 12:01:26 2011 +0200 @@ -4598,6 +5301,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit a304886a997ce0bb88102479ba9446e372352188 +Merge: b92bfe4 6b2a8a7 +Author: Stephan Arts +Date: Thu Sep 23 10:11:01 2010 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 6b2a8a7d4641ac1898dbc0fcc1d4b6b2d864b971 Author: Denis Koryavov Date: Thu Sep 23 09:45:16 2010 +0200 @@ -4711,6 +5421,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit bce4ed706435dda06c22388c4e2ac092d27664c4 +Merge: c5f540c 86ced18 +Author: Stephan Arts +Date: Sun Aug 1 23:42:29 2010 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit c5f540c66b5172560f9343d0e75da845241fffc9 Author: Stephan Arts Date: Sun Aug 1 23:42:21 2010 +0200 @@ -4757,6 +5474,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit a7784687b4a1cf384405725ff618f5f038b6ae76 +Merge: b2ceb4c 647c9ee +Author: Stephan Arts +Date: Fri Jul 16 00:15:50 2010 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit b2ceb4c06216f43d0808e678647e6b97d889f188 Author: Stephan Arts Date: Fri Jul 16 00:15:44 2010 +0200 @@ -4803,6 +5527,13 @@ Fix reference-count bug +commit 7a16abe0ade061dbd5e5c864e8fb45bbfdb65b3b +Merge: 513caf5 141e9c0 +Author: Stephan Arts +Date: Tue Jul 13 22:33:23 2010 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 513caf5fef4bb1269771ca470fc7957dd19e322f Author: Stephan Arts Date: Tue Jul 13 19:01:29 2010 +0200 @@ -4883,6 +5614,13 @@ - Fix warning (could've segfaulted ristretto, evil bug) - Update picture-viewer when bgcolor-properties get updated +commit da1b9a846a031e45dd83c367ba7e8e966f4d37e2 +Merge: 4043912 f7d4828 +Author: Stephan Arts +Date: Mon Jul 12 11:17:34 2010 +0200 + + Merge branch 'devel' + commit f7d4828aee88787aa5c996a5425e0dd107c7a46e Author: Stephan Arts Date: Mon Jul 12 11:13:22 2010 +0200 @@ -5412,6 +6150,13 @@ Reset adjustments when no image is loaded. +commit 2a31e2ed23f60bd7500a74172f18011f14678c4d +Merge: 405d604 1987552 +Author: Stephan Arts +Date: Sun Jan 17 23:51:55 2010 +0100 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 1987552645a6b9c161c2ce8ff81e293035942fbd Author: Michal Várady Date: Sun Jan 17 15:55:05 2010 +0100 @@ -5488,6 +6233,13 @@ Transmitted-via: Transifex (translations.xfce.org). +commit 2f5ac49acd1bca48b4396f8c4a372d2697fed5e0 +Merge: f7df9db 62b93c5 +Author: Stephan Arts +Date: Fri Jan 8 23:38:52 2010 +0100 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit f7df9dbb483a663e5ff618012f91c9c8ac71c894 Author: Stephan Arts Date: Fri Jan 8 23:37:45 2010 +0100 @@ -5516,6 +6268,13 @@ Fix assert +commit 84884ba370e3a8cee3458eeeeb4d53066e1b948a +Merge: 6e636be 69619f1 +Author: Stephan Arts +Date: Fri Jan 8 00:29:42 2010 +0100 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 6e636bef4a505fb4a42a70a372b7891dc15286b2 Author: Stephan Arts Date: Fri Jan 8 00:29:15 2010 +0100 @@ -5679,6 +6438,13 @@ update .po files +commit 34ac6fd5a0f438886448cabcb457b957baef123b +Merge: 535dd6f 0e5ecd5 +Author: Stephan Arts +Date: Sun Oct 25 19:26:05 2009 +0100 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 535dd6f1961a1e729d6fcaafc288f6a1a91f611a Author: Stephan Arts Date: Sun Oct 25 18:34:34 2009 +0100 @@ -5743,6 +6509,13 @@ implement auto-center on thumbnail-bar +commit bd4acfa129dab706130be9e5c963bb3e602b7045 +Merge: a8b0d38 0982f16 +Author: Stephan Arts +Date: Thu Oct 15 23:19:09 2009 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit a8b0d38c4754b693e3821acdb4f7a5e24233e9e3 Author: Stephan Arts Date: Thu Oct 15 23:18:44 2009 +0200 @@ -5765,6 +6538,16 @@ Transmitted-via: Transifex (translations.xfce.org) +commit 4cb99fa5451db6c56b203e8d8c7aead44d084d39 +Merge: c8c6e4b 8927de9 +Author: Stephan Arts +Date: Mon Oct 12 00:16:20 2009 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + + Conflicts: + po/ca.po + commit c8c6e4b3f3baabea943b3dd97a58fe5e3be1b199 Author: Stephan Arts Date: Mon Oct 12 00:14:28 2009 +0200 @@ -5819,6 +6602,13 @@ Change default settings +commit 46f80f42f466ddf7f340126d00018d14a87bdf37 +Merge: c2e3386 bfdff74 +Author: Stephan Arts +Date: Sat Oct 3 11:26:13 2009 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit c2e33860a30b9c1d58fc69fc1827455cda3d2eb3 Author: Stephan Arts Date: Sat Oct 3 11:24:58 2009 +0200 @@ -5915,6 +6705,13 @@ Implement open-with menu with launcher menu-items +commit 5562dcd515df545490234466f9ab2c419de78868 +Merge: 3e7c0bb bc65111 +Author: Stephan Arts +Date: Wed Sep 23 00:16:30 2009 +0200 + + Merge branch 'master' of ssh://git.xfce.org/git/apps/ristretto + commit 3e7c0bb6540eaef683a6aff3306ed53d1ff5c2e9 Author: Stephan Arts Date: Wed Sep 23 00:15:52 2009 +0200 @@ -6195,6 +6992,60 @@ Transmitted-via: Transifex (translations.xfce.org) +commit 73c621338fce0b7a508d2ec81e8d8ec5acae3fd9 +Merge: 924eb9c 9b75414 +Author: Stephan Arts +Date: Wed Aug 12 18:00:04 2009 +0200 + + Merge branch 'master' of stephan/ristretto + + Conflicts: + ChangeLog + Makefile.am + NEWS + configure.in.in + po/ChangeLog + po/LINGUAS + po/POTFILES.in + po/ar.po + po/bg.po + po/ca.po + po/cs.po + po/da.po + po/de.po + po/el.po + po/en_GB.po + po/es.po + po/eu.po + po/fi.po + po/fr.po + po/gl.po + po/hu.po + po/id.po + po/it.po + po/ja.po + po/lv.po + po/nl.po + po/pl.po + po/pt_BR.po + po/ru.po + po/sk.po + po/tr.po + po/uk.po + po/ur.po + po/zh_CN.po + ristretto.desktop.in + src/Makefile.am + src/main.c + src/main_window.c + src/main_window.h + src/picture_viewer.c + src/picture_viewer.h + src/thumbnail.c + src/thumbnail.h + src/thumbnail_bar.c + src/thumbnail_bar.h + commit 924eb9c8b4c87fd09a7c9e34d469b534d4eaf0c1 Author: Stephan Arts Date: Wed Aug 12 12:40:25 2009 +0200 @@ -6909,6 +7760,17 @@ Fix moving of zoomed-in image +commit f6b085b3e0b356796a592414249485c7a8e8ae20 +Merge: 7c3c0b8 0c1e906 +Author: Stephan Arts +Date: Mon Mar 9 22:01:38 2009 +0100 + + Merge branch 'breakup_refresh' + + Conflicts: + + src/picture_viewer.c + commit 7c3c0b8d56ed639352d7e11d1bdf3058052a2d5c Author: Stephan Arts Date: Mon Mar 9 22:00:05 2009 +0100 @@ -7041,6 +7903,20 @@ Add some rudimentary preview support +commit 9a99870c75f66aa963e22434ff4f1c5fc2a521f4 +Merge: c2e9b6b ce3185b +Author: Stephan Arts +Date: Sat Feb 21 11:06:54 2009 +0100 + + Merge branch 'master' into new_picture_viewer + +commit ce3185bf18ad773e073ab83e87354f7c4da9507c +Merge: 3f8ba01 1d06647 +Author: Stephan Arts +Date: Sat Feb 21 10:59:21 2009 +0100 + + Merge branch 'recent_menu' + commit 1d06647dac89feb4e0eb82ac437b7710b7753b8c Author: Stephan Arts Date: Sat Feb 21 10:56:52 2009 +0100 @@ -7055,6 +7931,13 @@ Add a recent-filter to the recent-chooser (only filter the files opened by ristretto) Actually open files from the recent-chooser +commit c2e9b6b2e7c036f6e144318f9856ed44c28e69ae +Merge: d4e2a5d 3f8ba01 +Author: Stephan Arts +Date: Sat Feb 21 09:26:25 2009 +0100 + + Merge branch 'master' into new_picture_viewer + commit 3f8ba01f6df517764a03802d145dfcf18bf14fbc Author: Stephan Arts Date: Sat Feb 21 09:22:56 2009 +0100 diff -Nru ristretto-0.3.2/configure ristretto-0.3.4/configure --- ristretto-0.3.2/configure 2012-01-14 16:37:40.000000000 +0000 +++ ristretto-0.3.4/configure 2012-01-28 06:39:09.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ristretto 0.3.2. +# Generated by GNU Autoconf 2.68 for ristretto 0.3.4. # # Copyright (c) 2006-2011 # The Xfce development team. All rights reserved. @@ -562,8 +562,8 @@ # Identity of this package. PACKAGE_NAME='ristretto' PACKAGE_TARNAME='ristretto' -PACKAGE_VERSION='0.3.2' -PACKAGE_STRING='ristretto 0.3.2' +PACKAGE_VERSION='0.3.4' +PACKAGE_STRING='ristretto 0.3.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1378,7 +1378,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 ristretto 0.3.2 to adapt to many kinds of systems. +\`configure' configures ristretto 0.3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1452,7 +1452,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ristretto 0.3.2:";; + short | recursive ) echo "Configuration of ristretto 0.3.4:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ristretto configure 0.3.2 +ristretto configure 0.3.4 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1931,7 +1931,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ristretto $as_me 0.3.2, which was +It was created by ristretto $as_me 0.3.4, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2281,7 +2281,7 @@ -RISTRETTO_VERSION=0.3.2 +RISTRETTO_VERSION=0.3.4 am__api_version='1.11' ac_aux_dir= @@ -5670,7 +5670,7 @@ - ALL_LINGUAS="ar ast bg ca cs da de el en_GB es eu fi fr gl hr hu id is it ja lv nb nl pl pt_BR pt ro ru sk sl sv tr ug uk ur_PK ur vi zh_CN " + ALL_LINGUAS="ar ast bg ca cs da de el en_GB es eu fi fr gl hr hu id is it ja lt lv nb nl pl pt_BR pt ro ru sk sl sv te tr ug uk ur_PK ur vi zh_CN zh_TW " for ac_header in locale.h do : @@ -10711,7 +10711,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ristretto $as_me 0.3.2, which was +This file was extended by ristretto $as_me 0.3.4, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10777,7 +10777,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ristretto config.status 0.3.2 +ristretto config.status 0.3.4 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru ristretto-0.3.2/configure.in ristretto-0.3.4/configure.in --- ristretto-0.3.2/configure.in 2012-01-14 16:37:36.000000000 +0000 +++ ristretto-0.3.4/configure.in 2012-01-28 06:39:04.000000000 +0000 @@ -16,8 +16,8 @@ dnl *************************** m4_define([ristretto_version_major], [0]) m4_define([ristretto_version_minor], [3]) -m4_define([ristretto_version_micro], [2]) -m4_define([ristretto_version_build], [r928e0d8]) +m4_define([ristretto_version_micro], [4]) +m4_define([ristretto_version_build], [r9beba6d]) m4_define([ristretto_version_tag], []) # Leave empty for releases m4_define([ristretto_version], [ristretto_version_major().ristretto_version_minor().ristretto_version_micro()ifelse(ristretto_version_tag(), [], [], [ristretto_version_tag()-ristretto_version_build()])]) @@ -54,7 +54,7 @@ AC_HEADER_STDC dnl Check for i18n support -XDT_I18N([ar ast bg ca cs da de el en_GB es eu fi fr gl hr hu id is it ja lv nb nl pl pt_BR pt ro ru sk sl sv tr ug uk ur_PK ur vi zh_CN ]) +XDT_I18N([ar ast bg ca cs da de el en_GB es eu fi fr gl hr hu id is it ja lt lv nb nl pl pt_BR pt ro ru sk sl sv te tr ug uk ur_PK ur vi zh_CN zh_TW ]) XDT_CHECK_PACKAGE([LIBEXIF], [libexif], [0.6.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) diff -Nru ristretto-0.3.2/debian/changelog ristretto-0.3.4/debian/changelog --- ristretto-0.3.2/debian/changelog 2012-01-14 20:07:57.000000000 +0000 +++ ristretto-0.3.4/debian/changelog 2012-02-12 21:39:56.000000000 +0000 @@ -1,3 +1,9 @@ +ristretto (0.3.4-0ubuntu1) precise; urgency=low + + * New upstream bugfix release. + + -- Lionel Le Folgoc Sun, 12 Feb 2012 22:39:49 +0100 + ristretto (0.3.2-1) unstable; urgency=low * New upstream release. diff -Nru ristretto-0.3.2/debian/control ristretto-0.3.4/debian/control --- ristretto-0.3.2/debian/control 2011-11-05 21:38:39.000000000 +0000 +++ ristretto-0.3.4/debian/control 2012-02-12 21:39:31.000000000 +0000 @@ -1,7 +1,8 @@ Source: ristretto Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 8.9.3), libexif-dev, libgtk2.0-dev, Binary files /tmp/yMteKrX1EI/ristretto-0.3.2/docs/manual/media/preferences-behaviour.png and /tmp/2T9iCoTLnl/ristretto-0.3.4/docs/manual/media/preferences-behaviour.png differ Binary files /tmp/yMteKrX1EI/ristretto-0.3.2/docs/manual/media/preferences-control.png and /tmp/2T9iCoTLnl/ristretto-0.3.4/docs/manual/media/preferences-control.png differ Binary files /tmp/yMteKrX1EI/ristretto-0.3.2/docs/manual/media/preferences-display.png and /tmp/2T9iCoTLnl/ristretto-0.3.4/docs/manual/media/preferences-display.png differ Binary files /tmp/yMteKrX1EI/ristretto-0.3.2/docs/manual/media/preferences-slideshow.png and /tmp/2T9iCoTLnl/ristretto-0.3.4/docs/manual/media/preferences-slideshow.png differ Binary files /tmp/yMteKrX1EI/ristretto-0.3.2/docs/manual/media/ristretto.png and /tmp/2T9iCoTLnl/ristretto-0.3.4/docs/manual/media/ristretto.png differ Binary files /tmp/yMteKrX1EI/ristretto-0.3.2/docs/manual/media/view-images-1.png and /tmp/2T9iCoTLnl/ristretto-0.3.4/docs/manual/media/view-images-1.png differ diff -Nru ristretto-0.3.2/Makefile.am ristretto-0.3.4/Makefile.am --- ristretto-0.3.2/Makefile.am 2012-01-14 15:47:12.000000000 +0000 +++ ristretto-0.3.4/Makefile.am 2012-01-28 06:31:45.000000000 +0000 @@ -27,3 +27,12 @@ AUTOMAKE_OPTIONS = \ 1.8 \ dist-bzip2 + +.PHONY: ChangeLog + +ChangeLog: Makefile + (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \ + && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \ + || (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog diff -Nru ristretto-0.3.2/Makefile.in ristretto-0.3.4/Makefile.in --- ristretto-0.3.2/Makefile.in 2012-01-14 16:37:40.000000000 +0000 +++ ristretto-0.3.4/Makefile.in 2012-01-28 06:39:09.000000000 +0000 @@ -607,6 +607,9 @@ || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ @@ -831,21 +834,30 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am 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 \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-desktopDATA + dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am 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 installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am uninstall-desktopDATA @INTLTOOL_DESKTOP_RULE@ +.PHONY: ChangeLog + +ChangeLog: Makefile + (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \ + && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \ + || (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog + # 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 ristretto-0.3.2/NEWS ristretto-0.3.4/NEWS --- ristretto-0.3.2/NEWS 2012-01-14 16:37:09.000000000 +0000 +++ ristretto-0.3.4/NEWS 2012-01-28 06:37:46.000000000 +0000 @@ -1,3 +1,16 @@ +0.3.4 +===== +- Fix compiler-warning due to missing return-statement + +0.3.3 +===== +- Fix bug #8343 (Do not use symbols from gtk+ > 2.20) +- Autogenerate Changelog on make dist +- Update scale information when box-zoom is used. +- Fix bug #8317 (Blurred full-screen image) - round offset to nearest + pixel. +- Fix --fullscreen and --slideshow CLI options. + 0.3.2 ===== - Add missing docs diff -Nru ristretto-0.3.2/po/ca.po ristretto-0.3.4/po/ca.po --- ristretto-0.3.2/po/ca.po 2012-01-08 12:32:20.000000000 +0000 +++ ristretto-0.3.4/po/ca.po 2012-01-23 19:13:37.000000000 +0000 @@ -3,7 +3,7 @@ # Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the # ristretto package. -# Carles Muñoz Gorriz , 2008-2011. +# Carles Muñoz Gorriz , 2008-2012. # Harald Servat , 2009. # Pol Ruzafa , 2011. # @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i18n@xfce.org\n" -"POT-Creation-Date: 2012-01-08 13:32+0100\n" -"PO-Revision-Date: 2011-12-18 17:17+0100\n" +"POT-Creation-Date: 2012-01-15 14:57+0000\n" +"PO-Revision-Date: 2012-01-15 18:21+0100\n" "Last-Translator: Carles Muñoz Gorriz \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -51,7 +51,8 @@ "Feu %s --help per veure la llista completa \n" "d'opcions disponibles de la línia d'ordres.\n" -#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1 +#: ../src/main_window.c:55 +#: ../ristretto.desktop.in.h:1 msgid "Image Viewer" msgstr "Visor d'imatges" @@ -303,11 +304,13 @@ msgid "Recently used" msgstr "Emprats recentment" -#: ../src/main_window.c:639 ../src/main_window.c:1113 +#: ../src/main_window.c:639 +#: ../src/main_window.c:1113 msgid "Press open to select an image" msgstr "Feu clic a Obrir per seleccionar una imatge" -#: ../src/main_window.c:1017 ../src/main_window.c:1023 +#: ../src/main_window.c:1017 +#: ../src/main_window.c:1023 msgid "Empty" msgstr "Buit" @@ -315,7 +318,8 @@ msgid "Choose 'set wallpaper' method" msgstr "Trieu el mètode «Posa com fons d'escriptori»" -#: ../src/main_window.c:1945 ../src/preferences_dialog.c:349 +#: ../src/main_window.c:1945 +#: ../src/preferences_dialog.c:349 msgid "" "Configure which system is currently managing your desktop.\n" "This setting determines the method Ristretto will use\n" @@ -325,15 +329,18 @@ "Aquest paràmetre determina quin mètode emprarà Ristretto\n" "per configurar el fons de l'escriptori." -#: ../src/main_window.c:1970 ../src/preferences_dialog.c:373 +#: ../src/main_window.c:1970 +#: ../src/preferences_dialog.c:373 msgid "None" msgstr "Cap" -#: ../src/main_window.c:1974 ../src/preferences_dialog.c:377 +#: ../src/main_window.c:1974 +#: ../src/preferences_dialog.c:377 msgid "Xfce" msgstr "Xfce" -#: ../src/main_window.c:1978 ../src/preferences_dialog.c:381 +#: ../src/main_window.c:1978 +#: ../src/preferences_dialog.c:381 msgid "GNOME" msgstr "GNOME" @@ -363,7 +370,8 @@ msgid ".jp(e)g" msgstr ".jp(e)g" -#: ../src/main_window.c:2834 ../src/main_window.c:2936 +#: ../src/main_window.c:2834 +#: ../src/main_window.c:2936 msgid "Could not open file" msgstr "No s'ha pogut obrir el fitxer" @@ -533,7 +541,8 @@ msgid "Date taken:" msgstr "Data de captura:" -#: ../src/properties_dialog.c:537 ../src/properties_dialog.c:549 +#: ../src/properties_dialog.c:537 +#: ../src/properties_dialog.c:549 #: ../src/properties_dialog.c:561 #, c-format msgid "%s" @@ -553,10 +562,15 @@ "Install Tumbler or another thumbnailing daemon\n" "to resolve this issue." msgstr "" +"No s'ha trobat el servei de miniatures,per aquest\n" +"motiu no es poden crear les miniatures.\n" +"\n" +"Instaŀleu Tumbler o algun altre dimoni de\n" +"miniatures per resoldre el problema." #: ../src/thumbnailer.c:441 msgid "Do _not show this message again" -msgstr "" +msgstr "_No tornis a mostrar aquest missatge" #: ../src/thumbnail_bar.c:208 msgid "Spacing" @@ -574,7 +588,8 @@ msgid "the border width of the thumbnail bar" msgstr "l'amplada de la bora de la barra de miniatures" -#: ../src/xfce_wallpaper_manager.c:335 ../src/gnome_wallpaper_manager.c:234 +#: ../src/xfce_wallpaper_manager.c:335 +#: ../src/gnome_wallpaper_manager.c:234 msgid "Style:" msgstr "Estil:" @@ -586,11 +601,13 @@ msgid "Saturation:" msgstr "Saturació:" -#: ../src/xfce_wallpaper_manager.c:354 ../src/gnome_wallpaper_manager.c:245 +#: ../src/xfce_wallpaper_manager.c:354 +#: ../src/gnome_wallpaper_manager.c:245 msgid "Set as wallpaper" msgstr "Posa com fons d'escriptori" -#: ../src/xfce_wallpaper_manager.c:507 ../src/gnome_wallpaper_manager.c:312 +#: ../src/xfce_wallpaper_manager.c:507 +#: ../src/gnome_wallpaper_manager.c:312 msgid "Auto" msgstr "Automàtic" diff -Nru ristretto-0.3.2/po/es.po ristretto-0.3.4/po/es.po --- ristretto-0.3.2/po/es.po 2012-01-08 12:32:20.000000000 +0000 +++ ristretto-0.3.4/po/es.po 2012-01-23 19:13:37.000000000 +0000 @@ -2,19 +2,19 @@ # Copyright (C) 2007 THE ristretto'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Abel Martín , 2008 -# +# msgid "" msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i18n@xfce.org\n" -"POT-Creation-Date: 2012-01-08 13:32+0100\n" +"POT-Creation-Date: 2012-01-21 13:00+0000\n" "PO-Revision-Date: 2009-11-06 09:18-0300\n" "Last-Translator: elega \n" "Language-Team: Spanish \n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,84,11,-1,-1,-1\n" #: ../src/main.c:61 @@ -142,7 +142,6 @@ #. Zoom submenu #: ../src/main_window.c:335 -#, fuzzy msgid "_Zoom" msgstr "_Zoom" diff -Nru ristretto-0.3.2/po/fr.po ristretto-0.3.4/po/fr.po --- ristretto-0.3.2/po/fr.po 2012-01-08 12:32:21.000000000 +0000 +++ ristretto-0.3.4/po/fr.po 2012-01-23 19:13:37.000000000 +0000 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i18n@xfce.org\n" -"POT-Creation-Date: 2012-01-08 13:32+0100\n" -"PO-Revision-Date: 2010-02-11 15:32+0100\n" -"Last-Translator: Douart Patrick \n" +"POT-Creation-Date: 2012-01-19 15:00+0000\n" +"PO-Revision-Date: 2012-01-19 20:37+0100\n" +"Last-Translator: Benoit \n" "Language-Team: French\n" "Language: \n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "Afficher la fenêtre des préférences" #: ../src/main.c:105 -#, fuzzy, c-format +#, c-format msgid "" "%s: %s\n" "\n" @@ -43,10 +43,12 @@ "available command line options.\n" msgstr "" "%s : %s\n" -"Essayez %s --help pour voir une liste complète des options en ligne de " -"commande.\n" +"\n" +"%s --help pour voir une liste complète\n" +"des options en ligne de commande.\n" -#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1 +#: ../src/main_window.c:55 +#: ../ristretto.desktop.in.h:1 msgid "Image Viewer" msgstr "Visualiseur d’images" @@ -143,7 +145,6 @@ #. Zoom submenu #: ../src/main_window.c:335 -#, fuzzy msgid "_Zoom" msgstr "_Zoom" @@ -224,7 +225,6 @@ msgstr "_Position" #: ../src/main_window.c:364 -#, fuzzy msgid "Thumbnail Bar _Position" msgstr "_Position de la barre de miniatures" @@ -245,7 +245,6 @@ #. Toggle visibility of the thumbnailbar #: ../src/main_window.c:378 -#, fuzzy msgid "Show _Thumbnail Bar" msgstr "Montrer la Barre de _Miniatures" @@ -301,47 +300,53 @@ msgid "Recently used" msgstr "Utilisé récemment" -#: ../src/main_window.c:639 ../src/main_window.c:1113 +#: ../src/main_window.c:639 +#: ../src/main_window.c:1113 msgid "Press open to select an image" msgstr "Cliquez sur ouvrir pour sélectionner une image" -#: ../src/main_window.c:1017 ../src/main_window.c:1023 +#: ../src/main_window.c:1017 +#: ../src/main_window.c:1023 msgid "Empty" msgstr "Vide" #: ../src/main_window.c:1930 msgid "Choose 'set wallpaper' method" -msgstr "" +msgstr "Choisir la méthode pour 'Utiliser en tant que fond d'écran'" -#: ../src/main_window.c:1945 ../src/preferences_dialog.c:349 +#: ../src/main_window.c:1945 +#: ../src/preferences_dialog.c:349 msgid "" "Configure which system is currently managing your desktop.\n" "This setting determines the method Ristretto will use\n" "to configure the desktop wallpaper." msgstr "" +"Définir comment sont gèrés les paramètres de votre bureau.\n" +"Ce réglage permettra à Ristretto de choisir sa méthode\n" +"pour affecter un papier peint au bureau." -#: ../src/main_window.c:1970 ../src/preferences_dialog.c:373 +#: ../src/main_window.c:1970 +#: ../src/preferences_dialog.c:373 msgid "None" -msgstr "" +msgstr "Aucun" -#: ../src/main_window.c:1974 ../src/preferences_dialog.c:377 +#: ../src/main_window.c:1974 +#: ../src/preferences_dialog.c:377 msgid "Xfce" -msgstr "" +msgstr "Xfce" -#: ../src/main_window.c:1978 ../src/preferences_dialog.c:381 +#: ../src/main_window.c:1978 +#: ../src/preferences_dialog.c:381 msgid "GNOME" -msgstr "" +msgstr "GNOME" #: ../src/main_window.c:2480 msgid "Developer:" msgstr "Développeur :" #: ../src/main_window.c:2489 -#, fuzzy msgid "Ristretto is an image viewer for the Xfce desktop environment." -msgstr "" -"Ristretto est une visionneuse d’images légère et rapide pour l’environnement " -"de bureau Xfce." +msgstr "Ristretto est une visionneuse d’images pour l’environnement de bureau Xfce." #: ../src/main_window.c:2497 msgid "translator-credits" @@ -361,7 +366,8 @@ msgid ".jp(e)g" msgstr ".jp(e)g" -#: ../src/main_window.c:2834 ../src/main_window.c:2936 +#: ../src/main_window.c:2834 +#: ../src/main_window.c:2936 msgid "Could not open file" msgstr "Impossible d’ouvrir le fichier" @@ -370,9 +376,8 @@ msgstr "Sauvegarder une copie" #: ../src/main_window.c:2995 -#, fuzzy msgid "Could not save file" -msgstr "Impossible d’ouvrir le fichier" +msgstr "N'a pas pû sauvegarder le fichier" #: ../src/main_window.c:3112 #, c-format @@ -380,9 +385,8 @@ msgstr "Désirez-vous vraiment supprimer l'image '%s' du disque ?" #: ../src/privacy_dialog.c:151 -#, fuzzy msgid "Time range to clear:" -msgstr "Effacer les éléments datant :" +msgstr "Période de temps à effacer :" #: ../src/privacy_dialog.c:155 msgid "Cleanup" @@ -437,18 +441,16 @@ msgstr "Miniatures" #: ../src/preferences_dialog.c:228 -#, fuzzy msgid "" "The thumbnail bar can be automatically hidden \n" "when the window is fullscreen." msgstr "" -"La barre de miniatures peut être cachée automatiquement \n" -"lorsque la visionneuse d'images est en plein écran." +"La barre de miniatures peut être masquée\n" +"automatiquement en mode plein écran." #: ../src/preferences_dialog.c:230 -#, fuzzy msgid "Hide thumbnail bar when fullscreen" -msgstr "Cacher les miniatures en plein écran" +msgstr "Cacher les miniatures en mode plein écran" #: ../src/preferences_dialog.c:266 msgid "Slideshow" @@ -471,12 +473,10 @@ msgstr "Contrôles" #: ../src/preferences_dialog.c:293 -#, fuzzy msgid "Scroll wheel" -msgstr "Défilement de la molette" +msgstr "Défilement avec la molette" #: ../src/preferences_dialog.c:296 -#, fuzzy msgid "Invert zoom direction" msgstr "Inverser la direction du zoom" @@ -498,7 +498,7 @@ #: ../src/preferences_dialog.c:338 msgid "Desktop" -msgstr "" +msgstr "Bureau" #: ../src/preferences_dialog.c:460 msgid "Image Viewer Preferences" @@ -537,7 +537,8 @@ msgid "Date taken:" msgstr "Date de prise :" -#: ../src/properties_dialog.c:537 ../src/properties_dialog.c:549 +#: ../src/properties_dialog.c:537 +#: ../src/properties_dialog.c:549 #: ../src/properties_dialog.c:561 #, c-format msgid "%s" @@ -557,10 +558,16 @@ "Install Tumbler or another thumbnailing daemon\n" "to resolve this issue." msgstr "" +"Impossible de lancer le service \"Miniatures\".\n" +"Les miniatures ne peuvent donc pas être\n" +"créées.\n" +"\n" +"Installez Tumbler ou un autre démon de création\n" +"de miniatures pour résoudre ce problème." #: ../src/thumbnailer.c:441 msgid "Do _not show this message again" -msgstr "" +msgstr "_Ne plus afficher ce message de nouveau" #: ../src/thumbnail_bar.c:208 msgid "Spacing" @@ -575,11 +582,11 @@ msgstr "Largeur des bordures" #: ../src/thumbnail_bar.c:216 -#, fuzzy msgid "the border width of the thumbnail bar" msgstr "Largeur de la barre des miniatures" -#: ../src/xfce_wallpaper_manager.c:335 ../src/gnome_wallpaper_manager.c:234 +#: ../src/xfce_wallpaper_manager.c:335 +#: ../src/gnome_wallpaper_manager.c:234 msgid "Style:" msgstr "Style :" @@ -591,11 +598,13 @@ msgid "Saturation:" msgstr "Saturation :" -#: ../src/xfce_wallpaper_manager.c:354 ../src/gnome_wallpaper_manager.c:245 +#: ../src/xfce_wallpaper_manager.c:354 +#: ../src/gnome_wallpaper_manager.c:245 msgid "Set as wallpaper" msgstr "Utiliser en tant que fond d'écran" -#: ../src/xfce_wallpaper_manager.c:507 ../src/gnome_wallpaper_manager.c:312 +#: ../src/xfce_wallpaper_manager.c:507 +#: ../src/gnome_wallpaper_manager.c:312 msgid "Auto" msgstr "Auto" @@ -620,10 +629,10 @@ msgstr "Zoomé" #: ../ristretto.desktop.in.h:2 -#, fuzzy msgid "Look at your images easily" -msgstr "Regardez vos photos facilement" +msgstr "Regarder vos photos facilement" #: ../ristretto.desktop.in.h:3 msgid "Ristretto Image Viewer" msgstr "Visionneuse d’Images Ristretto" + diff -Nru ristretto-0.3.2/po/lt.po ristretto-0.3.4/po/lt.po --- ristretto-0.3.2/po/lt.po 1970-01-01 00:00:00.000000000 +0000 +++ ristretto-0.3.4/po/lt.po 2012-01-23 19:13:37.000000000 +0000 @@ -0,0 +1,626 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# Algimantas Margevičius , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: ristretto\n" +"Report-Msgid-Bugs-To: xfce-i18n@xfce.org\n" +"POT-Creation-Date: 2012-01-22 08:11+0200\n" +"PO-Revision-Date: 2012-01-22 08:48+0200\n" +"Last-Translator: Algimantas Margevičius \n" +"Language-Team: Lietuvių <>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2)\n" + +#: ../src/main.c:61 +msgid "Version information" +msgstr "Versijos informacija" + +#: ../src/main.c:65 +msgid "Start in fullscreen mode" +msgstr "Paleisti viso ekrano režimu" + +#: ../src/main.c:69 +msgid "Start a slideshow" +msgstr "Pradėti skaidrių rodymą" + +#: ../src/main.c:77 +msgid "Show settings dialog" +msgstr "Rodyti nustatymų langą" + +#: ../src/main.c:105 +#, c-format +msgid "" +"%s: %s\n" +"\n" +"Try %s --help to see a full list of\n" +"available command line options.\n" +msgstr "" +"%s: %s\n" +"\n" +"Norėdami pamatyti komandų eilutės \n" +"parametrų sąrašą, paleiskite „%s --help“.\n" + +#: ../src/main_window.c:55 ../ristretto.desktop.in.h:3 +msgid "Image Viewer" +msgstr "Paveikslėlių peržiūros programa" + +#. File Menu +#: ../src/main_window.c:316 +msgid "_File" +msgstr "_Failas" + +#: ../src/main_window.c:317 +msgid "_Open" +msgstr "_Atverti" + +#: ../src/main_window.c:317 +msgid "Open an image" +msgstr "Atverti paveikslėlį" + +#: ../src/main_window.c:318 +msgid "_Save copy" +msgstr "_Išsaugoti kopiją" + +#: ../src/main_window.c:318 +msgid "Save a copy of the image" +msgstr "Išsaugoti paveikslėlio kopiją" + +#: ../src/main_window.c:319 +msgid "_Properties" +msgstr "_Savybės" + +#: ../src/main_window.c:319 +msgid "Show file properties" +msgstr "Rodyti paveikslėlio savybes" + +#: ../src/main_window.c:320 +msgid "_Close" +msgstr "_Užverti" + +#: ../src/main_window.c:320 +msgid "Close this image" +msgstr "Užverti šį paveikslėlį" + +#: ../src/main_window.c:321 +msgid "_Quit" +msgstr "I_šeiti" + +#: ../src/main_window.c:321 +msgid "Quit Ristretto" +msgstr "Išeiti Ristretto" + +#. Edit Menu +#: ../src/main_window.c:323 +msgid "_Edit" +msgstr "_Keisti" + +#: ../src/main_window.c:324 +msgid "_Open with..." +msgstr "_Atverti su..." + +#: ../src/main_window.c:325 +msgid "_Sorting" +msgstr "_Rikiavimas" + +#: ../src/main_window.c:326 +msgid "_Delete" +msgstr "Išt_rinti" + +#: ../src/main_window.c:326 +msgid "Delete this image from disk" +msgstr "Ištrinti šį paveikslėlį iš disko" + +#: ../src/main_window.c:327 +msgid "_Clear private data" +msgstr "_Išvalyti duomenų saugyklą" + +#: ../src/main_window.c:328 +msgid "_Preferences" +msgstr "_Nustatymai" + +#. View Menu +#: ../src/main_window.c:330 +msgid "_View" +msgstr "R_odymas" + +#: ../src/main_window.c:331 +msgid "_Fullscreen" +msgstr "_Visas ekranas" + +#: ../src/main_window.c:332 +msgid "_Leave Fullscreen" +msgstr "_Palikti viso ekrano režimą" + +#: ../src/main_window.c:333 +msgid "_Set as Wallpaper" +msgstr "_Nustatyti kaip darbastalio foną" + +#. Zoom submenu +#: ../src/main_window.c:335 +msgid "_Zoom" +msgstr "Keisti _mastelį" + +#: ../src/main_window.c:336 +msgid "Zoom _In" +msgstr "Pa_didinti" + +#: ../src/main_window.c:337 +msgid "Zoom _Out" +msgstr "Su_mažinti" + +#: ../src/main_window.c:338 +msgid "Zoom _Fit" +msgstr "_Priderinti prie lango" + +#: ../src/main_window.c:339 +msgid "_Normal Size" +msgstr "_Normalus dydis" + +#. Rotation submenu +#: ../src/main_window.c:341 +msgid "_Rotation" +msgstr "_Pasukimas" + +#: ../src/main_window.c:342 +msgid "Rotate _Right" +msgstr "Pasukti _dešinėn" + +#: ../src/main_window.c:343 +msgid "Rotate _Left" +msgstr "Pasukti _kairėn" + +#. Go Menu +#: ../src/main_window.c:345 +msgid "_Go" +msgstr "_Eiti" + +#: ../src/main_window.c:346 +msgid "_Forward" +msgstr "Pir_myn" + +#: ../src/main_window.c:347 +msgid "_Back" +msgstr "A_tgal" + +#: ../src/main_window.c:348 +msgid "_First" +msgstr "_Pirmas" + +#: ../src/main_window.c:349 +msgid "_Last" +msgstr "Pa_skutinis" + +#. Help Menu +#: ../src/main_window.c:351 +msgid "_Help" +msgstr "_Žinynas" + +#: ../src/main_window.c:353 +msgid "_Contents" +msgstr "_Turinys" + +#: ../src/main_window.c:355 +msgid "Display ristretto user manual" +msgstr "Rodyti ristretto vartotojo žinyną" + +#: ../src/main_window.c:358 +msgid "_About" +msgstr "_Apie" + +#: ../src/main_window.c:360 +msgid "Display information about ristretto" +msgstr "Rodyti informaciją apie ristretto" + +#. Position Menu +#: ../src/main_window.c:363 +msgid "_Position" +msgstr "_Pozicija" + +#: ../src/main_window.c:364 +msgid "Thumbnail Bar _Position" +msgstr "_Miniatiūrų juostos pozicija" + +#. Misc +#: ../src/main_window.c:366 +msgid "Leave _Fullscreen" +msgstr "Išjungti _viso ekrano veikseną" + +#. Toggle visibility of the main file toolbar +#: ../src/main_window.c:374 +msgid "Show _File Toolbar" +msgstr "Rodyti _failų įrankių juostą" + +#. Toggle visibility of the main navigation toolbar +#: ../src/main_window.c:376 +msgid "Show _Navigation Toolbar" +msgstr "Rodyti _navigacijos įrankių juostą" + +#. Toggle visibility of the thumbnailbar +#: ../src/main_window.c:378 +msgid "Show _Thumbnail Bar" +msgstr "Rodyti _miniatiūrų juostą" + +#. Sort by Filename +#: ../src/main_window.c:385 +msgid "sort by filename" +msgstr "rikiuoti pagal failo vardą" + +#. Sort by Date +#: ../src/main_window.c:387 +msgid "sort by date" +msgstr "rikiuoti pagal datą" + +#: ../src/main_window.c:393 +msgid "Left" +msgstr "Kairėje" + +#: ../src/main_window.c:394 +msgid "Right" +msgstr "Dešinėje" + +#: ../src/main_window.c:395 +msgid "Top" +msgstr "Viršuje" + +#: ../src/main_window.c:396 +msgid "Bottom" +msgstr "Apačioje" + +#. Create Play/Pause Slideshow actions +#: ../src/main_window.c:538 +msgid "_Play" +msgstr "_Leisti" + +#: ../src/main_window.c:538 +msgid "Play slideshow" +msgstr "Paleisti skaidrių peržiūrą" + +#: ../src/main_window.c:539 +msgid "_Pause" +msgstr "_Pristabdyti" + +#: ../src/main_window.c:539 +msgid "Pause slideshow" +msgstr "Pristabdyti skaidrių peržiūrą" + +#. Create Recently used items Action +#: ../src/main_window.c:542 +msgid "_Recently used" +msgstr "_Neseniai naudoti" + +#: ../src/main_window.c:542 +msgid "Recently used" +msgstr "Neseniai naudoti" + +#: ../src/main_window.c:639 ../src/main_window.c:1113 +msgid "Press open to select an image" +msgstr "Paspauskite atverti norėdami pasirinkti paveikslėlį" + +#: ../src/main_window.c:1017 ../src/main_window.c:1023 +msgid "Empty" +msgstr "Tuščia" + +#: ../src/main_window.c:1930 +msgid "Choose 'set wallpaper' method" +msgstr "Pasirinkite „nustatyti kaip foną“ būdą" + +#: ../src/main_window.c:1945 ../src/preferences_dialog.c:349 +msgid "" +"Configure which system is currently managing your desktop.\n" +"This setting determines the method Ristretto will use\n" +"to configure the desktop wallpaper." +msgstr "" +"Pasirinkite kuri sistema tvarkosi su jūsų darbastaliu.\n" +"Šis nustatymas nustato būdą kurį Ristretto naudos\n" +"sukonfigūruoti darbastalio foną." + +#: ../src/main_window.c:1970 ../src/preferences_dialog.c:373 +msgid "None" +msgstr "Joks" + +#: ../src/main_window.c:1974 ../src/preferences_dialog.c:377 +msgid "Xfce" +msgstr "Xfce" + +#: ../src/main_window.c:1978 ../src/preferences_dialog.c:381 +msgid "GNOME" +msgstr "GNOME" + +#: ../src/main_window.c:2480 +msgid "Developer:" +msgstr "Kūrėjas:" + +#: ../src/main_window.c:2489 +msgid "Ristretto is an image viewer for the Xfce desktop environment." +msgstr "" +"Ristretto yra paveikslėlių peržiūros programa skirta Xfce darbastalio " +"aplinkai." + +#: ../src/main_window.c:2497 +msgid "translator-credits" +msgstr "Algimantas Margevičius " + +#: ../src/main_window.c:2783 +msgid "Open image" +msgstr "Atverti paveikslėlį" + +#: ../src/main_window.c:2802 +msgid "Images" +msgstr "Paveikslėliai" + +#: ../src/main_window.c:2807 +msgid ".jp(e)g" +msgstr ".jp(e)g" + +#: ../src/main_window.c:2834 ../src/main_window.c:2936 +msgid "Could not open file" +msgstr "Nepavyko atverti failo" + +#: ../src/main_window.c:2969 +msgid "Save copy" +msgstr "Išsaugoti kopiją" + +#: ../src/main_window.c:2995 +msgid "Could not save file" +msgstr "Nepavyko išsaugoti failo" + +#: ../src/main_window.c:3112 +#, c-format +msgid "Are you sure you want to delete image '%s' from disk?" +msgstr "Ar tikrai norite ištrinti paveikslėlį „%s“ iš disko?" + +#: ../src/privacy_dialog.c:151 +msgid "Time range to clear:" +msgstr "Laiko trapas kurį išvalyti:" + +#: ../src/privacy_dialog.c:155 +msgid "Cleanup" +msgstr "Išvalyti" + +#: ../src/privacy_dialog.c:157 +msgid "Last Hour" +msgstr "Paskutinė valanda" + +#: ../src/privacy_dialog.c:158 +msgid "Last Two Hours" +msgstr "Paskutinės dvi valandos" + +#: ../src/privacy_dialog.c:159 +msgid "Last Four Hours" +msgstr "Paskutinės keturios valandos" + +#: ../src/privacy_dialog.c:160 +msgid "Today" +msgstr "Šiandien" + +#: ../src/privacy_dialog.c:161 +msgid "Everything" +msgstr "Viskas" + +#: ../src/privacy_dialog.c:459 +msgid "Clear private data" +msgstr "Išvalyti duomenų saugyklą" + +#: ../src/preferences_dialog.c:196 +msgid "Display" +msgstr "Ekranas" + +#: ../src/preferences_dialog.c:202 +msgid "Background color" +msgstr "Fono spalva" + +#: ../src/preferences_dialog.c:204 +msgid "Toolbars" +msgstr "Įrankių juostos" + +#: ../src/preferences_dialog.c:209 +msgid "Override background color:" +msgstr "Perrašyti fono spalvą:" + +#: ../src/preferences_dialog.c:220 +msgid "Merge toolbars" +msgstr "Sulieti įrankių juostas" + +#: ../src/preferences_dialog.c:225 +msgid "Thumbnails" +msgstr "Miniatiūros" + +#: ../src/preferences_dialog.c:228 +msgid "" +"The thumbnail bar can be automatically hidden \n" +"when the window is fullscreen." +msgstr "" +"Kai langas visame ekrane, miniatiūrų juosta \n" +"gali būti automatiškai paslėpta." + +#: ../src/preferences_dialog.c:230 +msgid "Hide thumbnail bar when fullscreen" +msgstr "Slėpti miniatiūrų juostą, viso ekrano režime" + +#: ../src/preferences_dialog.c:266 +msgid "Slideshow" +msgstr "Skaidrių peržiūra" + +#: ../src/preferences_dialog.c:270 +msgid "Timeout" +msgstr "Laukimo laikas" + +#: ../src/preferences_dialog.c:273 +msgid "" +"The time period an individual image is displayed during a slideshow\n" +"(in seconds)" +msgstr "" +"Laiko intervalas kurį, skaidrių peržiūroje, bus rodomas kiekvienas " +"paveikslėlis\n" +"(sekundėmis)" + +#: ../src/preferences_dialog.c:289 +msgid "Control" +msgstr "Valdymas" + +#: ../src/preferences_dialog.c:293 +msgid "Scroll wheel" +msgstr "Slinkties ratukas" + +#: ../src/preferences_dialog.c:296 +msgid "Invert zoom direction" +msgstr "Invertuoti mastelio kryptį" + +#: ../src/preferences_dialog.c:306 +msgid "Behaviour" +msgstr "Vaizdavimas" + +#: ../src/preferences_dialog.c:311 +msgid "Startup" +msgstr "Paleidimas" + +#: ../src/preferences_dialog.c:313 +msgid "Maximize window on startup when opening an image" +msgstr "Atveriant paveikslėlį išdidinti jį" + +#: ../src/preferences_dialog.c:319 +msgid "Wrap around images" +msgstr "Pritaikyti paveikslėlių dydį" + +#: ../src/preferences_dialog.c:338 +msgid "Desktop" +msgstr "Darbastalis" + +#: ../src/preferences_dialog.c:460 +msgid "Image Viewer Preferences" +msgstr "Paveikslėlių peržiūros programos nustatymai" + +#: ../src/properties_dialog.c:180 +msgid "Name:" +msgstr "Pavadinimas:" + +#: ../src/properties_dialog.c:181 +msgid "Kind:" +msgstr "Rūšis:" + +#: ../src/properties_dialog.c:182 +msgid "Modified:" +msgstr "Pakeista:" + +#: ../src/properties_dialog.c:183 +msgid "Accessed:" +msgstr "Paskutinį kartą naudota:" + +#: ../src/properties_dialog.c:184 +msgid "Size:" +msgstr "Dydis:" + +#: ../src/properties_dialog.c:308 +msgid "General" +msgstr "Bendra" + +#: ../src/properties_dialog.c:312 +msgid "Image" +msgstr "Paveikslėlis" + +#: ../src/properties_dialog.c:525 +#, c-format +msgid "Date taken:" +msgstr "Fotografavimo data:" + +#: ../src/properties_dialog.c:537 ../src/properties_dialog.c:549 +#: ../src/properties_dialog.c:561 +#, c-format +msgid "%s" +msgstr "%s" + +#: ../src/properties_dialog.c:623 +#, c-format +msgid "%s - Properties" +msgstr "%s - Savybės" + +#: ../src/thumbnailer.c:431 +msgid "" +"The thumbnailer-service can not be reached,\n" +"for this reason, the thumbnails can not be\n" +"created.\n" +"\n" +"Install Tumbler or another thumbnailing daemon\n" +"to resolve this issue." +msgstr "" +"„thumbnailer-service“ nepasiekiamas,\n" +"todėl miniatiūros negali būti sukurtos.\n" +"\n" +"Įdiekite Tumbler ar kitą thumbnailing daemon\n" +"norėdami išspręsti šią problemą." + +#: ../src/thumbnailer.c:441 +msgid "Do _not show this message again" +msgstr "_Daugiau nerodyti šio pranešimo" + +#: ../src/thumbnail_bar.c:208 +msgid "Spacing" +msgstr "Išretinimas" + +#: ../src/thumbnail_bar.c:209 +msgid "The amount of space between the thumbnails" +msgstr "Tarpas tarp miniatiūrų" + +#: ../src/thumbnail_bar.c:215 +msgid "border width" +msgstr "Rėmelio plotis" + +#: ../src/thumbnail_bar.c:216 +msgid "the border width of the thumbnail bar" +msgstr "miniatiūros juostos rėmelio plotis" + +#: ../src/xfce_wallpaper_manager.c:335 ../src/gnome_wallpaper_manager.c:234 +msgid "Style:" +msgstr "Stilius:" + +#: ../src/xfce_wallpaper_manager.c:336 +msgid "Brightness:" +msgstr "Ryškumas:" + +#: ../src/xfce_wallpaper_manager.c:337 +msgid "Saturation:" +msgstr "Sodrumas:" + +#: ../src/xfce_wallpaper_manager.c:354 ../src/gnome_wallpaper_manager.c:245 +msgid "Set as wallpaper" +msgstr "Nustatyti kaip foną" + +#: ../src/xfce_wallpaper_manager.c:507 ../src/gnome_wallpaper_manager.c:312 +msgid "Auto" +msgstr "Auto" + +#: ../src/xfce_wallpaper_manager.c:510 +msgid "Centered" +msgstr "Centruotas" + +#: ../src/xfce_wallpaper_manager.c:513 +msgid "Tiled" +msgstr "Išklotas" + +#: ../src/xfce_wallpaper_manager.c:516 +msgid "Stretched" +msgstr "Paplatinta" + +#: ../src/xfce_wallpaper_manager.c:519 +msgid "Scaled" +msgstr "Ištemptas" + +#: ../src/xfce_wallpaper_manager.c:522 +msgid "Zoomed" +msgstr "Pritauktas" + +#: ../ristretto.desktop.in.h:1 +msgid "Ristretto Image Viewer" +msgstr "Ristretto paveikslėlių peržiūros programa" + +#: ../ristretto.desktop.in.h:2 +msgid "Look at your images easily" +msgstr "Peržiūrėkite savo paveikslėlius paprastai" diff -Nru ristretto-0.3.2/po/pt.po ristretto-0.3.4/po/pt.po --- ristretto-0.3.2/po/pt.po 2012-01-09 17:35:02.000000000 +0000 +++ ristretto-0.3.4/po/pt.po 2012-01-28 06:08:44.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Nuno Miguel , 2007 -# +# msgid "" msgstr "" -"Project-Id-Version: ristretto 0.0.22\n" +"Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i18n@xfce.org\n" "POT-Creation-Date: 2012-01-08 21:57+0000\n" -"PO-Revision-Date: 2010-01-15 14:16-0000\n" -"Last-Translator: Sérgio Marques \n" +"PO-Revision-Date: 2012-01-27 18:08+0100\n" +"Last-Translator: Nuno Miguel \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ #: ../src/main.c:61 msgid "Version information" -msgstr "Informação de versão" +msgstr "Informações da versão" #: ../src/main.c:65 msgid "Start in fullscreen mode" @@ -44,10 +44,12 @@ "available command line options.\n" msgstr "" "%s: %s\n" -"Tente %s --help para ver uma lista completa de opções em linha de comandos " -"disponíveis.\n" +"\n" +"Tente %s --help para ver uma lista completa\n" +"de opções em linha de comandos disponíveis.\n" -#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1 +#: ../src/main_window.c:55 +#: ../ristretto.desktop.in.h:1 msgid "Image Viewer" msgstr "Visualizador de imagens" @@ -187,7 +189,7 @@ #: ../src/main_window.c:347 msgid "_Back" -msgstr "_Voltar" +msgstr "_Recuar" #: ../src/main_window.c:348 msgid "_First" @@ -208,7 +210,7 @@ #: ../src/main_window.c:355 msgid "Display ristretto user manual" -msgstr "Mostrar o manual de utilizador do ristretto" +msgstr "Abrir manual de utilizador" #: ../src/main_window.c:358 msgid "_About" @@ -216,7 +218,7 @@ #: ../src/main_window.c:360 msgid "Display information about ristretto" -msgstr "Mostrar informações do ristretto" +msgstr "Exibir informações do ristretto" #. Position Menu #: ../src/main_window.c:363 @@ -299,37 +301,43 @@ msgid "Recently used" msgstr "Recentes" -#: ../src/main_window.c:639 ../src/main_window.c:1113 +#: ../src/main_window.c:639 +#: ../src/main_window.c:1113 msgid "Press open to select an image" -msgstr "Prima abrir para seleccionar uma imagem" +msgstr "Prima abrir para selecionar uma imagem" -#: ../src/main_window.c:1017 ../src/main_window.c:1023 +#: ../src/main_window.c:1017 +#: ../src/main_window.c:1023 msgid "Empty" msgstr "Vazio" #: ../src/main_window.c:1930 msgid "Choose 'set wallpaper' method" -msgstr "Escolha o método \"definir papel de parede\"" +msgstr "Escolha o método 'definir papel de parede'" -#: ../src/main_window.c:1945 ../src/preferences_dialog.c:349 +#: ../src/main_window.c:1945 +#: ../src/preferences_dialog.c:349 msgid "" "Configure which system is currently managing your desktop.\n" "This setting determines the method Ristretto will use\n" "to configure the desktop wallpaper." msgstr "" "Configurar o sistema que faz a gestão do ambiente de trabalho.\n" -"Esta definição determina o método utilizado pelo Ristretto para " +"Esta definição determina o método uzado pelo Ristretto para\n" "configurar o papel de parede." -#: ../src/main_window.c:1970 ../src/preferences_dialog.c:373 +#: ../src/main_window.c:1970 +#: ../src/preferences_dialog.c:373 msgid "None" msgstr "Nenhum" -#: ../src/main_window.c:1974 ../src/preferences_dialog.c:377 +#: ../src/main_window.c:1974 +#: ../src/preferences_dialog.c:377 msgid "Xfce" msgstr "Xfce" -#: ../src/main_window.c:1978 ../src/preferences_dialog.c:381 +#: ../src/main_window.c:1978 +#: ../src/preferences_dialog.c:381 msgid "GNOME" msgstr "GNOME" @@ -339,8 +347,7 @@ #: ../src/main_window.c:2489 msgid "Ristretto is an image viewer for the Xfce desktop environment." -msgstr "" -"O Ristretto é um visualizador de imagens para o ambiente de trabalho Xfce." +msgstr "O Ristretto é um visualizador de imagens para o ambiente de trabalho Xfce" #: ../src/main_window.c:2497 msgid "translator-credits" @@ -358,7 +365,8 @@ msgid ".jp(e)g" msgstr ".jp(e)g" -#: ../src/main_window.c:2834 ../src/main_window.c:2936 +#: ../src/main_window.c:2834 +#: ../src/main_window.c:2936 msgid "Could not open file" msgstr "Incapaz de abrir ficheiro" @@ -373,11 +381,11 @@ #: ../src/main_window.c:3112 #, c-format msgid "Are you sure you want to delete image '%s' from disk?" -msgstr "Tem a certeza que quer apagar do disco a imagem \"%s\"?" +msgstr "Tem a certeza que quer apagar do disco a imagem '%s'?" #: ../src/privacy_dialog.c:151 msgid "Time range to clear:" -msgstr "Intervalo de tempo a limpar:" +msgstr "Intervalo de tempo:" #: ../src/privacy_dialog.c:155 msgid "Cleanup" @@ -409,7 +417,7 @@ #: ../src/preferences_dialog.c:196 msgid "Display" -msgstr "Exibição" +msgstr "Exibir" #: ../src/preferences_dialog.c:202 msgid "Background color" @@ -477,15 +485,15 @@ #: ../src/preferences_dialog.c:311 msgid "Startup" -msgstr "Início" +msgstr "Arranque" #: ../src/preferences_dialog.c:313 msgid "Maximize window on startup when opening an image" -msgstr "Ao abrir uma imagem, maximizar a janela" +msgstr "Maximizar janela no arranque ao abrir uma imagem" #: ../src/preferences_dialog.c:319 msgid "Wrap around images" -msgstr "Contorno em redor das imagens" +msgstr "Contorno das imagens" #: ../src/preferences_dialog.c:338 msgid "Desktop" @@ -528,7 +536,8 @@ msgid "Date taken:" msgstr "Tirada em:" -#: ../src/properties_dialog.c:537 ../src/properties_dialog.c:549 +#: ../src/properties_dialog.c:537 +#: ../src/properties_dialog.c:549 #: ../src/properties_dialog.c:561 #, c-format msgid "%s" @@ -550,10 +559,10 @@ msgstr "" "O serviço de miniaturas não foi processado,\n" "porque as miniaturas não foram\n" -"criadas.\n" +"criadas\n" "\n" -"Instale o Tumbler ou outro serviço de miniaturas,\n" -"para solucionar o problema." +"Instale o Tumbler ou outro serviço de miniaturas\n" +"para solucionar o problema" #: ../src/thumbnailer.c:441 msgid "Do _not show this message again" @@ -575,7 +584,8 @@ msgid "the border width of the thumbnail bar" msgstr "a largura do contorno da barra de miniaturas" -#: ../src/xfce_wallpaper_manager.c:335 ../src/gnome_wallpaper_manager.c:234 +#: ../src/xfce_wallpaper_manager.c:335 +#: ../src/gnome_wallpaper_manager.c:234 msgid "Style:" msgstr "Estilo:" @@ -587,11 +597,13 @@ msgid "Saturation:" msgstr "Saturação:" -#: ../src/xfce_wallpaper_manager.c:354 ../src/gnome_wallpaper_manager.c:245 +#: ../src/xfce_wallpaper_manager.c:354 +#: ../src/gnome_wallpaper_manager.c:245 msgid "Set as wallpaper" msgstr "Definir como papel de parede" -#: ../src/xfce_wallpaper_manager.c:507 ../src/gnome_wallpaper_manager.c:312 +#: ../src/xfce_wallpaper_manager.c:507 +#: ../src/gnome_wallpaper_manager.c:312 msgid "Auto" msgstr "Automático" @@ -617,116 +629,9 @@ #: ../ristretto.desktop.in.h:2 msgid "Look at your images easily" -msgstr "Ver imagens com simplicidade" +msgstr "Veja as suas imagens facilmente" #: ../ristretto.desktop.in.h:3 msgid "Ristretto Image Viewer" -msgstr "Ristretto - Visualizador de imagens" - -#~ msgid "Scaling" -#~ msgstr "Escala" - -#~ msgid "Don't scale over 100% when maximizing the window." -#~ msgstr "Ao maximizar a janela, não escalonar acima de 100%." - -#~ msgid "Preferences" -#~ msgstr "Preferências" - -#~ msgid "Image viewer" -#~ msgstr "Visualizador de imagens" - -#~ msgid "Open _Folder" -#~ msgstr "Abrir _pasta" - -#~ msgid "Open a folder" -#~ msgstr "Abrir uma pasta" - -#~ msgid "_Close All" -#~ msgstr "Fe_char todas" - -#~ msgid "Close all images" -#~ msgstr "Fechar todas as imagens" - -#~ msgid "Open folder" -#~ msgstr "Abrir pasta" - -#~ msgid "Open entire folder on startup" -#~ msgstr "Ao iniciar, abrir toda a pasta" - -#~ msgid "Monitor:" -#~ msgstr "Monitor:" - -#~ msgid "One" -#~ msgstr "Uma" - -#~ msgid "Two" -#~ msgstr "Duas" - -#~ msgid "Three" -#~ msgstr "Três" - -#~ msgid "Four" -#~ msgstr "Quatro" - -#~ msgid "Show preview when loading image" -#~ msgstr "Mostrar antevisão ao carregar imagem" - -#~ msgid "No action" -#~ msgstr "Sem acção" - -#~ msgid "Zoom in and out" -#~ msgstr "Ampliar e reduzir" - -#~ msgid "Switch images" -#~ msgstr "Trocar imagens" - -#~ msgid "Memory" -#~ msgstr "Memória" - -#~ msgid "Image cache" -#~ msgstr "Cache de imagens" - -#~ msgid "Cache size" -#~ msgstr "Tamanho de cache" - -#~ msgid "MB" -#~ msgstr "MB" - -#~ msgid "Enable cache" -#~ msgstr "Activar cache" - -#~ msgid "Enable preloading" -#~ msgstr "Activar pré-carregamento" - -#~ msgid "filmstrip width" -#~ msgstr "largura da película" - -#~ msgid "the width of the thumbnail-bar film-strip" -#~ msgstr "a largura da barra de película das miniaturas" - -#~ msgid "_Print" -#~ msgstr "_Imprimir" - -#~ msgid "Print the image" -#~ msgstr "Imprimir a imagem" - -#~ msgid "Quality" -#~ msgstr "Qualidade" - -#~ msgid "Maximum render quality:" -#~ msgstr "Qualidade máxima de renderização:" - -#~ msgid "Best" -#~ msgstr "Melhor" - -#~ msgid "High" -#~ msgstr "Alto" - -#~ msgid "Medium" -#~ msgstr "Médio" - -#~ msgid "Low" -#~ msgstr "Baixo" +msgstr "Visualizador de imagens Ristretto" -#~ msgid "Preload images" -#~ msgstr "Pré-carregar imagens" diff -Nru ristretto-0.3.2/po/te.po ristretto-0.3.4/po/te.po --- ristretto-0.3.2/po/te.po 1970-01-01 00:00:00.000000000 +0000 +++ ristretto-0.3.4/po/te.po 2012-01-28 06:09:12.000000000 +0000 @@ -0,0 +1,608 @@ +# Telugu Translation. +# Copyright (C) 2012 e-telugu Localization Team +# This file is distributed under the same license as the ristretto package. +# Praveen Illa , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: master\n" +"Report-Msgid-Bugs-To: xfce-i18n@xfce.org\n" +"POT-Creation-Date: 2012-01-27 13:48+0000\n" +"PO-Revision-Date: 2012-01-27 21:12+0530\n" +"Last-Translator: Praveen Illa \n" +"Language-Team: Telugu \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" + +#: ../src/main.c:61 +msgid "Version information" +msgstr "రూపాంతర సమాచారం" + +#: ../src/main.c:65 +msgid "Start in fullscreen mode" +msgstr "నిండుతెర విధములో ప్రారంభించు" + +#: ../src/main.c:69 +msgid "Start a slideshow" +msgstr "పలకప్రదర్శనను ప్రారంభించు" + +#: ../src/main.c:77 +msgid "Show settings dialog" +msgstr "అమరికలన డైలాగును చూపించు" + +#: ../src/main.c:105 +#, c-format +msgid "" +"%s: %s\n" +"\n" +"Try %s --help to see a full list of\n" +"available command line options.\n" +msgstr "" +"%s: %s\n" +"\n" +"అందుబాటులో వున్న ఆదేశ వరుస ఐచ్చికముల పూర్తి జాబితా కొరకు '%s --help' నడుపండి.\n" + +#: ../src/main_window.c:55 ../ristretto.desktop.in.h:1 +msgid "Image Viewer" +msgstr "ప్రతిబింబ వీక్షకం" + +#. File Menu +#: ../src/main_window.c:316 +msgid "_File" +msgstr "ఫైల్ (_F)" + +#: ../src/main_window.c:317 +msgid "_Open" +msgstr "తెరువు (_O)" + +#: ../src/main_window.c:317 +msgid "Open an image" +msgstr "ఒక బొమ్మను తెరువు" + +#: ../src/main_window.c:318 +msgid "_Save copy" +msgstr "నకలును భద్రపరుచు (_S)" + +#: ../src/main_window.c:318 +msgid "Save a copy of the image" +msgstr "బొమ్మ యొక్క నకలును భద్రపరుచు" + +#: ../src/main_window.c:319 +msgid "_Properties" +msgstr "లక్షణాలు (_P)" + +#: ../src/main_window.c:319 +msgid "Show file properties" +msgstr "ఫైల్ లక్షణాలను చూపించు" + +#: ../src/main_window.c:320 +msgid "_Close" +msgstr "మూసివేయి (_C)" + +#: ../src/main_window.c:320 +msgid "Close this image" +msgstr "ఈ బొమ్మని మూసివేయి" + +#: ../src/main_window.c:321 +msgid "_Quit" +msgstr "నిష్క్రమించు (_Q)" + +#: ../src/main_window.c:321 +msgid "Quit Ristretto" +msgstr "రిస్ట్రెట్టోను త్యజించు" + +#. Edit Menu +#: ../src/main_window.c:323 +msgid "_Edit" +msgstr "సవరణ (_E)" + +#: ../src/main_window.c:324 +msgid "_Open with..." +msgstr "దీనితో తెరువు...(_O)" + +#: ../src/main_window.c:325 +msgid "_Sorting" +msgstr "క్రమబద్ధీకరణ (_S)" + +#: ../src/main_window.c:326 +msgid "_Delete" +msgstr "తొలగించు (_D)" + +#: ../src/main_window.c:326 +msgid "Delete this image from disk" +msgstr "డిస్కు నుండి ఈ బొమ్మను తొలగించు" + +#: ../src/main_window.c:327 +msgid "_Clear private data" +msgstr "" + +#: ../src/main_window.c:328 +msgid "_Preferences" +msgstr "ప్రాధాన్యతలు (_P)" + +#. View Menu +#: ../src/main_window.c:330 +msgid "_View" +msgstr "వీక్షణం (_V)" + +#: ../src/main_window.c:331 +msgid "_Fullscreen" +msgstr "పూర్తితెర (_F)" + +#: ../src/main_window.c:332 +msgid "_Leave Fullscreen" +msgstr "పూర్తితెరను వదిలివెళ్ళు (_L)" + +#: ../src/main_window.c:333 +msgid "_Set as Wallpaper" +msgstr "నేపథ్యచిత్రం వలె అమర్చు (_S)" + +#. Zoom submenu +#: ../src/main_window.c:335 +msgid "_Zoom" +msgstr "జూమ్ (_Z)" + +#: ../src/main_window.c:336 +msgid "Zoom _In" +msgstr "అతిరూపించు (_I)" + +#: ../src/main_window.c:337 +msgid "Zoom _Out" +msgstr "అవరూపించు (_O)" + +#: ../src/main_window.c:338 +msgid "Zoom _Fit" +msgstr "సరితగిన జూమ్ (_F)" + +#: ../src/main_window.c:339 +msgid "_Normal Size" +msgstr "సాధారణ పరిమాణం (_N)" + +#. Rotation submenu +#: ../src/main_window.c:341 +msgid "_Rotation" +msgstr "పరిభ్రమణం (_R)" + +#: ../src/main_window.c:342 +msgid "Rotate _Right" +msgstr "కుడివైపు తిప్పు (_R)" + +#: ../src/main_window.c:343 +msgid "Rotate _Left" +msgstr "ఎడమవైపు తిప్పు (_L)" + +#. Go Menu +#: ../src/main_window.c:345 +msgid "_Go" +msgstr "వెళ్లు (_G)" + +#: ../src/main_window.c:346 +msgid "_Forward" +msgstr "ముందుకు (_F)" + +#: ../src/main_window.c:347 +msgid "_Back" +msgstr "వెనక్కి (_B)" + +#: ../src/main_window.c:348 +msgid "_First" +msgstr "మొదటిది (_F)" + +#: ../src/main_window.c:349 +msgid "_Last" +msgstr "చివరిది (_L)" + +#. Help Menu +#: ../src/main_window.c:351 +msgid "_Help" +msgstr "స‌‌హాయం (_H)" + +#: ../src/main_window.c:353 +msgid "_Contents" +msgstr "విషయసూచిక (_C)" + +#: ../src/main_window.c:355 +msgid "Display ristretto user manual" +msgstr "" + +#: ../src/main_window.c:358 +msgid "_About" +msgstr "గురించి (_A)" + +#: ../src/main_window.c:360 +msgid "Display information about ristretto" +msgstr "రిస్ట్రెట్టో గురించిన సమాచారాన్ని చూపించు" + +#. Position Menu +#: ../src/main_window.c:363 +msgid "_Position" +msgstr "స్థానము (_P)" + +#: ../src/main_window.c:364 +msgid "Thumbnail Bar _Position" +msgstr "" + +#. Misc +#: ../src/main_window.c:366 +msgid "Leave _Fullscreen" +msgstr "నిండు తెరను వదిలివెళ్ళు (_F)" + +#. Toggle visibility of the main file toolbar +#: ../src/main_window.c:374 +msgid "Show _File Toolbar" +msgstr "" + +#. Toggle visibility of the main navigation toolbar +#: ../src/main_window.c:376 +msgid "Show _Navigation Toolbar" +msgstr "" + +#. Toggle visibility of the thumbnailbar +#: ../src/main_window.c:378 +msgid "Show _Thumbnail Bar" +msgstr "" + +#. Sort by Filename +#: ../src/main_window.c:385 +msgid "sort by filename" +msgstr "" + +#. Sort by Date +#: ../src/main_window.c:387 +msgid "sort by date" +msgstr "" + +#: ../src/main_window.c:393 +msgid "Left" +msgstr "ఎడమ" + +#: ../src/main_window.c:394 +msgid "Right" +msgstr "కుడి" + +#: ../src/main_window.c:395 +msgid "Top" +msgstr "పైన" + +#: ../src/main_window.c:396 +msgid "Bottom" +msgstr "క్రింద" + +#. Create Play/Pause Slideshow actions +#: ../src/main_window.c:538 +msgid "_Play" +msgstr "ఆడించు (_P)" + +#: ../src/main_window.c:538 +msgid "Play slideshow" +msgstr "పలకప్రదర్శనను ఆడించు" + +#: ../src/main_window.c:539 +msgid "_Pause" +msgstr "నిలిపివేయి(_P)" + +#: ../src/main_window.c:539 +msgid "Pause slideshow" +msgstr "పలకప్రదర్శనను నిలిపివేయి" + +#. Create Recently used items Action +#: ../src/main_window.c:542 +msgid "_Recently used" +msgstr "ఇటీవలి వాడినవి (_R)" + +#: ../src/main_window.c:542 +msgid "Recently used" +msgstr "ఇటీవలి వాడినవి" + +#: ../src/main_window.c:639 ../src/main_window.c:1113 +msgid "Press open to select an image" +msgstr "" + +#: ../src/main_window.c:1017 ../src/main_window.c:1023 +msgid "Empty" +msgstr "ఖాళీ" + +#: ../src/main_window.c:1938 +msgid "Choose 'set wallpaper' method" +msgstr "" + +#: ../src/main_window.c:1953 ../src/preferences_dialog.c:349 +msgid "" +"Configure which system is currently managing your desktop.\n" +"This setting determines the method Ristretto will use\n" +"to configure the desktop wallpaper." +msgstr "" + +#: ../src/main_window.c:1978 ../src/preferences_dialog.c:373 +msgid "None" +msgstr "ఏదీకాదు" + +#: ../src/main_window.c:1982 ../src/preferences_dialog.c:377 +msgid "Xfce" +msgstr "Xfce" + +#: ../src/main_window.c:1986 ../src/preferences_dialog.c:381 +msgid "GNOME" +msgstr "గ్నోమ్" + +#: ../src/main_window.c:2442 +msgid "Developer:" +msgstr "అభివృద్ధికారి:" + +#: ../src/main_window.c:2451 +msgid "Ristretto is an image viewer for the Xfce desktop environment." +msgstr "" + +#: ../src/main_window.c:2459 +msgid "translator-credits" +msgstr "Praveen Illa , 2012." + +#: ../src/main_window.c:2749 +msgid "Open image" +msgstr "బొమ్మని తెరువు" + +#: ../src/main_window.c:2768 +msgid "Images" +msgstr "బొమ్మలు" + +#: ../src/main_window.c:2773 +msgid ".jp(e)g" +msgstr ".jp(e)g" + +#: ../src/main_window.c:2800 ../src/main_window.c:2902 +msgid "Could not open file" +msgstr "" + +#: ../src/main_window.c:2935 +msgid "Save copy" +msgstr "నకలును భద్రపరుచు" + +#: ../src/main_window.c:2961 +msgid "Could not save file" +msgstr "ఫైలును భద్రపరుచుట వీలుకాదు" + +#: ../src/main_window.c:3078 +#, c-format +msgid "Are you sure you want to delete image '%s' from disk?" +msgstr "" + +#: ../src/privacy_dialog.c:151 +msgid "Time range to clear:" +msgstr "" + +#: ../src/privacy_dialog.c:155 +msgid "Cleanup" +msgstr "" + +#: ../src/privacy_dialog.c:157 +msgid "Last Hour" +msgstr "" + +#: ../src/privacy_dialog.c:158 +msgid "Last Two Hours" +msgstr "" + +#: ../src/privacy_dialog.c:159 +msgid "Last Four Hours" +msgstr "" + +#: ../src/privacy_dialog.c:160 +msgid "Today" +msgstr "నేడు" + +#: ../src/privacy_dialog.c:161 +msgid "Everything" +msgstr "మొత్తం" + +#: ../src/privacy_dialog.c:459 +msgid "Clear private data" +msgstr "రహస్య డేటాను చెరిపివేయి" + +#: ../src/preferences_dialog.c:196 +msgid "Display" +msgstr "" + +#: ../src/preferences_dialog.c:202 +msgid "Background color" +msgstr "నేపథ్యం రంగు" + +#: ../src/preferences_dialog.c:204 +msgid "Toolbars" +msgstr "పనిముట్టుపట్టీలు" + +#: ../src/preferences_dialog.c:209 +msgid "Override background color:" +msgstr "" + +#: ../src/preferences_dialog.c:220 +msgid "Merge toolbars" +msgstr "" + +#: ../src/preferences_dialog.c:225 +msgid "Thumbnails" +msgstr "చిరుచిత్రాలు" + +#: ../src/preferences_dialog.c:228 +msgid "" +"The thumbnail bar can be automatically hidden \n" +"when the window is fullscreen." +msgstr "" + +#: ../src/preferences_dialog.c:230 +msgid "Hide thumbnail bar when fullscreen" +msgstr "" + +#: ../src/preferences_dialog.c:266 +msgid "Slideshow" +msgstr "పలకప్రదర్శన" + +#: ../src/preferences_dialog.c:270 +msgid "Timeout" +msgstr "" + +#: ../src/preferences_dialog.c:273 +msgid "" +"The time period an individual image is displayed during a slideshow\n" +"(in seconds)" +msgstr "" + +#: ../src/preferences_dialog.c:289 +msgid "Control" +msgstr "నియంత్రణ" + +#: ../src/preferences_dialog.c:293 +msgid "Scroll wheel" +msgstr "" + +#: ../src/preferences_dialog.c:296 +msgid "Invert zoom direction" +msgstr "" + +#: ../src/preferences_dialog.c:306 +msgid "Behaviour" +msgstr "ప్రవర్తన" + +#: ../src/preferences_dialog.c:311 +msgid "Startup" +msgstr "" + +#: ../src/preferences_dialog.c:313 +msgid "Maximize window on startup when opening an image" +msgstr "" + +#: ../src/preferences_dialog.c:319 +msgid "Wrap around images" +msgstr "" + +#: ../src/preferences_dialog.c:338 +msgid "Desktop" +msgstr "డెస్క్‍టాప్‌" + +#: ../src/preferences_dialog.c:460 +msgid "Image Viewer Preferences" +msgstr "ప్రతిబింబ వీక్షకం ప్రాధాన్యతలు" + +#: ../src/properties_dialog.c:180 +msgid "Name:" +msgstr "పేరు:" + +#: ../src/properties_dialog.c:181 +msgid "Kind:" +msgstr "రకం:" + +#: ../src/properties_dialog.c:182 +msgid "Modified:" +msgstr "సవరించబడినది:" + +#: ../src/properties_dialog.c:183 +msgid "Accessed:" +msgstr "వాడబడినది:" + +#: ../src/properties_dialog.c:184 +msgid "Size:" +msgstr "పరిమాణం:" + +#: ../src/properties_dialog.c:308 +msgid "General" +msgstr "సాధారణం" + +#: ../src/properties_dialog.c:312 +msgid "Image" +msgstr "బొమ్మ" + +#: ../src/properties_dialog.c:525 +#, c-format +msgid "Date taken:" +msgstr "తీసిన తేదీ:" + +#: ../src/properties_dialog.c:537 ../src/properties_dialog.c:549 +#: ../src/properties_dialog.c:561 +#, c-format +msgid "%s" +msgstr "%s" + +#: ../src/properties_dialog.c:623 +#, c-format +msgid "%s - Properties" +msgstr "%s - లక్షణాలు" + +#: ../src/thumbnailer.c:431 +msgid "" +"The thumbnailer-service can not be reached,\n" +"for this reason, the thumbnails can not be\n" +"created.\n" +"\n" +"Install Tumbler or another thumbnailing daemon\n" +"to resolve this issue." +msgstr "" + +#: ../src/thumbnailer.c:441 +msgid "Do _not show this message again" +msgstr "ఈ సందేశాన్ని మరలా చూపవద్దు (_n)" + +#: ../src/thumbnail_bar.c:208 +msgid "Spacing" +msgstr "అంతరం" + +#: ../src/thumbnail_bar.c:209 +msgid "The amount of space between the thumbnails" +msgstr "" + +#: ../src/thumbnail_bar.c:215 +msgid "border width" +msgstr "సరిహద్దు వెడల్పు" + +#: ../src/thumbnail_bar.c:216 +msgid "the border width of the thumbnail bar" +msgstr "" + +#: ../src/xfce_wallpaper_manager.c:335 ../src/gnome_wallpaper_manager.c:234 +msgid "Style:" +msgstr "శైలి:" + +#: ../src/xfce_wallpaper_manager.c:336 +msgid "Brightness:" +msgstr "ప్రకాశత:" + +#: ../src/xfce_wallpaper_manager.c:337 +msgid "Saturation:" +msgstr "సాచురేషన్:" + +#: ../src/xfce_wallpaper_manager.c:354 ../src/gnome_wallpaper_manager.c:245 +msgid "Set as wallpaper" +msgstr "నేపథ్యచిత్రము వలె అమర్చు" + +#: ../src/xfce_wallpaper_manager.c:507 ../src/gnome_wallpaper_manager.c:312 +msgid "Auto" +msgstr "స్వయం" + +#: ../src/xfce_wallpaper_manager.c:510 +msgid "Centered" +msgstr "మధ్యస్థం" + +#: ../src/xfce_wallpaper_manager.c:513 +msgid "Tiled" +msgstr "ముక్కలు" + +#: ../src/xfce_wallpaper_manager.c:516 +msgid "Stretched" +msgstr "సాగదీయి" + +#: ../src/xfce_wallpaper_manager.c:519 +msgid "Scaled" +msgstr "" + +#: ../src/xfce_wallpaper_manager.c:522 +msgid "Zoomed" +msgstr "జూమ్ చేయి" + +#: ../ristretto.desktop.in.h:2 +msgid "Look at your images easily" +msgstr "మీ బొమ్మలను సులభంగా వీక్షించండి" + +#: ../ristretto.desktop.in.h:3 +msgid "Ristretto Image Viewer" +msgstr "రిస్ట్రెట్టో ప్రతిబింబ వీక్షకం" diff -Nru ristretto-0.3.2/po/zh_CN.po ristretto-0.3.4/po/zh_CN.po --- ristretto-0.3.2/po/zh_CN.po 2012-01-09 17:35:02.000000000 +0000 +++ ristretto-0.3.4/po/zh_CN.po 2012-01-28 06:31:50.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ristretto\n" "Report-Msgid-Bugs-To: xfce-i18n@xfce.org\n" -"POT-Creation-Date: 2012-01-08 21:57+0000\n" +"POT-Creation-Date: 2012-01-28 01:24+0000\n" "PO-Revision-Date: 2010-11-23 23:34+0800\n" "Last-Translator: Chipong Luo \n" "Language-Team: Chinese (Simplified) \n" @@ -25,7 +25,7 @@ #: ../src/main.c:65 msgid "Start in fullscreen mode" -msgstr "以全屏模式开始" +msgstr "以全屏模式启动" #: ../src/main.c:69 msgid "Start a slideshow" @@ -45,8 +45,8 @@ msgstr "" "%s：%s\n" "\n" -"试试 %s --help 查看\n" -"全部可用命令行选项。\n" +"尝试 %s --help 查看\n" +"可用命令行选项的完整列表。\n" #: ../src/main_window.c:55 ../ristretto.desktop.in.h:1 msgid "Image Viewer" @@ -71,11 +71,11 @@ #: ../src/main_window.c:318 msgid "Save a copy of the image" -msgstr "保存一份此图片的副本" +msgstr "保存此图片的一份副本" #: ../src/main_window.c:319 msgid "_Properties" -msgstr "属性" +msgstr "属性(_P)" #: ../src/main_window.c:319 msgid "Show file properties" @@ -162,7 +162,7 @@ #: ../src/main_window.c:339 msgid "_Normal Size" -msgstr "原始大小(_N)" +msgstr "正常大小(_N)" #. Rotation submenu #: ../src/main_window.c:341 @@ -180,7 +180,7 @@ #. Go Menu #: ../src/main_window.c:345 msgid "_Go" -msgstr "执行(_G)" +msgstr "转到(_G)" #: ../src/main_window.c:346 msgid "_Forward" @@ -302,78 +302,78 @@ #: ../src/main_window.c:639 ../src/main_window.c:1113 msgid "Press open to select an image" -msgstr "点击打开选择图片" +msgstr "按打开选择图片" #: ../src/main_window.c:1017 ../src/main_window.c:1023 msgid "Empty" msgstr "空" -#: ../src/main_window.c:1930 +#: ../src/main_window.c:1938 msgid "Choose 'set wallpaper' method" -msgstr "选择 ‘设置壁纸’ 的模式" +msgstr "选择 ‘设置壁纸’ 的方式" -#: ../src/main_window.c:1945 ../src/preferences_dialog.c:349 +#: ../src/main_window.c:1953 ../src/preferences_dialog.c:349 msgid "" "Configure which system is currently managing your desktop.\n" "This setting determines the method Ristretto will use\n" "to configure the desktop wallpaper." msgstr "" "配置当前用何种系统管理您的桌面。\n" -"此设置决定用于 Ristretto \n" -"配置桌面壁纸的模式。" +"此设置决定用于 Ristretto\n" +"配置桌面壁纸的方式。" -#: ../src/main_window.c:1970 ../src/preferences_dialog.c:373 +#: ../src/main_window.c:1978 ../src/preferences_dialog.c:373 msgid "None" msgstr "无" -#: ../src/main_window.c:1974 ../src/preferences_dialog.c:377 +#: ../src/main_window.c:1982 ../src/preferences_dialog.c:377 msgid "Xfce" msgstr "Xfce" -#: ../src/main_window.c:1978 ../src/preferences_dialog.c:381 +#: ../src/main_window.c:1986 ../src/preferences_dialog.c:381 msgid "GNOME" msgstr "GNOME" -#: ../src/main_window.c:2480 +#: ../src/main_window.c:2442 msgid "Developer:" msgstr "开发者：" -#: ../src/main_window.c:2489 +#: ../src/main_window.c:2451 msgid "Ristretto is an image viewer for the Xfce desktop environment." -msgstr "Ristretto 是 Xfce 桌面环境下的一个图片查看器。" +msgstr "Ristretto 是 Xfce 桌面环境下的图片查看器。" -#: ../src/main_window.c:2497 +#: ../src/main_window.c:2459 msgid "translator-credits" msgstr "" "WuLi , 2008.\n" "Hunt Xu , 2008, 2009, 2010.\n" "Chipong Luo , 2011, 2012." -#: ../src/main_window.c:2783 +#: ../src/main_window.c:2749 msgid "Open image" msgstr "打开图片" -#: ../src/main_window.c:2802 +#: ../src/main_window.c:2768 msgid "Images" msgstr "图片" -#: ../src/main_window.c:2807 +#: ../src/main_window.c:2773 msgid ".jp(e)g" msgstr ".jp(e)g" -#: ../src/main_window.c:2834 ../src/main_window.c:2936 +#: ../src/main_window.c:2800 ../src/main_window.c:2902 msgid "Could not open file" -msgstr "无法打开文件" +msgstr "未能打开文件" -#: ../src/main_window.c:2969 +#: ../src/main_window.c:2935 msgid "Save copy" msgstr "保存副本" -#: ../src/main_window.c:2995 +#: ../src/main_window.c:2961 msgid "Could not save file" msgstr "未能保存文件" -#: ../src/main_window.c:3112 +#: ../src/main_window.c:3078 #, c-format msgid "Are you sure you want to delete image '%s' from disk?" msgstr "您确定要从磁盘上删除图片 ‘%s’ 吗？" @@ -388,15 +388,15 @@ #: ../src/privacy_dialog.c:157 msgid "Last Hour" -msgstr "前一小时" +msgstr "上一小时" #: ../src/privacy_dialog.c:158 msgid "Last Two Hours" -msgstr "前两小时" +msgstr "上两小时" #: ../src/privacy_dialog.c:159 msgid "Last Four Hours" -msgstr "前四小时" +msgstr "上四小时" #: ../src/privacy_dialog.c:160 msgid "Today" @@ -416,7 +416,7 @@ #: ../src/preferences_dialog.c:202 msgid "Background color" -msgstr "背景颜色" +msgstr "背景色" #: ../src/preferences_dialog.c:204 msgid "Toolbars" @@ -424,7 +424,7 @@ #: ../src/preferences_dialog.c:209 msgid "Override background color:" -msgstr "覆盖背景颜色：" +msgstr "覆盖背景色：" #: ../src/preferences_dialog.c:220 msgid "Merge toolbars" @@ -440,7 +440,7 @@ "when the window is fullscreen." msgstr "" "缩略图栏在窗口全屏\n" -"显示时会自动隐藏。" +"显示时可以自动隐藏。" #: ../src/preferences_dialog.c:230 msgid "Hide thumbnail bar when fullscreen" @@ -458,7 +458,8 @@ msgid "" "The time period an individual image is displayed during a slideshow\n" "(in seconds)" -msgstr "幻灯片播放时单个图片持续显示的时间(以秒计)" +msgstr "" +"幻灯片播放时单个图片持续显示的时间(以秒计)" #: ../src/preferences_dialog.c:289 msgid "Control" @@ -482,7 +483,7 @@ #: ../src/preferences_dialog.c:313 msgid "Maximize window on startup when opening an image" -msgstr "在打开图片时最小化启动窗口" +msgstr "打开图片时最小化启动窗口" #: ../src/preferences_dialog.c:319 msgid "Wrap around images" @@ -506,11 +507,11 @@ #: ../src/properties_dialog.c:182 msgid "Modified:" -msgstr "上次修改：" +msgstr "修改：" #: ../src/properties_dialog.c:183 msgid "Accessed:" -msgstr "上次访问：" +msgstr "访问：" #: ../src/properties_dialog.c:184 msgid "Size:" @@ -527,7 +528,7 @@ #: ../src/properties_dialog.c:525 #, c-format msgid "Date taken:" -msgstr "获取日期：" +msgstr "拍摄日期：" #: ../src/properties_dialog.c:537 ../src/properties_dialog.c:549 #: ../src/properties_dialog.c:561 @@ -538,7 +539,7 @@ #: ../src/properties_dialog.c:623 #, c-format msgid "%s - Properties" -msgstr "%s - 属性" +msgstr "%s-属性" #: ../src/thumbnailer.c:431 msgid "" @@ -566,7 +567,7 @@ #: ../src/thumbnail_bar.c:209 msgid "The amount of space between the thumbnails" -msgstr "缩略图之间的空格数量" +msgstr "缩略图之间的空间" #: ../src/thumbnail_bar.c:215 msgid "border width" @@ -618,8 +619,8 @@ #: ../ristretto.desktop.in.h:2 msgid "Look at your images easily" -msgstr "轻松地看看您的图片" +msgstr "轻松地看您的图片" #: ../ristretto.desktop.in.h:3 msgid "Ristretto Image Viewer" -msgstr "Ristretto 图片查看器" \ No newline at end of file +msgstr "Ristretto 图片查看器" diff -Nru ristretto-0.3.2/po/zh_TW.po ristretto-0.3.4/po/zh_TW.po --- ristretto-0.3.2/po/zh_TW.po 1970-01-01 00:00:00.000000000 +0000 +++ ristretto-0.3.4/po/zh_TW.po 2012-01-23 19:13:37.000000000 +0000 @@ -0,0 +1,635 @@ +# Traditional Chinese translation of ristrerro image viewer. +# Copyright (C) 2011 THE ristretto'S COPYRIGHT HOLDER +# This file is distributed under the same license as the ristretto package. +# Cheng-Chia Tseng , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: ristretto master\n" +"Report-Msgid-Bugs-To: xfce-i18n@xfce.org\n" +"POT-Creation-Date: 2012-01-19 15:00+0000\n" +"PO-Revision-Date: 2012-01-20 00:05+0800\n" +"Last-Translator: Cheng-Chia Tseng \n" +"Language-Team: chinese-l10n \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../src/main.c:61 +msgid "Version information" +msgstr "版本資訊" + +#: ../src/main.c:65 +msgid "Start in fullscreen mode" +msgstr "以全螢幕模式啟動" + +#: ../src/main.c:69 +msgid "Start a slideshow" +msgstr "開始投影片秀" + +#: ../src/main.c:77 +msgid "Show settings dialog" +msgstr "顯示設定值對話窗" + +#: ../src/main.c:105 +#, c-format +msgid "" +"%s: %s\n" +"\n" +"Try %s --help to see a full list of\n" +"available command line options.\n" +msgstr "" +"%s: %s\n" +"\n" +"試試 %s --help 來查看可用指令\n" +"列選項的完整清單。\n" + +#: ../src/main_window.c:55 +#: ../ristretto.desktop.in.h:1 +msgid "Image Viewer" +msgstr "影像檢視器" + +#. File Menu +#: ../src/main_window.c:316 +msgid "_File" +msgstr "檔案(_F)" + +#: ../src/main_window.c:317 +msgid "_Open" +msgstr "開啟(_O)" + +#: ../src/main_window.c:317 +msgid "Open an image" +msgstr "開啟影像" + +#: ../src/main_window.c:318 +msgid "_Save copy" +msgstr "儲存副本(_S)" + +#: ../src/main_window.c:318 +msgid "Save a copy of the image" +msgstr "儲存一份該影像的副本" + +#: ../src/main_window.c:319 +msgid "_Properties" +msgstr "屬性(_P)" + +#: ../src/main_window.c:319 +msgid "Show file properties" +msgstr "顯示檔案屬性" + +#: ../src/main_window.c:320 +msgid "_Close" +msgstr "關閉(_C)" + +#: ../src/main_window.c:320 +msgid "Close this image" +msgstr "關閉此影像" + +#: ../src/main_window.c:321 +msgid "_Quit" +msgstr "退出(_Q)" + +#: ../src/main_window.c:321 +msgid "Quit Ristretto" +msgstr "退出 Ristretto" + +#. Edit Menu +#: ../src/main_window.c:323 +msgid "_Edit" +msgstr "編輯(_E)" + +#: ../src/main_window.c:324 +msgid "_Open with..." +msgstr "以此開啟(_O)..." + +#: ../src/main_window.c:325 +msgid "_Sorting" +msgstr "排序(_S)" + +#: ../src/main_window.c:326 +msgid "_Delete" +msgstr "刪除(_D)" + +#: ../src/main_window.c:326 +msgid "Delete this image from disk" +msgstr "從磁碟刪除此影像" + +#: ../src/main_window.c:327 +msgid "_Clear private data" +msgstr "清除隱私資料(_C)" + +#: ../src/main_window.c:328 +msgid "_Preferences" +msgstr "偏好設定(_P)" + +#. View Menu +#: ../src/main_window.c:330 +msgid "_View" +msgstr "檢視(_V)" + +#: ../src/main_window.c:331 +msgid "_Fullscreen" +msgstr "全螢幕(_F)" + +#: ../src/main_window.c:332 +msgid "_Leave Fullscreen" +msgstr "離開全螢幕(_L)" + +#: ../src/main_window.c:333 +msgid "_Set as Wallpaper" +msgstr "設定為桌布(_S)" + +#. Zoom submenu +#: ../src/main_window.c:335 +msgid "_Zoom" +msgstr "遠近(_Z)" + +#: ../src/main_window.c:336 +msgid "Zoom _In" +msgstr "拉近(_I)" + +#: ../src/main_window.c:337 +msgid "Zoom _Out" +msgstr "拉遠(_O)" + +#: ../src/main_window.c:338 +msgid "Zoom _Fit" +msgstr "拉至符合視窗(_F)" + +#: ../src/main_window.c:339 +msgid "_Normal Size" +msgstr "正常大小(_N)" + +#. Rotation submenu +#: ../src/main_window.c:341 +msgid "_Rotation" +msgstr "旋轉(_R)" + +#: ../src/main_window.c:342 +msgid "Rotate _Right" +msgstr "向右旋轉(_R)" + +#: ../src/main_window.c:343 +msgid "Rotate _Left" +msgstr "向左旋轉(_L)" + +#. Go Menu +#: ../src/main_window.c:345 +msgid "_Go" +msgstr "前往(_G)" + +#: ../src/main_window.c:346 +msgid "_Forward" +msgstr "前進(_F)" + +#: ../src/main_window.c:347 +msgid "_Back" +msgstr "返回(_B)" + +#: ../src/main_window.c:348 +msgid "_First" +msgstr "首(_F)" + +#: ../src/main_window.c:349 +msgid "_Last" +msgstr "尾(_L)" + +#. Help Menu +#: ../src/main_window.c:351 +msgid "_Help" +msgstr "幫助(_H)" + +#: ../src/main_window.c:353 +msgid "_Contents" +msgstr "內容(_C)" + +#: ../src/main_window.c:355 +msgid "Display ristretto user manual" +msgstr "顯示 ristretto 使用者手冊" + +#: ../src/main_window.c:358 +msgid "_About" +msgstr "關於(_A)" + +#: ../src/main_window.c:360 +msgid "Display information about ristretto" +msgstr "顯示有關 ristretto 的資訊" + +#. Position Menu +#: ../src/main_window.c:363 +msgid "_Position" +msgstr "位置(_P)" + +#: ../src/main_window.c:364 +msgid "Thumbnail Bar _Position" +msgstr "縮圖列位置(_P)" + +#. Misc +#: ../src/main_window.c:366 +msgid "Leave _Fullscreen" +msgstr "離開全螢幕(_F)" + +#. Toggle visibility of the main file toolbar +#: ../src/main_window.c:374 +msgid "Show _File Toolbar" +msgstr "顯示檔案工具列(_F)" + +#. Toggle visibility of the main navigation toolbar +#: ../src/main_window.c:376 +msgid "Show _Navigation Toolbar" +msgstr "顯示導覽工具列(_N)" + +#. Toggle visibility of the thumbnailbar +#: ../src/main_window.c:378 +msgid "Show _Thumbnail Bar" +msgstr "顯示縮圖列(_T)" + +#. Sort by Filename +#: ../src/main_window.c:385 +msgid "sort by filename" +msgstr "依檔名排序" + +#. Sort by Date +#: ../src/main_window.c:387 +msgid "sort by date" +msgstr "依日期排序" + +#: ../src/main_window.c:393 +msgid "Left" +msgstr "左" + +#: ../src/main_window.c:394 +msgid "Right" +msgstr "右" + +#: ../src/main_window.c:395 +msgid "Top" +msgstr "上" + +#: ../src/main_window.c:396 +msgid "Bottom" +msgstr "下" + +#. Create Play/Pause Slideshow actions +#: ../src/main_window.c:538 +msgid "_Play" +msgstr "播放(_P)" + +#: ../src/main_window.c:538 +msgid "Play slideshow" +msgstr "播放投影片秀" + +#: ../src/main_window.c:539 +msgid "_Pause" +msgstr "暫停(_P)" + +#: ../src/main_window.c:539 +msgid "Pause slideshow" +msgstr "暫停投影片秀" + +#. Create Recently used items Action +#: ../src/main_window.c:542 +msgid "_Recently used" +msgstr "近期使用(_R)" + +#: ../src/main_window.c:542 +msgid "Recently used" +msgstr "近期使用" + +#: ../src/main_window.c:639 +#: ../src/main_window.c:1113 +msgid "Press open to select an image" +msgstr "按下開啟以選取影像" + +#: ../src/main_window.c:1017 +#: ../src/main_window.c:1023 +msgid "Empty" +msgstr "空" + +#: ../src/main_window.c:1930 +msgid "Choose 'set wallpaper' method" +msgstr "選擇「設定桌布」方法" + +#: ../src/main_window.c:1945 +#: ../src/preferences_dialog.c:349 +msgid "" +"Configure which system is currently managing your desktop.\n" +"This setting determines the method Ristretto will use\n" +"to configure the desktop wallpaper." +msgstr "" +"設定目前管理您桌面的系統為何。\n" +"這個設定值決定 Ristretto 用來\n" +"設定桌布的方法。" + +#: ../src/main_window.c:1970 +#: ../src/preferences_dialog.c:373 +msgid "None" +msgstr "無" + +#: ../src/main_window.c:1974 +#: ../src/preferences_dialog.c:377 +msgid "Xfce" +msgstr "Xfce" + +#: ../src/main_window.c:1978 +#: ../src/preferences_dialog.c:381 +msgid "GNOME" +msgstr "GNOME" + +#: ../src/main_window.c:2480 +msgid "Developer:" +msgstr "開發者：" + +#: ../src/main_window.c:2489 +msgid "Ristretto is an image viewer for the Xfce desktop environment." +msgstr "Ristretto 是個 Xfce 桌面環境的影像檢視器。" + +#: ../src/main_window.c:2497 +msgid "translator-credits" +msgstr "Cheng-Chia Tseng , 2011." + +#: ../src/main_window.c:2783 +msgid "Open image" +msgstr "開啟影像" + +#: ../src/main_window.c:2802 +msgid "Images" +msgstr "影像" + +#: ../src/main_window.c:2807 +msgid ".jp(e)g" +msgstr ".jp(e)g" + +#: ../src/main_window.c:2834 +#: ../src/main_window.c:2936 +msgid "Could not open file" +msgstr "無法開啟檔案" + +#: ../src/main_window.c:2969 +msgid "Save copy" +msgstr "儲存副本" + +#: ../src/main_window.c:2995 +msgid "Could not save file" +msgstr "無法儲存檔案" + +#: ../src/main_window.c:3112 +#, c-format +msgid "Are you sure you want to delete image '%s' from disk?" +msgstr "您確定要從磁碟刪除「%s」影像嗎？" + +#: ../src/privacy_dialog.c:151 +msgid "Time range to clear:" +msgstr "要清除的時間範圍：" + +#: ../src/privacy_dialog.c:155 +msgid "Cleanup" +msgstr "清理" + +#: ../src/privacy_dialog.c:157 +msgid "Last Hour" +msgstr "近一小時" + +#: ../src/privacy_dialog.c:158 +msgid "Last Two Hours" +msgstr "近二小時" + +#: ../src/privacy_dialog.c:159 +msgid "Last Four Hours" +msgstr "近四小時" + +#: ../src/privacy_dialog.c:160 +msgid "Today" +msgstr "今天" + +#: ../src/privacy_dialog.c:161 +msgid "Everything" +msgstr "每個" + +#: ../src/privacy_dialog.c:459 +msgid "Clear private data" +msgstr "清除隱私資料" + +#: ../src/preferences_dialog.c:196 +msgid "Display" +msgstr "顯示" + +#: ../src/preferences_dialog.c:202 +msgid "Background color" +msgstr "背景色彩" + +#: ../src/preferences_dialog.c:204 +msgid "Toolbars" +msgstr "工具列" + +#: ../src/preferences_dialog.c:209 +msgid "Override background color:" +msgstr "凌駕背景色彩：" + +#: ../src/preferences_dialog.c:220 +msgid "Merge toolbars" +msgstr "合併工具列" + +#: ../src/preferences_dialog.c:225 +msgid "Thumbnails" +msgstr "縮圖" + +#: ../src/preferences_dialog.c:228 +msgid "" +"The thumbnail bar can be automatically hidden \n" +"when the window is fullscreen." +msgstr "" +"當視窗全螢幕時，縮圖列\n" +"可以自動隱藏。" + +#: ../src/preferences_dialog.c:230 +msgid "Hide thumbnail bar when fullscreen" +msgstr "全螢幕時隱藏縮圖列" + +#: ../src/preferences_dialog.c:266 +msgid "Slideshow" +msgstr "投影片秀" + +#: ../src/preferences_dialog.c:270 +msgid "Timeout" +msgstr "超出時限" + +#: ../src/preferences_dialog.c:273 +msgid "" +"The time period an individual image is displayed during a slideshow\n" +"(in seconds)" +msgstr "" +"投影片秀中各個影像顯示的時間\n" +"(秒)" + +#: ../src/preferences_dialog.c:289 +msgid "Control" +msgstr "控制" + +#: ../src/preferences_dialog.c:293 +msgid "Scroll wheel" +msgstr "滑鼠滾輪" + +#: ../src/preferences_dialog.c:296 +msgid "Invert zoom direction" +msgstr "反轉遠近方向" + +#: ../src/preferences_dialog.c:306 +msgid "Behaviour" +msgstr "行為" + +#: ../src/preferences_dialog.c:311 +msgid "Startup" +msgstr "初始啟動" + +#: ../src/preferences_dialog.c:313 +msgid "Maximize window on startup when opening an image" +msgstr "開啟影像時，初始啟動便將視窗最大化" + +#: ../src/preferences_dialog.c:319 +msgid "Wrap around images" +msgstr "包圍影像" + +#: ../src/preferences_dialog.c:338 +msgid "Desktop" +msgstr "桌面" + +#: ../src/preferences_dialog.c:460 +msgid "Image Viewer Preferences" +msgstr "影像檢視器偏好設定" + +#: ../src/properties_dialog.c:180 +msgid "Name:" +msgstr "名稱：" + +#: ../src/properties_dialog.c:181 +msgid "Kind:" +msgstr "類型：" + +#: ../src/properties_dialog.c:182 +msgid "Modified:" +msgstr "修改：" + +#: ../src/properties_dialog.c:183 +msgid "Accessed:" +msgstr "存取：" + +#: ../src/properties_dialog.c:184 +msgid "Size:" +msgstr "大小：" + +#: ../src/properties_dialog.c:308 +msgid "General" +msgstr "一般" + +#: ../src/properties_dialog.c:312 +msgid "Image" +msgstr "影像" + +#: ../src/properties_dialog.c:525 +#, c-format +msgid "Date taken:" +msgstr "拍攝日期：" + +#: ../src/properties_dialog.c:537 +#: ../src/properties_dialog.c:549 +#: ../src/properties_dialog.c:561 +#, c-format +msgid "%s" +msgstr "%s" + +#: ../src/properties_dialog.c:623 +#, c-format +msgid "%s - Properties" +msgstr "%s - 屬性" + +#: ../src/thumbnailer.c:431 +msgid "" +"The thumbnailer-service can not be reached,\n" +"for this reason, the thumbnails can not be\n" +"created.\n" +"\n" +"Install Tumbler or another thumbnailing daemon\n" +"to resolve this issue." +msgstr "" +"無法聯絡縮圖製作器服務，\n" +"基於這個原因，縮圖無法\n" +"建立。\n" +"\n" +"請安裝 Tumbler 或其他 縮圖製作幕後程式\n" +"來解決此問題。" + +#: ../src/thumbnailer.c:441 +msgid "Do _not show this message again" +msgstr "不要再顯示此訊息(_N)" + +#: ../src/thumbnail_bar.c:208 +msgid "Spacing" +msgstr "間隔" + +#: ../src/thumbnail_bar.c:209 +msgid "The amount of space between the thumbnails" +msgstr "縮圖之間的間隔" + +#: ../src/thumbnail_bar.c:215 +msgid "border width" +msgstr "邊緣寬" + +#: ../src/thumbnail_bar.c:216 +msgid "the border width of the thumbnail bar" +msgstr "縮圖列的邊緣寬度" + +#: ../src/xfce_wallpaper_manager.c:335 +#: ../src/gnome_wallpaper_manager.c:234 +msgid "Style:" +msgstr "樣式：" + +#: ../src/xfce_wallpaper_manager.c:336 +msgid "Brightness:" +msgstr "亮度：" + +#: ../src/xfce_wallpaper_manager.c:337 +msgid "Saturation:" +msgstr "飽和度：" + +#: ../src/xfce_wallpaper_manager.c:354 +#: ../src/gnome_wallpaper_manager.c:245 +msgid "Set as wallpaper" +msgstr "設定為桌布" + +#: ../src/xfce_wallpaper_manager.c:507 +#: ../src/gnome_wallpaper_manager.c:312 +msgid "Auto" +msgstr "自動" + +#: ../src/xfce_wallpaper_manager.c:510 +msgid "Centered" +msgstr "置中" + +#: ../src/xfce_wallpaper_manager.c:513 +msgid "Tiled" +msgstr "鋪排" + +#: ../src/xfce_wallpaper_manager.c:516 +msgid "Stretched" +msgstr "延展" + +#: ../src/xfce_wallpaper_manager.c:519 +msgid "Scaled" +msgstr "縮放" + +#: ../src/xfce_wallpaper_manager.c:522 +msgid "Zoomed" +msgstr "拉近" + +#: ../ristretto.desktop.in.h:2 +msgid "Look at your images easily" +msgstr "輕鬆查看您的影像" + +#: ../ristretto.desktop.in.h:3 +msgid "Ristretto Image Viewer" +msgstr "Ristretto 影像檢視器" + diff -Nru ristretto-0.3.2/README ristretto-0.3.4/README --- ristretto-0.3.2/README 2012-01-07 08:53:27.000000000 +0000 +++ ristretto-0.3.4/README 2012-01-23 19:13:37.000000000 +0000 @@ -1,3 +0,0 @@ -ChangeLog is generated as followed: - -git log --format=medium --max-parents=1 > ChangeLog diff -Nru ristretto-0.3.2/src/image_viewer.c ristretto-0.3.4/src/image_viewer.c --- ristretto-0.3.2/src/image_viewer.c 2012-01-14 16:35:04.000000000 +0000 +++ ristretto-0.3.4/src/image_viewer.c 2012-01-28 06:08:22.000000000 +0000 @@ -1002,8 +1002,8 @@ } cairo_save (ctx); - x_offset = viewer->priv->rendering.x_offset; - y_offset = viewer->priv->rendering.y_offset; + x_offset = floor ( viewer->priv->rendering.x_offset ); + y_offset = floor ( viewer->priv->rendering.y_offset ); /* BEGIN PAINT CHECKERED BACKGROUND */ if (TRUE == gdk_pixbuf_get_has_alpha (viewer->priv->pixbuf)) @@ -1063,16 +1063,16 @@ M_PI*0.5); cairo_translate ( ctx, - 0.0 - gtk_adjustment_get_value (viewer->vadjustment), - gtk_adjustment_get_value (viewer->hadjustment)); + 0.0 - floor (gtk_adjustment_get_value (viewer->vadjustment)), + floor (gtk_adjustment_get_value (viewer->hadjustment))); cairo_translate ( ctx, 0.0, -1.0 * viewer->priv->image_height * viewer->priv->scale); cairo_translate ( ctx, - viewer->priv->rendering.y_offset, - -1.0 * viewer->priv->rendering.x_offset); + y_offset, + -1.0 * x_offset); break; case RSTTO_IMAGE_ORIENT_270: cairo_rotate ( @@ -1080,8 +1080,8 @@ M_PI*1.5); cairo_translate ( ctx, - gtk_adjustment_get_value (viewer->vadjustment), - 0.0 - gtk_adjustment_get_value (viewer->hadjustment)); + floor(gtk_adjustment_get_value (viewer->vadjustment)), + 0.0 - floor(gtk_adjustment_get_value (viewer->hadjustment))); cairo_translate ( ctx, -1.0 * viewer->priv->image_width * viewer->priv->scale, @@ -1089,8 +1089,8 @@ cairo_translate ( ctx, - -1.0 * viewer->priv->rendering.y_offset, - viewer->priv->rendering.x_offset); + -1.0 * y_offset, + x_offset); break; case RSTTO_IMAGE_ORIENT_180: cairo_rotate ( @@ -1098,8 +1098,8 @@ M_PI); cairo_translate ( ctx, - gtk_adjustment_get_value (viewer->hadjustment), - gtk_adjustment_get_value (viewer->vadjustment)); + floor(gtk_adjustment_get_value (viewer->hadjustment)), + floor(gtk_adjustment_get_value (viewer->vadjustment))); cairo_translate ( ctx, -1.0 * viewer->priv->image_width * viewer->priv->scale, @@ -1107,20 +1107,20 @@ cairo_translate ( ctx, - -1.0 * viewer->priv->rendering.x_offset, - -1.0 * viewer->priv->rendering.y_offset); + -1.0 * x_offset, + -1.0 * y_offset); break; case RSTTO_IMAGE_ORIENT_NONE: default: cairo_translate ( ctx, - 0.0 - gtk_adjustment_get_value (viewer->hadjustment), - 0.0 - gtk_adjustment_get_value (viewer->vadjustment)); + 0.0 - floor(gtk_adjustment_get_value (viewer->hadjustment)), + 0.0 - floor(gtk_adjustment_get_value (viewer->vadjustment))); cairo_translate ( ctx, - viewer->priv->rendering.x_offset, - viewer->priv->rendering.y_offset); + x_offset, + y_offset); break; } @@ -2416,6 +2416,8 @@ */ gtk_adjustment_changed(viewer->hadjustment); gtk_adjustment_changed(viewer->vadjustment); + + g_signal_emit_by_name(viewer, "scale-changed"); } break; default: diff -Nru ristretto-0.3.2/src/main.c ristretto-0.3.4/src/main.c --- ristretto-0.3.2/src/main.c 2012-01-09 17:36:43.000000000 +0000 +++ ristretto-0.3.4/src/main.c 2012-01-28 06:31:45.000000000 +0000 @@ -150,9 +150,15 @@ } } + /* Start fullscreen */ + if (TRUE == start_fullscreen) + { + gtk_window_fullscreen (GTK_WINDOW (window)); + } + g_signal_connect(G_OBJECT(window), "destroy", G_CALLBACK(gtk_main_quit), NULL); gtk_widget_show_all (window); - + GDK_THREADS_ENTER(); gtk_main(); GDK_THREADS_LEAVE(); @@ -263,6 +269,12 @@ /* Point the iterator to the correct image */ rstto_image_list_iter_set_position (iter, 0); } + + if (TRUE == start_slideshow) + { + rstto_main_window_play_slideshow (RSTTO_MAIN_WINDOW(rof->window)); + } + } return FALSE; } diff -Nru ristretto-0.3.2/src/main_window.c ristretto-0.3.4/src/main_window.c --- ristretto-0.3.2/src/main_window.c 2012-01-14 15:46:25.000000000 +0000 +++ ristretto-0.3.4/src/main_window.c 2012-01-28 06:31:45.000000000 +0000 @@ -1263,6 +1263,10 @@ } } + if ( 0 != (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN )) + { + gtk_widget_hide (window->priv->toolbar); + } gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window->priv->ui_manager, "/main-menu/file-menu/save-copy"), TRUE); /* gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window->priv->ui_manager, "/main-menu/file-menu/print"), TRUE); @@ -1390,6 +1394,10 @@ } } + if ( 0 != (gdk_window_get_state (GTK_WIDGET (window)->window) & GDK_WINDOW_STATE_FULLSCREEN )) + { + gtk_widget_hide (window->priv->toolbar); + } gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window->priv->ui_manager, "/main-menu/file-menu/save-copy"), TRUE); /* gtk_widget_set_sensitive ( gtk_ui_manager_get_widget ( window->priv->ui_manager, "/main-menu/file-menu/print"), TRUE); @@ -2301,53 +2309,7 @@ static void cb_rstto_main_window_play (GtkWidget *widget, RsttoMainWindow *window) { - GValue timeout = {0, }; - - gtk_ui_manager_add_ui (window->priv->ui_manager, - window->priv->pause_merge_id, - "/main-menu/go-menu/placeholder-slideshow", - "pause", - "pause", - GTK_UI_MANAGER_MENUITEM, - FALSE); - gtk_ui_manager_remove_ui (window->priv->ui_manager, - window->priv->play_merge_id); - - if ( TRUE == rstto_settings_get_boolean_property (window->priv->settings_manager, "merge-toolbars")) - { - gtk_ui_manager_add_ui ( - window->priv->ui_manager, - window->priv->toolbar_pause_merge_id, - "/file-toolbar/placeholder-slideshow", - "pause", - "pause", - GTK_UI_MANAGER_TOOLITEM, - FALSE); - gtk_ui_manager_remove_ui ( - window->priv->ui_manager, - window->priv->toolbar_play_merge_id); - } - else - { - gtk_ui_manager_add_ui ( - window->priv->ui_manager, - window->priv->toolbar_pause_merge_id, - "/navigation-toolbar/placeholder-slideshow", - "pause", - "pause", - GTK_UI_MANAGER_TOOLITEM, - FALSE); - gtk_ui_manager_remove_ui ( - window->priv->ui_manager, - window->priv->toolbar_play_merge_id); - } - - - g_value_init (&timeout, G_TYPE_UINT); - g_object_get_property (G_OBJECT(window->priv->settings_manager), "slideshow-timeout", &timeout); - - window->priv->playing = TRUE; - window->priv->play_timeout_id = g_timeout_add (g_value_get_uint (&timeout)*1000, (GSourceFunc)cb_rstto_main_window_play_slideshow, window); + rstto_main_window_play_slideshow (window); } /** @@ -3500,3 +3462,56 @@ rstto_main_window_update_buttons (window); } + +gboolean +rstto_main_window_play_slideshow (RsttoMainWindow *window) +{ + GValue timeout = {0, }; + + gtk_ui_manager_add_ui (window->priv->ui_manager, + window->priv->pause_merge_id, + "/main-menu/go-menu/placeholder-slideshow", + "pause", + "pause", + GTK_UI_MANAGER_MENUITEM, + FALSE); + gtk_ui_manager_remove_ui (window->priv->ui_manager, + window->priv->play_merge_id); + + if ( TRUE == rstto_settings_get_boolean_property (window->priv->settings_manager, "merge-toolbars")) + { + gtk_ui_manager_add_ui ( + window->priv->ui_manager, + window->priv->toolbar_pause_merge_id, + "/file-toolbar/placeholder-slideshow", + "pause", + "pause", + GTK_UI_MANAGER_TOOLITEM, + FALSE); + gtk_ui_manager_remove_ui ( + window->priv->ui_manager, + window->priv->toolbar_play_merge_id); + } + else + { + gtk_ui_manager_add_ui ( + window->priv->ui_manager, + window->priv->toolbar_pause_merge_id, + "/navigation-toolbar/placeholder-slideshow", + "pause", + "pause", + GTK_UI_MANAGER_TOOLITEM, + FALSE); + gtk_ui_manager_remove_ui ( + window->priv->ui_manager, + window->priv->toolbar_play_merge_id); + } + + + g_value_init (&timeout, G_TYPE_UINT); + g_object_get_property (G_OBJECT(window->priv->settings_manager), "slideshow-timeout", &timeout); + + window->priv->playing = TRUE; + window->priv->play_timeout_id = g_timeout_add (g_value_get_uint (&timeout)*1000, (GSourceFunc)cb_rstto_main_window_play_slideshow, window); + return FALSE; +} diff -Nru ristretto-0.3.2/src/main_window.h ristretto-0.3.4/src/main_window.h --- ristretto-0.3.2/src/main_window.h 2012-01-09 17:36:43.000000000 +0000 +++ ristretto-0.3.4/src/main_window.h 2012-01-28 06:08:22.000000000 +0000 @@ -74,7 +74,11 @@ rstto_main_window_get_iter ( RsttoMainWindow *); -gboolean rstto_main_window_add_file_to_recent_files (GFile *); +gboolean +rstto_main_window_add_file_to_recent_files (GFile *); + +gboolean +rstto_main_window_play_slideshow (RsttoMainWindow *); G_END_DECLS diff -Nru ristretto-0.3.2/src/preferences_dialog.c ristretto-0.3.4/src/preferences_dialog.c --- ristretto-0.3.2/src/preferences_dialog.c 2012-01-09 17:36:43.000000000 +0000 +++ ristretto-0.3.4/src/preferences_dialog.c 2012-01-23 19:13:37.000000000 +0000 @@ -360,23 +360,23 @@ FALSE, 0); dialog->priv->behaviour_tab.choose_desktop_combo_box = - gtk_combo_box_text_new(); + gtk_combo_box_new_text(); gtk_box_pack_start ( GTK_BOX (dialog->priv->behaviour_tab.desktop_vbox), dialog->priv->behaviour_tab.choose_desktop_combo_box, FALSE, FALSE, 0); - gtk_combo_box_text_insert_text( - GTK_COMBO_BOX_TEXT (dialog->priv->behaviour_tab.choose_desktop_combo_box), + gtk_combo_box_insert_text( + GTK_COMBO_BOX (dialog->priv->behaviour_tab.choose_desktop_combo_box), DESKTOP_TYPE_NONE, _("None")); - gtk_combo_box_text_insert_text ( - GTK_COMBO_BOX_TEXT (dialog->priv->behaviour_tab.choose_desktop_combo_box), + gtk_combo_box_insert_text ( + GTK_COMBO_BOX (dialog->priv->behaviour_tab.choose_desktop_combo_box), DESKTOP_TYPE_XFCE, _("Xfce")); - gtk_combo_box_text_insert_text ( - GTK_COMBO_BOX_TEXT (dialog->priv->behaviour_tab.choose_desktop_combo_box), + gtk_combo_box_insert_text ( + GTK_COMBO_BOX (dialog->priv->behaviour_tab.choose_desktop_combo_box), DESKTOP_TYPE_GNOME, _("GNOME"));