SHR: Add all missing packages to org.oe.dev

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>

138 files changed, 18961 insertions, 43 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 106c479d5e..79da14abc1 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -78,6 +78,10 @@ sha256=02f10b35508cb11908bb908156daad1ea5e653840440d62482231efeb4cbe178
 md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2
 sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc
 
+[http://monto.homelinux.org/89notifier]
+md5=6a197a3216abfd21ce2ae37b2be8da38
+sha256=7795a3c6339c35d172ced0e43785ff657c1430f9fab7e2e553411529e177e501
+
 [ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.8.tar.bz2]
 md5=81c1ff761c3431cd12c81337aa80d558
 sha256=96b70582d931a7e83c3ca31b3bc7e23957391e16dee4ae6ddf938c9574d50b27
@@ -762,6 +766,14 @@ sha256=4e44eb7be990cb62e57840f4b01b6c9af06c4655869d0cb565fc45749c20b82e
 md5=955082ee50358b1cc3eddcb438b7fae4
 sha256=70e7fb5e8cc3a35a04213230e1e4340ddc8766a2615318086da7d51ec930f6f2
 
+[http://www.packagekit.org/releases/PackageKit-0.5.1.tar.gz]
+md5=8575a23e406fffa8d11ba2ad4b5d99f3
+sha256=d6ccb149de52c76993f0ed9a31f44690fa27254f91fe8b69bbd2f99b714aee29
+
+[http://www.packagekit.org/releases/PackageKit-0.5.2.tar.gz]
+md5=e406ad5e776e31c99e70c7cf6e7bcdc4
+sha256=8defbfdfe6937fd1d4320f2c2e599b5579fec14404a4e920ff2e5ac68516744b
+
 [http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-0.20.tar.gz]
 md5=33c4466239c97cc3e1063eff0577206c
 sha256=29f7e05045a5699b211d2a8332d36113c22f9c2e96174f40939e79dbc356905d
@@ -814,6 +826,10 @@ sha256=ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf
 md5=104ad743d4bc999796ceff4f39d1003a
 sha256=593912fdf122d9a1499767bc305ca7b3b688ace7edcb93f53e07202aa1242c58
 
+[http://pybluez.googlecode.com/files/PyBluez-0.16.tar.gz]
+md5=2ce8ff0dbb94c6be14e92e9968f4c914
+sha256=cbe1f076a4947e29ded08ba9dd6dbbb86b25939fb4e50f508dd02f41681554e2
+
 [http://www.vanille.de/mirror/PyMP3-0.3.4.tar.gz]
 md5=28e884057750aa4f0da368678e5b20bd
 sha256=e534ea5505e2d0a571ca8baa4b34260953e796f6c762013756373f13411ebd6e
@@ -922,6 +938,14 @@ sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739
 md5=b3db3d60b0ee83f5f23101d2c3bb99e0
 sha256=ea1d3a8141654781a0df31e6607c4722436fa33eb2e9934492770b3b61be8122
 
+[http://downloads.sourceforge.net/project/pythonwebdavlib/pythonwebdavlib/Python%20WebDAV%20Library%20-%200.1.2/Python_WebDAV_Library-0.1.2.zip]
+md5=8e49e0ecc5b4327c4f752a544ee10e1a
+sha256=72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23
+
+[http://downloads.sourceforge.net/pythonwebdavlib/Python%20WebDAV%20Library%20-%200.1.2/Python_WebDAV_Library-0.1.2.zip]
+md5=8e49e0ecc5b4327c4f752a544ee10e1a
+sha256=72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23
+
 [http://www.stats.bris.ac.uk/R/src/base/R-2/R-2.0.0.tar.gz]
 md5=3900bca37cabb4b76b8d736d51cc9251
 sha256=a06c3546400503e6d4ca4505c3f838b9bbd03fab6a3cbab7993f6d9115b68b64
@@ -1386,6 +1410,14 @@ sha256=bda8a3c42733853444e1d4bee16e85990b78c2eaafc4b26e0769be2e14dab931
 md5=9703f591801c5bbded35c9739d04f81c
 sha256=68b1d0acd1a6e17d91412635cd4f65ba58d293e62a01475a43f3712c49a46e7d
 
+[http://www.delorie.com/store/ace/ace-1.2.tar.gz]
+md5=03e5e7ab8ac3acc59661c6e9c09089b7
+sha256=fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d
+
+[http://downloads.vdm-design.de/aceofpenguins-launcher-0.3.tar.gz]
+md5=2fe7dcdbbdbf3b2821f627e02c406caa
+sha256=13013cd19cb165825f4ef5cc790b0e103705f68ece470fd12012db97e3e60839
+
 [http://downloads.sourceforge.net/acpid/acpid-1.0.2.tar.gz]
 md5=15884aaf0b82717954f9366b5c00808b
 sha256=7347042a5328b22965256d98462e8dd8f1cad37de992b135912f32c70163ae71
@@ -1690,6 +1722,10 @@ sha256=a938c07ea331359f379802c50c33aa0307b913f742ad74087d45e7fb2a1f4d50
 md5=44e18d01857f9dfeb8628e317e786f31
 sha256=4f549083df9db85e61d0b272645e3dc71bacde9b9156ca20a57440e794b71042
 
+[http://xorg.freedesktop.org/releases/individual/proto/applewmproto-1.4.1.tar.bz2]
+md5=76ca1c6e1d8904d2d885f81f7332eba6
+sha256=08069e1b7dd0e357c1ac7fa63aadcae094dc131d2a578eb1600a9bd16b8fde19
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/applewmproto-X11R7.0-1.0.3.tar.bz2]
 md5=2acf46c814a27c40acd3e448ed17fee3
 sha256=db738777fd573bede8e41f121f31692e8ec70bb822b5dcd263973533273fc5ec
@@ -1698,6 +1734,10 @@ sha256=db738777fd573bede8e41f121f31692e8ec70bb822b5dcd263973533273fc5ec
 md5=420e6cdf38bb771ec8b00228bf09e8ff
 sha256=15fef83a202b8dcee3420c88dba4aeed1f8fc840ab537487fb5411b99a2eb962
 
+[http://xorg.freedesktop.org/releases/individual/app/appres-1.0.2.tar.bz2]
+md5=6f2f5d9f41669d498b56d73dc3206951
+sha256=37d0fbb16c553fa09878d107f29f26c2ca4206c98dd23c44a0cb670ace531e36
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/appres-X11R7.0-1.0.0.tar.bz2]
 md5=3327357fc851a49e8e5dc44405e7b862
 sha256=bbc15785d609c7f26176b91d26354ca7bfcc5d9fe72d15a78f2809eeba1cb6b0
@@ -2558,6 +2598,10 @@ sha256=46d427fd5b1509ec7dd980c07efd88634fde61cf07ab221dcbde9e1021bd2817
 md5=3f2f6b408828d34c5c2f1445e744e6ac
 sha256=2b0f22efc1bda016649db8d6e1214e381d034befa9c9835c3a6a75d5f95cf931
 
+[http://downloads.open-mesh.net/batman/stable/sources/batman-0.3.tar.gz]
+md5=54812e81f70a4155edcce88f0c7aeb02
+sha256=846f34019c6f30bbb88790088a0e205c7a4e7ee0ab656a5ea3b4b624a0a028cb
+
 [http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.tar.gz]
 md5=54812e81f70a4155edcce88f0c7aeb02
 sha256=846f34019c6f30bbb88790088a0e205c7a4e7ee0ab656a5ea3b4b624a0a028cb
@@ -2594,6 +2638,10 @@ sha256=8c01b85eab01f35ed6bc9d597d4c6c76cf9ddbe2596d9120d66e66135df1f9a1
 md5=9685fab33d39954ab8a0d22e0969d5a4
 sha256=aaaa45ab361781aebda2093fdc7eb5c187f6215b4ba308dd6b9ff2b727e805d3
 
+[http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.2.tar.bz2]
+md5=148f20d28caaa69bbe7dcca7c2674fb6
+sha256=11017f0dd637fd3228bd56fdbbd72193fd747c10d893a711c25bf6734c4da06b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.bz2]
 md5=f43667fcf613054cae0679f5dc5a1e7a
 sha256=59760e300acf5b616400d08ac97d8ea265dfbb872b6131c65eb6246c61654803
@@ -2650,6 +2698,10 @@ sha256=b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06edcd528c
 md5=95c29d9d10bf2868996c0c47a3b9a8dc
 sha256=30da0098a24578e645193464526cc4d5c2c7fecaf476d1b9dabe68118850adee
 
+[http://xorg.freedesktop.org/releases/individual/proto/bigreqsproto-1.1.0.tar.bz2]
+md5=d30c5dbf19ca6dffcd9788227ecff8c5
+sha256=4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/bigreqsproto-X11R7.0-1.0.2.tar.bz2]
 md5=ec15d17e3f04ddb5870ef7239b4ab367
 sha256=69d82eff84b1cef08a30e3a79de26df0bce7f531a86d2144ee0d5e43fc21ce86
@@ -2858,6 +2910,10 @@ sha256=83719927ac4309f42e3cadde125a52cfba2e9c951115ac4c017f292f6e4c14bc
 md5=98200c358e5401d648b980564d9ae39d
 sha256=863f673518af19f9ae35ee221b30bf8c8b695c76c543d18b3ac400a51b855c41
 
+[http://xorg.freedesktop.org/releases/individual/app/bitmap-1.0.4.tar.bz2]
+md5=7d0c1ac193be2491c72a91ccf37ef18e
+sha256=2517aaa015795a348435e4e83bafe7642d4b2fe1976ee982a5d652cf417f79d8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/bitmap-X11R7.0-1.0.1.tar.bz2]
 md5=bbb3df097821d3edb4d5a4b2ae731de6
 sha256=ac6a5c3f4aa88f39e8f04fe43f00972f0235674ac3edb994c70ac802a1ed0219
@@ -2894,6 +2950,10 @@ sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
 md5=62edc09c9908107e69391c87f4f3fd40
 sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
 
+[http://download.tuxfamily.org/blueman/blueman-1.10.tar.gz]
+md5=f9058305c42038678d5023fcabba22a4
+sha256=f4a92834a538dc9dbb93fde76933e849b24639faa1721b24549f209b8b590f71
+
 [http://gpe.linuxtogo.org/download/source/blueprobe-0.13.tar.gz]
 md5=33745b0e86603124654773c1361df33e
 sha256=b4318d0e1ba7422ba4415838448718e037efe4d8236cf12132075ccf36d1803d
@@ -2946,6 +3006,14 @@ sha256=5a2e6e83062699fb01babfb5b211054e01dde097d3b31767135be5447bb05bde
 md5=53a3347a1c38971bee4c4016b45bcf6d
 sha256=f6cfceb541a10849805f853b790bc8343309e7b21078a9c18a7a6a8cf2f94e3b
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.32.tar.gz]
+md5=a3c1007cbeca6865cd202ac205769551
+sha256=447debd3f5c7deea91d459cfe28fd417fb66e9871e8f7926cebaab75e94cd207
+
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.33.tar.gz]
+md5=13cb8c25706dc8c874d1c82fa24b3aae
+sha256=948de26ffcf75880dbeb3c0bd30b049e47aee59c7d2afcf2ca914ef7f262e5b8
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.34.tar.gz]
 md5=2435f7a932cdeecce01211e06142795f
 sha256=1c46b6e219aec9bbd3286e9366de7e6dd05f68ed33b7487fbd211397c890fc40
@@ -3634,6 +3702,10 @@ sha256=015c4237a532b873990aeeecdf351138ce5a811d062d6db73c611a4985de5435
 md5=b8c51a2e3cccb381428426c0fc543244
 sha256=f1e44d628cc4cbac192bf33f492ad8d1e1988cae576924128df36f3638e9a485
 
+[http://alioth.debian.org/download.php/2924/ccid-1.3.10.tar.bz2]
+md5=92220d7b7b0aae7bc141b09ba529458c
+sha256=54610f1a6cd65e8d2b5cb9f7917e509ebcdf130a565e71e06ad4e65ed0dad5ec
+
 [http://alioth.debian.org/download.php/2482/ccid-1.3.8.tar.bz2]
 md5=ebb5fc927d73cd63737a9114481e8957
 sha256=8cb892ef36321069eff7826aa732f1481715fe54bf96346fae1d25565b44c536
@@ -3678,6 +3750,26 @@ sha256=f33cbb551e494747b76bfbeba3954b4839fe7c849f200746fd7dc21bd665aa56
 md5=7b19b6f68d2c648296378b784d5f7681
 sha256=73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21
 
+[http://78.47.116.33/~hole/cellhunter/files/cellhunter-0.3.1.tar.gz]
+md5=b034b7ae3182794c57552a183d6f3542
+sha256=b8b6277b2f211666877b5022bed12809cc88e96a4a2138c0ff4bbf14167a6765
+
+[http://78.47.116.33/~hole/cellhunter/files/cellhunter-0.4.0.tar.gz]
+md5=ac05fbf48ce5ac8173beb7df8f62ddf8
+sha256=cf4e434fa7f00f240917547dcaf121a733edc973c1ab4693cd2ea805c728b47d
+
+[http://78.47.116.33/~hole/cellhunter/files/cellhunter-0.4.1.tar.gz]
+md5=f50e9cf55542d5bc49f04776ea634d41
+sha256=6c59287cdf49fd4ea5c4368443c29e6771ff01fdda74f73a0a0683d99e2ea557
+
+[http://78.47.116.33/~hole/cellhunter/files/cellhunter-0.4.2.tar.gz]
+md5=6d9f5101f2420332f77f6920fa01e231
+sha256=ede3283b4c5f192bea42e1b2f9f8814ad79b64f6af70a353631bc77ae0c7492a
+
+[http://ch.omoco.de/cellhunter/files/cellhunter-0.4.2.tar.gz]
+md5=6d9f5101f2420332f77f6920fa01e231
+sha256=ede3283b4c5f192bea42e1b2f9f8814ad79b64f6af70a353631bc77ae0c7492a
+
 [http://pub.risujin.org/cellwriter/cellwriter-1.3.3.tar.gz]
 md5=09b2019e926d5ef42d52edb2dd33ceae
 sha256=3fb7c11ec5d802338a0bf522b11702c37820597c9a2c36f89b52872c6571e602
@@ -4154,6 +4246,10 @@ sha256=bd6f9e5dc0a89e9918f78a550f6e688480f044cec2e8674d34c7c6212831d6bd
 md5=315ce9665059f1b2f4067cc8bd7ecf44
 sha256=a6d9b1e4e8720941e7fa7e68373a9a211c16bad0eb449438e0b8c6093190cab6
 
+[http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.4.1.tar.bz2]
+md5=3692f3f8b2ea10dff3d2cede8dc65e79
+sha256=e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984
+
 [http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.4.tar.bz2]
 md5=6281344d656d4e0c8e9db4918efe3d1d
 sha256=6013d1ca63b2b7540f6f99977090812b899852acfbd9df123b5ebaa911e30003
@@ -4190,6 +4286,10 @@ sha256=65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859
 md5=493aa462d01d7c5f0461d6d7f9f549b1
 sha256=1d56be1036de59926548e3defa4b9af894af9e2121d3598da13769da5c0f55b1
 
+[ftp://ftp.moblin.org/connman/releases/connman-0.10.tar.gz]
+md5=094743343e062ea370fcd461aa48a7fe
+sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
+
 [http://ftp.moblin.org/connman/releases/connman-0.10.tar.gz]
 md5=094743343e062ea370fcd461aa48a7fe
 sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
@@ -4206,6 +4306,10 @@ sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
 md5=c0d27961dbdcb92b79dfde9c532dd348
 sha256=2dda1ba0d18e2b6de5fddd33a18324c8e75cddfc7df61595babfc19931fa4507
 
+[http://www.kernel.org/pub/linux/network/connman/connman-0.13.tar.gz]
+md5=39e0f9255a30a8da7fdb95d0f99e3d4e
+sha256=1c55f2584af219bbdc4a901f78113c14bb605501c197f15b4db1c830991fd846
+
 [http://www.kernel.org/pub/linux/network/connman/connman-0.14.tar.gz]
 md5=746dc6b68cb99536ed4e7f8d6125f02b
 sha256=79e7d8948e11b94ced41f030c495706baca4bd9dafdfe730cf537fd0907ed3ef
@@ -4294,6 +4398,10 @@ sha256=e77e1cb6cdeb30367f75accf62a7b94598ece4400c42eb9d8181b7da4fc87f82
 md5=9f99bee77ff3c565b4898663810fbef5
 sha256=11403054cb407cdf31da48216f55d1b5943798cb442bcab69faa0a3d7d167541
 
+[http://xorg.freedesktop.org/releases/individual/app/constype-1.0.2.tar.bz2]
+md5=83f623f961400ecc56ff52a716308173
+sha256=70375ea6b3e17cabc35492f87b5b138295c8f0258d65b0fbba998e3ff69bb634
+
 [http://projects.o-hand.com/sources/contacts/contacts-0.4.tar.gz]
 md5=7d72fac4f0d6e1c771c37e4e80093e70
 sha256=e090ab64a02e4918f78312df19715bc2008aae7d44f6b0913c2a46a13d1881c4
@@ -4622,6 +4730,10 @@ sha256=4488bee8994e45dfe91563e89fd7e862779ae02a67b8a121d2ec10b263f2d2f3
 md5=33ee591e0b1ca5ad7902934541db7d24
 sha256=9d2684fac835e9cdf78befff2a58292f54db90094acbfb9f2ed5316fa30d641d
 
+[http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.2.0.tar.bz2]
+md5=434b931b02bd83ed9fc44951df81cdac
+sha256=a50250770a2eead9d6fd56577e3328d0a6a1c4d425b58faa0f5ca7683169ee8f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/damageproto-X11R7.0-1.0.3.tar.bz2]
 md5=b906344d68e09a5639deb0097bd74224
 sha256=f71ae6f74fd43af078c052d5e9daa262b6bd28cc0d40938c3743391eaeb58bfc
@@ -4742,6 +4854,10 @@ sha256=6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
 md5=b57aa1ba0834cbbb1e7502dc2cbfacc2
 sha256=8016540602189e1dca6aca6b7c0735706387e4f85ced75217c6a874980fd0e86
 
+[http://dbus.freedesktop.org/releases/dbus/dbus-1.2.14.tar.gz]
+md5=2c267ccd45d0b18db8c9edacad63ec98
+sha256=f58c66e5117f0c66fbc51f99dd994c5e603baa5df2e3d7250a9d880f2b4e1a54
+
 [http://dbus.freedesktop.org/releases/dbus/dbus-1.3.0.tar.gz]
 md5=b3298d5ce0e4ad4731b1e4e1787d56bb
 sha256=fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
@@ -4947,13 +5063,13 @@ md5=1a4032b942d8b47544da1957374a9786
 sha256=1dd2cce79f93cb3483fefdc02f65ed0868754ad12360c830d5f5cbe95da8e0e4
 
 [http://www.abcsinc.com/small-linux/devmem2.c]
-md5=e23f236e94be4c429aa1ceac0f01544b
-sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
-
-[http://www.lartmaker.nl/lartware/port/devmem2.c]
 md5=be12c0132a1ae118cbf5e79d98427c1d
 sha256=ec382c90af3ef2f49695ff14a4d6521e58ac482c4e29d6c9ebca8768f699c191
 
+[http://www.lartmaker.nl/lartware/port/devmem2.c]
+md5=e23f236e94be4c429aa1ceac0f01544b
+sha256=3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639
+
 [http://pknet.com/~joe/dgen-sdl-1.23.tar.gz]
 md5=b1896c1b21ddb152626aec2e8a157a3a
 sha256=44396b3b324433187cf7082d1059cd9f519f02accddd667e627a57ff8514d436
@@ -5030,6 +5146,10 @@ sha256=c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9
 md5=8ce5945be0660bd3152bd9eb0827f945
 sha256=e3968765ed916b348fce5e309029d25d068a61e1d422a69a506d0fc80ee6e976
 
+[http://home.htw-berlin.de/~s0526295/dictator-0.2.tar.gz]
+md5=8f5cb1d0b7c7d5437b260d9ba5362c74
+sha256=e43251af443eb72a803a6aac3e984feb1f5df8124c64b55fceac6140ab76161e
+
 [http://didiwiki.org/sources/didiwiki-0.2.tar.gz]
 md5=a8643526ced64ed066df407e013259e3
 sha256=a87cdc67ad367d6bde595811e7869f5c4715e4baeec7261bcfe45ab42621543a
@@ -5122,6 +5242,10 @@ sha256=bd72287adedccf493f046f0e6ca29ef47f2cd3741c62a98d5eb82a9068846b73
 md5=b65233d368bbd265a55effcf2c17f84b
 sha256=47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9
 
+[http://www.dillo.org/download/dillo-2.0.tar.bz2]
+md5=bb9999cabeb4db3d915687de465dbeb0
+sha256=847d1db31bd68ab9ab94b642b0cd40ac8d3cf816900f5d5652124986601df1e9
+
 [http://dircproxy.securiweb.net/pub/1.1/dircproxy-1.1.0.tar.gz]
 md5=066bd39d80f286ae5ce69a2adbbd01e4
 sha256=f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e
@@ -5182,6 +5306,14 @@ sha256=888eb2c25bdcef5ee34c38cd5cb0f491d7dd82029dc0f4ae96183a0088a5e015
 md5=d80acad88411e7944b9b085463d53302
 sha256=aaa6d9c9d5ec58f733ca4d7413c541413482bce666217267e5bf88442e35fce2
 
+[http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.2.99.1.tar.bz2]
+md5=7bd9ccde42f022725c0086bd93d269f3
+sha256=68d921110782029133f652403ad4f7b787eee3e0f5152363cf9bb07a7cb33429
+
+[http://xorg.freedesktop.org/releases/individual/proto/dmxproto-2.3.tar.bz2]
+md5=880a41720b2937e2660dcdc0d34a8791
+sha256=3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/dmxproto-X11R7.0-2.2.2.tar.bz2]
 md5=21c79302beb868a078490549f558cdcf
 sha256=531b957d9589950a96cbdbf6a8376f31203797948baed311553cc2d2870c78db
@@ -5346,6 +5478,10 @@ sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
 md5=26f6515322ec50691584ac74291b4254
 sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4
 
+[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.1.tar.bz2]
+md5=5cb7987d29db068153bdc8f23c767c43
+sha256=2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d
+
 [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz]
 md5=8e11d77770452f97bb3c23f510489815
 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
@@ -5622,6 +5758,10 @@ sha256=978fbc134eef3da8a5f363c9e93494a3d7399e8f2b435ac6b1f2c63f09c167df
 md5=a25f931cc6c8d03daaed434f5db5df2d
 sha256=a2a56b32eaa92ad6f667853f023177ffad9128cfa0361afc2872323598aeceae
 
+[http://xorg.freedesktop.org/releases/individual/app/editres-1.0.4.tar.bz2]
+md5=1800dda934ebb7c588ea686278a10e9f
+sha256=d7ce4c0bb214e055cb7680d8b88b9f551610fc40c28269cb51649133862f3302
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/editres-X11R7.0-1.0.1.tar.bz2]
 md5=a9dc7f3b0cb59f08ab1e6554a5e60721
 sha256=1373ded7c35c38e479122ac1fd8a85682a533612538645c79d09992abcbaab10
@@ -5906,10 +6046,18 @@ sha256=17c450622752cbda0e41fffd496d3022a533659f3db942e14da8015c47623856
 md5=408d3c63f9efa06e93e29a691c28985e
 sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc
 
+[http://downloads.sourceforge.net/project/epydoc/epydoc/3.0.1/epydoc-3.0.1.tar.gz]
+md5=cdd6f6c76dd8bab5e653a343a0544294
+sha256=d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1
+
 [http://www.inf.fu-berlin.de/~rschuste/er-refresh-tools-1.3.1.tar.gz]
 md5=f100632e67f94ef4fffa4da32d25427a
 sha256=748359a51e008c179dc5dd5e2974f4b1279c78e09a2613a73d15cd22cb55e8d8
 
+[https://garage.maemo.org/frs/download.php/4737/erminig_3.0.3-3.tar.gz]
+md5=d710853b0559c9919c730e503c0f05e2
+sha256=45490d585d62e2a36d202f7ca9b91883f257c24b51471894bf23b64e76ba89c9
+
 [http://www.burghardt.pl/files/esekeyd-1.2.4.tar.gz]
 md5=5eb8d1b02cdd99d0681e946768e529db
 sha256=7267db1685b04e766b782e4c5aab9729bf3f23b86d568a3a513c77eb91aaed03
@@ -6042,6 +6190,10 @@ sha256=914319726bcd01a4055b1c5e09671085875af6de2b0d8589841916139574ee11
 md5=2507b5d0f4b2848147fbddd155aa6cfe
 sha256=0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125
 
+[http://xorg.freedesktop.org/releases/individual/proto/evieext-1.1.0.tar.bz2]
+md5=5c74f61d6f77b2e6a083b2b31000be42
+sha256=47881a52a8d9da1e41e4f028ed32a8b44f738afbead819c0a07253fdc1641885
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/evieext-X11R7.0-1.0.2.tar.bz2]
 md5=411c0d4f9eaa7d220a8d13edc790e3de
 sha256=d7dad048a9496058ec19c63e958e5216c27964d8cb766926fd5dcb96ff879f23
@@ -6430,6 +6582,10 @@ sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac
 md5=1b84621072b4f906b5686a4fbae0b1d7
 sha256=d06e7244dcd2b462c0e7bea0d01edadb54905f4533afc45f971ab9f6ee46497c
 
+[http://projects.openmoko.org/frs/download.php/832/ffalarms-0.2.2.tar.gz]
+md5=6f03b9663245b93e8370e43cc556dba1
+sha256=df0561124faa5c2e64038f5efcf39432c4795829115b86819083ae66b001899a
+
 [http://downloads.sourceforge.net/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz]
 md5=ea5587e3c66d50b1503b82ac4179c303
 sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
@@ -6494,6 +6650,10 @@ sha256=21e68eeb291ab5a9f4d618f2985c16c26cdfeb0f0f37d3b88550446678dab30a
 md5=24e76434ca74ba3c2c6ad621eb64e1ff
 sha256=1a9ed8db0711f8419156e786b6aecd42dd05df29e53e380d8924e696f7071ae0
 
+[ftp://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz]
+md5=351cc4adb07d54877fa15f75fb77d39f
+sha256=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a
+
 [http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2]
 md5=5704a8c36de84b408e069afb0c5bc1df
 sha256=10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd
@@ -6566,6 +6726,14 @@ sha256=c7ce53b1678268ec2f08d0a32580c2783b6e297941de36d8b880c0533ed51c26
 md5=8b298cc3424597f8138c7faf7763dce9
 sha256=b3fe971ccc8152db6c78da7117c31fc4cd2fcb2b6a4df3db0f8fed13d4ceb08f
 
+[http://xorg.freedesktop.org/releases/individual/proto/fixesproto-4.1.1.tar.bz2]
+md5=4c1cb4f2ed9f34de59f2f04783ca9483
+sha256=e72a32916ad4bbd03847f8945c55582bdbafc039d286ded7365d402a7ff164ef
+
+[http://xorg.freedesktop.org/releases/individual/proto/fixesproto-4.1.tar.bz2]
+md5=157644edb3cd526f2cb164eb79c52bad
+sha256=9635e292887e67caf59a16ee991ac348c978b279faa5acc323d30c3dcede398d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/fixesproto-X11R7.0-3.0.2.tar.bz2]
 md5=ff8899d2325ed8a5787cde372ca8f80f
 sha256=dd7f67b0f01c253512b53a8a051271144316e82783d5f8391df77fc8c21ed327
@@ -6962,6 +7130,10 @@ sha256=d5c6c9f293ffa4d2cdb312b463381271bb8ad763738396671fdea19456fb38df
 md5=aea02d9dff03e0e1a3de85364367c0c6
 sha256=01de82644a9b765599ba8c36c6b689035a85b6590486842067f707f2cb0cf268
 
+[http://xorg.freedesktop.org/releases/individual/font/font-screen-cyrillic-1.0.1.tar.bz2]
+md5=c8d5aef01c906c7aaea329702a8b1b63
+sha256=d9575f0f302a183590d2bad82a8f260aed06fd93695a1faf79f1842a6a16c51f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-screen-cyrillic-X11R7.0-1.0.0.tar.bz2]
 md5=c08da585feb173e1b27c3fbf8f90ba45
 sha256=0c6da93cecc16e4ddc6897e90b941d72087bc82cfcbb26ef54e9a59d371c601d
@@ -6986,6 +7158,10 @@ sha256=80094cd7060a08bda61eef0e481800e8f94d4bbb08b8297dcf6aecea99a09a07
 md5=b81535f78fe05732931f02841e5ca37b
 sha256=048c23b17ea32ee3abb341f0b1105ad07517b2e78efe2e95a4a8218089600612
 
+[http://xorg.freedesktop.org/releases/individual/font/font-util-1.0.2.tar.bz2]
+md5=fe5a7df765d297623663477edce70b7c
+sha256=42133b8b73abfac38fd75a9ecabbd576973ef538c7a8afee63e778c9b2727b5a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/font/font-util-X11R7.0-1.0.0.tar.bz2]
 md5=73cc445cb20a658037ad3a7ac571f525
 sha256=02eefdacc36d5df3707b3e454f5842d06c9c2eb9591e4cae93ccd3d66c78368f
@@ -7026,6 +7202,10 @@ sha256=cda4fed7e7d462257f7282db3459fa94f94ab70934a401b7a90f5decb044f94f
 md5=60df6b625074a9790e28543dcea71651
 sha256=48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9
 
+[http://xorg.freedesktop.org/releases/individual/proto/fontcacheproto-0.1.3.tar.bz2]
+md5=a8a50e5e995bfacb0359575faf7f6906
+sha256=1dcaa659d416272ff68e567d1910ccc1e369768f13b983cffcccd6c563dbe3cb
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/fontcacheproto-X11R7.0-0.1.2.tar.bz2]
 md5=116997d63cf6f65b75593ff5ae7afecb
 sha256=72a6200a586f27c55b837cc6e537f15499a2f07783a826521c9ad2eaf35a6461
@@ -7066,6 +7246,10 @@ sha256=42c15ed555719c27f67990454cdda791cbcd26ab98712fd88ca7e20e6ce3f1fd
 md5=c946f166107b016a21cc7a02e1132724
 sha256=83bd547131aa11a232717a0f06d3c6cd58a0b2f6d541660bbe9ebf43073a8b7b
 
+[http://xorg.freedesktop.org/releases/individual/proto/fontsproto-2.1.0.tar.bz2]
+md5=f3a857deadca3144fba041af1dbf7603
+sha256=5a9af61dc9142488c9ba6e4ae30a9d970ea0f889a1ab7f59de1c1898c83aeb35
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/fontsproto-X11R7.0-2.0.2.tar.bz2]
 md5=e2ca22df3a20177f060f04f15b8ce19b
 sha256=90a5d9ad2328e682a58c179a7df9eac1193db06423e832b107bd4e7802f660b4
@@ -7762,6 +7946,10 @@ sha256=00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
 md5=1939de5fe43d12884d85fa5d7797e3c2
 sha256=243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
 
+[http://gdata-python-client.googlecode.com/files/gdata-2.0.1.tar.gz]
+md5=d646b8f6e32911df61ea0e7379b4bc35
+sha256=a9dba7645ccda502bfeedd3d15f34672b3dec668d8953188b87df36f17c6b849
+
 [http://gdata-python-client.googlecode.com/files/gdata.py-1.2.4.tar.gz]
 md5=521f33a377d64f8a6505ba119415b787
 sha256=fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde
@@ -8486,6 +8674,10 @@ sha256=7f836c8189b55ef4ec8f3387673687d0a5c1a713abc9617144638b28e6857bd2
 md5=dc590e34107de5cb296c238afa8e843b
 sha256=9d9ef356cc4478499442573556787125dc76c8acd1e55e5001fb11f1e224d27f
 
+[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.10.tar.bz2]
+md5=c9f8cebfba72bfab674bc0170551fb8d
+sha256=7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf
+
 [http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.8.tar.bz2]
 md5=3dfbd17203c0c88b94b6f579f24c11cc
 sha256=2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c
@@ -11338,6 +11530,10 @@ sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f
 md5=faa08f321fefd2c61ce4c9355a62fe31
 sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f
 
+[http://isteve.bofh.cz/~isteve/hotplug2/downloads/hotplug2-1.0-beta.tar.gz]
+md5=353656ea499d395260c0de143983da4d
+sha256=54e2fa375506d92a8ac94b5ed332c4c0bf1b69c252692b332c92702670bba583
+
 [http://www.porchdogsoft.com/download/howl-0.9.7.tar.gz]
 md5=85fbe016e2ebad99108b1212ae4b1d6f
 sha256=f8766c44291aac92b2b4abc762e1b11e3504dd9f2a855fdde371b5abd730fe9f
@@ -11830,6 +12026,14 @@ sha256=5360e221354bbdfd67bf9834c2c1d7a0d83f22c17e057f92194411911fbb81f5
 md5=dcc36554aea1338b3813943daf1e9988
 sha256=ef90f7e4c151095cc75a573acd86355aa65c5bc7fd1dcce4a1483b64788e1461
 
+[http://xorg.freedesktop.org/releases/individual/proto/inputproto-1.9.99.902.tar.bz2]
+md5=1937db6f8881409a1fc8b45bcc01f4ad
+sha256=7983e540cadb2f8e090de04c0ddaf2430295837b6e7649f388513afa6f4e77e5
+
+[http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.0.tar.bz2]
+md5=0f7acbc14a082f9ae03744396527d23d
+sha256=472f57f7928ab20a1303a25982c4091db9674c2729bbd692c9a7204e23ea1af4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/inputproto-X11R7.0-1.3.2.tar.bz2]
 md5=0da271f396bede5b8d09a61f6d1c4484
 sha256=3b48f495f9af74fc7cca2fe913e10ce3d947d1aa5e677722e87620b32f1068d0
@@ -12154,6 +12358,26 @@ sha256=4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566
 md5=b941b8f4de297827f3211c2cb34af199
 sha256=79e80af8cbeb68ddad75a1aa6244d7acd62176bfd69bcdc0640d11177dcde97d
 
+[http://downloads.sourceforge.net/jamvm/jamvm-1.3.0.tar.gz]
+md5=4f0af6c15f1b9fc50375d30a422bc88f
+sha256=445813850236d5ea54942df45046ee9414192b403fb8fb1b8e7cfce0f3ace761
+
+[http://downloads.sourceforge.net/jamvm/jamvm-1.3.1.tar.gz]
+md5=cceb887aec78fee99773949ede34759e
+sha256=3a089c19c49e0e29f319d60afac73708a80a22ac42a9728316193e680f4cec5d
+
+[http://downloads.sourceforge.net/jamvm/jamvm-1.3.2.tar.gz]
+md5=f63b7cf4b541a144c41f17fffb7cc869
+sha256=6740f2cef6a2620bc5959eb65562866ffb5c45050a04555aed244abcbe30f88d
+
+[http://downloads.sourceforge.net/jamvm/jamvm-1.4.1.tar.gz]
+md5=ed79d6b60e50b007614831f8c28321ac
+sha256=a73727c9c2e15d6302cf4f5d3aaf8378c5de9d60a302b9d5fa4ee5332341f867
+
+[http://downloads.sourceforge.net/jamvm/jamvm-1.4.2.tar.gz]
+md5=c7affcc61d4135ee838121a57b08de0f
+sha256=dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3
+
 [http://downloads.sourceforge.net/jamvm/jamvm-1.4.5.tar.gz]
 md5=3f538bab6e1c77aed331e5e71f754f5b
 sha256=f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5
@@ -12754,6 +12978,10 @@ sha256=ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e
 md5=d58b5a03ba36c661ff48f38048c2edd3
 sha256=82f9b9dff544fc3d8bcda5878930cdc3817d478f34b3790c599fe185c138f160
 
+[http://xorg.freedesktop.org/releases/individual/lib/libAppleWM-1.4.0.tar.bz2]
+md5=75e27245bc15aed845fe0505f4f21ca6
+sha256=c8e92616ad465ce2ae86360ff216a9711bdd1156dbb06af6d86009c6773e1c82
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libAppleWM-X11R7.0-1.0.0.tar.bz2]
 md5=8af30932ebc278835375fca34a2790f5
 sha256=66d5b9d53816cc158a0f241772cbde60a52aa0a722e28d3ef76a5eb6c82840d5
@@ -12766,6 +12994,10 @@ sha256=2f18f9fa0e18a3eab3c154ba820ad64b5c6ee364e147524055a553a130ccfdde
 md5=81521249353fa33be7a4bb0062c2fbb9
 sha256=9bf92ffdb51e69e07682cd1a6c0101f2a833b16b9bfa5d601491ff46a35a2cf5
 
+[http://xorg.freedesktop.org/releases/individual/lib/libFS-1.0.2.tar.bz2]
+md5=ecf2d6a27da053500283e803efa2a808
+sha256=af2a5fe5eaa2b026e10bddb4e3f39976dc13deb5dbdc714abe1f016435ce3049
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libFS-X11R7.0-1.0.0.tar.bz2]
 md5=12d2d89e7eb6ab0eb5823c3296f4e7a5
 sha256=15bedd7f892fbb130e2b9c17d4f927c4904362a7be5b73d07d56d8aa7025f6f1
@@ -12778,6 +13010,10 @@ sha256=ffd46270dae30cad147d73559142a701a8ff8d0658f4abfb2341edefabb8161d
 md5=4ab4e67e0b8845aa201e984153087f4a
 sha256=13055e2f4c645cbd135ce97a7974a5866f9ba3ed8988e686b552f55c30514f04
 
+[http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.6.tar.bz2]
+md5=2d39bc924af24325dae589e9a849180c
+sha256=a8346859505d2aa27ecc4531f1c86d72801936d96c31c5beaeff4587441b568b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libICE-X11R7.0-1.0.0.tar.bz2]
 md5=c778084b135311726da8dc74a16b3555
 sha256=e37cffdb45bbb193e5cb75e74e7e0410554f4b3c3a1fe436debea907778e6aac
@@ -12822,6 +13058,10 @@ sha256=57f42d3557effe452cd348362977ff90fa61009885c23b3aca8cb0219b5dec04
 md5=05a04c2b6382fb0054f6c70494e22733
 sha256=7536ac382e1ff82014d3a0defba0c61b3a30984f4e5bc7707960d6debcb92a82
 
+[http://xorg.freedesktop.org/releases/individual/lib/libSM-1.1.1.tar.bz2]
+md5=6889a455496aaaa65b1fa05fc518d179
+sha256=f50d184d8c6a031b3ff4f0d52efcfd4ffa811b0362b166a9ff9ba4c2e9aa7ce0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libSM-X11R7.0-1.0.0.tar.bz2]
 md5=8a4eec299e8f14e26200718af7b2dcfc
 sha256=df219b7d5c2fac93bc7c8eb411ed365492eaeb3727ecbb04999890fd694d4e80
@@ -12870,10 +13110,18 @@ sha256=da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82
 md5=2f2beb98e71f397e1209beaca4e97cb1
 sha256=d172e5a401a2607f4ff145db4e8e09c193a1980bbb2c5c7f824e61ee3fdfdff3
 
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.2.99.901.tar.bz2]
+md5=5923d6b4436fda8a0f04a3b08f693f17
+sha256=bdd7dc8fd7028b7969c29fa980a441766de89861d41ff7b2c00fa7b310f287fe
+
 [http://xorg.freedesktop.org/releases/individual/lib/libX11-1.2.tar.bz2]
 md5=c6265b59ea2b594fd68e33f9125b4d20
 sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
 
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2]
+md5=0545089013213e90aac19b8f8045d32e
+sha256=34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libX11-X11R7.0-1.0.0.tar.bz2]
 md5=dcf59f148c978816ebbe3fbc5c9ef0e1
 sha256=89a3c2d8324ff9d0d91682503407310f7df30a74915cd253be3a75247b044248
@@ -12890,6 +13138,10 @@ sha256=6c75debca746060e0c2408a6ca119613ae02d1054adebd4b26ff8beee79bcc67
 md5=93f84b6797f2f29cae1ce23b0355d00d
 sha256=4b90245093c15a24aaaf2fc6e09f075137aad994f72043e098597997d9b2c988
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.0.tar.bz2]
+md5=33e54f64b55f22d8bbe822a5b62568cb
+sha256=5b067bec0f2eb6405226bde5f20ca107eb0e5c11f5e5e24b455930c450487f85
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXScrnSaver-X11R7.0-1.0.1.tar.bz2]
 md5=b9deb6ac3194aeab15d8f6220481af6d
 sha256=66287d18ebe2b239b7b0adc02f4d40b6ea918761e5fde6b8db9c180742618c94
@@ -12914,6 +13166,10 @@ sha256=d6c30a88770a720e96e0bd7e13e0334f9ef60f1b475a92556764828005c19e3b
 md5=0f2b88d857e0a3f5898e4759c541af46
 sha256=10d3ffa5f00d0c0a4083309ba68bdfa01dfdf912ef4cf2141e3f260b2edeb22c
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.5.tar.bz2]
+md5=993b3185c629e4b89401fca072dcb663
+sha256=a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXau-X11R7.0-1.0.0.tar.bz2]
 md5=51ceac78ae0eaf40ffb77b3cccc028cc
 sha256=9500d088e1b3cbf107a93703b81d4636f778492c1c1d14dea6aca7b8354e39e8
@@ -12934,6 +13190,10 @@ sha256=11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9
 md5=64e7782db4653cb57c7f7e660b2431c3
 sha256=2503f3e3348ee3cf38368161dfab8112d3aea2a26deea34f3136898c13cfb88d
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.6.tar.bz2]
+md5=066218dceb82eb8da0e11d259ed3ceda
+sha256=20c1ecad21474187b340cd6056b1083da8cfa5d919d208feac360644108db587
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXaw-X11R7.0-1.0.1.tar.bz2]
 md5=ded3c7ed6d6ca2c5e257f60079a1a824
 sha256=076ed9c4b07379b1a957753a3c8fd2a1d93ba460587d450787630f81a85f9741
@@ -12950,6 +13210,10 @@ sha256=d42b59d3c38dae5e4fec375d12e56e7a5764ba10e8b8ec70f9ce951fc9cec72b
 md5=7e95395dea89be21bae929b9b7f16641
 sha256=7db759e82dd1f68094e4c4d257025f7893dafb2913ed249e00cbe18fa13c7510
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.1.tar.bz2]
+md5=0f1367f57fdf5df17a8dd71d0fa68248
+sha256=3715a25565222d8eb0468805db1113b514128ee5e9bc6908400f189f680d7a13
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXcomposite-X11R7.0-0.2.2.2.tar.bz2]
 md5=5773fe74d0f44b7264bd37c874efc7b1
 sha256=d3d0e8883171a38802400836ba2bf7a40f3b22f669db80e01509c400137c5228
@@ -12958,6 +13222,10 @@ sha256=d3d0e8883171a38802400836ba2bf7a40f3b22f669db80e01509c400137c5228
 md5=f5229a7a38bc3d90380b7c18de10db5e
 sha256=142cd1c1958e2cb92ff2975a092a2c519dd5f4c433c9d1d8b6cc9ca967aad283
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.10.tar.bz2]
+md5=7dcdad1c10daea872cb3355af414b2ca
+sha256=b9446df62203f2c3204b6bcc0057dc909d0dc792f0dd97bc491581b08be36cbd
+
 [http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.8.tar.bz2]
 md5=ec2acd10a7736a85dd1e1ed9ea5bec96
 sha256=8f039f81af52c88d583fba48b878abd074542221cb0030638ad52336b4ae1377
@@ -12982,6 +13250,10 @@ sha256=5df90f0efa77e1d6f9e1768a2b0adfc896d09c7a3d8680ed0980511b3625c636
 md5=ac0ce6b0063a9858c8f24ddb4c60487d
 sha256=0102754db23952a1c3adf7881bbf191f91ca3e3d183e1b0179452bce932fae2e
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.2.tar.bz2]
+md5=b42780bce703ec202a33e5693991c09d
+sha256=a56a10acb34827c4d1a0ee282a338cbb04baa03d7fc7bc69e5690915c8fc7c0a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXdamage-X11R7.0-1.0.2.2.tar.bz2]
 md5=e98c6cc1075db5f6e7e6c8aef303c562
 sha256=bba5acb547fee5c33d582cbd55ad8d03965b582808912a20a457c8b78ca04184
@@ -12994,6 +13266,10 @@ sha256=96d4b70a3853894ceb4c71c3b44a0816014894bad63f494ddfcd30a89caa76c8
 md5=10facf2bc7cbd5e5c1a698b8a210a582
 sha256=f3e50c1847599145c22784a2f15818821960652ee91d21d905817fb7c10f96a8
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.0.3.tar.bz2]
+md5=d60941d471800f41a3f19b24bea855a7
+sha256=d8033a2fae20fed6de4f16b73ad69ca1c511e7da31c88e9bc6e75976187378cb
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXdmcp-X11R7.0-1.0.0.tar.bz2]
 md5=509390dc46af61e3a6d07656fc5ad0ec
 sha256=a9f12dc2d3dff9a36904fd1d14fed3cc1b84dfa5661349e88ad164a4107cc878
@@ -13030,6 +13306,14 @@ sha256=2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f
 md5=aa11d859cc8e9a0bad3bb55e1666547b
 sha256=1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.0.99.4.tar.bz2]
+md5=24da44888b87c66edb326acec35b85aa
+sha256=af941a61486ded37ae58c14ae2612046a3c88c36f825aa9b1769a8a704ebee8e
+
+[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.1.tar.bz2]
+md5=b8ee455effbcaf5a475870e92ed6973c
+sha256=5ebde6ef24d04db758ce60f5b99f96926ba1215547cdff88753d9a2b46fc3e26
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXext-X11R7.0-1.0.0.tar.bz2]
 md5=9e47f574ac747446ac58ff9f6f402ceb
 sha256=5ccefe638c3dfc12fd8c2f2de38ec7e0e0b54bb271fa75f687e474a58edbad28
@@ -13042,6 +13326,10 @@ sha256=322db66638b6db7144ca8028ea968e7aa92d0381e08b99f00ec12193ed624bdc
 md5=1990d19725a3c7f32290037f02d3737f
 sha256=547e093c5037c4b85ce653ce26f5bd70a97b177f9b582f5351a626d8e0a829dd
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXfixes-4.0.4.tar.bz2]
+md5=7f2c40852eb337b237ad944ca5c30d49
+sha256=ba31d7e5c5c1907c30cba50bfd669aa7fe860555287c29f6e786612e4be33b48
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfixes-X11R7.0-3.0.1.2.tar.bz2]
 md5=5a027e5959dae32b69dce42118938544
 sha256=bdcb52a46967aca4367e276f88de35354daa5a62b4d0776e6a89dc43c2d336e6
@@ -13094,6 +13382,10 @@ sha256=cdd0f39c99d02b38e804c7dc2c7fdbdd956b8a0b68d2ebcaf7bf434533f58f1e
 md5=1adca018aa7bf2d215f20a69c10828ad
 sha256=ffe747cfbf81cdd862af1b05d021ad1ab83b623eab5b32b0a618efb4c0f3e01c
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXfontcache-1.0.5.tar.bz2]
+md5=bbd37768c87f63cf2eb845b2c0f56515
+sha256=0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfontcache-X11R7.0-1.0.1.tar.bz2]
 md5=1e3c7718ffaf4f617d3f67ada5a7601e
 sha256=3ae73ba79b28499082ea81527caf032004d5a884bf69ec8b8508dedd913556b8
@@ -13138,6 +13430,14 @@ sha256=7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a
 md5=cfb36307e8e7ffafe40848dba24e0b11
 sha256=a0cef8deaccedb877137782a7e77441c8231b2da848bd145788a12fe05034fc5
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.2.99.4.tar.bz2]
+md5=0f3e9002b5797b01c84c302cb124dc55
+sha256=a8bfacc8b5d9c3c5a049636b74194d555d59f7fd3834f261d66a34135142128f
+
+[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.3.tar.bz2]
+md5=8df4ece9bd1efb02c28acb2b6f485e09
+sha256=362b8c0c60386841063bd7e01afa72e37eb87ada6e64e539d960f88c780a944b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2]
 md5=99503799b4d52ec0cac8e203341bb7b3
 sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b
@@ -13154,6 +13454,14 @@ sha256=d245d7ae4c766ecbc4e5cc2666e2e78198d8386dbaa06b35c3d1b1457ee5d03d
 md5=cd9f7c46439ac40e0517a302d2434d2c
 sha256=07b3564cd56154c20580b56230b7a95d74fe6582c80cedf0550d8d7955181219
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.0.99.1.tar.bz2]
+md5=473725c59bbb2f1dc1afb73ca8a3b5cb
+sha256=8fd310ad500ae9a34266cf087e69741c2834b060c801445c36740b6ae922180c
+
+[http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.tar.bz2]
+md5=a2ac01fc0426cdbb713c5d59cf9955ed
+sha256=e0d39e74c2e131b44cc98dd4910165c9b8d937df93be58e6afb7c2a56772bf34
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXinerama-X11R7.0-1.0.1.tar.bz2]
 md5=1a1be870bb106193a4acc73c8c584dbc
 sha256=72b5a499ddce72f1e18963586f7fb67e8ef69f989be455ba2c5d7f4d9b5f467a
@@ -13166,6 +13474,10 @@ sha256=b56e308e36da8d9cb48433ddb81fd04e26b4f1c695586ac8106ac48a35466d66
 md5=fb372a5f3ab42b5ba16d7af4d833a0cb
 sha256=f83c00d6ed8f4c08effa9dcc2d7f1ff6f5a753f2b9fe1babda16618c2afa18f0
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.0.5.tar.bz2]
+md5=fc4d66be7a1a1eb474954728415e46d6
+sha256=0692b6b0ec1019cfaa8418020b1127bfb0975f5a579a0b1f9eb7fd8f2f7126d7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXmu-X11R7.0-1.0.0.tar.bz2]
 md5=df62f44da82c6780f07dc475a68dd9fa
 sha256=537ba847b3a7665e7c84dfa3d6d1719db495e780f87a3e4583671c5aafbd0e29
@@ -13254,6 +13566,10 @@ sha256=9882ba2d74e9ca5cfd0c2231ac8eba14d8fc59d538c787fa639f8d77c996bbef
 md5=dc266e850c51368f964e0d67bf5fb5e6
 sha256=5682d343dd4e7ef291a6577e956c331946ce5801d8fa076284a01b41de3017ec
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.5.tar.bz2]
+md5=276dd9e85daf0680616cd9f132b354c9
+sha256=bc0590438a4be2b674cbac6f4ad46e5a89acd02aa94817da0fa8eb3ef05ed5d5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrender-X11R7.0-0.9.0.2.tar.bz2]
 md5=3f0fa590dd84df07568631c91fbe68ab
 sha256=f240490ce348cedcf09c2c5d170c7d79002790d72ea5dc3d7d702005684ff713
@@ -13282,6 +13598,14 @@ sha256=ec7088b2ffe8f56c177525283601fb048decaf6f175d9ee5db01e12810a4d345
 md5=f3bdd67785ace8cd0b23249e9d8c9975
 sha256=43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.6.tar.bz2]
+md5=953930ddf9fdaa1405732c7f01e9e599
+sha256=8d940251972ffe7e3caa41c4e82b6659ad4070aa2ec0d3e789c9fa39b79ff947
+
+[http://xorg.freedesktop.org/releases/individual/lib/libXt-1.0.7.tar.bz2]
+md5=96f3c93434a93186d178b60d4a262496
+sha256=706d5248b061c8455f74ce5269ecc5ef59c27d0f52d22b07138f781928dda9ec
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXt-X11R7.0-1.0.0.tar.bz2]
 md5=d9c1c161f086a4d6c7510a924ee35c94
 sha256=dad0c901d3a542866dae53df27994498f320fb1981be2820d2ded81f4bf840f5
@@ -13298,6 +13622,14 @@ sha256=eef98ad3d35254384c3714cd63826fc2009f9b394f2b489718aba9be7be0a10b
 md5=090c1ad04e34982eada5cf3b1a0792fd
 sha256=b4a8dd3d9ceb04cd7322c1f7e5d2320d6ccf85ba8c81d736fd6d6c83c658c905
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.0.99.2.tar.bz2]
+md5=b5edc35ca9b9ba4133a3fa34cb1b00f8
+sha256=4db0c123a9ba5c61945734ca3dda138cf050328a06ab1b61b78a9eab761d392e
+
+[http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.1.0.tar.bz2]
+md5=dd6f3e20b87310187121539f9605d977
+sha256=bd440f4779e06957211ba83782a5a1cfbf1d42b14fd3510a6dce440489a4eb26
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXtst-X11R7.0-1.0.1.tar.bz2]
 md5=3a3a3b88b4bc2a82f0b6de8ff526cc8c
 sha256=93d9c1fb831e2aaaab4627835e79ae0550837cbe18a0d6bc91edc2aa3ea67ad3
@@ -13310,6 +13642,10 @@ sha256=f87ae65be39a3c26dc3c87159d9126daf2af1b8c5e7f2ffc38b9f72b9236261b
 md5=723a0275227165383e967a1ca8899b52
 sha256=4d3cc49b6f4da6d396196054eca23a91df1a41001c736dcfd22fec5a5c7428c8
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.5.tar.bz2]
+md5=1d97798b1d8bbf8d9085e1b223a0738f
+sha256=d549afdf22feefb97cca85dee12242af9f08c4d2435255dc7c30bd17d1d96010
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXv-X11R7.0-1.0.1.tar.bz2]
 md5=9f0075619fc8d8df460be8aaa9d9ab5d
 sha256=b3bcacd212b1aac947cdfe7e64175255f0302bc5a461e2c8925e3cf491532b10
@@ -13318,6 +13654,10 @@ sha256=b3bcacd212b1aac947cdfe7e64175255f0302bc5a461e2c8925e3cf491532b10
 md5=b54600573daf9d1a29b952e8d35b389e
 sha256=1217825ba8d66198466ee8306d0d6d237d2dd80d0f0783c98701296791833abb
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.5.tar.bz2]
+md5=16c3a11add14979beb7510e44623cac6
+sha256=0644c768d28343af0efe0cb09fc9e0220b8ad755642bb498a3038cee328fde7f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXvMC-X11R7.0-1.0.1.tar.bz2]
 md5=c3eb4f526f08862489355a99e3eda1bd
 sha256=fa18853a6cb877e59433fdc1455e5b7fde9bd47c617d97208c7e3e32ff84d774
@@ -13334,6 +13674,18 @@ sha256=8c68f429942b1258cff0fb27505645a463690374ecf318ae660ff4cde7a03db9
 md5=6f5f621804ee652b6cc6f2025c517c78
 sha256=59175230a00a1fb359148f36eadb50fc6cb080849379ccb0e43c6cbb97309a25
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.0.99.1.tar.bz2]
+md5=de75bfb5a399af5df158a6dba203205b
+sha256=4f4cabeec19d092b075507a4e27aa9b9101a5f33eba308f0307a9ace65bc33d0
+
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.0.99.2.tar.bz2]
+md5=ca6405a5cf7de14211ff743b9a25370e
+sha256=e8e0a5a5e86eec0a4880e31b71c18e0688332f662b51bd001d5e44fccebc6e69
+
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.1.tar.bz2]
+md5=368837d3d7a4d3b4f70be48383e3544e
+sha256=8d37f8895ecff15cb821a3e77bd505598983a5c6eae546e77e2d3070a8de5616
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86dga-X11R7.0-1.0.0.tar.bz2]
 md5=d2154a588953d8db4ae6252ebc7db439
 sha256=8bc2f9b7efe25f9765db6963501bcb06efef292006e184d5fe3f8b8f2a9c5199
@@ -13346,6 +13698,10 @@ sha256=ed3bd1cc72252aebe8268c7357692dcdb72f003c2c36ee7a74da312b750afdb7
 md5=7cee0df63903cef7f7a3fb68cdd99eef
 sha256=2122d67d49aaa06eeaeb3db173ea8a7048f3b52665e5135874bc5cadada91289
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86misc-1.0.2.tar.bz2]
+md5=51fed53e8de067d4b8666f75a0212400
+sha256=8e64b6b1bf34fcd112b1fd866d77e110b47794e825a996e4492c0ee408957cb3
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86misc-X11R7.0-1.0.0.tar.bz2]
 md5=338568c9ca48b801f314c89c97327397
 sha256=94ea1585a426e1d36f9067d65b176c27d3fbecfdf59a076263014292d10862c5
@@ -13362,6 +13718,14 @@ sha256=e08fc2c1611c422f751ed02810491b45bf7faa4207d762a11f11815263c9285a
 md5=304d37bd0a10d9b58aa9b64469ad73e5
 sha256=3cb3c3c6552a4fbc686ba6c2dbeb6e4ba2a27103279908831d56363de73951de
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.0.99.1.tar.bz2]
+md5=18579bdfd75aed88575930288bee4da7
+sha256=b59b7a72f379ea99010440b6618f496a2bdf905851f81425a179d07080001d51
+
+[http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.0.tar.bz2]
+md5=b431ad7084e1055fef99a9115237edd8
+sha256=7cc5e577b337c5267f4e65741f27229111ada8cb833e24b47713a683e8838de8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXxf86vm-X11R7.0-1.0.0.tar.bz2]
 md5=ed59db622581b33ec2a62e12b2f9c274
 sha256=f972bbd632cf9047a28b4c467a2f7c2c72f9b36959a98649b3dfef6bf898b8df
@@ -13582,6 +13946,10 @@ sha256=c3540df46bd9716c6a6f521806c70ae548822a5e62d245900cc28b5fa9fc3eb3
 md5=f02bfa27a21b3040089026975b9dc0b8
 sha256=5677f32eff184883d7ca402234f92142f35bea7d04d503becdd104ae8343cb1c
 
+[http://www.hyperrealm.com/libconfig/libconfig-1.3.2.tar.gz]
+md5=094a82afd382aa2305c6cc3c06025c2d
+sha256=2a680bb33e290c3c799e3a90cf2c0fb9f5482dd930ad93d9f83ce39923258c0a
+
 [http://repository.maemo.org/pool/maemo4.0/free/source/libc/libconic/libconic_0.13-0.8.tar.gz]
 md5=b4078390c459ae4df3acdabca36f53da
 sha256=1ee5bf796367d27987098f73dad866359e188cafe32f1871c12b4469f262c846
@@ -13706,6 +14074,14 @@ sha256=bd9669e5f1a43d1cfcff4d3dc5f18736ba7c950c8ba7b71b1d9cf4436a3783b3
 md5=4d866967210d06098fc9f302ed4c79b1
 sha256=fa3ff31a543f7cea04762c08f48b418e75230de8b4dfdf9d2d3ae9e2af26b9c4
 
+[http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.0.99.1.tar.bz2]
+md5=cd8d5777a4ac53e06573c4bde178621e
+sha256=5169c7da47dfca84d517f8232eba15ea45f78a7354c503a30ec175b6476732e2
+
+[http://xorg.freedesktop.org/releases/individual/lib/libdmx-1.1.0.tar.bz2]
+md5=a2fcf0382837888d3781b714489a8999
+sha256=1904a8f848cc5d76105cb07707890aca095540a37fb0a63d359f71da51d3e2d5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libdmx-X11R7.0-1.0.1.tar.bz2]
 md5=ae6b3c48f1349fc5dfa7d7c4b9cf4718
 sha256=3dfb83a88826c7250e41180442e891ac39898e46e0c9c1c2aba352d4a4aa9973
@@ -13918,6 +14294,10 @@ sha256=b53afe2a88fa24bdd53e2a3dd51ab660b89b46b1ba4918735d7331b2e56548d6
 md5=5cd16a2e51ca7b96a3081c7486ff98b9
 sha256=b993aa3d17e845a12a49160b5d96993059ce919c7ba902005b910b867b6258c8
 
+[http://xorg.freedesktop.org/releases/individual/lib/libfontenc-1.0.5.tar.bz2]
+md5=4f0d8191819be9f2bdf9dad49a65e43b
+sha256=7f3cde0331e9ad3da720b1a8255e121673701199df0802b62380436e74222700
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libfontenc-X11R7.0-1.0.1.tar.bz2]
 md5=d7971cbb2d1000737bba86a4bd70b900
 sha256=448a4e35a8685b60829d1b51b498e2a6e4107549fd0458fa17dcc801d29d5f72
@@ -14018,6 +14398,10 @@ sha256=01cb83ef0e765c9856bed79c18a766eed2027f2b2576e8eaa14e02c15c7658fd
 md5=1ac35c278299fcbc69b7dde79a642d89
 sha256=26c7d9c1b7a41f28fea5213484b274be55dcf2bbf5eac723ad795c0c5fb85df6
 
+[ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.1/libgee-0.1.6.tar.bz2]
+md5=9bf21c1d832fc0313d08829446983fe6
+sha256=d319b87691dfae207d1deeb4ff8bd9e342c1b85d9277be25defb402ae10b496d
+
 [ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.3/libgee-0.3.0.tar.bz2]
 md5=1ca2b8a87950ef1b14342fb32db3e558
 sha256=fd373e48bbe7a8f4903bd405f6310223321bc1ab22c7c3a7bc6ab0a11256b597
@@ -14542,6 +14926,10 @@ sha256=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 md5=440835808c577073db7d571357223dce
 sha256=4f707c189259d7b3dda908d78a995366d388fe051aa3554b82cb324426997a23
 
+[http://josefsson.org/libidn/releases/libidn-0.5.19.tar.gz]
+md5=440835808c577073db7d571357223dce
+sha256=4f707c189259d7b3dda908d78a995366d388fe051aa3554b82cb324426997a23
+
 [ftp://ftp.gnu.org/gnu/libidn/libidn-1.15.tar.gz]
 md5=482a25b7b223e52f967fafd284a1a992
 sha256=db75022eff366bd5646ab1e6d7bcd1c2048473a7dbdf0cd0421de92c88bbdc18
@@ -14718,6 +15106,10 @@ sha256=f7e11c6137a1628d63985799ebcb78577832fca3ca4aeb2fc53d0e667cf699c0
 md5=54935c6cff42df2f1daada267b701392
 sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
 
+[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz]
+md5=54935c6cff42df2f1daada267b701392
+sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
+
 [http://www.autistici.org/bakunin/libmrss/libmrss-0.19.2.tar.gz]
 md5=a6f66b72898d27270e3a68007f90d62b
 sha256=071416adcae5c1a9317a4a313f2deb34667e3cc2be4487fb3076528ce45b210b
@@ -14846,6 +15238,10 @@ sha256=54f316f530caaacd55dc23f546537759382a45ac6378ead249b5a5d51cf4db52
 md5=85b6a42a9e17a23c01b2f2ed0ece0563
 sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78
 
+[http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
+md5=85b6a42a9e17a23c01b2f2ed0ece0563
+sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78
+
 [http://www.autistici.org/bakunin/libnxml/libnxml-0.18.3.tar.gz]
 md5=857f43970e7f0724d28f4ddc87085daf
 sha256=0f9460e3ba16b347001caf6843f0050f5482e36ebcb307f709259fd6575aa547
@@ -15102,6 +15498,14 @@ sha256=2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc
 md5=ba25eb7582f69428648e8c67564d68e5
 sha256=b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce
 
+[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.10.8.tar.bz2]
+md5=b48d257b63dd5bcc9cea400d1b3a5242
+sha256=f9a8a24123c88bae95c2521f489684bd69671207bd7ea7e5271ec4a0d2e95a17
+
+[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.10.9.tar.bz2]
+md5=685cb20e7a6165bc010972f1183addbd
+sha256=5ccb9683b8be76edfceab4bf006e1cce9018e0d3dea5e54aa72e82798213fead
+
 [http://www.xmailserver.org/libpcl-1.4.tar.gz]
 md5=6d63c462911349de80109c0161ed6d37
 sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686
@@ -15526,6 +15930,10 @@ sha256=e234d314f0bdfcc54f52111519624fcd3d1ff37a267c39848b5de7a272367976
 md5=8c8d1f7378734231fd0458569346b9d4
 sha256=9269060f1a8c36c66748520a44d6ffc5059ae736de1e282bb8b6fd65d7890813
 
+[http://tinymail.org/files/releases/pre-releases/v0.0.9/libtinymail-0.0.9.tar.bz2]
+md5=674db3cb4750ba0a3e90aa95ec28bcc7
+sha256=82c4fa4315807af48ed0585b6efd03a42022016364474ead931634e689bce9a5
+
 [http://gpe.linuxtogo.org/download/source/libtododb-0.07.tar.gz]
 md5=5df2e1f7564d066dce6ec24344605528
 sha256=bc3fb1a20ec97149f6e81285a22bdc48fea9c4fbc9abad6919b87ce2f44acbc3
@@ -15862,6 +16270,10 @@ sha256=468ade4eaa3951a7c34b6ae1c290ab1a1d364ee36c5c455ef0df15550825b8ae
 md5=0726a845fe5a56551de2718c9f6b0e35
 sha256=0ab628271fc9cb6d05f861d9823573088d81d510aca95b87ac0504b2e558965f
 
+[http://xorg.freedesktop.org/releases/individual/lib/libxkbfile-1.0.6.tar.bz2]
+md5=b01156e263eca8177e6b7f10441951c4
+sha256=2ca43c1f6b2782994167a328471aa859d366cd7303c6dcbc8bda951a84a06039
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libxkbfile-X11R7.0-1.0.1.tar.bz2]
 md5=0b1bb70a1df474c26dd83feab52e733d
 sha256=2260663af7613e35996e7aa1e8911a062e849619bce88086529031e6c479c9ed
@@ -16062,6 +16474,10 @@ sha256=9f141c606cc93d0550eeb3532626f26ced56687c2bc9f2b8dad387798b929340
 md5=fb345125e23c787df0818ff7caad5515
 sha256=ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b
 
+[http://download.savannah.nongnu.org/releases/linphone/3.1.x/sources/linphone-3.1.0.tar.gz]
+md5=ed40cf4088c306400b005bbd63ac36be
+sha256=e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b
+
 [http://developer.ezaurus.com/sl_j/source/c860/20031107/linux-2.4.18-rmk7-pxa3-embedix-slc860-20031107-rom1_10.bz2]
 md5=d74fc9ea01384bead3925434b932d6b7
 sha256=3dcafe41355fcc688f4a376a5dc71901ea2fbb95698397c87c6a6b12aa058c69
@@ -16310,6 +16726,10 @@ sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
 md5=64921b5ff5cdadbccfcd3820f03be7d8
 sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.30.1.tar.bz2]
+md5=7da2e2e31f1c00f2673d2dc50de76b33
+sha256=fccb12e3f0f2fe13f392f60682b7114c40cca5c81f1bd9638f48ecd3cd3cba9c
+
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.30.tar.bz2]
 md5=7a80058a6382e5108cdb5554d1609615
 sha256=d7b9f19b92fd5c693c16cd62f441d051b699f28ec6a175d1b464e58bacd8c78f
@@ -16434,6 +16854,10 @@ sha256=ee3edf1ea89a90f2b7f82ad09b83c25dc8ea8ca7cf0fce2aa921f897929b2bb9
 md5=6f15406664ef31172c68d46567569bb8
 sha256=9532b981c9b8974ceedd3d25a8f9a0e167a92c9da0dece47f34a4ec34e34b1cf
 
+[http://www.angstrom-distribution.org/unstable/sources/live.2009.06.02.tar.gz]
+md5=088f848b64cef1d54034bc24cfa3c156
+sha256=66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
+
 [http://www.live555.com/liveMedia/public/live.2009.06.02.tar.gz]
 md5=088f848b64cef1d54034bc24cfa3c156
 sha256=66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
@@ -16706,6 +17130,10 @@ sha256=c0c4d76df0350c626df7ce62bf3df7915f9959557d76abce96222857d782389c
 md5=b01e4f71c20fc1c79ed727759c1df40c
 sha256=2010f2152eee89a67f02edc3041574fb07442d075ca46fbcf84f981f0977a5d7
 
+[http://xorg.freedesktop.org/releases/individual/app/luit-1.0.4.tar.bz2]
+md5=4e45233e310d72dce307709761cf241b
+sha256=d11cd500975f652060f89d79cb8034011d99ee9aa6c82951680fc0621ecb8252
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/luit-X11R7.0-1.0.1.tar.bz2]
 md5=30428b8ff783a0cfd61dab05a17cfaa7
 sha256=fb423dc3ae75e64a256172c873732fe869ae482409cf1f3e7d980d222f070cee
@@ -17710,6 +18138,10 @@ sha256=7fbadfa5cb38f7d754214b792854c4a0cb32fd1c9b5ae8ff05434cb3b3acbe01
 md5=912e6305998441c26852309403742bec
 sha256=25cba395022c878cf0323da5b2b4aba1cca03001311a4e2d7632d6a199806294
 
+[http://xorg.freedesktop.org/releases/individual/app/mkcomposecache-1.2.1.tar.bz2]
+md5=25b774e1b64833d0cdc00663931efc73
+sha256=c9ee54d18cb9a8a0c5fcd8d2dd08ed8ed869f3a538af46caff08ca9bc9cf2caf
+
 [http://xorg.freedesktop.org/releases/individual/app/mkcomposecache-1.2.tar.bz2]
 md5=c8237b4aea1ae0c15441deab6b12c5c0
 sha256=8c34cdd03f7d11ac86c681349d39a4faf88854faaad928f0663da55f125aedfb
@@ -17742,6 +18174,10 @@ sha256=dc9b946cc23490c960fbca8b32e4bba4bc23ce404a8d7e1c0e916894c83b4227
 md5=5e6e210b70adfef1264b0212aab1f758
 sha256=f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850
 
+[http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.6.tar.bz2]
+md5=0d0752af232054b720febcc1b2fd6c57
+sha256=273512f86fdc46689e9295409982dff0fb5b2ab0cac1690c0d973907bb7b6776
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/mkfontscale-X11R7.0-1.0.1.tar.bz2]
 md5=75bbd1dc425849e415a60afd9e74d2ff
 sha256=e83b80b4ccd7863223fac4a2d54974a64a79c635d6bdda0c6e7039f966eae9e2
@@ -17830,6 +18266,10 @@ sha256=ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0
 md5=bac989c74ed10f3bf86177fc5b4b89b6
 sha256=ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0
 
+[http://projects.openmoko.org/frs/download.php/271/mofi.0.02.tar.gz]
+md5=3a2efecc54880a6708d7ddfa88df3df9
+sha256=33a25af95a6aa3a810f5fdf0070ba7744988ad8c60cfc38193ed79b8b4059c9f
+
 [http://downloads.sourceforge.net/moin/moin-1.2.2.tar.gz]
 md5=4032f2305a3393ab18e02efe6550e1aa
 sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e
@@ -17842,6 +18282,22 @@ sha256=569c9b4f7b2cf411718a3ac5e6427c1babacbaf1b085276f822d8d08040e4a8f
 md5=4a0dbe4e0cfdc15d30958bdc571bbfd7
 sha256=2492f6bd7e2140e62436f11e14b21ec36d17d784fa8271e61f8f06012c83a1d2
 
+[http://projects.openmoko.org/frs/download.php/764/mokomaze-0.2.3.tar.gz]
+md5=9efe9a31cdd842881b45fd7f686812aa
+sha256=c7f3d8920b7f1fed316293e8805ef031a8a063490b4a807f955497b01bf825c4
+
+[http://projects.openmoko.org/frs/download.php/781/mokomaze-0.5.1.tar.gz]
+md5=2ad9b8ed79359201b54d96a17aa19cef
+sha256=ba3ae988b96a5bd0ac9c9c8cfd2c3fa7169b6ec5d3950d6e848ed394411fd891
+
+[http://projects.openmoko.org/frs/download.php/813/mokomaze-0.5.1.tar.gz]
+md5=206ce4ab9da06643dfa0147144457d4a
+sha256=f7e2a6d9f28e02c4866f5972ea32b7c1fdc65af36cb4122bb4adb747514a8340
+
+[http://mokomaze.projects.openmoko.org/files/mokomaze-0.5.5+git8.tar.gz]
+md5=f4e1dbd444b4049c361f9c1c3d40d32b
+sha256=515d842b79a2c34f5789fa10110bc9d7b15c65a7b1fa623131a1e03599fe7362
+
 [http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz]
 md5=d3143b0bbd79b53f1b019d2fc1dae656
 sha256=f6a29300648381538a403f24506e75b94164e26c69c6861ca112d425edc9d193
@@ -18622,6 +19078,14 @@ sha256=a187976c1957a7a0e17014ed97cbb4341f6898d5f60301f1b0c37e52188ebd13
 md5=7fa369bff1031acbe4ca41f03bee7d02
 sha256=53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540
 
+[http://monto.homelinux.org/notifier]
+md5=24d87301da8843e2dbc3330ece57677f
+sha256=896c6942a9a3b0b2d6846eab1de8c471c9fcf860ca182ce18e12f1ce255f42cc
+
+[http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.gz]
+md5=8f0ef0939cc8edd2efd896ce5ba80cf4
+sha256=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022
+
 [http://hauppauge.lightpath.net/de/nova-pci218c.exe]
 md5=139a1ed50a1a12e47b1f7deedf4f40c3
 sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173
@@ -18782,6 +19246,10 @@ sha256=c986121e520897af6c326ece8a26eca87bdb4641a93913b63a5c29521cefaf66
 md5=f9adc013e0e4b26c992cc0ca05328f3d
 sha256=44ba0d99e1bf8fa2caf9f7a85d569e513208c0710c1ad00032e271289e87b63f
 
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.9.tar.gz]
+md5=0048546c5140109d7b9e79ac2ef28d74
+sha256=852aaa2f160e0402685132e94622c7fb42f07f7a9f51a60cfb35c4a2875931d9
+
 [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
 md5=085b9edc0504c0d79e7479a54e2018c5
 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -18830,6 +19298,10 @@ sha256=b99b6e2c1a0977fbe2f0c19210694ed44ff182d17d3920c485fb6ce725b89816
 md5=6b11065c9dbd3c9743d234c2f785fb7b
 sha256=fb093e267e5b9656f767896a33d664e5ee921e28898a481542bdb4db31f7604e
 
+[http://downloads.sourceforge.net/opende/ode-0.11.1.tar.gz]
+md5=5f79628b7b10a7a59092759a5af77775
+sha256=4c225b76d57a5a8094653fba48f3169ac1a99622f3ce98f2be55fbd5a1b76519
+
 [http://downloads.sourceforge.net/opende/ode-0.5.tgz]
 md5=b33b21e04ee9661f27802b6b6c8eefd2
 sha256=5388c4cd4666f270f18216c90ab6526229c53fdc7e82f93ddb0824e69521df1c
@@ -18998,10 +19470,26 @@ sha256=723e2c57c3cdffa7ff11f9b6b5478d6cb4af017e5a1ee7a56032969c39c1c2fe
 md5=643a18c7ba09254d36e93afd6277346f
 sha256=a898b79336c7372c901bcc7e5f83db7b8e79f8e864be6a262f515b3e088bc607
 
+[http://downloads.sourceforge.net/myposition/openbmap-logger-0.1.0.tar.gz]
+md5=314e39d3f4f689f50bd2bd2a54703bbc
+sha256=48cbe5774aaa2641e7850a69d3ae8187383deafa4bb2e3704ec8731d8e4e2a92
+
 [http://downloads.sourceforge.net/myposition/openbmap-logger-0.2.0.tar.gz]
 md5=5c9c1639bdff3bd35c63697d398f1a68
 sha256=3d6c58830e50373d0dc2a72f6fc65afd7ef30aabf2d1078e6878c911270dec16
 
+[http://downloads.sourceforge.net/myposition/openbmap-logger-0.2.1.tar.gz]
+md5=2c9c49362332ca881f3224be8062626e
+sha256=c41627dce1eb13aea2ba9ca3ee3e40b227480a156f0bc8a27934e4164e401853
+
+[http://downloads.sourceforge.net/myposition/openbmap-logger-0.3.0.tar.gz]
+md5=11a2fd2725b23a6794c8bd244d7ebf0b
+sha256=c0968f5164222e115691423e83f5e49441e86988772adecfdf777a13bfd96f04
+
+[http://downloads.sourceforge.net/myposition/openbmap-logger-0.3.2.tar.gz]
+md5=edeea53ea62d241d472912417b5cc248
+sha256=0a6bf110bf108416d85aabd42f01e52860be26a45bd1f0c7fb76252d47f9b19f
+
 [http://downloads.sourceforge.net/myposition/openbmap-logger-0.4.0.tar.gz]
 md5=52b71c33ce0d2da8d5c29db293132630
 sha256=93820366128b394d84b1b37830344b70f349c2896b60b601e884f9d857ff5d84
@@ -19266,6 +19754,10 @@ sha256=2997613ab33ad42dc8269a63b7c40a6938b3552e196780a4a269cc7340dd23bd
 md5=9613e6be14ba7a0ca5d42a88e6ed3516
 sha256=45145ea27333be1552624065297b4d9d76feadf2a4a89fdf0ddafc830ced3a98
 
+[http://projects.openmoko.org/frs/download.php/581/orrery_2.4_clean.tar.gz]
+md5=03da10cffda64a0927a1d929c20eb8f8
+sha256=0a8fd606d12b98e439a95d608c317849b7fe151dca8e1b8b3dee329a3a75292b
+
 [http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.13.1.tar.gz]
 md5=293f16da6dd434e68652f0f725b7f97c
 sha256=2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c
@@ -20163,8 +20655,8 @@ md5=e4e6155530a23ea0ea4ca59f8c5fda8c
 sha256=e86a0a81ce1b989a4d06e0c07d64e1fcbba2456fa8e22ae24f333f186f3fc663
 
 [http://gpephone.linuxtogo.org/download/gpephone/phoneserver-1.0/phoneserver-1.0.tar.bz2]
-md5=6f6450c4e762059e790216b15b5930e6
-sha256=a1f05eba12369fb8bafb53559ae5ab2855ab1e83746049a100ce5a6d69bec2a6
+md5=195b684e025ff5c15617d6f757cf631f
+sha256=e14546d11e899e7e9f06ca58979fee14b273d53c637eb268d7c6fe3bf78d564d
 
 [http://de3.php.net/distributions/php-4.4.4.tar.bz2]
 md5=bc6fa8908e2ac36e93bab9f7d42cda3a
@@ -20250,6 +20742,14 @@ sha256=a2d8473577c2b3b51ebf29e2c6cb31463158676a5d5b44438ff0db18e8aab949
 md5=1d5e267c57b126038689ce3bf26eea24
 sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4
 
+[http://projects.openmoko.org/frs/download.php/888/pisi-src-0.4.4.tar.gz]
+md5=327287831045451c503990eb6cdd6e4f
+sha256=562d4804096c6057277d22d5d40b8a3c03405ace108844dedf83568891e54d12
+
+[http://projects.openmoko.org/frs/download.php/907/pisi-src-0.4.7.tar.gz]
+md5=8d47a6a2926c635cb4eb633e3ee063ce
+sha256=fd4d89c138ef2d1a6f9458cb85363581a205d1c1b69578fe7e0f856668a7fe9a
+
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.10.0.tar.bz2]
 md5=fb23e17a8a0308e8fad6dc153753ba9a
 sha256=2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4
@@ -20278,6 +20778,14 @@ sha256=45d491879791140dc1f20287e6489f32dc59ae37628038d991d9511abede3fc2
 md5=fe922698df46b21d7e19f28ded4ca100
 sha256=3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22
 
+[http://cairographics.org/releases/pixman-0.16.0.tar.gz]
+md5=46147b142ea530847e2228940f1cd535
+sha256=b99e19601cd468065503cfada97664f097f93bf895a0811a7769ebeddd423ceb
+
+[http://cairographics.org/releases/pixman-0.16.2.tar.gz]
+md5=02bd3669f53c404c19980d5efb6f86fb
+sha256=05f78c2fd3a5f054c0d716e8ba1b67a0c04a7a7e642d6946828ec383b389d185
+
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.4.tar.bz2]
 md5=c354ab5b0da10227226d3ef604254875
 sha256=261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa
@@ -21102,6 +21610,10 @@ sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1
 md5=d2aa74615aa9cf23413975a68613ffc1
 sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1
 
+[http://twhiteman.netfirms.com/pyDES/pyDes-1.3.1.tar.gz]
+md5=e499fdde54e98be87324c0322311e034
+sha256=4f1aae18f2aabb3559b8878d95a7228ebe6633fc4a88905935354ccdf2accc32
+
 [http://downloads.sourceforge.net/pyopenssl/pyOpenSSL-0.6.tar.gz]
 md5=af67fda6d2125cae9c56ee50430a40c7
 sha256=58ee9dd10fbd97d65347626f60a38aafdcb05d19ad90c883c4284266ba7ec959
@@ -21278,6 +21790,10 @@ sha256=c746693328bfed7838a1f3bfac41b13d7f39a81ac961559cd0daf700fc677da7
 md5=431e7d4632163b93d1ee43cd071a389c
 sha256=db0ab6f998bc5750aba2dfa96c8932f673914d8bf804a2c1c769b4a6e3f192d2
 
+[ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.20/pygobject-2.20.0.tar.bz2]
+md5=10e1fb79be3d698476a28b1e1b0c5640
+sha256=41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81
+
 [http://downloads.sourceforge.net/pygoogle/pygoogle-0.6.tar.gz]
 md5=334e2d9e5a765ffa9769e2c4cdfcd110
 sha256=ad3f4530977a15e52b379ef301a4a80cf69a883f24dd6cebc5b47b3009c092a4
@@ -21298,6 +21814,10 @@ sha256=03a605f106e30bea448b04007635a21140eeaba4c8844188d661c3b133cbee89
 md5=89afe242275a3fce57b4ffb5fadc5888
 sha256=ab9ad4481af435894db27e78010f6bbc21c62252dbe7a254121453419edde8f5
 
+[ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.16/pygtk-2.16.0.tar.bz2]
+md5=bd0d437fefd6d5390f5d770a495cd50c
+sha256=7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8
+
 [ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/pygtk-2.6.3.tar.bz2]
 md5=5acd4a4f5807f93a80389c1e9af48808
 sha256=1cd8e9bb0a011317862aec90a03e562bebbbf7fcf865a8ff12992548cdda746d
@@ -21406,6 +21926,10 @@ sha256=703b204bd1d57b1bfc0ba95246d229a599259b782ee18072d6041656d412073b
 md5=499cfc69b3cacbdf70a32f253b4a0eb1
 sha256=cb5a5855c68743622b1902c7c106b30316c623c265906f2acb2fa2c9d97b3f37
 
+[http://handheldshell.com/software/pyring_1.1.8.tgz]
+md5=77359741229bf18af9476d5c41355fe0
+sha256=4db4c58ec9b4cf7ebaae4e5f09ac6c90364805affd1ba7e852a12f8931ae7fd3
+
 [http://www.vanille.de/mirror/pyserial-2.0.tar.bz2]
 md5=a8db6163466c21845faa6ef57af992da
 sha256=df76084516b34b5e04dd84e54ef38613d87c56bc04de3d0a711f72fb6707ab0b
@@ -21454,6 +21978,10 @@ sha256=85bbe7a9fb6617e24bb4dbef528af8ef6eae07f8809dcd05ec926142feca7714
 md5=975e5449d6670dd19498bb9ec4856d39
 sha256=0d904161351a8e55b272ed9691b12dca4278bed62fde53ba2a36f479996db910
 
+[http://labix.org/download/python-dateutil/python-dateutil-1.4.1.tar.gz]
+md5=2a5f25ab12fcefcf0b21348f2d47595a
+sha256=74b615c6a55b4421187feba1633fc233e7c5ebdd7abe9b092447a32946823357
+
 [http://downloads.sourceforge.net/python-fam/python-fam-1.1.1.tar.gz]
 md5=f6c760c6d8e5ea69a3fce029f7973558
 sha256=139f069a4455560a8c68c4c18569f2cb453eeda33d522862f7a4af13932d9cdc
@@ -21494,6 +22022,10 @@ sha256=f1f472a698966b0350857b20fc7f6dd86e4a1f83870edfbe30eb36552b449680
 md5=7e4fc4b5382c6b54ede8b6e29270cba8
 sha256=f1f472a698966b0350857b20fc7f6dd86e4a1f83870edfbe30eb36552b449680
 
+[http://pypi.python.org/packages/source/p/python-ldap/python-ldap-2.3.9.tar.gz]
+md5=a9f9f16338288d118a1ae6266c993247
+sha256=62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4
+
 [http://opensource.bolloretelecom.eu/files/python-netfilter-0.5.4.tar.gz]
 md5=2029edea09db0829f16b06042c0004ed
 sha256=1ef9ca0508159cc63e1cd097a204664b99eedfa596d326866c8fce9b30715379
@@ -21506,6 +22038,10 @@ sha256=bce93266c593d79d7083052a6cae516de3d6c3e5bda277f664785d30157b8ac7
 md5=0df3d1c5109bb88d06575d70513a190c
 sha256=8ff2ec30050803e8b60cfb05d24fa32b3d175bffb81ef5919c3db4ac0f263df8
 
+[http://pypi.python.org/packages/source/p/python-wifi/python-wifi-0.3.1.tar.gz]
+md5=0458e32f82900e03c9fd155442242638
+sha256=a7087ac16ce2d1f146dd76cbfc442ae5b91774f4b8c8eba913c09d0c325eb12f
+
 [http://download.sugarlabs.org/sources/external/python-xklavier/python-xklavier-0.2.tar.gz]
 md5=5b3cd1832f4d37dfa48490759f3bd3be
 sha256=b71096448ca9d7933fbc4aff13cef95a5878f49e4c25f20f815dd1f8f635b6d6
@@ -21962,6 +22498,10 @@ sha256=102fd42f8f2562450f4e45c28bfb0390c2d30ffa6a805eead15d67018930f654
 md5=a49416013fff33c853efb32f1926551e
 sha256=cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d
 
+[http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.3.1.tar.bz2]
+md5=a5c244c36382b0de39b2828cea4b651d
+sha256=d93ca3c0ae710a45da6a27e1eeadfb3c9d4aee47f23657c996e1124c0d9985ca
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/randrproto-X11R7.0-1.1.2.tar.bz2]
 md5=bcf36d524f6f50aa16ee8e183350f7b8
 sha256=7a5eb58f10d02f58c2f7fb153bb5dc6d72173d5fa3d317bdbd9674f4577e0ad0
@@ -22046,6 +22586,14 @@ sha256=e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf
 md5=0ed4706564a34fc2aff724aa16d3ff00
 sha256=04e77a8b14f373a1825bbe0116cd0db8b2c5dee17b34ba9bddd27e576609cff9
 
+[http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.13.99.1.tar.bz2]
+md5=1ab825ee2dbf32dd4a09cfca89d0fad7
+sha256=3925c12341a20b53d87b184ba2636118362417d6955777e01e2ecf145899467d
+
+[http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.14.tar.bz2]
+md5=70f5998c673aa510e2acd6d8fb3799de
+sha256=1bd2375bd2bdaa3ea90aa0a70cf1657a2d61877b6eb7e3fe3e6f1d289e69d067
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/recordproto-X11R7.0-1.13.2.tar.bz2]
 md5=6f41a40e8cf4452f1c1725d46b08eb2e
 sha256=080aecbaaa5ad81750541ed19fb5ea6ccb45e1c2a5a93e9a2878a42532e40ba5
@@ -22106,6 +22654,10 @@ sha256=60e83bebab37c2754ae77cc359c0b67e8bc72b46821c7fa260ccc5c811bd741f
 md5=b00a97b00bf93ab2ac6442ea13ea9c0b
 sha256=779317ca2e99f02b394af0c6f77f16def56de3b71a5d9f9ac6e5e9cfb65192e1
 
+[http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.11.tar.bz2]
+md5=b160a9733fe91b666e74fca284333148
+sha256=c4d1d6d9b0b6ed9a328a94890c171d534f62708f0982d071ccd443322bedffc2
+
 [http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.9.2.tar.bz2]
 md5=28fbe8a59ebd31f098b90ec64f3d133a
 sha256=7754dfbbb1e3818f28720fa9647b8a593e9d54626a7896771c2bfac7f75e2726
@@ -22162,6 +22714,10 @@ sha256=78e0a532bb84d6d85e90244bf3bb0ee9a5246545ebc9b677173e37e231d30cdc
 md5=b823b314e37eb19dae1f297951d2e933
 sha256=0c33d6fceef5483001459bdc934b5831502250b27f1f4ad370ab044f8ab53487
 
+[http://xorg.freedesktop.org/releases/individual/proto/resourceproto-1.1.0.tar.bz2]
+md5=84795594b3ebd2ee2570cf93340d152c
+sha256=408d9ab067e4141d1bb844d2d0d7d26ad177567384190c32a913131cf549b36b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/resourceproto-X11R7.0-1.0.2.tar.bz2]
 md5=e13d7b0aa5c591224f073bbbd9d1b038
 sha256=72df7c8fe3ea2177adcb9442fcc49dfde75231abf0300844bf4551393cdd42b4
@@ -22251,8 +22807,8 @@ md5=b8f0661ac765ce1a2de66ca53e37af83
 sha256=a8168b8884ab40aadebba0ba696b889e25020d32a88e646d4f4bc56f2236b184
 
 [ftp://ftp.freebsd.org/pub/FreeBSD//ports/packages/archivers/rpm2cpio-1.2_2.tbz]
-md5=d4950dc6918ca79a4abab306b6188512
-sha256=5ec970d34b4e22feea0333dae3b5f5ee0e38295d89e306b4929b910f4a2aae25
+md5=63f39118ea5ef7cda84a0638002ed6d2
+sha256=27ffe0392ae193eb04786a2159c099a00fe38ccdaebcebd72afc842c528bb6d3
 
 [http://www.freebsd.org/cgi/cvsweb.cgi/%7Echeckout%7E/ports/archivers/rpm2cpio/files/rpm2cpio?rev=1.2]
 md5=07f64fa3dae6eb8b1b578d01473a5c07
@@ -22286,6 +22842,10 @@ sha256=b02eff373fd66daec2ffd75afd3ad97c32c45679883ee65b21aa50fec92fc752
 md5=99aea04a27197056368a4431f30f9cdb
 sha256=02fc48b5069018e4262f0e5ebb669acedc04167307c98f0fdb2ca22e568e9596
 
+[http://xorg.freedesktop.org/releases/individual/app/rstart-1.0.3.tar.bz2]
+md5=e09c14cf1ac78260f95a9aa45bccab4c
+sha256=d6ee7becf9ece2fcc30ce50f7e9be31f231cce0cb3a8ba09d1697ac2822c3fcc
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/rstart-X11R7.0-1.0.1.tar.bz2]
 md5=6f33a1bd8e99372b7544ddfcad456369
 sha256=d662e932154df4d99ffcf29cd1efe5adb7b0eb1841ccffe9155b9c5d8055434c
@@ -22390,6 +22950,10 @@ sha256=257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee
 md5=3fbb02294a8ca33d4684055adba5ed6f
 sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
 
+[ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz]
+md5=3fbb02294a8ca33d4684055adba5ed6f
+sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
+
 [ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p286.tar.gz]
 md5=797ea136fe43e4286c9362ee4516674e
 sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed
@@ -22694,6 +23258,10 @@ sha256=b502bc765cffc23189b77ba4d22e843fe03404bfab4e24b97ff4daee58176b33
 md5=5d551850e6f4acdf49a13f4eb3a5bbfa
 sha256=db09abf73cc339c05c0488639731794372a4770cfca76c2645f503f9fccd478f
 
+[http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.0.tar.bz2]
+md5=9040c991a56ee9b5976936f8c65d5c8a
+sha256=deaf0a3212617e0dab353a3c3a66e0a1f2398306eca0fd882ac15996b0e44d99
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/scrnsaverproto-X11R7.0-1.0.2.tar.bz2]
 md5=3185971597710d8843d986da3271b83f
 sha256=b709305970c99107d5121717711b244a7cd7a25e65d08f2e97dea8109f17b3cd
@@ -22910,6 +23478,10 @@ sha256=086f67c8272ceca059c64e127dbdb66ccad8de6f532aee02d22786543718a508
 md5=6fab3bb176be9e510c5613d054ef1ca4
 sha256=9b5b139238419757d57de584c2ad30b853367245eef49221ce02a3b403cf2bac
 
+[http://xorg.freedesktop.org/releases/individual/app/setxkbmap-1.1.0.tar.bz2]
+md5=2f902e0a89aaf2b19e06e7f26c6efb3a
+sha256=932f2b314a4bf6dfccd16d63c633073abf650d8e136f481904e972ef3d4faf64
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/setxkbmap-X11R7.0-1.0.1.tar.bz2]
 md5=28b141ab0b1c44a5e90d31ad73bd1078
 sha256=4d710b17c5440518b43d3d1f7cbcb78a62c72f25e48a1b385a0ae3872ec8b40b
@@ -23174,6 +23746,10 @@ sha256=7b408a4e7eb5c4fa6861e3d5f0b49f5ce872c87775fb302a7d36956b77f1e2b9
 md5=baa60d94d99c943b136347a5438ad708
 sha256=b1118e32a03c245fe1140f968fc6d045dae66a7c092f2e42274e9bae3b7b96b8
 
+[http://www.handheldshell.com/software/fso/sms-sentry_1.01.tgz]
+md5=4c21f533aebbe17105374ab0fbcfede3
+sha256=e6ea066943305025dd67e200b272f278911f474c30a4d54bb74268ea930f5130
+
 [http://www.linux-projects.org/downloads/sn9c102-1.32.tar.gz]
 md5=4d5b5bb9c70e69435a608c73da73b632
 sha256=780edfac5a67172a49bc4e8b1bd384fa9184ceaf55bf5ab002fd7b8415db7e3b
@@ -23227,8 +23803,8 @@ md5=a362dc3f5f23d785990917103c76a43d
 sha256=084f8286eb945455f3f1567c0a7e7df3a759f2a4e1aab3b881b8ef1bda5bdb21
 
 [http://gpephone.linuxtogo.org/download/gpephone/soundserver-1.0/soundserver-1.0.tar.bz2]
-md5=14cbf40e5c6ba1ac05a9309d392326fc
-sha256=2cd45d30fcf862f65d3d9a096e69df1e6520920b01cc35fe66e1f21799645614
+md5=95a2346791fb461d570808369ac5a2bb
+sha256=0b1009cd6bb5a345be3fe69048b23c8f3248a86340832861f0ffda9e368a6015
 
 [http://mutab0r.chat.ru/soundtracker-0.6.7.gtk2.tar.bz2]
 md5=e10563187f49d9f39d360d4c59de6c6c
@@ -24066,6 +24642,10 @@ sha256=d2a107e3a5ceaeeb15ab2e3d7cd308653b4ded8aaf8d3c0e0be3b64ba4e17cfc
 md5=85755b15099f6071776d6feb67bdbca8
 sha256=e56a77325cdea8c274a39fcb79bd47919cbafa15d8009176538ec9a94f5e6e13
 
+[http://www.tangogps.org/downloads/tangogps-0.9.7.tar.gz]
+md5=168f30696c6024379d953d4c8b38ff2a
+sha256=5c0e4ad8d48993ea5a8c0b748848501d12ae458a631590a2d7b2a022d3a422c2
+
 [http://downloads.sourceforge.net/tapioca-voip/tapioca-0.3.9.tar.gz]
 md5=e88c400394c092c2688bb2d490c80ccb
 sha256=fb89ac4e8578adc140e19cb4929b200d2898e5a8373230f500c16e59c803cba1
@@ -25198,6 +25778,10 @@ sha256=c4bf829816c3e53b0807bb12cfdc8b1f0e0c1eae14a5be2ffb1a59ad71bbb188
 md5=261038b0a6890207b68a26be10a37822
 sha256=1d645fa76a9482a6630b9a7257d11eabfa94ef4337493ef7075e25cbb8820491
 
+[http://www.techiem2.net/files/usbmode.tar.gz]
+md5=1af56936129a4cf59487f8825cce44b6
+sha256=368b06259170e7e960c8ba4e344e6df45c85ac23476554e84fe9e53667dcfc0e
+
 [http://downloads.sourceforge.net/linux-usb/usbutils-0.70.tar.gz]
 md5=05276dc307a0297904bc892e9998bf59
 sha256=98d29c0c013debc32f1a17fd66f5e9248025959b07d13f1faba91aa5a1a9ba6b
@@ -25306,6 +25890,10 @@ sha256=97748154c41a1cd12635a79aee0c2846fd48ecb555fc8b54e3e5baec174e6e74
 md5=81b9746d6202ccf0b4a498cfd0731e71
 sha256=f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401
 
+[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.3.0.tar.gz]
+md5=51bb54c08415ee3c3000b7df9e9b07c5
+sha256=57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2]
 md5=bc6be634532d4936eb753de54e1663d3
 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd
@@ -25406,6 +25994,14 @@ sha256=d0425be8572be85b8a7ae802a19bcb73fdeac74906f7bcbbc129697ea6a86f3a
 md5=9e5888a79757eb0f47df118b39762ed6
 sha256=9d1cb3661e6c15059e4eecce323b3f118c243d1f17a1883e2b2d7ca0a16987e5
 
+[http://download.gnome.org/sources/vala/0.7/vala-0.7.1.tar.bz2]
+md5=a1e35fe5a7ebeb6c208c1d379e445115
+sha256=906d5a36cbe9d639a528812dc6d43bc6369027e7a0eda7db20646625f1ad2372
+
+[http://www.freesmartphone.org/sources/vala-0.7.3-fso1.tar.gz]
+md5=10371510d6a690fa1e324989e5f05574
+sha256=eee6f3ff0ff6d45ecef8dd6e6135e2faa74cb04d1e03421eb9149e7ac51f2a46
+
 [http://www.freesmartphone.org/sources/vala-0.7.5-fso2.tar.gz]
 md5=1a10e3c3d7c8eab324ecb0d8b81732bd
 sha256=4dfd1ff2793f71ab11d842ff4379a676a30af4287b7b6892ba9733bf7b691c10
@@ -25414,6 +26010,10 @@ sha256=4dfd1ff2793f71ab11d842ff4379a676a30af4287b7b6892ba9733bf7b691c10
 md5=ca44d7e733e4f2058a1e5e8a0aa5d2e0
 sha256=59295d46010c19f7b23f46e60522e6161ffc44685ef20fc04aca8b54d3fd7ef0
 
+[http://ftp.gnome.org/pub/GNOME/sources/vala/0.7/vala-0.7.7.tar.bz2]
+md5=7d11fcddb2bd30b9ecbdacfaa20f2769
+sha256=ebb1afbb0a61dd8f5f8ef13512e789697e98d5ad5f98739120f3b3cc02d46d8f
+
 [http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
 md5=9407d33961186814cef0e6ecedfd6318
 sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
@@ -25458,6 +26058,10 @@ sha256=3cf9b04025015ad06ab3449f20778e34887f5aecdfe367a983ae8e52e394b0df
 md5=44292d74a9a3c94b1ecb9d77a0da83e8
 sha256=ab088478830cd30c2fe34fb7f44ffd4d177af7711c225c24676d3e9e9f24780c
 
+[http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.3.0.tar.bz2]
+md5=fb762146a18207a1e8bc9f299dfc7ac0
+sha256=4f2bc94e5a1b60d6f35a9a2589ca98949e8841997f6a9acf4e85f46c1f34045f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/videoproto-X11R7.0-2.2.2.tar.bz2]
 md5=de9e16a8a464531a54a36211d2f983bd
 sha256=074b4576113e89213940e3ea3901dd035ab317255cd78c929aa52d89227f1f37
@@ -25562,9 +26166,13 @@ sha256=bca8b0073d9527c0293b831c9b8d8f89fc3dc7b5ab30898e7b748843af07a978
 md5=511ffbc8ed8d9df82e7c67852164728c
 sha256=ee1faf72ef745a7d96e44cb4797d92a8cd2c9e290dfe602fae0fd955a11d4f3a
 
+[http://vobject.skyhouseconsulting.com/vobject-0.8.1c.tar.gz]
+md5=c9686dd74d39fdae140890d9c694c076
+sha256=594113117f2017ed837c8f3ce727616f9053baa5a5463a7420c8249b8fc556f5
+
 [http://gpephone.linuxtogo.org/download/gpephone/voicecall-0.1/voicecall-0.1.tar.gz]
-md5=7fa731310c2f5e334ca4eba9c5482965
-sha256=f6ddc993d4890b9500a63345f76acd3eb4a04a9190fcd055f323319627bf104e
+md5=c775c0663a5c499d3f2ac23602e98426
+sha256=52f8a7087960aa8845941d08d4fe58c29670c374fbeccd722dd5fbfe995fb89c
 
 [http://www.wirelessdefence.org/Contents/Files/void11-0.2.0.tar.bz2]
 md5=1c5b3e3e70916de74c2932c7f3e46d9e
@@ -25730,6 +26338,10 @@ sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
 md5=96830836f64edbb12c248eb84e6b0d18
 sha256=b8e200ae66c20897c9aaa80b0044e638a0016d3bdb6e67560fd61f1ef162f305
 
+[http://www.webkitgtk.org/webkit-1.1.4.tar.gz]
+md5=2c941eb9ad9e791fba9b57bf252e3f04
+sha256=8515db4ab3ed408a2e66fbc007cc65466c3206e94c872b6594da10eb38ad7e47
+
 [http://downloads.sourceforge.net/wesnoth/wesnoth-1.4.6.tar.bz2]
 md5=9e92234b29f062b3779750ba3cd0a71b
 sha256=87caf592bd81922908e7ee6ff356c7d46cf5a2cbe46847df7d64aff537ca16b6
@@ -25762,6 +26374,10 @@ sha256=00b2384e225d6a1cbda4994c63103ac229269bb2946537e9357655e5c5b84333
 md5=ed5416cf7e2ba6e66641c88f12768c0c
 sha256=780d249696bb2de7acabded90a465a62cd6cbda3b7f0ccff6ebfdf0d8180f151
 
+[http://xorg.freedesktop.org/releases/individual/proto/windowswmproto-1.0.4.tar.bz2]
+md5=e74b2ff3172a6117f2a62b655ef99064
+sha256=c05bb0edb627554fe97aa1516aed44accf6566b1db0e50332689a24afcebd26b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/windowswmproto-X11R7.0-1.0.3.tar.bz2]
 md5=ea2f71075f68371fec22eb98a6af8074
 sha256=e575dc15f7ac3bd4dd4241be617bd88806506cf6ff1fc9332a42ae2275a5118c
@@ -25826,6 +26442,10 @@ sha256=e9152e09ff174fc4c4cd5ce00e52a15005c738c2a4c0de87f5ff24ca325f9b85
 md5=1fe3c7a2caa6071e071ba34f587e1555
 sha256=d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9
 
+[http://trac.hackable1.org/trac/raw-attachment/wiki/WooshBrowser/woosh-0.1.tar.gz]
+md5=3a9639e077c3d8f85bb59333ef14015b
+sha256=1e8d7eb70f349bfee9eb3f3cb2464c19a4229d0f7faa0a6962a3cd15a460b99f
+
 [http://hostap.epitest.fi/releases/wpa_supplicant-0.2.6.tar.gz]
 md5=7f83c74bf5e6db7dc564c391a44a9fe7
 sha256=f32c5e7607312d3650684977e6d1888a4a53cdb4ba16746225fab66cf345d55a
@@ -26094,6 +26714,10 @@ sha256=569e5a581e5eb16abf1c04a66da22c6dade14578ab34e5e78b8724bb655f1f17
 md5=e91e10ace1df0d5f2cbc74ead256407a
 sha256=1fd18b53fda74ea4649eb9577b1cf86538a25d171f10251eeb30d11cdd5bda8c
 
+[http://xorg.freedesktop.org/releases/individual/app/xauth-1.0.4.tar.bz2]
+md5=fa00078c414c4a57cab7a6d89a0c8734
+sha256=f91190c8b8bb18270b86b00f30da5684bb5e5bd1ed0ccf352322f8145e076a59
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xauth-X11R7.0-1.0.1.tar.bz2]
 md5=ef2359ddaaea6ffaf9072fa342d6eb09
 sha256=cbb271f6c3586210f31953933c4d06bd34272df9c596f5e26124ca3caf8529be
@@ -26106,6 +26730,10 @@ sha256=019578691e8ab02532e35033331e275b658b360033e9e34dfdecf4774d161e3c
 md5=8d2731e6e95f173f41a0ddc875d55804
 sha256=d5e333bc74c0a534bf96f40ea89b7e700f137d46f1fdbaea13fa552ad6227af8
 
+[http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.1.tar.bz2]
+md5=3e39eec6d0fd5c587ca6d55aa7bb8fe1
+sha256=5d32d891c83b9c0089231f4f1c424ab02301b627ce26e5c2e6e397b8ea606fb2
+
 [http://xorg.freedesktop.org/releases/individual/app/xbacklight-1.1.tar.bz2]
 md5=51b4a1c0ae2b3bd77417306fd78a3e94
 sha256=c795001f15974569e16f25b201ac2ac7666c5a646f8d0de3afa0c3a1ba5d64a4
@@ -26206,6 +26834,10 @@ sha256=ced648762382eab09e0ccb87371cb745646ede08ffcb068faa6025d20c4d1f3d
 md5=2b1a3d030d87e62a591db8ee4c0072e6
 sha256=10b5777ae9ef2a10d4cf447bd1bf13372d7061573835c2c87d5c948b65e9577f
 
+[http://xorg.freedesktop.org/releases/individual/app/xclock-1.0.4.tar.bz2]
+md5=bb9fd5e00d39c348a0078b97fdf8258f
+sha256=69b903b6305211c9fc5db394f3d08c0a696aa51942d73db7f594422e7be6edf0
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xclock-X11R7.0-1.0.1.tar.bz2]
 md5=00444fed4bf5cd51624476ee11dd1fab
 sha256=eb93d5278f5e46f8d7ff5b53a10a03fef09326e72966c3a0b8faa255436ee6b9
@@ -26218,6 +26850,10 @@ sha256=1584dcd6d9f5206b1b44eb4645b09b809cb8a6b06eef8b7d6dc9615906692e1b
 md5=fde0b050901f024b19159cdacdcfbd20
 sha256=b2807e96a9d632b7bbf1782a43095de51f3feae3d2e25374d3df00c6c68792ab
 
+[http://xorg.freedesktop.org/releases/individual/proto/xcmiscproto-1.2.0.tar.bz2]
+md5=7b83e4a7e9f4edc9c6cfb0500f4a7196
+sha256=de17c06b7005c5e9ab469e324e76c5c3b8baa2dfc3c1dc7e93438c197facf68e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xcmiscproto-X11R7.0-1.1.2.tar.bz2]
 md5=77f3ba0cbef119e0230d235507a1d916
 sha256=f28e8f6baaaa590ed991314c98f16d114e4668b93c5c6e7fb1bf51f3cc7bf6c0
@@ -26258,6 +26894,10 @@ sha256=e0dd4b753690c650c6bfbb5af9d190fa6bb3d889a491c8553a34ba397ede8bbc
 md5=014bad415e64c49994679cdb71a97e37
 sha256=4e7dcd402cd045ce1bd1a3de496270e78d6ead2478a0bcb3404072b33c5c9ea0
 
+[http://xorg.freedesktop.org/releases/individual/data/xcursor-themes-1.0.2.tar.bz2]
+md5=e8929a1bb4d98d1a3991fd340d0b5f09
+sha256=5f798c2f1d2794c09fa0a40700c40359b725107608012866828015dca47514d6
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/data/xcursor-themes-X11R7.0-1.0.1.tar.bz2]
 md5=c39afeae55a7d330297b2fec3d113634
 sha256=730029a4f23661094f0d246595041e51ec0b55e7405fcd5affee1ec7f9aba813
@@ -26346,6 +26986,10 @@ sha256=6a7bceccb1eb9ce3d14259be7a6cc8268bc9e1f127298480b9322ceb6f032d6d
 md5=cc1816bc62a3722ad509373b0b7f30fe
 sha256=e1169058775a44b0898351d2f645039b4d8946360285831e553587a147b735e9
 
+[http://xorg.freedesktop.org/releases/individual/app/xdm-1.1.9.tar.bz2]
+md5=030ae4bd9b8d428749d68bfdf56ce8a5
+sha256=e7b1db0e1b0d0113a301d94e40b0314e55f7e0006415f50a9cf06f636b11b134
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xdm-X11R7.0-1.0.1.tar.bz2]
 md5=9ac363721dbb8cd39aa1064b260624a6
 sha256=9bf8895b98fb35ee38ac713ce83c80abdd8e33de278e1ddf982a293c31b56b81
@@ -26386,6 +27030,10 @@ sha256=9049146404b9596d70f77a0250d26aff93ba7ba6f42e99f7ee2302a757dfd362
 md5=c56160e93c24ddf17e69891ed50deb72
 sha256=2658d78bbaf8c9effac261f3c229c035fbfda817fa9636dea1e46078213362df
 
+[http://xorg.freedesktop.org/releases/individual/app/xedit-1.1.2.tar.bz2]
+md5=67193be728414d45a1922911e6437991
+sha256=a38823a8b7919e2efa689bc4c279e12314e45b41131c39ce9ca523e54f42fa1f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xedit-X11R7.0-1.0.1.tar.bz2]
 md5=19f607d033f62fb1ee5965f4236b19d4
 sha256=cfbea0872e9963ae3ff61b07000f92d840b65244eec0e1a9750a58a03d70db93
@@ -26426,6 +27074,10 @@ sha256=3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4
 md5=e6841018a7c64983b0954aa2c564d115
 sha256=d33e1f3c96daad78667b2dfc14a1ce2ee3bdce19409f82cd5ede6c696ca5b042
 
+[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.1.1.tar.bz2]
+md5=fb6ccaae76db7a35e49b12aea60ca6ff
+sha256=6d0abd31ddd57c2cb24cecf5fd90b4c29a276e20e3e03ca3c2c57d074f964d99
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xextproto-X11R7.0-7.0.2.tar.bz2]
 md5=c0e88fc3483d90a7fea6a399298d90ea
 sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
@@ -26438,6 +27090,10 @@ sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
 md5=033f14f7c4e30d1f4edbb22d5ef86883
 sha256=530902e8732130e37d9b46e73eecff90d6dbc5d5628620fded74a4e054aa8029
 
+[http://xorg.freedesktop.org/releases/individual/app/xeyes-1.0.991.tar.bz2]
+md5=ba1b886bd6104018fe78ab431d83ce4d
+sha256=594324114bb20a502102a9a584dfa5c63d85aa60b7975fd7587d82d42c8ef115
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xeyes-X11R7.0-1.0.1.tar.bz2]
 md5=3ffafa7f222ea799bcd9fcd85c60ab98
 sha256=e93bb322fe96ceabd0581bb70101aaa1001b0b8f894b3ae0e1fa2e4b38f41af2
@@ -26454,6 +27110,10 @@ sha256=07d2f8a1153d34a6516b8f1129fc32a18f2862bbb58c9bad4637fb282d60385a
 md5=2d6596b2b0cfa527b5ed4df2014684bf
 sha256=953ebb7d7ed579ce648dd6f6a25307c37ad8230a0336ec6fc58247732835f26e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-acecad-1.3.0.tar.bz2]
+md5=dd8821ea9239d86d67a84912f4702adf
+sha256=aedd5657984d45d76045cc61d54709f9c71e4296a4c06b318086ee320209b504
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-acecad-X11R7.0-1.0.0.5.tar.bz2]
 md5=b35b1756579ebe296801622bdf063ab1
 sha256=699ba1716f74db0aaa66aa510ebf195560ff09f88001f98bde9275d2826f30ea
@@ -26470,6 +27130,10 @@ sha256=3db0e3259034d838c2ff7ae26718422db6d33d89cd1a2defa0efdddbbbfcc28a
 md5=2aa75313ea5652a8cf93581c65ee6493
 sha256=219116b0275b93333b8471fc94d97320a116d695c4249837fd97763f00a85d77
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-aiptek-1.2.0.tar.bz2]
+md5=ae6702ead7b4040d0761809ee471c934
+sha256=7d4efd64d8b7be2bcc22c93e365a1a14e8f478b7501ea0d4b34f4bf4cd2ab0b7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-aiptek-X11R7.0-1.0.0.5.tar.bz2]
 md5=9ee5109ef33e281ce0784ad077f26cee
 sha256=62d1dfdc2f902d016999861ec3fd58b4630341e8f4df45e65c7bee730b51fd8e
@@ -26506,6 +27170,10 @@ sha256=26cfa755d3a383f80039fcd286c44ba5f7b353feb8c674f386bb08d741d2c3fe
 md5=4e254fcefb3bea55772e63c12570f6d9
 sha256=1480ba63b342c00a53292d513bd79a69e1ea7c01a0c77d1a368ffb22e37c1a83
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-citron-2.2.2.tar.bz2]
+md5=8cad35da16ea4688ebb74533ccc7f190
+sha256=6d1908d1f1be1ce94fdc946f47d163c45b0a1fc4b9ffb05cc436bac865e1ecaf
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-citron-X11R7.0-2.1.1.5.tar.bz2]
 md5=62b5405d337bc055bc9345565cc0da8c
 sha256=fbac5de06334b6757d91fcc2abc08e2c56c7a57dcba1abdb5c99133decf7f795
@@ -26638,6 +27306,14 @@ sha256=63606119e86c27b47bd7ec4b2b6048b76515df6755fc5dd8bcfc98f5fe53d994
 md5=e926692d74ee81ed459d0fe89439ff8b
 sha256=433fd29043cd427ba486bcce471aae3ad1abca94c8682feff92da0c380b8dff3
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.99.1.tar.bz2]
+md5=b50c24efa826d0d6651f7e314e3c4054
+sha256=a2fca822c9cf65d5e420d370649a5ee40d47cf775adefd8d4ba243e05d6b25de
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.99.2.tar.bz2]
+md5=2412a5d422169e79bde62b8362bc70b7
+sha256=1eae4c4b5927c514aeca060a9ff177a7f2819d0628fad76fef5fd39c52733599
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2]
 md5=d982c6f185f4c75a4b65703ceed7be06
 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
@@ -26658,6 +27334,10 @@ sha256=8ee3b2df90516182460fbda025153aa7fb2c6ba343e4239d225963a287f694f8
 md5=0f3e013d5ff58e0aba3d9e1d18830291
 sha256=87e3dd97d57ddb520cafa5e68fa7846cfc3d9d71cb054cdf0e1d650c7b1cff7e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-fpit-1.3.0.tar.bz2]
+md5=e5bfda480f25121e3c4222e5e1eb5880
+sha256=d1ced3b8c6d799c3af1c93e72dc571cb30d38083e1221b8ea0b2d4fc48a7eef8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-fpit-X11R7.0-1.0.0.5.tar.bz2]
 md5=fc0e11fefc322623914a2d819d5b6d51
 sha256=8f131c2b26b1e0e16e9dfacc73d457bb16cf6e455a1dbdc382f4a3e3b219c703
@@ -26674,6 +27354,10 @@ sha256=d1c20a3340e06c5634759832dcf2edc6acb41476a4f637eba6880730e607f493
 md5=175c1e1ad668ebbbe212c1e975dd14f9
 sha256=689d1c5c1f21eed00ae03a01c57482f7bbef36d7e07156556c99febe28c7d413
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-1.3.0.tar.bz2]
+md5=c50d0da3206d18d9d94f720e3688eca5
+sha256=e7a13a7597fa32f05d595d05a66cf94c529ba8ce1d03249bb9da5be9512c4b7b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-hyperpen-X11R7.0-1.0.0.5.tar.bz2]
 md5=0c4f2a6390e3045e4c48a48b47b6332c
 sha256=708011ed8fdb6d321e7ca91787ff06c7bcb011cc4a3b5d6c0c02562222da7ef4
@@ -26710,6 +27394,10 @@ sha256=1d33b9668e039ea9adc0680c1f2971785508cfd74b2215749db23af23ef8f9ce
 md5=e48b99e55093525ebb7811a014391a0b
 sha256=6cad238e0a54dec75c5224f9c0774b4fce2a03b06f1c61b404e9ea97d4941d4b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-joystick-1.4.99.2.tar.bz2]
+md5=29cce86738411c9f8de04375090bbbec
+sha256=7224e93a8560362d454a104e8bb481213dcb559b41516c7b883c0881e25252bb
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-joystick-X11R7.0-1.0.0.5.tar.bz2]
 md5=9e3ba60836f4c1d2e4cebc63a28321b4
 sha256=9b69192a4368bafeaf94432ec50025dd3f60340290ef2500f6032159870ed489
@@ -26738,6 +27426,14 @@ sha256=7b514715dfb5a2512dea3355bc3f09eb879d7184440c5525f0a9d29ec9f3be42
 md5=d6fe929c4f6085d6dd67f197ae9c42f6
 sha256=33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.3.99.1.tar.bz2]
+md5=94a849a5eb041124b993e3fe4eaaa7f1
+sha256=c4c9222d87aa53cc9afc9fad88e2a20f889c1d603bfb9372ebe84703b39b7285
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.4.0.tar.bz2]
+md5=fd17158ffeacecc8cc670604460cb98b
+sha256=842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-keyboard-X11R7.0-1.0.1.3.tar.bz2]
 md5=8fb8a30fd9d7f152a1aef4eb8ef32b3f
 sha256=e82d510157d13be37eed604cfb0d9355c054c4d3ac39bdef0c6ef320f2973d77
@@ -26822,6 +27518,14 @@ sha256=054b253f366795c2865714ce8bc545c79e59aa9ce1b7a9a4a05b9c674dff9dec
 md5=e7dc0759c14a9bfd373917a49e5f7c7d
 sha256=e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.4.99.1.tar.bz2]
+md5=092c125d0d45a98f8450aefaffd5c10f
+sha256=e9ba5a7c7bd684c641b4f56f828c247d35a8a5d5ed16ca3d058cb9ec1ec3c456
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.5.0.tar.bz2]
+md5=c58629fddf0782dad5c02da6aeb35521
+sha256=f303e20872ab2fb20e07a7f734d17723346d2b4b8687ea2086f7a7468d1ab397
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mouse-X11R7.0-1.0.3.1.tar.bz2]
 md5=12a908e5a97b1b03e8717abf167f4f27
 sha256=183c1cda6550c8821ef4b8d13e681a32813bcd32b6cf34a75d3870e399fa292d
@@ -26838,6 +27542,10 @@ sha256=cc67e0dd4f4fcc8d798f0bfe42b975132c5739bdd80809580a74182e4d1b62ea
 md5=50711d390d2867e3fa7e06b59b2d575b
 sha256=214f0831f36ebfc081b9f31f91ae27972ced9371b9b2256650998596a097061d
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-1.2.1.tar.bz2]
+md5=f28998cdfae2a4c41589299a4ee1f459
+sha256=53bfe976042de69f87e28261ad581cf418c67b5cb69a09cfe1eea169021db35b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mutouch-X11R7.0-1.0.0.5.tar.bz2]
 md5=4758e667bfbba517df2a58d51270cfe2
 sha256=f46f328c9d8ef4dd6fe118121831ff4cd34ea9f06b198f548af4c703a1aab771
@@ -26874,6 +27582,10 @@ sha256=fab08de727da6f56b82d8ecee451a52e7129ff80522e711c5322f1bd2fa9970a
 md5=24594c0222e631fedccc7c540c420b03
 sha256=9cb4e0e83dcefe1ece814d638bd186785b6bc1debe1aa2101ce2a4ea0376805a
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-penmount-1.4.0.tar.bz2]
+md5=d5f1395b2dcefc7533ff5580e63f2066
+sha256=8cb15e9a30f3602d22eba6c7bcca2c1040889ed0851c7b575273671c2da1bff1
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-penmount-X11R7.0-1.0.0.5.tar.bz2]
 md5=065b1cf862864741aebcfefcc7c09539
 sha256=314492cea0998182623f2a67461d64df00b910acd052c3a50f9349ead740151a
@@ -26918,6 +27630,10 @@ sha256=57460dfa0429c58d598f192aa65661300dd104953073d977ad4f4b15a596eda8
 md5=939f1c831c5cd3a6f027e982592dfc5b
 sha256=e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.2.0.tar.bz2]
+md5=2cf0a2b0b3006bcfcd85bb77d966244a
+sha256=ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-tek4957-1.1.0.tar.bz2]
 md5=be8a4bd474ad6c85b93f66dd6fcfa6ee
 sha256=09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727
@@ -26970,6 +27686,10 @@ sha256=b43c5d920821bd06b6a1a131dd071ab838bf024c3cb092c6d1f10d57b648b0e4
 md5=862c230f5f6e0c545f232b4c0fa9537a
 sha256=dde062d6267a3fd9d51b0daee88fd84fceea52a6019de51dece46e92012dbc4f
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-void-1.2.0.tar.bz2]
+md5=c81fbd9368abbe1488b423ddef477e88
+sha256=b01706192b00a777640f2be0a0635bbded70c2ef38863d268372d27d2b53e2a5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-void-X11R7.0-1.0.0.5.tar.bz2]
 md5=c7ae53dee1f3e95fa5ce9659b34d8446
 sha256=ca90a522b78114d72748164c7a99274634cd2b50953f9c52f91b31746c790b5e
@@ -26986,6 +27706,10 @@ sha256=09d7e6cf30b94f141f8ebe2560b301a058f645e74108edc28c908e750865dcec
 md5=4f78650d79656dc803a720049d65682e
 sha256=f0fe020f892e6e3a696a490c86312a1b32672bffb7dead153c24f103540a6185
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-1.2.2.tar.bz2]
+md5=48441a19aaf015570b267f2a8e67d8ab
+sha256=678edd063e1d5e7c7f72ccdda2388c5857559847b3d313c94d659f9bd51c1752
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-apm-X11R7.0-1.0.1.5.tar.bz2]
 md5=323911ab16a6147d3cabceff9336a3d2
 sha256=ceaf4a611b8ee8bc31bc784f1012b0d6be6380e8823f6bf03a9a1ee737264a78
@@ -27002,6 +27726,10 @@ sha256=e5abc4f4ae643ce56d5773f052515196f05786235e4afd155a3232e20dbc84d7
 md5=6826c556ebe9a1248cbc7f7edd44f956
 sha256=8e65e73045fabe37c15f6d4895baa09346bdac2f7537607b523aacd7bcf57594
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ark-0.7.1.tar.bz2]
+md5=be91391f061863617018403cdbd2944f
+sha256=14c34fb3fc894aad7ca24141cbc2283d955849eec920d058ba1aca2a1f5e3b86
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-ark-X11R7.0-0.5.0.5.tar.bz2]
 md5=342937e275dbc92f437417a3186a8222
 sha256=47aa2ecf4129e72e049796571e3125ff3bc8dae7fe31e27d361470d4a3b8d548
@@ -27018,10 +27746,18 @@ sha256=b95553aaf89bef28051c82914cee2b91102dbc2370d0d855404ba453902459b8
 md5=b415bf3259ad0acdaf62e3dde76e3289
 sha256=9018ff84e4866d895c037aad33fb31c79d5f47d3f54707600cc3fe6076485b28
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ast-0.89.9.tar.bz2]
+md5=619f6ff15db869be3800bb001d5b0468
+sha256=880f16d32a373a052515f4ae28a3f1a97543d0d73d2ea5d74baf23bdc3a6b401
+
 [http://xorg.freedesktop.org/releases/X11R7.1/src/driver/xf86-video-ast-X11R7.1-0.81.0.tar.bz2]
 md5=ac1595de8397efd740038994b1e9ef67
 sha256=f0020c88ca3f86b4826c556888b476f081b80010ba78239f95e5349835ad8811
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.12.3.tar.bz2]
+md5=d3b181098799b93de41588d231cae189
+sha256=2d092361a6e872f06401060df411bc7765b9cfe4599d8708c5b63b53572fa658
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-ati-6.6.193.tar.bz2]
 md5=102b781f543213852401f3422b18ccc7
 sha256=9b0899694000cb91d5643e2482376af24bd495cb01b4c9dcdd6ee3545b0aefae
@@ -27058,6 +27794,10 @@ sha256=16a81cdb6b311176936c3326d279c0d75530adbcf9a3489eea55992ac5bc7494
 md5=0fec6bee65383790485d917247a61629
 sha256=05f38c49b23be36afa68b738faf520b8dbf05b92c769107039426651801d4f99
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-1.2.2.tar.bz2]
+md5=a3969c28c3b36ab2caa852a9324e9b70
+sha256=ff6fef2cffc62feb3b23f3fee375e502ab7356d571517a89b4de67f0f6037f0e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-chips-X11R7.0-1.0.1.3.tar.bz2]
 md5=90f23505faceac30d3f46ab94f7293e1
 sha256=2df2e34dc61907fb3c41b4590f51d39f951d2d74422d84f1f7d53ef6f5b25352
@@ -27074,6 +27814,10 @@ sha256=5988962199d5013274f6a6952939e4f405df658bb6616ebf9954c993b1179b1b
 md5=bc28fdedaee9059180e2534f9dbcd2f6
 sha256=e7c99ed66326df5fadf6e5d875859a430fec4369415a27cde72a91109f78bb9c
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-cirrus-1.3.2.tar.bz2]
+md5=8195d03ed0be0975c03441e66a9f53b3
+sha256=529a98a42c94ba5e1b9269e6f7b32a9e76cfd2d4728df08aeba615df8b28ca1a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-cirrus-X11R7.0-1.0.0.5.tar.bz2]
 md5=7708693ad9d73cd76d4caef7c644a46f
 sha256=29e6fdd67e8ec51c534f6123f9935a165711255d935fb9cb28cd44f9db278b3e
@@ -27110,6 +27854,10 @@ sha256=46013885696f3c1a5e05c5d503abc69e691443319a97cf2c6a01ec031e06c910
 md5=3d96297556846bee02a74166ffb5d052
 sha256=5a4bbde0b7f0334bb63b159e5ef6e164be3699e3424734c2bd9823f20a30a278
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-dummy-0.3.2.tar.bz2]
+md5=2a6f1f07462fbe336865068cd69c8593
+sha256=9389cbc21b0b5f90920fdfaad4466f4ec07674bb1ddbbf63cbb8759ace5c45fa
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-dummy-X11R7.0-0.1.0.5.tar.bz2]
 md5=462654f9be7e3022f97147e3390db97a
 sha256=f50f6d3d7fd79c5ce40ea6039a2fb82f136b13c18afbc2b7e941d41d6568b698
@@ -27170,6 +27918,10 @@ sha256=a0edd1109c03efdb0f6defc18745f89fb3c11142381e2657f94d492ddd1e7419
 md5=6d7afdac0a26cf201c3f3b417c31c5e1
 sha256=161780d2127d0548a2017ca461ce38e7a69afce5d921a08604e91478c6be1cda
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-glint-1.2.4.tar.bz2]
+md5=960df34e129faa411e58c0d6b56d79a3
+sha256=5f8d6e3b02c261d235bae63d95510b940b6c9a775301146b3c229926ed99d76f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-glint-X11R7.0-1.0.1.3.tar.bz2]
 md5=f14c2f1696c05760207adcaac856e5e5
 sha256=d5b4cb7b490edc3be57c40a00299002b60b8060396b3c902b2bf92090fcbd940
@@ -27198,6 +27950,10 @@ sha256=62eadebd3417ffb3857f10f16597c59541ceb135ddbc30b2140f46d9eb7dddd7
 md5=3b170a6df5114420cd4021a057918a09
 sha256=49bb23625654ebcd74d0d23f534b074188f4b21c3cd443b06ac83b9485bf9a75
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i128-1.3.3.tar.bz2]
+md5=a597e8efeec6ab8bc6ba6d87fceb2dba
+sha256=4d0691ce8e3b54075d05cc34717350be42915174b3930b2c9b7f5e309b32b02e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i128-X11R7.0-1.1.0.5.tar.bz2]
 md5=078eed8c3673488ee618dfc7a3ef101b
 sha256=543d7b8bc0c9e7889c686a647f98641f0a9b052e58321a8a17518d680e6db95a
@@ -27214,6 +27970,10 @@ sha256=b8f2144c987d8a14f8b477ee3aa43fc1c76d040a77e40938c3c97c8e34e2b7c5
 md5=d0e5a805c546b29b1dd3b55a68d16dc4
 sha256=59c8f6ee465bef033c1c20bfff8121a318efda9656d5dc29f674bb655f18486f
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-i740-1.3.2.tar.bz2]
+md5=4ac1318788f62159965f15131c869e7a
+sha256=48549c6a3d8c0a0d417fc486e77f3f7c6815df7e8ede04bb4c539666be2bf943
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-i740-X11R7.0-1.0.0.5.tar.bz2]
 md5=625448b13ebe2a13b7defad1efec05c4
 sha256=b0f2f2dd17bd01018fa91d042214b596f9d2303a81a0b86de102400b00f87d09
@@ -27266,10 +28026,26 @@ sha256=5afdc91e93ffed09ea5258c6fde210c729ea2b44d83f98acfd92c3da7e99e64b
 md5=440c014bbd3072b5d379fe1bdb861918
 sha256=b35a142aeba034ad06b8d9b477c243f82ce9f82ad65a0ee4408630f228e90258
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.8.99.901.tar.bz2]
+md5=10059edc5382d9bccd80cdfcd2a84281
+sha256=d9dcd7bc94bfb9fcf5f75b5cfdc9927a525d06f9a166ee10d6ae4ddf8aed4ffc
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.8.99.902.tar.bz2]
+md5=589c6ffac2e1978fd3f18595968239b0
+sha256=6191c0f4f7985ef353ba73808a5d81ed0d64193b93e483bbd85b7df9526b576c
+
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.9.0.tar.bz2]
+md5=34ff2582993d64dddd62d0cb7b30d759
+sha256=69f4f4992ceee24ab3dace23abdd995c2fc776538732d7e2457b7c21b8142e51
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.0.tar.bz2]
 md5=6081b8fa50c689d51f85c2fbaf93867e
 sha256=fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mach64-6.8.2.tar.bz2]
+md5=6c0522b2b72a0a47c48d718443616651
+sha256=b91194033023a41793a525a631789df1d229b228af0d44dcbe20b06ed66c671d
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.4.1.tar.bz2]
 md5=ba373233a7d13084d14046a17b02e248
 sha256=5becb5f0caf0f99296db28b32be46eb95d0a88ac8e4829c47cb637fb52d06564
@@ -27278,6 +28054,10 @@ sha256=5becb5f0caf0f99296db28b32be46eb95d0a88ac8e4829c47cb637fb52d06564
 md5=11066b84b949cd04300ec819c9c51532
 sha256=d57dd2323052f064092167a232fb7576f46e5d62e98bc9cc6a7f270cc8d0fdc0
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.9.100.tar.bz2]
+md5=3e80cfb84b62866d2f94774ecbf3e46c
+sha256=e8efee8d5269eb29f9bd499db3d47a6a4d3c320d4b0a24874cdf7b598ad77a5c
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-1.9.99.tar.bz2]
 md5=29785ff1de2b0f7b7f1c48350449447c
 sha256=82a91e523d40625c9e042ee640276756d1169cca7eb305c691a3378805c4c81c
@@ -27298,6 +28078,10 @@ sha256=d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86
 md5=a72f57fca4f4dff9a2c82eb1fe7456f4
 sha256=96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-1.2.4.tar.bz2]
+md5=2d722ee9b9fe8da49109f280689c9c25
+sha256=434da2986d007243f4590a86d16a1632a9611b71de44d6e46f28bd3cdb898353
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-neomagic-X11R7.0-1.0.0.5.tar.bz2]
 md5=ffe9015678a41e97bdbd2825066bb47b
 sha256=cfaa594be277cd2a1bf9d796bb398e07319e9b34cff306b408145a37925dc97f
@@ -27310,6 +28094,10 @@ sha256=2f3ba4a6775c66de2b269179a219bf1fcfee85c74db273c85784d80209e1ce81
 md5=2bd8e5b9ea68e0dcd80dfcaca0eff82c
 sha256=66ac855452690ef896400577806dc1dd86318940f8a62ce20039037318b1ce08
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-newport-0.2.2.tar.bz2]
+md5=92d7d807cb70d3c1b9e716fb6d0d24df
+sha256=9c9e21d6d285aad4f13106233973ec249bc695ce68e35009ed96e5c8dc5ebfde
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-newport-X11R7.0-0.1.4.1.tar.bz2]
 md5=d74d9896d57c3caf224ba3472630d874
 sha256=88d4b58efd0dca626e926ce6dc531026c8a10e7126f2e6544e31a2fc00001c67
@@ -27342,6 +28130,10 @@ sha256=97d47df7720d3cfcb56c4debca9218c3fc5352d34d82bc4880c8a620185f8c5e
 md5=42f12a36d7afc26c817e8e8f5c8b7274
 sha256=f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.14.tar.bz2]
+md5=118637515155624f8846c481a637c8c2
+sha256=8560ef6254dde37810e553278e2c3893af71f892869ea3538d533871855b0bdd
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.3.tar.bz2]
 md5=f9b38e24157c3aac6014119ac18d76da
 sha256=8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952
@@ -27374,14 +28166,26 @@ sha256=f645da4120b3ad5356b46269ae13ef8e2315bbb443a8c147e05c611f7fa21df7
 md5=c0820787e89958c9114d359b6a3cd464
 sha256=b7e4858d6b5c6428fae2485a2c2097cdf6073268ef812aae2ccbc3d936db7410
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-openchrome-0.2.904.tar.bz2]
+md5=f2481d98ef54febf5bffbb88a2a2426d
+sha256=c7bdf7c48365b1d077a4be7ccc652cf3f7a0f385fddeb2d4fe71b00b6c6b7aea
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.0.tar.bz2]
 md5=007bec0c6b07d9d3aeca4da18e561efb
 sha256=5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-r128-6.8.1.tar.bz2]
+md5=2b90854a62a4d45d652062f582dc8d13
+sha256=517e21cc83850b903549d698c9daeb633e8b9ba5b187fe298409cc51975a9eca
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-radeonhd-1.2.0.tar.bz2]
 md5=6a932ec17da9ce5a6d9000c1649c3a7e
 sha256=87c6353dd52bbe22d3a45f28fb39de1dd44f41568aaf8a9b0d45a7ed62313e27
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-radeonhd-1.2.5.tar.bz2]
+md5=10669b08101cb6d69894cc44b47e5094
+sha256=382e2a113117e469f295fa533064c7f21645b5da26b1ef4a0490c977c5ff62c5
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.1.3.tar.bz2]
 md5=a8b97feccb32184820d5856fe78d34db
 sha256=37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408
@@ -27390,6 +28194,10 @@ sha256=37e7aef72f7466485f5a3bafd0d43190cb7439de16868bfba2c59bb4c9df4408
 md5=7c03de3804d4c4f6ff59f74050d24b2b
 sha256=b57b62f707d87534a799170e31b33311449cfd7019a56e6b4fa85a4c7faaae15
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-rendition-4.2.2.tar.bz2]
+md5=562955e5c0abb19e5f050a100be2c920
+sha256=7d1f9f2bf7c52d720b0b3c0df8e6ea71e47166e2453a021401354198fbaa0145
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-rendition-X11R7.0-4.0.1.3.tar.bz2]
 md5=f1a25db74a148dea45115e813027b932
 sha256=4ad42c65f60bc7f3f37f636eae5ae5a9049cdd4df5c546f93f201fdf16213f48
@@ -27406,6 +28214,10 @@ sha256=4a1206cb1a200aad8881216547d9913d0e24928138f3b1bb912a3336b9c05c97
 md5=d05e7c3cb044437eda8663e174ba913c
 sha256=ed07e4648b0f405fddd563783b49f971d649dd07cc8bc7737a93ff3d90f6c067
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3-0.6.3.tar.bz2]
+md5=5eb06d88533fb327d067928faeb20860
+sha256=ed9f65aa6eb1811d8c16cddfce00c5fc5880d6d46b907a83ef77700610085144
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-s3-X11R7.0-0.3.5.5.tar.bz2]
 md5=83b9e8a9b8fc1c49bda2811358e5007c
 sha256=3e11f78c39eb03fe4b9e6a2b68347420297fa38cd36f42235ee4be9c87175103
@@ -27418,6 +28230,10 @@ sha256=b9b9abdd80c00782ca2e1313016c3d3904dc10a1de1c94d29cd4efafeb1f52f3
 md5=4a293047e988d4ea1e9e96d3b5793f43
 sha256=9094115621ef73c957cf887332717ec727c751959b1059e3d00fbfe0114a978a
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.10.4.tar.bz2]
+md5=6517bbbf808c700502d51acdc44662f8
+sha256=1cd00d6e71fdbd70dafe3beb8911d22cbdc5ef7b32d2d81c454ac8a18c967fb8
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-s3virge-1.9.1.tar.bz2]
 md5=a91c73285ef67ee7cd9e2da28acb6cc4
 sha256=cef5702963f49e737fb8b1472dc0241f7a5da49f844ac77f2df3e693a84bc822
@@ -27442,6 +28258,10 @@ sha256=f5f154df377cb445935d1453d6b7095d63912d5776dcb44f8d3c2f10ab1a3cc5
 md5=62b8aba48b54eaefeae87df502bf219c
 sha256=adf95cae0fbaf72326c51c4c9e61486eef062bb1706f6ab46d942f2c36d8a37e
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-savage-2.3.1.tar.bz2]
+md5=66c319f610e3699c3de0f3ef630abb32
+sha256=2b4adcdd820a6f3acba6f3c0995f5899edc8f5e33fb4c4666c4c7a78090ddaab
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-savage-X11R7.0-2.0.2.3.tar.bz2]
 md5=6b638dd500d10dba1822d3ea5061fc65
 sha256=e4ee3af5989cc9b0c8ff59082f64a564420dc22a2eb9fd53e41da24260a65e98
@@ -27458,6 +28278,10 @@ sha256=54cf791695a53d4836d32f899b7d34b969edf5415f02e36956b6e72993e21cd7
 md5=a8419a8ed17b02b2a6dd4d30d5e94b00
 sha256=cc5301b9c6adb9a0770509b8570d38730d43e9ffce6d6886cd9a090965017e53
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-siliconmotion-1.7.3.tar.bz2]
+md5=29fb322cd3adab52cc7f1ac86f9315bb
+sha256=ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-siliconmotion-X11R7.0-1.3.1.5.tar.bz2]
 md5=957de4e2a3c687dbb2e9e18582397804
 sha256=6723b5b7e9ea5b3aebcbbaeaca59790e6a9ab6a7d5324c671454e426854aef3f
@@ -27474,6 +28298,10 @@ sha256=bcc0dcde5d469cc2500676e0ad29dcd12b1370066289902387ead762260e4b40
 md5=9f57c2f5ccbd8340db32da1c74083771
 sha256=11529f094cbdcdaba505596488eda623e0f0bd3c51139359d587ea58b6527307
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.10.2.tar.bz2]
+md5=f04baa307e49e9f0e5a5c3d2e89a5576
+sha256=3aad701799e355669b9027a9baedd623fe6b7ce93da9ac22b6902fd7e38128c2
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sis-0.9.3.tar.bz2]
 md5=e35d817fa4ee7beb6cd5aa744b9c0783
 sha256=898ee8fb16fff89ba8ac5c83b9f5a2371084719db0cf034140427229191436f6
@@ -27502,6 +28330,10 @@ sha256=76b79c9b7d3b35b8e2e5354569bf0936c4afd39a9dcbdf66327714d75137930a
 md5=42069e70578bf3fb353cdacad186f6c0
 sha256=b3ca934ce3e31f4a162bf263cad3913edccc46906d09132118b74a2095c157d9
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-sisusb-0.9.3.tar.bz2]
+md5=be59e9c2d9458cee0b5006549c14a95d
+sha256=1df9a90ecc31d5fb63de7c970555f166dab24c0f633b54aaac4ee82fa7b49bb2
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-sisusb-X11R7.0-0.7.1.3.tar.bz2]
 md5=781d726a0ca54b65521e383ab99043c8
 sha256=6f972b126774d3d051b2f683e82661c07a1b4787b8ce04847eae80b283c5feb3
@@ -27526,6 +28358,10 @@ sha256=aa656c99ff6ba9c1013b6060c92bbcda2c30ceff72ecc49139c65eb935844f43
 md5=9e25784e912cb2f0493b87431fd60773
 sha256=1eca2b0970e725db49f9e462a0c2e618b2616389647335b5aec9d6e495e40527
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg14-1.1.1.tar.bz2]
+md5=8e4bd0a6b155cb861356e7430d667aee
+sha256=cb43007920394b000be98ea0eac16a1cc16b4ca7ea8532b5d803a0c7574720d8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg14-X11R7.0-1.0.0.5.tar.bz2]
 md5=8f3a734d02ae716415f9c6344fa661bd
 sha256=809a8d57a49c07991d350d4bff955656256afa2c99978050d2aa320d071ef52d
@@ -27538,6 +28374,10 @@ sha256=f9a1ee987c554607c6fed4ae27adbf75c825d628fe522802a717429a85327487
 md5=b9cb8cfb6a4234bebc434f744af53208
 sha256=3564ebc8ccdfea872d46559166d881e93ac7c17e3ed46bb4087960f491c37df9
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg3-1.1.1.tar.bz2]
+md5=bb6c4def5cfb0959b72dccb661473d4a
+sha256=d56fe98c34f2af1b6424e3fcaa22a31402a4b59d63679f0e5fdfb1d2ea878419
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg3-X11R7.0-1.0.0.5.tar.bz2]
 md5=799a54cef1f4435e00fa94a1d97d056f
 sha256=31831c2f44e7d28c928d816c2c5074cc0ec1f0cc83994bf28e46c7f840ab8866
@@ -27550,6 +28390,10 @@ sha256=9be5402d4f8f32154c01065f7b01a99e61c2deff959715eb8656259c63195adb
 md5=aa6b7836fe6ccc99994bf15ff2b74e86
 sha256=d6b1f3b79c57ef5281e0204b2847812cf9fa5df616478f01591445a36537194b
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suncg6-1.1.1.tar.bz2]
+md5=bc9904a9129aaf73408568ae1e2fa65f
+sha256=d1216c7c2be78d1dafad0cd46e464e9fa08f5e04544b76d9a0c547374c85801f
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suncg6-X11R7.0-1.0.0.5.tar.bz2]
 md5=2227f3fb86b02148f347e002662e53c8
 sha256=f6ddac6bc0b0a446ff9401467e4219340151498824d98c9274ed38a959330aea
@@ -27594,6 +28438,10 @@ sha256=6c7339466d5b3cfc3c6ea3ca4ec4bad2f16666f1c472efc4f3048c1f711c67d4
 md5=779a31151e44d2fd2a5ee1794f836889
 sha256=72986a3981b746f60df1aba443d610db437fe8d5053e64630686f471c47b01cf
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-suntcx-1.1.1.tar.bz2]
+md5=b064a8d2f3d481ec36ef9ac17e13a77d
+sha256=543115c4b3a8603dcc9d7a3030c9e7ce20baf6e3976d92ff951cfea80b54981e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-suntcx-X11R7.0-1.0.0.5.tar.bz2]
 md5=74d6ba5e55afdfebff84db08b6589e26
 sha256=38eb95f2991fab51c3442022bcef258de508ebfa0c631024edbdf55a1c4f24fd
@@ -27610,6 +28458,10 @@ sha256=6b1a00df5c9628817d08f07c6f18f578950744f3eb63b4397be8b0754e728624
 md5=b13132f24683ef759bfb0c1db5096496
 sha256=c3be06d324f2e49ece1f243b10d7180a32fbe65dbbb81e162279c8608800dead
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tdfx-1.4.3.tar.bz2]
+md5=8161bbf2b100c21b609163f0010766b3
+sha256=3ad935ca0aa306d10d1e6125a6bd485a3948c184dcfda01670961dc4740ebf33
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tdfx-X11R7.0-1.1.1.3.tar.bz2]
 md5=0201415230bf0454384c3bad099520d2
 sha256=65e95c95bc4fa5fdb766b7edf8f39253cf8496fca66bc4bc06f260ab9e9ce504
@@ -27646,6 +28498,10 @@ sha256=f942596e7427a089be9c9353c45c22002999580197c9715d9363d19ee170ba8d
 md5=e89799579d0cf3858362bd751469e0bf
 sha256=a4f66c9f46f6e93c2c1f10e782a211ddc338b0ff9f0a2ccd2d660db031d3ddb5
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-trident-1.3.3.tar.bz2]
+md5=47f3c5da1942017218355f178f02ef84
+sha256=6241eab6f3f0a075380be6b614e33ad72256242c865115bc8b696f83a75d11f5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-trident-X11R7.0-1.0.1.2.tar.bz2]
 md5=69f28afc7b585d01bb06b1e2f872f8ea
 sha256=b7958afb0204bb1d3c8a33e7a56b94a6d4f09426dbcd141ef327e28f523d42eb
@@ -27662,6 +28518,10 @@ sha256=c9c1f3318715b7268068bc733d00bcab93924e97eb38f94548e442fd6cdfd56e
 md5=f98fc22142a009dc3a6cdf930c95203f
 sha256=1090d9100934329000ac330d0c66a0ac4f60d2ba83196ea15c2833a28a18b1e3
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tseng-1.2.2.tar.bz2]
+md5=f55df4cb0e6cffcd3721164f35dfc88d
+sha256=4785e36a90177b1c8af8fa1c6fb64c0d68b1f78efe4923d62b8c941a44bf84ef
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-tseng-X11R7.0-1.0.0.5.tar.bz2]
 md5=981f46914c1e54742418f0444ea2e092
 sha256=5e67a6893375585be731b0fd822e9c3407a0930f7addbc8cf01fffad57f9d0b6
@@ -27702,6 +28562,10 @@ sha256=f20b2e429657552eea207fb8bc4b47c8e293d99c229dcb4da11b7c5bfdc1e165
 md5=9a86b683f73f3806f55d05cd804a6f4a
 sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.2.1.tar.bz2]
+md5=61a1dc9a22991bd04d0ff98f800775c1
+sha256=a3657971232e9c7db3e7517a8aedd86d3ef4d159f7099ec974cdd03aafa41080
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2]
 md5=049ada4df1abb5aa2b6633ba90353e78
 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452
@@ -27750,6 +28614,10 @@ sha256=91ed99ae936be5df25d310d81e31e0a7efefc023e462d93a9289ac18ebdf4e89
 md5=6d78c82ea7c2bb0fcb587d7bb4e8f60a
 sha256=3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.8.tar.bz2]
+md5=25287a202c986b33bd79fbe379c96a16
+sha256=956443948d94f7459b0056d8cb8ff2cd9fba4621d8b61f0257cb84469ea7da07
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2]
 md5=4df79349e26add4c23f6be8bec347ad4
 sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a
@@ -27766,6 +28634,10 @@ sha256=3975601baee674b2bad0dfe696586f17cc913f1dc7f1d5c4e184623e0461751c
 md5=7c681d9b57f5e1f798263fc1a9d99245
 sha256=b79ba6d5d4300570c00f8be37c536f47f2d78c18845f70f525da2a29e47c4b8c
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-voodoo-1.2.3.tar.bz2]
+md5=c164effcc839eca1fc1d43a42f4086db
+sha256=025d4d99ab19325b72417fadbb099c757412988f800c9511be3e2c3993ae29e9
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-voodoo-X11R7.0-1.0.0.5.tar.bz2]
 md5=e00cc814ebdb3f3067e075bc93b26199
 sha256=2241fd7e5ae8de43f109f712f5125afa6ec5156068c941d7b65981ac7ce7548a
@@ -27778,6 +28650,10 @@ sha256=35409b42f843ac3b352e344253f3075b2d9c8ae2ac5af02962fd67575427e066
 md5=c159af867a9af3abc4da332189213a76
 sha256=39e358aa17d939f561a28c82b9e7beca202d7ebd7d40d401c88a9dff3d90d148
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-wsfb-0.3.0.tar.bz2]
+md5=d6b5d25dfd61fa5113216d10a6dcbb50
+sha256=78bdb6d397869dbd8560ae1f0ee65473977d19ca5afc9fa7638c35057284989e
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-xgi-1.5.0.tar.bz2]
 md5=08529fd015191be9244f598aa0894aa6
 sha256=5fb23432ee8940c04494744da8b5f58bebc6ef113e96a50a74f0aa7d98a69194
@@ -27790,6 +28666,10 @@ sha256=13a1658ee3ead0ab8e8bf7a9c8f8f0e3e40e38138f45d8431e735cd7184fbbd8
 md5=a318c1e86123832d7b0c95fc7d47ef35
 sha256=01b475b5b27709a738db6f94ce2ded37f5db0792e8d9318069ecf1690a15f124
 
+[http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.2.0.tar.bz2]
+md5=120e226ede5a4687b25dd357cc9b8efe
+sha256=ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86bigfontproto-X11R7.0-1.1.2.tar.bz2]
 md5=5509d420a2bc898ca7d817cd8bf1b2a7
 sha256=56498126f54f123e2ffde0a883ccbc914097818e85bfa6b2a4a47df687f50b79
@@ -27810,6 +28690,18 @@ sha256=3ee1db2481ea222269bd201eef4d0e5d8ca4dbdb5eeb4852cf1efc42d4269b60
 md5=42fdcebc66efac02ab4beec2b1b0ad6e
 sha256=5ac4d4a308b032727c61fd56db5a2eaadaedfbce5bc9dc504320bff9d696b002
 
+[http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.0.99.1.tar.bz2]
+md5=a0135bcc07009475a9db5aee362566fc
+sha256=53caab2363d7f995f5927adb606ad7b1dfaeb87f6c4bcb44fe32690118f4619c
+
+[http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.0.99.2.tar.bz2]
+md5=760c1e3489388c41c630716358cc11bb
+sha256=b4605630de7d8612ff363ead965ee67f1ec83df4453acd24ad2b46831ddee2e6
+
+[http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2]
+md5=a036dc2fcbf052ec10621fd48b68dbb1
+sha256=ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86dgaproto-X11R7.0-2.0.2.tar.bz2]
 md5=48ddcc6b764dba7e711f8e25596abdb0
 sha256=c66920f0ad6921a33098008cd01f05eb9a47f550d214065dc6c7072f176c82cf
@@ -27822,6 +28714,10 @@ sha256=111c469a24374803b08104c725d8318760b226cedccd12b199c83d1b2756b8d6
 md5=01470d088da3a8a3deefa8e1f45d69cb
 sha256=f57da66bec8563502fe95c0e3f6ed297d9985862f5b64a5c9d3039719ac7f9da
 
+[http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.1.0.tar.bz2]
+md5=309d552732666c3333d7dc63e80d042f
+sha256=d23f12deffd03e582e897ed6a7df3ea7f66ee8577f0f61374dcdf2ebffdce1be
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86driproto-X11R7.0-2.0.3.tar.bz2]
 md5=839a70dfb8d5b02bcfc24996ab99a618
 sha256=256fd04cbd97b2b96e7ef808b6752561da855ded3835a1bb0d7acbe07758e924
@@ -27846,6 +28742,14 @@ sha256=861b881e2ac1e9164048c06217b54dffb5d88feb0bf72abf31984e663843b923
 md5=f00844a63d6e76b69eb0eb5e41eed843
 sha256=07152f990cc79ec5931989decc4a90b1919147e98ff6fcfe39507a9d3fc4d96e
 
+[http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.2.99.1.tar.bz2]
+md5=128a61f6e275cb76566e4ce477631938
+sha256=7b4042dd55ac6629c515675c68c4bdc206cb1b62ab23073b3a4bf6d0ad18331e
+
+[http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.3.tar.bz2]
+md5=4434894fc7d4eeb4a22e6b876d56fdaa
+sha256=8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2]
 md5=475f19a2ffbfab9a0886791c5f89c978
 sha256=2497487e51cb2e94dfe540b9084f625f8018eb0853a699d724be790b26d9fd15
@@ -28034,6 +28938,10 @@ sha256=5a3ad18fdc67e261454740217f7c02d1b6825013abcebdcd778a4865fd823353
 md5=f10717e45535b64eb45226aac571dac2
 sha256=34b5040b3db7552fc1cdfa46f926ce5b7217ea5d77cfafbbddf94fbae6b4f482
 
+[http://xorg.freedesktop.org/releases/individual/app/xfs-1.1.0.tar.bz2]
+md5=5cfc06a320f74f07a0aa73da62307e9a
+sha256=47bad4bbcd0488a8e573aa6efe3438076c4d27c498d6f642f3aa27262eb95f6d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xfs-X11R7.0-1.0.1.tar.bz2]
 md5=a297da3d906110e9c29ec56c5ea578a8
 sha256=5d9df9048863f6d281fc1b71601ff7d31d5075eceeba462b3a32dd4734440c6a
@@ -28138,10 +29046,26 @@ sha256=5e3db5f2387457f67798d664ed67c67337d2f84c45f15d986ee2f46f9b45d0d1
 md5=d12efb18c7e3025c5e6a6f63144c2145
 sha256=b968a10f52b0c5e807ec4c2c106f3aea301cf0ac00d04299b6961370c82c66d8
 
+[http://downloads.sourceforge.net/xine/xine-lib-1.0.tar.gz]
+md5=96e5195c366064e7778af44c3e71f43a
+sha256=6a283d383358200a9d6866d5d666a0227c8412d9c33d41f166f39c011482aed4
+
+[http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1.0.tar.gz]
+md5=96e5195c366064e7778af44c3e71f43a
+sha256=6a283d383358200a9d6866d5d666a0227c8412d9c33d41f166f39c011482aed4
+
+[http://heanet.dl.sourceforge.net/xine/xine-lib-1.0.tar.gz]
+md5=96e5195c366064e7778af44c3e71f43a
+sha256=6a283d383358200a9d6866d5d666a0227c8412d9c33d41f166f39c011482aed4
+
 [http://downloads.sourceforge.net/xine/xine-lib-1.1.0.tar.gz]
 md5=3537cfd58d253b4be20a4975e7086e38
 sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64
 
+[http://heanet.dl.sourceforge.net/xine/xine-lib-1.1.0.tar.gz]
+md5=3537cfd58d253b4be20a4975e7086e38
+sha256=795085a067b3a11c1b3de48b4d07b01d8ffb6123bd188a73cb53b0605f875c64
+
 [http://downloads.sourceforge.net/xine/xine-lib-1.1.16.3.tar.bz2]
 md5=4f508abf088cf427a731f85634c8260d
 sha256=d25a241efa55dc7d8f482336efa8bb7b9bb9d69b6df8a8a37f2660948fd67b52
@@ -28158,6 +29082,14 @@ sha256=86402c93b332c44b4e79c568137257d567de1f95cd5f6f6e5433b7e67b40050a
 md5=1cc292c562962ad0ad3a253cae68c632
 sha256=e8a62b1cafbcfc3b9fed147612ed4320233d0c9d6de30c991c2cd0c691c40910
 
+[http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.1.99.1.tar.bz2]
+md5=ae9dde9a3a81880cb718b36d32198fcd
+sha256=2ea707c1961772fb099c3ed41bbf485c766007c6d7bbbf067c112f113207eb93
+
+[http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.2.tar.bz2]
+md5=a8aadcb281b9c11a91303e24cdea45f5
+sha256=58e88087ceec7201d918f94d6b1247325adca2a9903fed11291b412427a7ba64
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xineramaproto-X11R7.0-1.1.2.tar.bz2]
 md5=80516ad305063f4e6c6c3ccf42ea2142
 sha256=f74d0dfb47d23f544a67464427754adf3fbc52b76b4a68834ab1caf8dc5406df
@@ -28194,6 +29126,10 @@ sha256=b4218fd4ca5e431bf69cba848c21e91235fda30504634b9f6b6cd011dcbd8999
 md5=9144097186c3d2454beffe8ac3b53c6e
 sha256=c79ec1a4d60404715a626f2832f1b62f43b9d52a1e4642b40af743ee41362590
 
+[http://xorg.freedesktop.org/releases/individual/app/xinit-1.1.1.tar.bz2]
+md5=93c73705ed9eb1e1a6b6938405672f2b
+sha256=b103d2cf9e1cd8b049e28bb1109f3da3a14287bbce3ab8b2f427d55a6e5f4785
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xinit-X11R7.0-1.0.1.tar.bz2]
 md5=6d2df59fa328cbc99c0de98bc2e14597
 sha256=e55c61ede6760ce0d8eaac6dc386850c7873311ab038c69338e35559ec0bbd02
@@ -28210,6 +29146,14 @@ sha256=330c3e5188abf256131c162c456060804f369349e9a0e7aa3efbc54add802e45
 md5=58e619576cbf4b6057eebb7a97fe2ddf
 sha256=3195916b6cebf109eb571b939d7cea7075ef1933782526a6d8fbbb353bc3924b
 
+[http://xorg.freedesktop.org/releases/individual/app/xinput-1.4.99.2.tar.bz2]
+md5=66cb86beeb27c53f7de1bb39b918ec2f
+sha256=144424a1c92c61eaab78c0e03535a9b749512beec66076d2546ecf3a64d095ce
+
+[http://xorg.freedesktop.org/releases/individual/app/xinput-1.4.99.3.tar.bz2]
+md5=cc2b98b561b6431bd1e06d13ad2c7b5e
+sha256=53c03bbb1aaff55bdb8a82fbf8056a4a0ccbbcfce399307ead5dc54aaa075688
+
 [http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.0.3.tar.bz2]
 md5=2fbcae1323c266edf5b6c61751f2e343
 sha256=0635bae5dae3c933ebba997475ae14fa213aee1f2ea8aaff2ca76c50f8aec716
@@ -28222,6 +29166,14 @@ sha256=fefc574bf639d64348939edf9654306af2bb3c20447be9cff493cb06d87cb672
 md5=6cc96c3e4ed5d9802fe717beac008f19
 sha256=204403e0388e83127212109310037d17f56c3c3fd3c96d7dcaa0df99684f00c1
 
+[http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.1.0.tar.bz2]
+md5=362380be3b3bed56c9ce45622eafc2c9
+sha256=cc6714454b88b3dd8086f99b42bbca77cd76bbeaef17a81070f22a21d75a168e
+
+[http://xorg.freedesktop.org/releases/individual/app/xkbcomp-1.1.1.tar.bz2]
+md5=38c387bacdc01038c8ac280588792bcf
+sha256=9775bcfd43d9ffa41e2865e5b2c933f419bf983d7a529b3103656c76fd82e663
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xkbcomp-X11R7.0-1.0.1.tar.bz2]
 md5=46d1e015897200d4dfed64990abaa8b9
 sha256=35825e80fa1905111302b5c069f5419f5fe63b370f9c437adb8c901fc10cfd16
@@ -28346,6 +29298,10 @@ sha256=1f239057cdfb2164b2e8fc229e2518d20b27a853f975e73618a4a81f09ebeb02
 md5=7c6a783e42c88360ac31d259a864a19d
 sha256=51dd943e607ddd8067fd13cd597998fb00560cbf06450a8c374563a78a86da43
 
+[http://xorg.freedesktop.org/releases/individual/app/xmag-1.0.3.tar.bz2]
+md5=32f7ed4c089365cadb9382f6fbd750a9
+sha256=0368268a352d302d0b84229a71e3ea0e8d1c44019b1f06b6301ad7a106418553
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmag-X11R7.0-1.0.1.tar.bz2]
 md5=38ac487ac1b75be0253fe7f973947386
 sha256=d039d857c6d334d481452c20f5e419b1e120e03e6c9af709f071d9c00ffd9cd1
@@ -28446,6 +29402,10 @@ sha256=4bed79ba6efcaabb3ce055cf88419a5190f8ab9d3408e7b14d722351cbaf4b44
 md5=626731003ec22a74ecf9e44ed098bbdf
 sha256=c3bfc724792858222c138c1ae9a017e69e7d3bdda3fc9f5da38b232ab031147f
 
+[http://xorg.freedesktop.org/releases/individual/app/xmodmap-1.0.4.tar.bz2]
+md5=bbe021f812e0014a8ee3692317788119
+sha256=805a63525d99f59d60a11aa89121fb9cdb001c8d542237ac4deafbadc7bd0bed
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xmodmap-X11R7.0-1.0.0.tar.bz2]
 md5=240ed53111925e005d2f138ea98ef5e1
 sha256=017530da4262a6e52c87cb8ea47aebc83fcd82346cc8072f02ba9de060407be3
@@ -28494,6 +29454,10 @@ sha256=b7b8593b055e29dedc0631e1db9781583038afc67bce0f715fdf3201570d1e4e
 md5=f817c5df43817846c1b27bac83da74d7
 sha256=23648ac11d5cc57f3e1e747a73bd1c4f83c42a657969814af0d399fdd3d7beec
 
+[http://xorg.freedesktop.org/releases/individual/doc/xorg-docs-1.4.99.901.tar.bz2]
+md5=c0d818df7b9e6c6733ce93212b35b051
+sha256=436790e0e2817bf11cb5c0680f0aaeb2d3b9292e6b01b00909c426e9131470c8
+
 [http://xorg.freedesktop.org/releases/individual/doc/xorg-docs-1.4.tar.bz2]
 md5=4f2005bdd430a98c262901383459009e
 sha256=fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925
@@ -28550,6 +29514,26 @@ sha256=a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 md5=ed0878bf32a24d4948c3b8a122a39eff
 sha256=0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.6.3.tar.bz2]
+md5=0af168abeefa6579cab20387f75c0c7a
+sha256=7de60906f128b43730585ed760ece8979146dff841038ddc59bff4ad5d4ed308
+
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.6.99.901.tar.bz2]
+md5=f30ecd48ae45f5bbe62fd17e81ee28c3
+sha256=9a4f6f2c78036686fa04128e545adc3ffa4ace876e9521c68a2f04d679965e05
+
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.6.99.902.tar.bz2]
+md5=ca914aa3b9a01c037fedcf7bc5964d73
+sha256=b6ec7a0d0c2aa227b1ca7376e820979f439f10d2c53d707758742dcc0e148192
+
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.6.99.903.tar.bz2]
+md5=3a2f20ebbeeae5c13f7a78df314b1164
+sha256=bafeea3f317e804013065a5659fa4743820d18ff361cbab178ea08134e6f1e06
+
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.0.tar.bz2]
+md5=e0b70d3d542959f677210172d2b0f237
+sha256=e55996b1e4217f84c61fd8d1126d7171295d83ddfaa63c5c516c63bf4703a6c4
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -28566,6 +29550,10 @@ sha256=211f4d13d8cd726b10553534a4d0f0267b18d39dd30b2f5bc6dfcde9f6d6b8c9
 md5=ae3d4f73c42953b0a5513bb2967ab913
 sha256=be1fbd7646a55eb9a9ad161f9b83034ba88a82c780e29d4a7888db2495947f25
 
+[http://xorg.freedesktop.org/releases/individual/doc/xorg-sgml-doctools-1.2.99.901.tar.bz2]
+md5=bd264b9f01aadafad74989e293853da5
+sha256=769919b80b84d24c9427dad7eab1cace4e3864965869ae3518fb8a643daf0cb4
+
 [http://xorg.freedesktop.org/releases/individual/doc/xorg-sgml-doctools-1.2.tar.bz2]
 md5=f930e5be117922f0841614c8d43f1ae8
 sha256=4def78f2e0e002f5693b61b53ab4325fbc150d3614fe53818e8df9b365a4dbea
@@ -28690,6 +29678,10 @@ sha256=6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592
 md5=1a2b31430d04340be2e49e8b6445e076
 sha256=fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee
 
+[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.16.tar.bz2]
+md5=75c9edff1f3823e5ab6bb9e66821a901
+sha256=8224da1ce19c0ded4e07a325f3ed62bb4453782db97fd175cb3ffd1acaeb9672
+
 [http://xorg.freedesktop.org/releases/development/X11R7.2-RC3/proto/xproto-7.0.9.tar.gz]
 md5=937c572775ff4a2edfbbf5568dc0e959
 sha256=e68db1c55c1c6d398098d69096b3c3b35863b5d25ef216cb2d1d4364ab0000af
@@ -28722,6 +29714,10 @@ sha256=632f3ff492a07f8279807ffbafe4f89af069bb0e7b4934b3ddf7379509aa9303
 md5=41a9d0cc073fa6165a31fbf9e85f68a6
 sha256=ab06b77f3a2b8866279e096f9d2702ac644681424eb0aec39e4eb7199f152207
 
+[http://xorg.freedesktop.org/releases/individual/app/xrandr-1.3.2.tar.bz2]
+md5=2cb19bb1c19ccf77c40032b03dbe06f0
+sha256=34d4334644a6494573141bb8647feb8f91c0ce8c8d3b6883b4861e038e912249
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrandr-X11R7.0-1.0.1.tar.bz2]
 md5=e433ccca3c4f9ab8609dfd1c9c8e36ea
 sha256=40ccd95d26c43d326fb8396ca758334bf34854336007b46285d3e881cb66e73a
@@ -28770,6 +29766,10 @@ sha256=67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257
 md5=5f65e24f8a225e255beb2059e33d6b37
 sha256=a51ac7c607f2f79de771807f590ccfe8b1819dae6f30dd615dd2afbe6007c4e4
 
+[http://xorg.freedesktop.org/releases/individual/app/xrx-1.0.3.tar.bz2]
+md5=c121945afcfc84e99af17158fda68be9
+sha256=9cb0fc67153ce935550d61dfd3d021cb3e6833274453538885b7cddff9fe8abe
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xrx-X11R7.0-1.0.1.tar.bz2]
 md5=9de3b04392c98df59c79a34fd51c385f
 sha256=2a177a9f36c92fdc109260a7c04980db6920fb9d3529d79e9bc019ae7f5a310e
@@ -28874,6 +29874,10 @@ sha256=0e3fd7d9902442df13c954316a194251e9b9acc197ae939d8b2fae66b8864d11
 md5=2f41fd983ba4d89419204854936025e2
 sha256=6c3e74bb36beab92b918f0db12198d2526675276c724558a1de71d7789d0bdad
 
+[http://xorg.freedesktop.org/releases/individual/app/xset-1.1.0.tar.bz2]
+md5=eeb0d02f69c76bd40470dede99b4bd49
+sha256=72c859c6030890a25cf828d0b2743454e50eadab30f6be8c17172fe97a554643
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xset-X11R7.0-1.0.1.tar.bz2]
 md5=a0350e334a215829166266e2ce504b1c
 sha256=db17d017fff06df2e47f9d123bfb4f1d63a063eb3c08ec017292cc206bb293d1
@@ -28954,6 +29958,10 @@ sha256=a3a947e9982fe1feef235fcbcf41b01b5f86ebf46d106fa719801cf061f6bb00
 md5=3de8a3756c284a46a08c6d0308909486
 sha256=652f579171e6e8f73c13ab6b060d2447ae35ebfbd39a6002b7c05a1dfc0f7eb8
 
+[ftp://ftp.debian.org/debian/pool/main/x/xtrace/xtrace_0.10.1.orig.tar.gz]
+md5=65bfd5f3b3bd076586b17c20a5635a40
+sha256=828d68d5f7cacdbe078f7cb9e5a4e1768f4e462e8e172be5d0d882d74038200c
+
 [http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.0.3.tar.bz2]
 md5=bb196907ea1e182dcb396eb22f7d2c1a
 sha256=e1a3c4986f16a5fbca611d0547cc7499a1fa47ca2096593644037e2609363085
@@ -28974,6 +29982,10 @@ sha256=9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd
 md5=f9cf791dfad59cf044e276aab3a71e1d
 sha256=a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0
 
+[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.4.tar.bz2]
+md5=b3b57e78dc06885e79f8393a83619715
+sha256=a26adb573ec47a21a8772d8ad89690c629c9128f8d3037d9037b032ae24cc76e
+
 [http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.tar.bz2]
 md5=a91fef8b932b21992af7dfff7b2643f3
 sha256=d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4
@@ -29210,6 +30222,10 @@ sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6
 md5=791e8986c6e16dcd1c9878126725e06b
 sha256=eba57692dadd21df8d4afaea4daf8db5179c7398e11cd019fd462aa6947f4119
 
+[ftp://ftp.gnome.org/pub/gnome/sources/zenity/2.20/zenity-2.20.1.tar.bz2]
+md5=b9989582ea43f8fd58819d85ef9c9bc5
+sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36
+
 [http://ftp.gnome.org/pub/GNOME/sources/zenity/2.20/zenity-2.20.1.tar.bz2]
 md5=b9989582ea43f8fd58819d85ef9c9bc5
 sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
new file mode 100644
index 0000000000..e6738b8c01
--- /dev/null
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -0,0 +1,2148 @@
+PREFERRED_VERSION_0xffff ?= "0.2"
+PREFERRED_VERSION_0xffff-native ?= "0.2"
+PREFERRED_VERSION_aalib ?= "1.4rc5"
+PREFERRED_VERSION_abiword ?= "2.6.4"
+PREFERRED_VERSION_abiword-embedded ?= "2.6.4"
+PREFERRED_VERSION_abiword-plugins ?= "2.6.4"
+PREFERRED_VERSION_abuse ?= "0.7.0"
+PREFERRED_VERSION_acpid ?= "1.0.4"
+PREFERRED_VERSION_acx-firmware ?= "1.0"
+PREFERRED_VERSION_addressbook ?= "0.1"
+PREFERRED_VERSION_adns ?= "1.0"
+PREFERRED_VERSION_agg ?= "2.5"
+PREFERRED_VERSION_aircrack ?= "2.41"
+PREFERRED_VERSION_aircrack-ng ?= "0.9.1"
+PREFERRED_VERSION_albumshaper ?= "2.1"
+PREFERRED_VERSION_aliens ?= "1.0.0"
+PREFERRED_VERSION_aliens-qt ?= "1.0.0"
+PREFERRED_VERSION_alsa-lib ?= "1.0.15"
+PREFERRED_VERSION_alsa-oss ?= "1.0.15"
+PREFERRED_VERSION_alsa-plugins ?= "1.0.14"
+PREFERRED_VERSION_alsa-state ?= "0.2.0"
+PREFERRED_VERSION_alsa-utils ?= "1.0.15"
+PREFERRED_VERSION_anthy ?= "7811"
+PREFERRED_VERSION_anthy-native ?= "7811"
+PREFERRED_VERSION_antlr ?= "2.7.7"
+PREFERRED_VERSION_antlr-native ?= "2.7.7"
+PREFERRED_VERSION_apache2 ?= "2.2.3"
+PREFERRED_VERSION_apache2-native ?= "2.2.3"
+PREFERRED_VERSION_apex-env ?= "1.5.8"
+PREFERRED_VERSION_apex-nslu2 ?= "1.5.8"
+PREFERRED_VERSION_apex-nslu2-16mb ?= "1.5.8"
+PREFERRED_VERSION_apmd ?= "3.2.2"
+PREFERRED_VERSION_applewmproto ?= "1.0.3"
+PREFERRED_VERSION_appres ?= "1.0.1"
+PREFERRED_VERSION_appweb ?= "2.0.4"
+PREFERRED_VERSION_apr ?= "1.3.3"
+PREFERRED_VERSION_apr-util ?= "1.3.4"
+PREFERRED_VERSION_apt ?= "0.7.3"
+PREFERRED_VERSION_apt-native ?= "0.7.3"
+PREFERRED_VERSION_argtable ?= "2.7"
+PREFERRED_VERSION_ark3116 ?= "0.4.1"
+PREFERRED_VERSION_arpwatch ?= "2.1a15"
+PREFERRED_VERSION_aspell ?= "0.60.5"
+PREFERRED_VERSION_aspell-native ?= "0.60.5"
+PREFERRED_VERSION_asterisk = "1.4.17"
+PREFERRED_VERSION_asterisk-sounds ?= "1.2.1"
+PREFERRED_VERSION_at ?= "3.1.8"
+PREFERRED_VERSION_atd ?= "0.70"
+PREFERRED_VERSION_atftp ?= "0.7"
+PREFERRED_VERSION_atk ?= "1.20.0"
+PREFERRED_VERSION_atmelwlandriver ?= "3.4.1.0"
+PREFERRED_VERSION_atomic ?= "1.0.1"
+PREFERRED_VERSION_audiofile ?= "0.2.6"
+PREFERRED_VERSION_audioplayer ?= "1.0"
+PREFERRED_VERSION_aumix ?= "2.8"
+PREFERRED_VERSION_autoconf ?= "2.61"
+PREFERRED_VERSION_autoconf-native ?= "2.61"
+PREFERRED_VERSION_autofs ?= "4.1.4"
+PREFERRED_VERSION_automake ?= "1.9.6"
+PREFERRED_VERSION_automake-native ?= "1.10"
+PREFERRED_VERSION_avahi ?= "0.6.22"
+PREFERRED_VERSION_avahi-python ?= "0.6.21"
+PREFERRED_VERSION_avahi-ui ?= "0.6.21"
+PREFERRED_VERSION_avetanabt ?= "20060413"
+PREFERRED_VERSION_bacula-client ?= "1.38.11"
+PREFERRED_VERSION_balsa ?= "2.0.17"
+PREFERRED_VERSION_base-files ?= "3.0.14"
+PREFERRED_VERSION_base-passwd ?= "3.5.9"
+PREFERRED_VERSION_bash ?= "3.2"
+PREFERRED_VERSION_bash-completion ?= "20040711"
+PREFERRED_VERSION_bazaar ?= "1.2"
+PREFERRED_VERSION_bb ?= "1.2"
+PREFERRED_VERSION_bc ?= "1.06"
+PREFERRED_VERSION_bdftopcf ?= "1.0.1"
+PREFERRED_VERSION_beecrypt ?= "3.1.0"
+PREFERRED_VERSION_beecrypt-native ?= "3.1.0"
+PREFERRED_VERSION_beep ?= "1.2.2"
+PREFERRED_VERSION_beepmp ?= "0.9.7"
+PREFERRED_VERSION_beforelight ?= "1.0.2"
+PREFERRED_VERSION_benchfft ?= "3.1"
+PREFERRED_VERSION_bigreqsproto ?= "1.0.2"
+PREFERRED_VERSION_bigreqsproto-native ?= "1.0.2"
+PREFERRED_VERSION_billiardz ?= "0.1.4"
+PREFERRED_VERSION_bind ?= "9.3.6"
+PREFERRED_VERSION_bing ?= "1.1.3"
+PREFERRED_VERSION_binutils ?= "2.18"
+PREFERRED_VERSION_binutils-cross ?= "2.18"
+PREFERRED_VERSION_binutils-cross-sdk ?= "2.18"
+PREFERRED_VERSION_bison ?= "2.0"
+PREFERRED_VERSION_bison-native ?= "2.0"
+PREFERRED_VERSION_bitbake ?= "1.8.6"
+PREFERRED_VERSION_bitchx ?= "1.1"
+PREFERRED_VERSION_bluesnarfer ?= "0.1"
+PREFERRED_VERSION_bluez-cups-backend ?= "3.33"
+PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0"
+PREFERRED_VERSION_bluez-gnome ?= "0.14"
+PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.33"
+PREFERRED_VERSION_bluez-hcidump ?= "1.42"
+PREFERRED_VERSION_bluez-libs ?= "3.33"
+PREFERRED_VERSION_bluez-utils ?= "3.33"
+PREFERRED_VERSION_bluez-utils-alsa ?= "3.33"
+PREFERRED_VERSION_bluez4 ?= "4.39"
+PREFERRED_VERSION_bmon ?= "2.1.0"
+PREFERRED_VERSION_boa ?= "0.94.13"
+PREFERRED_VERSION_bochs ?= "2.1"
+PREFERRED_VERSION_bogofilter ?= "0.96.0"
+PREFERRED_VERSION_boost ?= "1.33.1"
+PREFERRED_VERSION_boost-asio ?= "0.3.7"
+PREFERRED_VERSION_boost-jam-native ?= "3.1.11"
+PREFERRED_VERSION_bootchart ?= "0.9"
+PREFERRED_VERSION_bootmenu ?= "0.7"
+PREFERRED_VERSION_bootsplash ?= "3.0.7"
+PREFERRED_VERSION_bootsplash-native ?= "3.0.7"
+PREFERRED_VERSION_brickout ?= "2002.06.09"
+PREFERRED_VERSION_brutefir ?= "1.0i"
+PREFERRED_VERSION_bt950-cs ?= "0.1"
+PREFERRED_VERSION_btscanner ?= "2.0"
+PREFERRED_VERSION_btsco ?= "0.42"
+PREFERRED_VERSION_btsco-module ?= "0.42"
+PREFERRED_VERSION_btxml ?= "1.0"
+PREFERRED_VERSION_busybox ?= "1.13.2"
+PREFERRED_VERSION_busybox-static ?= "1.2.1"
+PREFERRED_VERSION_bvi ?= "1.3.1"
+PREFERRED_VERSION_bwmon ?= "1.3"
+PREFERRED_VERSION_bzflag ?= "1.10.6.20040515"
+PREFERRED_VERSION_bzflag-server ?= "1.10.6.20040515"
+PREFERRED_VERSION_bzip2 ?= "1.0.2"
+PREFERRED_VERSION_cacao-cldc ?= "0.98"
+PREFERRED_VERSION_cacaoh-cldc-native ?= "0.98"
+PREFERRED_VERSION_cairo ?= "1.8.0"
+PREFERRED_VERSION_cairo-directfb ?= "1.4.8"
+PREFERRED_VERSION_cairomm ?= "1.2.4"
+PREFERRED_VERSION_calc ?= "0.0.1"
+PREFERRED_VERSION_calendar ?= "1.0"
+PREFERRED_VERSION_came ?= "1.7"
+PREFERRED_VERSION_camera-assistant ?= "0.2.0"
+PREFERRED_VERSION_camsource ?= "0.7.0"
+PREFERRED_VERSION_c-ares ?= "1.3.0"
+PREFERRED_VERSION_cbrpager ?= "0.9.14"
+PREFERRED_VERSION_ccache ?= "2.4"
+PREFERRED_VERSION_cccc ?= "3.pre84"
+PREFERRED_VERSION_ccdv ?= "1.0"
+PREFERRED_VERSION_ccdv-native ?= "1.0"
+PREFERRED_VERSION_ccxstream ?= "1.0.15"
+PREFERRED_VERSION_cdparanoia ?= "9.8alpha"
+PREFERRED_VERSION_cdrtools-native ?= "2.01"
+PREFERRED_VERSION_cdstatus ?= "0.96.05"
+PREFERRED_VERSION_cdtool ?= "2.1.8"
+PREFERRED_VERSION_cdump-native ?= "1.0"
+PREFERRED_VERSION_centericq ?= "4.11.0"
+PREFERRED_VERSION_cetools ?= "0.3"
+PREFERRED_VERSION_cetools-native ?= "0.3"
+PREFERRED_VERSION_cflow ?= "2.0"
+PREFERRED_VERSION_cfu1-modules ?= "2.6"
+PREFERRED_VERSION_check ?= "0.9.2"
+PREFERRED_VERSION_checkers ?= "1.0.5ern"
+PREFERRED_VERSION_cherokee ?= "0.5.5"
+PREFERRED_VERSION_cherokee-nossl ?= "0.5.3"
+PREFERRED_VERSION_chillispot ?= "1.0RC3"
+PREFERRED_VERSION_chkhinge ?= "20040706"
+PREFERRED_VERSION_chmlib ?= "0.38"
+PREFERRED_VERSION_chrpath ?= "0.13"
+PREFERRED_VERSION_chrpath-native ?= "0.13"
+PREFERRED_VERSION_ckermit ?= "211"
+PREFERRED_VERSION_clamav ?= "0.91.1"
+PREFERRED_VERSION_clamsmtp ?= "1.8"
+PREFERRED_VERSION_classpath ?= "0.97.2"
+PREFERRED_VERSION_classpath-gtk ?= "0.97.2"
+PREFERRED_VERSION_classpath-minimal ?= "0.97.2"
+PREFERRED_VERSION_classpath-native ?= "0.97.2"
+PREFERRED_VERSION_clearsilver ?= "0.10.3"
+PREFERRED_VERSION_clish ?= "0.7.1"
+PREFERRED_VERSION_cmake-native ?= "2.4.7"
+PREFERRED_VERSION_cms92init ?= "0.1"
+PREFERRED_VERSION_compositeproto ?= "0.4"
+PREFERRED_VERSION_comprec ?= "0.02"
+PREFERRED_VERSION_confuse ?= "2.5"
+PREFERRED_VERSION_confuse-native ?= "2.5"
+PREFERRED_VERSION_connect ?= "0.1"
+PREFERRED_VERSION_connman ?= "0.22"
+PREFERRED_VERSION_conserver ?= "8.1.14"
+PREFERRED_VERSION_console-tools ?= "0.3.2"
+PREFERRED_VERSION_contacts ?= "0.7"
+PREFERRED_VERSION_coreutils ?= "5.3.0"
+PREFERRED_VERSION_coreutils-native ?= "5.3.0"
+PREFERRED_VERSION_corkscrew ?= "2.0"
+PREFERRED_VERSION_corsair ?= "0.2.6"
+PREFERRED_VERSION_cpio ?= "2.5"
+PREFERRED_VERSION_cppunit ?= "1.10.2"
+PREFERRED_VERSION_cpuburn ?= "1.4"
+PREFERRED_VERSION_cpufreqd ?= "1.1.2"
+PREFERRED_VERSION_cpusage ?= "0.2"
+PREFERRED_VERSION_cpuspeed ?= "1.1"
+PREFERRED_VERSION_cramfs ?= "1.1"
+PREFERRED_VERSION_cramfs-native ?= "1.1"
+PREFERRED_VERSION_crimsonfields ?= "0.4.8"
+PREFERRED_VERSION_crimsonfields-native ?= "0.4.8"
+PREFERRED_VERSION_cron ?= "3.0pl1"
+PREFERRED_VERSION_cross-linkage ?= "1.0"
+PREFERRED_VERSION_crossword ?= "0.0.3"
+PREFERRED_VERSION_cscope ?= "15.5"
+PREFERRED_VERSION_ctags-native ?= "5.5.4"
+PREFERRED_VERSION_ctorrent ?= "1.3.4"
+PREFERRED_VERSION_ctrlproxy ?= "2.6.2"
+PREFERRED_VERSION_cumulus ?= "1.2.1"
+PREFERRED_VERSION_cups ?= "1.2.12"
+PREFERRED_VERSION_curl ?= "7.18.2"
+PREFERRED_VERSION_curl-native ?= "7.18.2"
+PREFERRED_VERSION_custominput ?= "1.1.0"
+PREFERRED_VERSION_cvs ?= "1.12.9"
+PREFERRED_VERSION_cxcrypt ?= "1.0"
+PREFERRED_VERSION_cyrus-imapd ?= "2.2.12"
+PREFERRED_VERSION_cyrus-sasl ?= "2.1.19"
+PREFERRED_VERSION_damageext ?= "1.0"
+PREFERRED_VERSION_damageproto ?= "1.1.0"
+PREFERRED_VERSION_dash ?= "0.5.2"
+PREFERRED_VERSION_dasher-gpe ?= "0.0cvs20040828"
+PREFERRED_VERSION_dates ?= "0.4.4"
+PREFERRED_VERSION_davfs2 ?= "0.2.8"
+PREFERRED_VERSION_db3 ?= "3.2.9"
+PREFERRED_VERSION_db3-native ?= "3.2.9"
+PREFERRED_VERSION_db ?= "4.3.29"
+PREFERRED_VERSION_dbench ?= "4.0"
+PREFERRED_VERSION_dbh ?= "1.0-18"
+PREFERRED_VERSION_db-native ?= "4.3.29"
+PREFERRED_VERSION_dbus ?= "1.2.14"
+PREFERRED_VERSION_dbus-native ?= "1.2.1"
+PREFERRED_VERSION_dbus-glib ?= "0.78"
+PREFERRED_VERSION_dbus-glib-native ?= "0.76"
+PREFERRED_VERSION_dbus-native ?= "1.0.3"
+PREFERRED_VERSION_dbus-python ?= "0.71"
+PREFERRED_VERSION_dcetest ?= "1.2"
+PREFERRED_VERSION_dcopidl2cpp-native ?= "3.5.4"
+PREFERRED_VERSION_dcopidl-native ?= "3.5.4"
+PREFERRED_VERSION_dcron ?= "2.3.3"
+PREFERRED_VERSION_ddclient ?= "3.6.3"
+PREFERRED_VERSION_debianutils ?= "2.30"
+PREFERRED_VERSION_dejagnu ?= "1.4.4"
+PREFERRED_VERSION_dejagnu-native ?= "1.4.4"
+PREFERRED_VERSION_detect-stylus ?= "0.13"
+PREFERRED_VERSION_device-mapper ?= "1.01.05"
+PREFERRED_VERSION_devimage ?= "0.1"
+PREFERRED_VERSION_devimage-image ?= "1.0"
+PREFERRED_VERSION_devio ?= "1.2"
+PREFERRED_VERSION_devio-native ?= "1.2"
+PREFERRED_VERSION_devlabel ?= "0.48.01"
+PREFERRED_VERSION_devmem2 ?= "1.0"
+PREFERRED_VERSION_devshell ?= "1.0"
+PREFERRED_VERSION_dgen-sdl ?= "1.23"
+PREFERRED_VERSION_dhcdbd ?= "2.0"
+PREFERRED_VERSION_dhclient ?= "2.0pl5"
+PREFERRED_VERSION_dhcp ?= "3.0.2"
+PREFERRED_VERSION_dhcpcd ?= "1.3.22-pl4"
+PREFERRED_VERSION_dhcp-forwarder ?= "0.7"
+PREFERRED_VERSION_didiwiki ?= "0.5"
+PREFERRED_VERSION_diethotplug ?= "0.4"
+PREFERRED_VERSION_diet-x11 ?= "1.1.3"
+PREFERRED_VERSION_diffstat ?= "1.39"
+PREFERRED_VERSION_diffutils ?= "2.8.1"
+PREFERRED_VERSION_dillo ?= "2.0"
+PREFERRED_VERSION_dillo2 ?= "0.6.6"
+PREFERRED_VERSION_dircproxy ?= "1.1.0"
+PREFERRED_VERSION_directfb ?= "1.1.0"
+PREFERRED_VERSION_directfb-examples ?= "1.0.0"
+PREFERRED_VERSION_display-brightness ?= "1.0.0"
+PREFERRED_VERSION_distcc ?= "2.18.3"
+PREFERRED_VERSION_djvulibre ?= "3.5.19"
+PREFERRED_VERSION_dmxproto ?= "2.2.2"
+PREFERRED_VERSION_dnsmasq ?= "2.38"
+PREFERRED_VERSION_docbook-utils ?= "0.6.14"
+PREFERRED_VERSION_docbook-utils-native ?= "0.6.14"
+PREFERRED_VERSION_dosbox ?= "0.70"
+PREFERRED_VERSION_dosfstools ?= "2.11"
+PREFERRED_VERSION_dosfstools-native ?= "2.10"
+PREFERRED_VERSION_dpkg ?= "1.13.25"
+PREFERRED_VERSION_dpkg-native ?= "1.13.25"
+PREFERRED_VERSION_driftnet ?= "0.1.6"
+PREFERRED_VERSION_driftnet-nogui ?= "0.1.6"
+PREFERRED_VERSION_dropbear ?= "0.51"
+PREFERRED_VERSION_dsniff ?= "2.3"
+PREFERRED_VERSION_duma ?= "2.5.7"
+PREFERRED_VERSION_dvb-image ?= "1.0"
+PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814"
+PREFERRED_VERSION_dviviewer ?= "1.0.2"
+PREFERRED_VERSION_e2fsprogs ?= "1.38"
+PREFERRED_VERSION_e2fsprogs-libs ?= "1.41.2"
+PREFERRED_VERSION_e2fsprogs-libs-native ?= "1.41.2"
+PREFERRED_VERSION_e2fsprogs-native ?= "1.38"
+PREFERRED_VERSION_e2tools ?= "0.0.16"
+PREFERRED_VERSION_e2tools-native ?= "0.0.16"
+PREFERRED_VERSION_eb ?= "4.3"
+PREFERRED_VERSION_ebtables ?= "2.0.6"
+PREFERRED_VERSION_eciadsl ?= "0.11"
+PREFERRED_VERSION_libecj-bootstrap ?= "3.3"
+PREFERRED_VERSION_editres ?= "1.0.2"
+PREFERRED_VERSION_eds-feed ?= "0.3.2"
+PREFERRED_VERSION_eel ?= "2.12.2"
+PREFERRED_VERSION_ekg ?= "1.6"
+PREFERRED_VERSION_elfkickers ?= "2.0a"
+PREFERRED_VERSION_elfkickers-native ?= "2.0a"
+PREFERRED_VERSION_elftoaout ?= "2.3"
+PREFERRED_VERSION_elftoaout-native ?= "2.3"
+PREFERRED_VERSION_elfutils ?= "0.127"
+PREFERRED_VERSION_elvis ?= "2.2.0"
+PREFERRED_VERSION_elvis-tiny ?= "2.2.0"
+PREFERRED_VERSION_emacs ?= "20060801"
+PREFERRED_VERSION_emacs-x11 ?= "20060801"
+PREFERRED_VERSION_emelfm2 ?= "0.0.8"
+PREFERRED_VERSION_empathy ?= "0.5"
+PREFERRED_VERSION_emul ?= "1.0.5"
+PREFERRED_VERSION_enca ?= "1.9"
+PREFERRED_VERSION_enchant ?= "1.3.0"
+PREFERRED_VERSION_encodings ?= "1.0.2"
+PREFERRED_VERSION_enscript ?= "1.6.4"
+PREFERRED_VERSION_entrance ?= "0.9.0.010"
+PREFERRED_VERSION_epiphany ?= "2.19.6"
+PREFERRED_VERSION_erlang-native ?= "R11B.1"
+PREFERRED_VERSION_erlang ?= "R11B.1"
+PREFERRED_VERSION_esmtp ?= "0.5.1"
+PREFERRED_VERSION_esound ?= "0.2.36"
+PREFERRED_VERSION_espgs ?= "8.15.3"
+PREFERRED_VERSION_etherpuppet ?= "0.2"
+PREFERRED_VERSION_ethload ?= "1.2"
+PREFERRED_VERSION_ettercap ?= "0.6.b"
+PREFERRED_VERSION_e-uae ?= "0.8.28"
+PREFERRED_VERSION_eventlog ?= "0.2.5"
+PREFERRED_VERSION_evieext ?= "1.0.2"
+PREFERRED_VERSION_evince ?= "2.23.4"
+# The only e-wm recipe is a cvs one with SRCDATE floating!
+# PREFERRED_VERSION_e-wm ?= "0.16.999.042"
+PREFERRED_VERSION_exiv2 ?= "0.15"
+PREFERRED_VERSION_exmap-console ?= "0.4.1"
+PREFERRED_VERSION_exml ?= "cvs"
+PREFERRED_VERSION_exo ?= "0.3.2"
+PREFERRED_VERSION_expat ?= "2.0.0"
+PREFERRED_VERSION_expat-native ?= "1.95.7"
+PREFERRED_VERSION_expect ?= "5.44.1"
+PREFERRED_VERSION_ez-ipupdate ?= "3.0.10"
+PREFERRED_VERSION_ezx-boot-usb-native ?= "0.1.0"
+PREFERRED_VERSION_ezx-gpiotool ?= "1877"
+PREFERRED_VERSION_faac ?= "1.24"
+PREFERRED_VERSION_faad2 ?= "2.0"
+PREFERRED_VERSION_fakechroot ?= "2.5"
+PREFERRED_VERSION_fakechroot-native ?= "2.5"
+PREFERRED_VERSION_fakeconnect ?= "1.2.1"
+PREFERRED_VERSION_fakeroot ?= "1.9.6"
+PREFERRED_VERSION_fakeroot-native ?= "1.9.6"
+PREFERRED_VERSION_fam ?= "2.7.0"
+PREFERRED_VERSION_farsight ?= "0.1.5"
+PREFERRED_VERSION_fastcgi ?= "2.4.0"
+PREFERRED_VERSION_fastjar-native ?= "0.95"
+PREFERRED_VERSION_fbgetty ?= "0.1.698"
+PREFERRED_VERSION_fbgrab ?= "1.0"
+PREFERRED_VERSION_fbpanel ?= "4.3"
+PREFERRED_VERSION_fbreader ?= "0.8.2a"
+PREFERRED_VERSION_fbset ?= "2.1"
+PREFERRED_VERSION_fbui-utils ?= "0.9.14c"
+PREFERRED_VERSION_fbvncserver ?= "0.9.4"
+PREFERRED_VERSION_fbvncserver-kmodule ?= "0.9.4"
+PREFERRED_VERSION_fceu ?= "0.98.13-pre"
+PREFERRED_VERSION_fconfig ?= "20060419"
+PREFERRED_VERSION_fcron ?= "3.0.2"
+PREFERRED_VERSION_feh ?= "1.2.7"
+PREFERRED_VERSION_fetchmail ?= "6.2.5"
+PREFERRED_VERSION_fftw ?= "3.1.2"
+PREFERRED_VERSION_fftwf ?= "3.1.2"
+PREFERRED_VERSION_fftwl ?= "3.1.2"
+PREFERRED_VERSION_fget ?= "1.3.3"
+PREFERRED_VERSION_figment ?= "0.3.5"
+PREFERRED_VERSION_file ?= "4.21"
+PREFERRED_VERSION_file-native ?= "4.21"
+PREFERRED_VERSION_findutils ?= "4.2.29"
+PREFERRED_VERSION_findutils-native ?= "4.2.29"
+PREFERRED_VERSION_firefox ?= "3.0.1"
+PREFERRED_VERSION_fis ?= "1.0"
+PREFERRED_VERSION_fish ?= "1.1.0"
+PREFERRED_VERSION_fixesproto ?= "4.0"
+PREFERRED_VERSION_flac ?= "1.1.2"
+PREFERRED_VERSION_flex ?= "2.5.31"
+PREFERRED_VERSION_flexis-zaurus ?= "1.0.0"
+PREFERRED_VERSION_flex-native ?= "2.5.31"
+PREFERRED_VERSION_flnx ?= "0.18"
+PREFERRED_VERSION_fltk ?= "1.1.7"
+PREFERRED_VERSION_flumotion ?= "0.4.1"
+PREFERRED_VERSION_fontcacheproto ?= "0.1.2"
+PREFERRED_VERSION_fontcacheproto-native ?= "0.1.2"
+PREFERRED_VERSION_fontconfig ?= "2.6.0"
+PREFERRED_VERSION_fontconfig-native ?= "2.3.91"
+PREFERRED_VERSION_fontsproto ?= "2.0.2"
+PREFERRED_VERSION_fontsproto-native ?= "2.0.2"
+PREFERRED_VERSION_fonttosfnt ?= "1.0.3"
+PREFERRED_VERSION_foonas-init ?= "0.10"
+PREFERRED_VERSION_foonas-packages ?= "1.0"
+PREFERRED_VERSION_fortune-mod ?= "1.99.1"
+PREFERRED_VERSION_fpdf ?= "1.53"
+PREFERRED_VERSION_free42-vga ?= "1.4.41"
+PREFERRED_VERSION_freeciv ?= "2.0.8"
+PREFERRED_VERSION_freedoom ?= "0.3"
+PREFERRED_VERSION_freedroid ?= "1.0.2"
+PREFERRED_VERSION_freenote ?= "1.12.0"
+PREFERRED_VERSION_freeze ?= "1.0"
+PREFERRED_VERSION_frodo ?= "4.2"
+PREFERRED_VERSION_froot ?= "0.7.1"
+PREFERRED_VERSION_frotz ?= "2.43"
+PREFERRED_VERSION_frozen-bubble ?= "2.2.0"
+PREFERRED_VERSION_fsi-client ?= "20040803"
+PREFERRED_VERSION_ftdi-eeprom ?= "0.2"
+PREFERRED_VERSION_ftdi-eeprom-native ?= "0.2"
+PREFERRED_VERSION_ftpd-topfield ?= "0.7.4"
+PREFERRED_VERSION_fuse ?= "2.6.5"
+PREFERRED_VERSION_fuse-module ?= "2.6.5"
+PREFERRED_VERSION_fush ?= "0.9.0"
+PREFERRED_VERSION_fxload ?= "0.0.20020411"
+PREFERRED_VERSION_g15daemon ?= "1.2.6a"
+PREFERRED_VERSION_gail ?= "1.20.0"
+PREFERRED_VERSION_gaim ?= "1.5.0"
+PREFERRED_VERSION_gal-2.0 ?= "1.99.11"
+PREFERRED_VERSION_gal-2.1 ?= "2.1.10"
+PREFERRED_VERSION_galago-daemon ?= "0.3.4"
+PREFERRED_VERSION_galculator ?= "1.2.3"
+PREFERRED_VERSION_gallery ?= "1.5.5"
+PREFERRED_VERSION_gamin ?= "0.1.8"
+PREFERRED_VERSION_gammu ?= "1.17.0"
+PREFERRED_VERSION_gawk ?= "3.1.4"
+PREFERRED_VERSION_gawk-native ?= "3.1.4"
+PREFERRED_VERSION_gcalctool ?= "5.7.32"
+PREFERRED_VERSION_gccmakedep ?= "1.0.2"
+PREFERRED_VERSION_gconf ?= "2.6.1"
+PREFERRED_VERSION_gconf-native ?= "2.6.1"
+PREFERRED_VERSION_gd ?= "2.0.33"
+PREFERRED_VERSION_gdado ?= "2.2"
+PREFERRED_VERSION_gdal ?= "1.3.2"
+PREFERRED_VERSION_gdb ?= "6.8"
+PREFERRED_VERSION_gdb-cross ?= "6.8"
+PREFERRED_VERSION_gdb-cross-sdk ?= "6.8"
+PREFERRED_VERSION_gdbm ?= "1.8.3"
+PREFERRED_VERSION_gdbm-native ?= "1.8.3"
+PREFERRED_VERSION_gdk-pixbuf-csource-native ?= "2.12.11"
+PREFERRED_VERSION_gdm ?= "2.14.9"
+PREFERRED_VERSION_geda ?= "20050820"
+PREFERRED_VERSION_geda-gattrib ?= "20050820"
+PREFERRED_VERSION_geda-gschem ?= "20050820"
+PREFERRED_VERSION_geda-gsymcheck ?= "20050820"
+PREFERRED_VERSION_geda-symbols ?= "20050820"
+PREFERRED_VERSION_geda-utils ?= "20050820"
+PREFERRED_VERSION_gemdropx ?= "0.9"
+PREFERRED_VERSION_genboot-native ?= "1.0"
+PREFERRED_VERSION_genext2fs ?= "1.3"
+PREFERRED_VERSION_genext2fs-native ?= "1.3"
+PREFERRED_VERSION_genlist ?= "1.0"
+PREFERRED_VERSION_geode-accessbus5536 ?= "2.6.11"
+PREFERRED_VERSION_geode-aeslx ?= "2.6.11"
+PREFERRED_VERSION_geode-alsa5536 ?= "2.6.11"
+PREFERRED_VERSION_gettext ?= "0.17"
+PREFERRED_VERSION_gettext-native ?= "0.17"
+PREFERRED_VERSION_gftp ?= "2.0.18"
+PREFERRED_VERSION_ghettotooth ?= "1.0"
+PREFERRED_VERSION_giac ?= "0.5.0"
+PREFERRED_VERSION_giblib ?= "1.2.4"
+PREFERRED_VERSION_gif2png ?= "2.5.1"
+PREFERRED_VERSION_gift ?= "0.11.5"
+PREFERRED_VERSION_giftcurs ?= "0.6.2"
+PREFERRED_VERSION_gimp ?= "2.3.19"
+PREFERRED_VERSION_ginspector ?= "20050529"
+PREFERRED_VERSION_git ?= "1.6.0.4"
+PREFERRED_VERSION_git-native ?= "1.6.0.4"
+PREFERRED_VERSION_gizmod ?= "2.3"
+PREFERRED_VERSION_gkrellm ?= "2.2.10"
+PREFERRED_VERSION_glib-1.2 ?= "1.2.10"
+PREFERRED_VERSION_glib-1.2-native ?= "1.2.10"
+PREFERRED_VERSION_glib-2.0 ?= "2.18.3"
+PREFERRED_VERSION_glib-2.0-native ?= "2.18.0"
+PREFERRED_VERSION_glibc ?= "2.6.1"
+PREFERRED_VERSION_glibc-initial ?= "2.6.1"
+PREFERRED_VERSION_glibmm ?= "2.18.0"
+PREFERRED_VERSION_glider ?= "1.0.0"
+PREFERRED_VERSION_gloox ?= "0.8.9"
+PREFERRED_VERSION_glproto ?= "1.4.9"
+PREFERRED_VERSION_glrr ?= "20050529"
+PREFERRED_VERSION_glrr-widgets ?= "20050529"
+PREFERRED_VERSION_glurp ?= "0.11.3"
+PREFERRED_VERSION_gmailfs ?= "0.7.3"
+PREFERRED_VERSION_gmp ?= "4.2.2"
+PREFERRED_VERSION_gmpc ?= "0.13.0"
+PREFERRED_VERSION_gmp-native ?= "4.2.2"
+PREFERRED_VERSION_gnash ?= "0.8.3"
+PREFERRED_VERSION_gnocky ?= "0.0.3"
+PREFERRED_VERSION_gnokii ?= "0.6.14"
+PREFERRED_VERSION_gnomebaker ?= "0.6.0"
+PREFERRED_VERSION_gnome-common ?= "2.20.0"
+PREFERRED_VERSION_gnome-cups-manager ?= "0.31"
+PREFERRED_VERSION_gnome-desktop ?= "2.18.3"
+PREFERRED_VERSION_gnome-doc-utils ?= "0.12.0"
+PREFERRED_VERSION_gnome-games ?= "2.6.1"
+PREFERRED_VERSION_gnome-icon-theme ?= "2.22.0"
+PREFERRED_VERSION_gnome-keyring ?= "2.20.0"
+PREFERRED_VERSION_gnome-menus ?= "2.16.1"
+PREFERRED_VERSION_gnome-mime-data ?= "2.18.0"
+PREFERRED_VERSION_gnome-panel ?= "2.18.1"
+PREFERRED_VERSION_gnome-power ?= "0.0.5"
+PREFERRED_VERSION_gnome-power-manager ?= "2.18.3"
+PREFERRED_VERSION_gnomesword ?= "2.1.2"
+PREFERRED_VERSION_gnome-themes ?= "2.6.2"
+PREFERRED_VERSION_gnome-vfs ?= "2.22.0"
+PREFERRED_VERSION_gnome-vfs-extras ?= "0.99.13"
+PREFERRED_VERSION_gnome-vfs-obexftp ?= "0.4"
+PREFERRED_VERSION_gnuchess ?= "5.05"
+PREFERRED_VERSION_gnumeric ?= "1.6.3"
+PREFERRED_VERSION_gnupg ?= "1.4.2.2"
+PREFERRED_VERSION_gnuplot ?= "4.2.2"
+PREFERRED_VERSION_gnuradio ?= "3.0.4"
+PREFERRED_VERSION_gnutls ?= "1.6.3"
+PREFERRED_VERSION_gob2 ?= "2.0.14"
+PREFERRED_VERSION_gobby ?= "0.4.1"
+PREFERRED_VERSION_goffice ?= "0.2.1"
+PREFERRED_VERSION_gparted ?= "0.3.3"
+PREFERRED_VERSION_gpdf ?= "2.10.0"
+PREFERRED_VERSION_gpe-aerial ?= "0.3.0"
+PREFERRED_VERSION_gpe-announce ?= "0.13"
+PREFERRED_VERSION_gpe-applauncher ?= "0.11"
+PREFERRED_VERSION_gpe-appmgr ?= "2.8"
+PREFERRED_VERSION_gpe-autostarter ?= "0.12"
+PREFERRED_VERSION_gpe-beam ?= "0.2.9"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.55"
+PREFERRED_VERSION_gpe-bootsplash ?= "1.15"
+PREFERRED_VERSION_gpe-bootsplash-theme-e ?= "1.0"
+PREFERRED_VERSION_gpe-bootsplash-theme-gpephone ?= "1.0"
+PREFERRED_VERSION_gpe-buttonbox ?= "0.5"
+PREFERRED_VERSION_gpe-calculator ?= "0.2"
+PREFERRED_VERSION_gpe-calendar ?= "0.91"
+PREFERRED_VERSION_gpe-clock ?= "0.25"
+PREFERRED_VERSION_gpe-conf ?= "0.2.6"
+PREFERRED_VERSION_gpe-confd ?= "0.16"
+PREFERRED_VERSION_gpe-contacts ?= "0.47"
+PREFERRED_VERSION_gpe-contacts-hildon ?= "0.42"
+PREFERRED_VERSION_gpe-dm ?= "0.51"
+PREFERRED_VERSION_gpe-edit ?= "0.40"
+PREFERRED_VERSION_gpe-expenses ?= "0.0.6"
+PREFERRED_VERSION_gpe-filemanager ?= "0.30"
+PREFERRED_VERSION_gpe-fsi ?= "0.1"
+PREFERRED_VERSION_gpe-gallery ?= "0.97"
+PREFERRED_VERSION_gpe-go ?= "0.05"
+PREFERRED_VERSION_gpe-helpviewer ?= "1.0"
+PREFERRED_VERSION_gpe-icons ?= "0.25"
+PREFERRED_VERSION_gpe-irc ?= "0.08"
+PREFERRED_VERSION_gpe-keylock ?= "0.12"
+PREFERRED_VERSION_gpe-life ?= "0.2"
+PREFERRED_VERSION_gpe-lights ?= "0.13"
+PREFERRED_VERSION_gpe-login ?= "0.91"
+PREFERRED_VERSION_gpe-mini-browser ?= "0.21"
+PREFERRED_VERSION_gpe-mini-browser-hildon ?= "0.17"
+PREFERRED_VERSION_gpe-mininet ?= "0.7"
+PREFERRED_VERSION_gpe-mixer ?= "0.42"
+PREFERRED_VERSION_gpe-nmf ?= "0.22"
+PREFERRED_VERSION_gpe-othello ?= "0.2-1"
+PREFERRED_VERSION_gpe-ownerinfo ?= "0.28"
+PREFERRED_VERSION_gpe-package ?= "0.4"
+PREFERRED_VERSION_gpe-phonepanel ?= "0.9"
+PREFERRED_VERSION_gpe-plucker ?= "0.4"
+PREFERRED_VERSION_gpe-question ?= "0.04"
+PREFERRED_VERSION_gperf ?= "3.0.3"
+PREFERRED_VERSION_gperf-native ?= "3.0.3"
+PREFERRED_VERSION_gperiodic ?= "1.3.3"
+PREFERRED_VERSION_gpe-scap ?= "1.3"
+PREFERRED_VERSION_gpe-session-scripts ?= "0.67"
+PREFERRED_VERSION_gpe-session-scripts-phone ?= "0.67"
+PREFERRED_VERSION_gpe-shield ?= "0.9"
+PREFERRED_VERSION_gpe-sketchbook ?= "0.2.9"
+PREFERRED_VERSION_gpe-snes ?= "0.2"
+PREFERRED_VERSION_gpe-soundbite ?= "1.0.6"
+PREFERRED_VERSION_gpe-soundserver ?= "0.4-1"
+PREFERRED_VERSION_gpe-su ?= "0.19"
+PREFERRED_VERSION_gpesyncd ?= "2.0"
+PREFERRED_VERSION_gpe-synctool ?= "0.2"
+PREFERRED_VERSION_gpe-taskmanager ?= "0.20"
+PREFERRED_VERSION_gpe-terminal ?= "1.1"
+PREFERRED_VERSION_gpe-tetris ?= "0.6-4"
+PREFERRED_VERSION_gpe-theme-clearlooks ?= "0.3"
+PREFERRED_VERSION_gpe-theme-e17 ?= "0.1"
+PREFERRED_VERSION_gpe-theme-foxbox ?= "0.1"
+PREFERRED_VERSION_gpe-theme-industrial ?= "0.2"
+PREFERRED_VERSION_gpe-today ?= "0.11"
+PREFERRED_VERSION_gpe-todo ?= "0.56"
+PREFERRED_VERSION_gpe-todo-hildon ?= "0.55"
+PREFERRED_VERSION_gpe-watch ?= "0.10"
+PREFERRED_VERSION_gpe-what ?= "0.43"
+PREFERRED_VERSION_gpe-windowlist ?= "0.1"
+PREFERRED_VERSION_gpgme ?= "1.1.4"
+PREFERRED_VERSION_gphoto2 ?= "2.4.2"
+PREFERRED_VERSION_gpicview ?= "0.1.5"
+PREFERRED_VERSION_gpm ?= "1.20.1"
+PREFERRED_VERSION_gpp ?= "2.21"
+PREFERRED_VERSION_gpsbabel ?= "1.3.6"
+PREFERRED_VERSION_gpsd ?= "2.37"
+PREFERRED_VERSION_gpsdrive ?= "2.10pre4"
+PREFERRED_VERSION_gpstk ?= "1.2"
+PREFERRED_VERSION_gqview ?= "2.1.1"
+PREFERRED_VERSION_granule ?= "1.2.4"
+PREFERRED_VERSION_grass ?= "6.2.1"
+PREFERRED_VERSION_grep ?= "2.5.1"
+PREFERRED_VERSION_grep-native ?= "2.5.1"
+PREFERRED_VERSION_grip ?= "3.2.0"
+PREFERRED_VERSION_groff ?= "1.19.2"
+PREFERRED_VERSION_gs ?= "8.16"
+PREFERRED_VERSION_gsl ?= "1.4"
+PREFERRED_VERSION_gsmmux ?= "alpha-2"
+PREFERRED_VERSION_gsoap ?= "2.7.7"
+PREFERRED_VERSION_gsoap-native ?= "2.7.7"
+PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6"
+PREFERRED_VERSION_gspcav1 ?= "20070110"
+PREFERRED_VERSION_gst-ffmpeg ?= "0.10.2"
+PREFERRED_VERSION_gst-meta-base ?= "0.10"
+PREFERRED_VERSION_gst-plugin-pulse ?= "0.9.7"
+PREFERRED_VERSION_gst-plugins-bad ?= "0.10.6"
+PREFERRED_VERSION_gst-plugins-base ?= "0.10.17"
+PREFERRED_VERSION_gst-plugins-farsight ?= "0.10.1"
+PREFERRED_VERSION_gst-plugins-good ?= "0.10.7"
+PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.7"
+PREFERRED_VERSION_gst-pulse ?= "0.9.7"
+PREFERRED_VERSION_gstreamer ?= "0.10.17"
+PREFERRED_VERSION_gthumb ?= "2.6.9"
+PREFERRED_VERSION_gtk+ ?= "2.14.2"
+PREFERRED_VERSION_gtk2-ssh-askpass ?= "0.3"
+PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
+PREFERRED_VERSION_gtk-clearlooks-engine ?= "0.6.2"
+PREFERRED_VERSION_gtk-doc ?= "1.0"
+PREFERRED_VERSION_gtk-doc-native ?= "1.0"
+PREFERRED_VERSION_gtk-engines ?= "2.7.4"
+PREFERRED_VERSION_gtkhtml-2.0 ?= "2.6.3"
+PREFERRED_VERSION_gtkhtml-3.0 ?= "3.0.10"
+PREFERRED_VERSION_gtkhtml-3.1 ?= "3.1.16"
+PREFERRED_VERSION_gtkhtml-3.6 ?= "3.6.2"
+PREFERRED_VERSION_gtkhtml-3.8 ?= "3.8.2"
+PREFERRED_VERSION_gtkimageview ?= "1.3.0"
+PREFERRED_VERSION_gtk-industrial-engine ?= "0.2.46.0"
+PREFERRED_VERSION_gtkmathview ?= "0.7.6"
+PREFERRED_VERSION_gtkmm ?= "2.14.1"
+PREFERRED_VERSION_gtk-sato-engine ?= "0.1"
+PREFERRED_VERSION_gtk-sharp ?= "2.10.2"
+PREFERRED_VERSION_gtk-smooth-engine ?= "0.5.8"
+PREFERRED_VERSION_gtksourceview ?= "1.7.2"
+PREFERRED_VERSION_gtkterm2 ?= "0.2.3"
+PREFERRED_VERSION_gtk-xfce-engine ?= "2.4.1"
+PREFERRED_VERSION_gtracer ?= "0.0.10"
+PREFERRED_VERSION_guichan ?= "0.7.1"
+PREFERRED_VERSION_guile ?= "1.6.4"
+PREFERRED_VERSION_guile-native ?= "1.8.2"
+PREFERRED_VERSION_gutenprint ?= "5.1.3"
+PREFERRED_VERSION_gutenprint-native ?= "5.1.3"
+PREFERRED_VERSION_gvim ?= "7.0"
+PREFERRED_VERSION_gweled ?= "0.5"
+PREFERRED_VERSION_gxine ?= "0.4.1enhanced"
+PREFERRED_VERSION_gzip ?= "1.3.5"
+PREFERRED_VERSION_hal ?= "0.5.11"
+PREFERRED_VERSION_hal-info ?= "20080508"
+PREFERRED_VERSION_haserl ?= "0.8.0"
+PREFERRED_VERSION_havp ?= "0.86"
+PREFERRED_VERSION_hdparm ?= "6.9"
+PREFERRED_VERSION_helloworld ?= "1.0.0"
+PREFERRED_VERSION_hexatrolic ?= "1.0beta3"
+PREFERRED_VERSION_hfsplusutils ?= "1.0.4-4"
+PREFERRED_VERSION_hfsutils ?= "3.2.6"
+PREFERRED_VERSION_hibernate-script ?= "1.12"
+PREFERRED_VERSION_hicolor-icon-theme ?= "0.10"
+PREFERRED_VERSION_hiker ?= "0.9.1"
+PREFERRED_VERSION_hildon-base-lib ?= "0.11.1"
+PREFERRED_VERSION_hildon-control-panel ?= "0.9.1-1.2"
+PREFERRED_VERSION_hildon-fm ?= "0.9.1-2"
+PREFERRED_VERSION_hildon-home ?= "0.8.20-2"
+PREFERRED_VERSION_hildon-initscripts ?= "0.8.14-1"
+PREFERRED_VERSION_hildon-lgpl ?= "0.12.1"
+PREFERRED_VERSION_hildon-libs ?= "0.15.1"
+PREFERRED_VERSION_hildon-navigator ?= "0.9.6-2"
+PREFERRED_VERSION_hildon-status-bar ?= "0.8.11-1"
+PREFERRED_VERSION_hildon-thumbnail ?= "0.11"
+PREFERRED_VERSION_hostap-conf ?= "1.0"
+PREFERRED_VERSION_hostap-daemon ?= "0.4.4"
+PREFERRED_VERSION_hostap-utils ?= "0.4.7"
+PREFERRED_VERSION_hotplug-dbus ?= "0.9"
+PREFERRED_VERSION_hotplug-ng ?= "002"
+PREFERRED_VERSION_hotplug-qcop ?= "cvs"
+PREFERRED_VERSION_howl ?= "1.0.0"
+PREFERRED_VERSION_hsetroot ?= "1.0.2"
+PREFERRED_VERSION_htb-init ?= "0.8.5"
+PREFERRED_VERSION_httppc ?= "0.8.5"
+PREFERRED_VERSION_htun ?= "0.9.5"
+PREFERRED_VERSION_hvsc ?= "45"
+PREFERRED_VERSION_hwdata ?= "0.191"
+PREFERRED_VERSION_hydra ?= "4.5"
+PREFERRED_VERSION_iaimaster ?= "0.5"
+PREFERRED_VERSION_iana-etc ?= "2.20"
+PREFERRED_VERSION_ica-bin ?= "8.0"
+PREFERRED_VERSION_iceauth ?= "1.0.2"
+PREFERRED_VERSION_icebloxx ?= "1.0.0"
+PREFERRED_VERSION_icecc-create-env ?= "0.1"
+PREFERRED_VERSION_icewm ?= "1.2.30"
+PREFERRED_VERSION_icmpquery ?= "1.03"
+PREFERRED_VERSION_ico ?= "1.0.2"
+PREFERRED_VERSION_icu ?= "3.6"
+PREFERRED_VERSION_icu-native ?= "3.6"
+PREFERRED_VERSION_id3lib ?= "3.8.3"
+PREFERRED_VERSION_ifplugd ?= "0.25"
+PREFERRED_VERSION_ifupdown ?= "0.6.8"
+PREFERRED_VERSION_iksemel ?= "1.2"
+PREFERRED_VERSION_imagemagick ?= "6.3.5-10"
+PREFERRED_VERSION_imake ?= "1.0.2"
+PREFERRED_VERSION_imlib ?= "1.9.15"
+PREFERRED_VERSION_imlib2 ?= "1.4.0.002"
+PREFERRED_VERSION_imposter ?= "0.3"
+PREFERRED_VERSION_inetutils ?= "1.4.2"
+PREFERRED_VERSION_initscripts ?= "1.0"
+PREFERRED_VERSION_initscripts-openprotium ?= "1.0"
+PREFERRED_VERSION_initscripts-slugos ?= "1.0"
+PREFERRED_VERSION_inkscape ?= "0.43"
+PREFERRED_VERSION_inkwp ?= "0.1.1"
+PREFERRED_VERSION_inotify-tools ?= "2.1"
+PREFERRED_VERSION_inputproto ?= "1.4.4"
+PREFERRED_VERSION_install-native ?= "0.1"
+PREFERRED_VERSION_insttrain ?= "1.0.5"
+PREFERRED_VERSION_interbench ?= "0.30"
+PREFERRED_VERSION_intercom ?= "0.15"
+PREFERRED_VERSION_intltool ?= "0.40.3"
+PREFERRED_VERSION_intltool-native ?= "0.40.3"
+PREFERRED_VERSION_iozone3 ?= "263"
+PREFERRED_VERSION_ipaq-sleep ?= "0.9"
+PREFERRED_VERSION_ipatience ?= "0.1"
+PREFERRED_VERSION_iperf ?= "2.0.2"
+PREFERRED_VERSION_ipkg ?= "0.99.163"
+PREFERRED_VERSION_ipkg-collateral ?= "1.0"
+PREFERRED_VERSION_ipkg-native ?= "0.99.163"
+PREFERRED_VERSION_iproute2 ?= "2.6.22"
+PREFERRED_VERSION_ipsec-tools ?= "0.6.7"
+PREFERRED_VERSION_iptables ?= "1.3.8"
+PREFERRED_VERSION_iptstate ?= "2.2.1"
+PREFERRED_VERSION_iputils ?= "20020927"
+PREFERRED_VERSION_iqnotes ?= "2.0.99-2.1.0rc1"
+PREFERRED_VERSION_ircp ?= "0.3"
+PREFERRED_VERSION_irdadump ?= "0.9.16"
+PREFERRED_VERSION_irda-utils ?= "0.9.16"
+PREFERRED_VERSION_irk-belkin ?= "0.11"
+PREFERRED_VERSION_irk-targus ?= "0.11.0"
+PREFERRED_VERSION_irssi ?= "0.8.13"
+PREFERRED_VERSION_iso-codes ?= "1.4"
+PREFERRED_VERSION_ixp4xx-npe-native ?= "2.4"
+PREFERRED_VERSION_jack ?= "0.103.0"
+PREFERRED_VERSION_jamvm ?= "1.5.1"
+PREFERRED_VERSION_jards ?= "1.0"
+PREFERRED_VERSION_jhead ?= "2.6.0"
+PREFERRED_VERSION_jikes ?= "1.22"
+PREFERRED_VERSION_jikes-native ?= "1.21"
+PREFERRED_VERSION_joe ?= "3.1"
+PREFERRED_VERSION_js ?= "1.5"
+PREFERRED_VERSION_juce ?= "1.29"
+PREFERRED_VERSION_justreader ?= "2.0k"
+PREFERRED_VERSION_kaffe-gtk ?= "1.1.5"
+PREFERRED_VERSION_kaffeh-native ?= "1.1.5"
+PREFERRED_VERSION_kakasi ?= "2.3.4"
+PREFERRED_VERSION_kakasi-native ?= "2.3.4"
+PREFERRED_VERSION_kanatest ?= "0.3.6"
+PREFERRED_VERSION_kazehakase ?= "0.4.7"
+PREFERRED_VERSION_kbd ?= "1.12"
+PREFERRED_VERSION_kbproto ?= "1.0.3"
+PREFERRED_VERSION_kdepimpi ?= "2.2.7"
+PREFERRED_VERSION_kernbench ?= "0.41"
+PREFERRED_VERSION_kernel-module-wlags49-h1-cs ?= "718"
+PREFERRED_VERSION_kernel-module-wlags49-h2-cs ?= "718"
+PREFERRED_VERSION_kexec-tools ?= "1.101"
+PREFERRED_VERSION_keylaunch ?= "2.0.10"
+PREFERRED_VERSION_keymap-locales ?= "1.0"
+PREFERRED_VERSION_keymaps ?= "1.0"
+PREFERRED_VERSION_keyring ?= "0.6.8"
+PREFERRED_VERSION_kf ?= "0.5.4.1"
+PREFERRED_VERSION_kismet ?= "2007-10-R1"
+PREFERRED_VERSION_klibc ?= "1.1.1"
+PREFERRED_VERSION_klimt ?= "0.6.1"
+PREFERRED_VERSION_knights ?= "1.14"
+PREFERRED_VERSION_konqueror-embedded ?= "20070212"
+PREFERRED_VERSION_kpengine ?= "0.1"
+PREFERRED_VERSION_kphonepi ?= "1.0.0"
+PREFERRED_VERSION_kstars-embedded ?= "0.8.5"
+PREFERRED_VERSION_ksymoops ?= "2.4.9"
+PREFERRED_VERSION_ktimetrackerpi ?= "0.9.7"
+PREFERRED_VERSION_kxml2 ?= "2.3.0"
+PREFERRED_VERSION_labyrinth ?= "0.7"
+PREFERRED_VERSION_lame ?= "3.96.1"
+PREFERRED_VERSION_lbreakout2 ?= "2.6beta"
+PREFERRED_VERSION_lcdproc ?= "0.5.1"
+PREFERRED_VERSION_lcms ?= "1.15"
+PREFERRED_VERSION_leafpad ?= "0.8.9"
+PREFERRED_VERSION_led ?= "0.0cvs20060814"
+PREFERRED_VERSION_lemon ?= "3.3.5"
+PREFERRED_VERSION_lemon-native ?= "3.3.5"
+PREFERRED_VERSION_less ?= "406"
+PREFERRED_VERSION_lessertunjo ?= "0.0.10"
+PREFERRED_VERSION_lftp ?= "3.5.1"
+PREFERRED_VERSION_liba52 ?= "0.7.4"
+PREFERRED_VERSION_libaal ?= "1.0.4"
+PREFERRED_VERSION_libabenabler ?= "0.1"
+PREFERRED_VERSION_libabenabler2 ?= "1.0"
+PREFERRED_VERSION_libaio ?= "0.3.106"
+PREFERRED_VERSION_libaio-oracle ?= "0.3.0"
+PREFERRED_VERSION_libalgorithm-diff-perl ?= "1.1902"
+PREFERRED_VERSION_libalgorithm-diff-perl-native ?= "1.1902"
+PREFERRED_VERSION_libao ?= "0.8.6"
+PREFERRED_VERSION_libao-alsa ?= "0.8.6"
+PREFERRED_VERSION_libao-plugin-alsa ?= "0.8.6"
+PREFERRED_VERSION_libapplewm ?= "1.0.0"
+PREFERRED_VERSION_libarchive-tar-perl ?= "1.30"
+PREFERRED_VERSION_libarchive-tar-perl-native ?= "1.30"
+PREFERRED_VERSION_libarena ?= "0.2"
+PREFERRED_VERSION_libart-lgpl ?= "2.3.19"
+PREFERRED_VERSION_libassa ?= "3.4.2"
+PREFERRED_VERSION_libassuan ?= "0.6.9"
+PREFERRED_VERSION_libatomics-ops ?= "1.2"
+PREFERRED_VERSION_libbedic ?= "1.0"
+PREFERRED_VERSION_libbonobo ?= "2.22.0"
+PREFERRED_VERSION_libbonoboui ?= "2.18.0"
+PREFERRED_VERSION_libcache-cache-perl ?= "1.05"
+PREFERRED_VERSION_libcache-cache-perl-native ?= "1.05"
+PREFERRED_VERSION_libcalenabler ?= "1.0"
+PREFERRED_VERSION_libcap ?= "1.10"
+PREFERRED_VERSION_libccaudio2 ?= "0.9.0"
+PREFERRED_VERSION_libcdaudio ?= "0.99.12p2"
+PREFERRED_VERSION_libcgicc ?= "3.2.3"
+PREFERRED_VERSION_libchenabler ?= "0.1"
+PREFERRED_VERSION_libclass-container-perl ?= "0.12"
+PREFERRED_VERSION_libclass-container-perl-native ?= "0.12"
+PREFERRED_VERSION_libclass-data-inheritable-perl ?= "0.06"
+PREFERRED_VERSION_libclass-data-inheritable-perl-native ?= "0.06"
+PREFERRED_VERSION_libcompress-zlib-perl ?= "1.42"
+PREFERRED_VERSION_libcompress-zlib-perl-native ?= "1.42"
+PREFERRED_VERSION_libcontactsdb ?= "0.5"
+PREFERRED_VERSION_libcroco ?= "0.6.1"
+PREFERRED_VERSION_libcwd ?= "0.99.47"
+PREFERRED_VERSION_libdaemon ?= "0.12"
+PREFERRED_VERSION_libdata-optlist-perl ?= "0.101"
+PREFERRED_VERSION_libdata-optlist-perl-native ?= "0.101"
+PREFERRED_VERSION_libdbi ?= "0.7.2"
+PREFERRED_VERSION_libdbi-drivers ?= "0.7.1"
+PREFERRED_VERSION_libddmpeg ?= "1.5"
+PREFERRED_VERSION_libdes ?= "4.01"
+PREFERRED_VERSION_libdevel-stacktrace-perl ?= "1.13"
+PREFERRED_VERSION_libdevel-stacktrace-perl-native ?= "1.13"
+PREFERRED_VERSION_libdictionary ?= "1.0"
+PREFERRED_VERSION_libdigest-sha1-perl ?= "2.11"
+PREFERRED_VERSION_libdigest-sha1-perl-native ?= "2.11"
+PREFERRED_VERSION_libdisplaymigration ?= "0.99"
+PREFERRED_VERSION_libdmx ?= "1.0.2"
+PREFERRED_VERSION_libdotdesktop ?= "0.11"
+PREFERRED_VERSION_libdrm ?= "2.3.1"
+PREFERRED_VERSION_libdvb ?= "0.5.5.1"
+PREFERRED_VERSION_libdvdnav ?= "0.1.10"
+PREFERRED_VERSION_libdvdread ?= "0.9.6"
+PREFERRED_VERSION_libedit ?= "20050118"
+PREFERRED_VERSION_libeina ?= "0.96.7"
+PREFERRED_VERSION_libelf ?= "0.8.6"
+PREFERRED_VERSION_liberror-perl ?= "0.17004"
+PREFERRED_VERSION_liberror-perl-native ?= "0.17004"
+PREFERRED_VERSION_libesmtp ?= "1.0.4"
+PREFERRED_VERSION_libevent ?= "1.1a"
+PREFERRED_VERSION_libeventdb ?= "0.90"
+PREFERRED_VERSION_libevnet ?= "0.3.1"
+PREFERRED_VERSION_libexception-class-perl ?= "1.23"
+PREFERRED_VERSION_libexception-class-perl-native ?= "1.23"
+PREFERRED_VERSION_libexif ?= "0.6.17"
+PREFERRED_VERSION_libextutils-cbuilder-perl ?= "0.18"
+PREFERRED_VERSION_libextutils-cbuilder-perl-native ?= "0.18"
+PREFERRED_VERSION_libextutils-depends-perl ?= "0.205"
+PREFERRED_VERSION_libextutils-depends-perl-native ?= "0.205"
+PREFERRED_VERSION_libextutils-parsexs-perl ?= "2.16"
+PREFERRED_VERSION_libextutils-parsexs-perl-native ?= "2.16"
+PREFERRED_VERSION_libextutils-pkgconfig-perl ?= "1.07"
+PREFERRED_VERSION_libextutils-pkgconfig-perl-native ?= "1.07"
+PREFERRED_VERSION_libflv ?= "0.2"
+PREFERRED_VERSION_libfontenc ?= "1.0.4"
+PREFERRED_VERSION_libfontenc-native ?= "1.0.4"
+PREFERRED_VERSION_libfribidi ?= "0.10.4"
+PREFERRED_VERSION_libfs ?= "1.0.0"
+PREFERRED_VERSION_libftdi ?= "0.9"
+PREFERRED_VERSION_libftdi-native ?= "0.9"
+PREFERRED_VERSION_libg15 ?= "1.2.1"
+PREFERRED_VERSION_libg15render ?= "1.2"
+PREFERRED_VERSION_libgalago ?= "0.3.3"
+PREFERRED_VERSION_libgc ?= "6.7"
+PREFERRED_VERSION_libgcrypt ?= "1.4.0"
+PREFERRED_VERSION_libgeda ?= "20050820"
+PREFERRED_VERSION_libgemwidget ?= "1.0"
+PREFERRED_VERSION_libglade ?= "2.6.2"
+PREFERRED_VERSION_libglademm ?= "2.4.1"
+PREFERRED_VERSION_libgmime ?= "2.1.7"
+PREFERRED_VERSION_libgnome ?= "2.18.0"
+PREFERRED_VERSION_libgnomecanvas ?= "2.20.0"
+PREFERRED_VERSION_libgnomecups ?= "0.2.2"
+PREFERRED_VERSION_libgnomeprint ?= "2.8.2"
+PREFERRED_VERSION_libgnomeprintui ?= "2.8.2"
+PREFERRED_VERSION_libgnomeui ?= "2.24.0"
+PREFERRED_VERSION_libgpelaunch ?= "0.14"
+PREFERRED_VERSION_libgpephone ?= "0.4"
+PREFERRED_VERSION_libgpepimc ?= "0.9"
+PREFERRED_VERSION_libgpepimc-hildon ?= "0.5"
+PREFERRED_VERSION_libgpevtype ?= "0.50"
+PREFERRED_VERSION_libgpewidget ?= "0.117"
+PREFERRED_VERSION_libgpewidget-hildon ?= "0.102"
+PREFERRED_VERSION_libgpg-error ?= "1.4"
+PREFERRED_VERSION_libgphoto2 ?= "2.4.1"
+PREFERRED_VERSION_libgpsbt ?= "0.1"
+PREFERRED_VERSION_libgpsmgr ?= "0.1"
+PREFERRED_VERSION_libgsf ?= "1.14.2"
+PREFERRED_VERSION_libgsm ?= "1.0.10"
+PREFERRED_VERSION_libgtkinput ?= "0.3"
+PREFERRED_VERSION_libgtkstylus ?= "0.3"
+PREFERRED_VERSION_libhal-nm ?= "0.0.2"
+PREFERRED_VERSION_libhandoff ?= "0.1"
+PREFERRED_VERSION_libhangul ?= "0.0.4"
+PREFERRED_VERSION_libhildonfm ?= "1.9.41"
+PREFERRED_VERSION_libhildonhelp ?= "1.9.1"
+PREFERRED_VERSION_libhildonmime ?= "1.9.5"
+PREFERRED_VERSION_libhtml-mason-perl ?= "1.35"
+PREFERRED_VERSION_libiac ?= "1.0"
+PREFERRED_VERSION_libice ?= "1.0.4"
+PREFERRED_VERSION_libiconv ?= "1.11"
+PREFERRED_VERSION_libid3 ?= "1.1"
+PREFERRED_VERSION_libidl ?= "0.8.10"
+PREFERRED_VERSION_libidl-native ?= "0.8.10"
+PREFERRED_VERSION_libidn ?= "0.5.19"
+PREFERRED_VERSION_libim ?= "0.2"
+PREFERRED_VERSION_libintl-perl ?= "1.16"
+PREFERRED_VERSION_libintl-perl-native ?= "1.16"
+PREFERRED_VERSION_libio-zlib-perl ?= "1.04"
+PREFERRED_VERSION_libio-zlib-perl-native ?= "1.04"
+PREFERRED_VERSION_libjingle-tapioca ?= "0.3.10"
+PREFERRED_VERSION_liblbxutil ?= "1.0.1"
+PREFERRED_VERSION_liblipsevent ?= "0.1"
+PREFERRED_VERSION_liblocale-gettext-perl ?= "1.05"
+PREFERRED_VERSION_liblocale-gettext-perl-native ?= "1.05"
+PREFERRED_VERSION_liblockfile ?= "1.06"
+PREFERRED_VERSION_liblog-dispatch-perl ?= "2.13"
+PREFERRED_VERSION_liblog-dispatch-perl-native ?= "2.13"
+PREFERRED_VERSION_liblog-log4perl-perl ?= "1.06"
+PREFERRED_VERSION_liblog-log4perl-perl-native ?= "1.06"
+PREFERRED_VERSION_libmad ?= "0.15.1b"
+PREFERRED_VERSION_libmail-sendmail-perl ?= "0.79"
+PREFERRED_VERSION_libmailwrapper ?= "1.2.3"
+PREFERRED_VERSION_libmatchbox ?= "1.9"
+PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18"
+PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
+PREFERRED_VERSION_libmimedir ?= "0.4.2"
+PREFERRED_VERSION_libmng ?= "1.0.8"
+PREFERRED_VERSION_libmodplug ?= "0.8"
+PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
+PREFERRED_VERSION_libmodule-build-perl-native ?= "0.2805"
+PREFERRED_VERSION_libmrss ?= "0.17.2"
+PREFERRED_VERSION_libmsgenabler ?= "1.0"
+PREFERRED_VERSION_libmusicbrainz ?= "2.1.4"
+PREFERRED_VERSION_libnet ?= "1.1.2.1"
+PREFERRED_VERSION_libnetfilter-queue ?= "0.0.13"
+PREFERRED_VERSION_libnet-ip-perl ?= "1.25"
+PREFERRED_VERSION_libnet-ip-perl-native ?= "1.25"
+PREFERRED_VERSION_libnetserver-generic-perl ?= "1.03"
+PREFERRED_VERSION_libnfnetlink ?= "0.0.30"
+PREFERRED_VERSION_libnids ?= "1.18"
+PREFERRED_VERSION_libnotify ?= "0.4.4"
+PREFERRED_VERSION_libnss-mdns ?= "0.9"
+PREFERRED_VERSION_libnxml ?= "0.16"
+PREFERRED_VERSION_libogg ?= "1.1.3"
+PREFERRED_VERSION_liboil ?= "0.3.15"
+PREFERRED_VERSION_libol ?= "0.3.18"
+PREFERRED_VERSION_liboldx ?= "1.0.1"
+PREFERRED_VERSION_liboop ?= "1.0"
+PREFERRED_VERSION_libopenraw ?= "0.0.2"
+PREFERRED_VERSION_libopensync ?= "0.22"
+PREFERRED_VERSION_libopensync-plugin-evo2-sync ?= "0.22"
+PREFERRED_VERSION_libopensync-plugin-file ?= "0.18"
+PREFERRED_VERSION_libopensync-plugin-file-sync ?= "0.22"
+PREFERRED_VERSION_libopensync-plugin-gpe ?= "0.18"
+PREFERRED_VERSION_libopensync-plugin-irmc ?= "0.18"
+PREFERRED_VERSION_libopensync-plugin-irmc-sync ?= "0.22"
+PREFERRED_VERSION_libosip2 ?= "2.2.2"
+PREFERRED_VERSION_libosso ?= "1.20"
+PREFERRED_VERSION_libosso-gsf ?= "1.11.10.4"
+PREFERRED_VERSION_libosso-help ?= "2.1.2"
+PREFERRED_VERSION_libpam ?= "1.0.2"
+PREFERRED_VERSION_libparams-util-perl ?= "0.20"
+PREFERRED_VERSION_libparams-util-perl-native ?= "0.20"
+PREFERRED_VERSION_libparams-validate-perl ?= "0.86"
+PREFERRED_VERSION_libparams-validate-perl-native ?= "0.86"
+PREFERRED_VERSION_libpcap ?= "0.9.8"
+PREFERRED_VERSION_libpcl ?= "1.4"
+PREFERRED_VERSION_libpcre ?= "7.6"
+PREFERRED_VERSION_libpcre-native ?= "7.6"
+PREFERRED_VERSION_libperl6-junction-perl ?= "1.10"
+PREFERRED_VERSION_libpng ?= "1.2.20"
+PREFERRED_VERSION_libpng-native ?= "1.2.20"
+PREFERRED_VERSION_libpthread-stubs ?= "0.1"
+PREFERRED_VERSION_libqanava ?= "0.0.7"
+PREFERRED_VERSION_libqtaux2 ?= "1.2.3"
+PREFERRED_VERSION_librcf ?= "0.4"
+PREFERRED_VERSION_librecord ?= "0.1"
+PREFERRED_VERSION_librecord2 ?= "0.1"
+PREFERRED_VERSION_librewrite ?= "0.1"
+PREFERRED_VERSION_librsvg ?= "2.16.1"
+PREFERRED_VERSION_librsync ?= "0.9.7"
+PREFERRED_VERSION_librtaudio ?= "3.0.1"
+PREFERRED_VERSION_libsamplerate0 ?= "0.1.2"
+PREFERRED_VERSION_libschedule ?= "0.17"
+PREFERRED_VERSION_libsdl-directfb ?= "1.2.9"
+PREFERRED_VERSION_libsdl-gfx ?= "2.0.11"
+PREFERRED_VERSION_libsdl-image ?= "1.2.6"
+PREFERRED_VERSION_libsdl-mixer ?= "1.2.6"
+PREFERRED_VERSION_libsdl-native ?= "1.2.11"
+PREFERRED_VERSION_libsdl-net ?= "1.2.7"
+PREFERRED_VERSION_libsdl-ttf ?= "2.0.3"
+PREFERRED_VERSION_libsdl-ttf-native ?= "2.0.3"
+PREFERRED_VERSION_libsdl-x11 ?= "1.2.11"
+PREFERRED_VERSION_libsettings ?= "0.3"
+PREFERRED_VERSION_libsexy ?= "0.1.11"
+PREFERRED_VERSION_libsidplay ?= "1.36.59"
+PREFERRED_VERSION_libsigcx0 ?= "0.6.4"
+PREFERRED_VERSION_libsm ?= "1.0.3"
+PREFERRED_VERSION_libsndfile1 ?= "1.0.17"
+PREFERRED_VERSION_libsoundgen ?= "0.6"
+PREFERRED_VERSION_libsoup ?= "2.2.100"
+PREFERRED_VERSION_libspf2 ?= "1.0.4"
+PREFERRED_VERSION_libspiff ?= "0.8.2"
+PREFERRED_VERSION_libssh ?= "0.11"
+PREFERRED_VERSION_libsub-exporter-perl ?= "0.970"
+PREFERRED_VERSION_libsub-exporter-perl-native ?= "0.970"
+PREFERRED_VERSION_libsub-install-perl ?= "0.922"
+PREFERRED_VERSION_libsub-install-perl-native ?= "0.922"
+PREFERRED_VERSION_libsub-uplevel-perl ?= "0.13"
+PREFERRED_VERSION_libsub-uplevel-perl-native ?= "0.13"
+PREFERRED_VERSION_libsvg ?= "0.1.4"
+PREFERRED_VERSION_libtelepathy ?= "0.0.53"
+PREFERRED_VERSION_libtest-builder-tester-perl ?= "1.01"
+PREFERRED_VERSION_libtest-differences-perl ?= "0.47"
+PREFERRED_VERSION_libtest-exception-perl ?= "0.22"
+PREFERRED_VERSION_libtest-mockmodule-perl ?= "0.05"
+PREFERRED_VERSION_libtest-output-perl ?= "0.10"
+PREFERRED_VERSION_libtext-diff-perl ?= "0.35"
+PREFERRED_VERSION_libtext-diff-perl-native ?= "0.35"
+PREFERRED_VERSION_libticables ?= "3.9.2"
+PREFERRED_VERSION_libticalcs ?= "4.5.9"
+PREFERRED_VERSION_libtifiles ?= "0.6.5"
+PREFERRED_VERSION_libtinymail ?= "0.0.3"
+PREFERRED_VERSION_libtododb ?= "0.11"
+PREFERRED_VERSION_libtomcrypt ?= "0.97b"
+PREFERRED_VERSION_libtomoe-gtk ?= "0.1.0"
+PREFERRED_VERSION_libtool ?= "2.2.4"
+PREFERRED_VERSION_libtool-cross ?= "2.2.4"
+PREFERRED_VERSION_libtool-native ?= "2.2.4"
+PREFERRED_VERSION_libtool-sdk ?= "2.2.4"
+PREFERRED_VERSION_libungif ?= "4.1.3"
+PREFERRED_VERSION_libupnp ?= "1.3.1"
+PREFERRED_VERSION_liburiparser ?= "0.5.1"
+PREFERRED_VERSION_liburi-perl ?= "1.35"
+PREFERRED_VERSION_liburi-perl-native ?= "1.35"
+PREFERRED_VERSION_libusb ?= "0.1.12"
+PREFERRED_VERSION_libusb-native ?= "0.1.12"
+PREFERRED_VERSION_libversion-perl ?= "0.6701"
+PREFERRED_VERSION_libversion-perl-native ?= "0.6701"
+PREFERRED_VERSION_libvisual ?= "0.1.3"
+PREFERRED_VERSION_libvisual-plugins ?= "0.1.3"
+PREFERRED_VERSION_libvncserver ?= "0.9.1"
+PREFERRED_VERSION_libvocenabler ?= "0.1"
+PREFERRED_VERSION_libvorbis ?= "1.0.1"
+PREFERRED_VERSION_libw100 ?= "0.0.2"
+PREFERRED_VERSION_libwindowswm ?= "1.0.0"
+PREFERRED_VERSION_libwnck ?= "2.13.5"
+PREFERRED_VERSION_libwpd ?= "0.8.6"
+PREFERRED_VERSION_libx11 ?= "1.1.3"
+PREFERRED_VERSION_libx11-native ?= "1.0.3"
+PREFERRED_VERSION_libxau ?= "1.0.3"
+PREFERRED_VERSION_libxau-native ?= "1.0.3"
+PREFERRED_VERSION_libxaw ?= "1.0.4"
+PREFERRED_VERSION_libxcb ?= "1.0"
+PREFERRED_VERSION_libxcomposite ?= "0.4.0"
+PREFERRED_VERSION_libxcursor ?= "1.1.9"
+PREFERRED_VERSION_libxdamage ?= "1.1.1"
+PREFERRED_VERSION_libxdmcp ?= "1.0.2"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
+PREFERRED_VERSION_libxevie ?= "1.0.2"
+PREFERRED_VERSION_libxext ?= "1.0.3"
+PREFERRED_VERSION_libxfce4mcs ?= "4.4.1"
+PREFERRED_VERSION_libxfce4util ?= "4.4.1"
+PREFERRED_VERSION_libxfcegui4 ?= "4.4.1"
+PREFERRED_VERSION_libxfixes ?= "4.0.3"
+PREFERRED_VERSION_libxfont ?= "1.3.1"
+PREFERRED_VERSION_libxfontcache ?= "1.0.4"
+PREFERRED_VERSION_libxfont-native ?= "1.3.0"
+PREFERRED_VERSION_libxft ?= "2.1.12"
+PREFERRED_VERSION_libxi ?= "1.1.3"
+PREFERRED_VERSION_libxine ?= "1.1.0"
+PREFERRED_VERSION_libxine-fb ?= "1.0"
+PREFERRED_VERSION_libxinerama ?= "1.0.2"
+PREFERRED_VERSION_libxine-x11 ?= "1.0"
+PREFERRED_VERSION_libxkbfile ?= "1.0.4"
+PREFERRED_VERSION_libxkbui ?= "1.0.2"
+PREFERRED_VERSION_libxml2 ?= "2.7.2"
+PREFERRED_VERSION_libxml2-native ?= "2.7.2"
+PREFERRED_VERSION_libxml-parser-perl ?= "2.34"
+PREFERRED_VERSION_libxml-parser-perl-native ?= "2.34"
+PREFERRED_VERSION_libxmu ?= "1.0.3"
+PREFERRED_VERSION_libxp ?= "1.0.0"
+PREFERRED_VERSION_libxpm ?= "3.5.7"
+PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
+PREFERRED_VERSION_libxprintutil ?= "1.0.1"
+PREFERRED_VERSION_libxrandr ?= "1.2.2"
+PREFERRED_VERSION_libxrender ?= "0.9.4"
+PREFERRED_VERSION_libxres ?= "1.0.3"
+PREFERRED_VERSION_libxscrnsaver ?= "1.1.2"
+PREFERRED_VERSION_libxsettings ?= "0.11"
+PREFERRED_VERSION_libxsettings-client ?= "0.17"
+PREFERRED_VERSION_libxslt ?= "1.1.22"
+PREFERRED_VERSION_libxslt-native ?= "1.1.21"
+PREFERRED_VERSION_libxt ?= "1.0.5"
+PREFERRED_VERSION_libxtrap ?= "1.0.0"
+PREFERRED_VERSION_libxtst ?= "1.0.3"
+PREFERRED_VERSION_libxv ?= "1.0.3"
+PREFERRED_VERSION_libxvmc ?= "1.0.4"
+PREFERRED_VERSION_libxxf86dga ?= "1.0.2"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
+PREFERRED_VERSION_libxxf86vm ?= "1.0.1"
+PREFERRED_VERSION_libyaml-perl ?= "0.62"
+PREFERRED_VERSION_libyaml-perl-native ?= "0.62"
+PREFERRED_VERSION_lighttpd ?= "1.4.18"
+PREFERRED_VERSION_lineak ?= "0.8.3"
+PREFERRED_VERSION_linphone ?= "3.1.0"
+PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1"
+PREFERRED_VERSION_linux-hotplug ?= "20040920"
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.23"
+PREFERRED_VERSION_lisa ?= "0.2.2"
+PREFERRED_VERSION_live555 ?= "20090602"
+PREFERRED_VERSION_llvm ?= "2.0"
+PREFERRED_VERSION_llvm-native ?= "2.1"
+PREFERRED_VERSION_lmbench ?= "2.0.4"
+PREFERRED_VERSION_lmsensors-apps ?= "2.10.1"
+PREFERRED_VERSION_lndir ?= "1.0.1"
+PREFERRED_VERSION_loader ?= "0.04"
+PREFERRED_VERSION_login-manager ?= "1.0"
+PREFERRED_VERSION_logrotate ?= "3.7.1"
+PREFERRED_VERSION_logrotate-script ?= "cvs"
+PREFERRED_VERSION_loudmouth ?= "1.2.2"
+PREFERRED_VERSION_lrzsz ?= "0.12.20"
+PREFERRED_VERSION_lsh ?= "1.5.5"
+PREFERRED_VERSION_lsof ?= "4.78"
+PREFERRED_VERSION_ltp ?= "20070228"
+PREFERRED_VERSION_ltrace ?= "0.4"
+PREFERRED_VERSION_lttng-control ?= "0.12"
+PREFERRED_VERSION_lttng-viewer ?= "0.8.41-20060512"
+PREFERRED_VERSION_lua ?= "5.0.2"
+PREFERRED_VERSION_lua-gtk2 ?= "0.3"
+PREFERRED_VERSION_lua-native ?= "5.0.2"
+PREFERRED_VERSION_luit ?= "1.0.2"
+PREFERRED_VERSION_lvm2 ?= "2.01.15"
+PREFERRED_VERSION_lxt ?= "1.0"
+PREFERRED_VERSION_lyx ?= "1.4.4"
+PREFERRED_VERSION_lzma ?= "4.17"
+PREFERRED_VERSION_lzma-native ?= "4.17"
+PREFERRED_VERSION_lzo ?= "1.08"
+PREFERRED_VERSION_lzo-native ?= "1.08"
+PREFERRED_VERSION_m4 ?= "1.4.8"
+PREFERRED_VERSION_m4-native ?= "1.4.8"
+PREFERRED_VERSION_macchanger ?= "1.5.0"
+PREFERRED_VERSION_madfu ?= "1.2"
+PREFERRED_VERSION_madplay ?= "0.15.2b"
+PREFERRED_VERSION_mahjongg ?= "1.0.0"
+PREFERRED_VERSION_mailutils ?= "0.3.1"
+PREFERRED_VERSION_mailx ?= "8.1.2-0.20050715cvs"
+PREFERRED_VERSION_make ?= "3.81"
+PREFERRED_VERSION_makedepend ?= "1.0.1"
+PREFERRED_VERSION_makedepend-native ?= "1.0.1"
+PREFERRED_VERSION_makedev ?= "2.3.1"
+PREFERRED_VERSION_makedevs ?= "1.0.0"
+PREFERRED_VERSION_makedevs-native ?= "1.0.0"
+PREFERRED_VERSION_make-native ?= "3.81"
+PREFERRED_VERSION_makeself-native ?= "cvs"
+PREFERRED_VERSION_maki ?= "1.0.4ern"
+PREFERRED_VERSION_man ?= "1.5p"
+PREFERRED_VERSION_man-pages ?= "2.41"
+PREFERRED_VERSION_manufacturers ?= "20031209"
+PREFERRED_VERSION_mapnik ?= "0.4.0"
+PREFERRED_VERSION_maradns ?= "1.0.39"
+PREFERRED_VERSION_masqmail ?= "0.2.21"
+PREFERRED_VERSION_matchbox ?= "0.9.1"
+PREFERRED_VERSION_matchbox-applet-cards ?= "1.0.2"
+PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_matchbox-applet-startup-monitor ?= "0.1"
+PREFERRED_VERSION_matchbox-applet-volume ?= "0.1"
+PREFERRED_VERSION_matchbox-common ?= "0.9.1"
+PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
+PREFERRED_VERSION_matchbox-panel ?= "0.9.3"
+PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1"
+PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
+PREFERRED_VERSION_matchbox-theme-sato ?= "0.1"
+PREFERRED_VERSION_matchbox-themes-extra ?= "0.3"
+PREFERRED_VERSION_matchbox-themes-gtk ?= "1.0"
+PREFERRED_VERSION_matchbox-wm ?= "1.2"
+PREFERRED_VERSION_mathomatic ?= "unstable"
+PREFERRED_VERSION_matrixssl ?= "1.1.1"
+PREFERRED_VERSION_mb-applet-tasks ?= "1.0.0"
+PREFERRED_VERSION_mb-desktop-xine ?= "0.4"
+PREFERRED_VERSION_mbmerlin ?= "0.8.1-2"
+PREFERRED_VERSION_mc ?= "4.6.1"
+PREFERRED_VERSION_mce-dev ?= "1.5.6"
+PREFERRED_VERSION_mdadm ?= "2.5.5"
+PREFERRED_VERSION_mdev ?= "1.2.1"
+PREFERRED_VERSION_mdk2 ?= "v33"
+PREFERRED_VERSION_memedit ?= "0.7"
+PREFERRED_VERSION_memtester ?= "4.0.6"
+PREFERRED_VERSION_mesa ?= "7.2"
+PREFERRED_VERSION_mesa-dri ?= "7.2"
+PREFERRED_VERSION_meta-e-x11 ?= "1.0"
+PREFERRED_VERSION_meta-e-x11-core ?= "1.0"
+PREFERRED_VERSION_meta-gpe ?= "1.0"
+PREFERRED_VERSION_meta-gpe-extras ?= "1.0"
+PREFERRED_VERSION_meta-gpephone ?= "1.0"
+PREFERRED_VERSION_metakit ?= "2.4.9.3"
+PREFERRED_VERSION_metalog ?= "0.7"
+PREFERRED_VERSION_meta-maemo ?= "1.0"
+PREFERRED_VERSION_meta-sdk ?= "1.0"
+PREFERRED_VERSION_meta-sdk-gpe ?= "1.0"
+PREFERRED_VERSION_meta-sdk-sbox ?= "1.0"
+PREFERRED_VERSION_meta-sdk-sbox-gpe ?= "1.0"
+PREFERRED_VERSION_meta-sdl ?= "1.0"
+PREFERRED_VERSION_meta-sectest-gpe ?= "1.0"
+PREFERRED_VERSION_meta-toolchain ?= "1.0"
+PREFERRED_VERSION_mgetty ?= "1.1.30"
+PREFERRED_VERSION_miau ?= "0.5.3"
+PREFERRED_VERSION_microcom ?= "1.02"
+PREFERRED_VERSION_micro-emacs ?= "20060909"
+PREFERRED_VERSION_microwindows ?= "0.90"
+PREFERRED_VERSION_midori ?= "0.1.10"
+PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-fb ?= "0.2+0.3rc2"  
+PREFERRED_VERSION_midpath-backend-gtk ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-pulseaudio ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-qt3x11 ?= "0.2+0.3rc2"  
+PREFERRED_VERSION_midpath-backend-qt4x11 ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-qte ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-backend-sdl ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-cldc ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-core ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-demos ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-jgl ?= "0.2+0.3rc2"  
+PREFERRED_VERSION_midpath-location ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-m3g ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-maemo ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-messaging ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-opengles ?= "0.2+0.3rc2"
+PREFERRED_VERSION_midpath-openmoko ?= "0.2+0.3rc2" 
+PREFERRED_VERSION_midpath-svg ?= "0.2+0.3rc2"  
+PREFERRED_VERSION_midpath-webservices ?= "0.2+0.3rc2"
+PREFERRED_VERSION_mikmod ?= "3.2.2-beta1"
+PREFERRED_VERSION_mileage ?= "4.2.0-cvs-20060814"
+PREFERRED_VERSION_militaryalphabet ?= "0.2.1"
+PREFERRED_VERSION_mime-support ?= "3.28"
+PREFERRED_VERSION_miniclipboard ?= "0.3"
+PREFERRED_VERSION_minicom ?= "2.1"
+PREFERRED_VERSION_minifo-modules ?= "0.6.1-pre1"
+PREFERRED_VERSION_miniinit ?= "1.0"
+PREFERRED_VERSION_minimix ?= "0.9"
+PREFERRED_VERSION_minipredict ?= "1.0"
+PREFERRED_VERSION_mipv6 ?= "1.1-v2.4.26"
+PREFERRED_VERSION_misdn ?= "cvs"
+PREFERRED_VERSION_mkbot ?= "0.3"
+PREFERRED_VERSION_mkfontdir ?= "1.0.3"
+PREFERRED_VERSION_mkfontdir-native ?= "1.0.3"
+PREFERRED_VERSION_mobilemesh ?= "1.2"
+PREFERRED_VERSION_moc ?= "2.4.0"
+PREFERRED_VERSION_modphp ?= "5.1.6"
+PREFERRED_VERSION_modplugplay ?= "1.0"
+PREFERRED_VERSION_module-init-tools ?= "3.2.2"
+PREFERRED_VERSION_module-init-tools-cross ?= "3.2.2"
+PREFERRED_VERSION_modutils ?= "2.4.27"
+PREFERRED_VERSION_modutils-collateral ?= "1.0"
+PREFERRED_VERSION_modutils-cross ?= "2.4.27"
+PREFERRED_VERSION_modutils-initscripts ?= "1.0"
+PREFERRED_VERSION_moin ?= "1.5.8"
+PREFERRED_VERSION_mokomaze ?= "0.5.5"
+PREFERRED_VERSION_mono ?= "1.2.5.1"
+PREFERRED_VERSION_mono-mcs-intermediate ?= "1.2.5.1"
+PREFERRED_VERSION_mono-native ?= "1.2.5.1"
+PREFERRED_VERSION_monotone-4 ?= "0.19"
+PREFERRED_VERSION_monotone-5 ?= "0.25.2"
+PREFERRED_VERSION_monotone-6 ?= "0.34"
+PREFERRED_VERSION_motion ?= "3.2.6"
+PREFERRED_VERSION_mousepad ?= "0.2.12"
+PREFERRED_VERSION_mp3blaster ?= "3.2.3"
+PREFERRED_VERSION_mpc ?= "0.12.1"
+PREFERRED_VERSION_mpeg2dec ?= "0.4.0b"
+PREFERRED_VERSION_mpfr ?= "2.3.1"
+PREFERRED_VERSION_mpfr-native ?= "2.3.1"
+PREFERRED_VERSION_mpg123 ?= "0.66"
+PREFERRED_VERSION_mpg321 ?= "0.2.10"
+PREFERRED_VERSION_mplayer-common ?= "0.0.1"
+PREFERRED_VERSION_mrxvt ?= "0.5.2"
+PREFERRED_VERSION_msmtp ?= "1.4.10"
+PREFERRED_VERSION_msn-cap ?= "1.0"
+PREFERRED_VERSION_msynctool ?= "0.22"
+PREFERRED_VERSION_mt-daapd ?= "0.2.3"
+PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git"
+PREFERRED_VERSION_mtools ?= "3.9.9"
+PREFERRED_VERSION_mtools-native ?= "3.9.9"
+PREFERRED_VERSION_mtpaint ?= "3.02"
+PREFERRED_VERSION_mtr ?= "0.65"
+PREFERRED_VERSION_multisync ?= "0.90.18"
+PREFERRED_VERSION_murasaki ?= "0.8.8"
+PREFERRED_VERSION_mutt ?= "1.5.15"
+PREFERRED_VERSION_mysql ?= "4.1.18"
+PREFERRED_VERSION_mysql-native ?= "4.1.18"
+PREFERRED_VERSION_mythfront-config ?= "1.10"
+PREFERRED_VERSION_mythfront-session ?= "1.5"
+PREFERRED_VERSION_nabi ?= "0.17"
+PREFERRED_VERSION_nail ?= "11.21"
+PREFERRED_VERSION_nano ?= "2.0.7"
+PREFERRED_VERSION_nasm-native ?= "0.98.38"
+PREFERRED_VERSION_nautilus ?= "2.12.2"
+PREFERRED_VERSION_nautilus-cd-burner ?= "2.8.5"
+PREFERRED_VERSION_nbd ?= "2.8.7"
+PREFERRED_VERSION_ncftp ?= "3.2.0"
+PREFERRED_VERSION_ncmpc ?= "0.11.1"
+PREFERRED_VERSION_ncurses ?= "5.4"
+PREFERRED_VERSION_ncurses-native ?= "5.4"
+PREFERRED_VERSION_ndisc6 ?= "0.6.7"
+PREFERRED_VERSION_neon ?= "0.25.5"
+PREFERRED_VERSION_net6 ?= "1.3.1"
+PREFERRED_VERSION_netatalk ?= "2.0.3"
+PREFERRED_VERSION_netbase ?= "4.21"
+PREFERRED_VERSION_netcat ?= "0.7.1"
+PREFERRED_VERSION_netpbm ?= "10.28"
+PREFERRED_VERSION_netperf ?= "2.4.2"
+PREFERRED_VERSION_net-snmp ?= "5.4.1"
+PREFERRED_VERSION_net-tools ?= "1.60"
+PREFERRED_VERSION_networkmanager ?= "0.7.1"
+PREFERRED_VERSION_network-manager-applet ?= "0.6.5"
+PREFERRED_VERSION_network-suspend-scripts ?= "1.1"
+PREFERRED_VERSION_nfs-utils ?= "1.0.6"
+PREFERRED_VERSION_ngrep ?= "1.42"
+PREFERRED_VERSION_nis-all ?= "1.0"
+PREFERRED_VERSION_nkf ?= "2.07"
+PREFERRED_VERSION_nkf-native ?= "2.07"
+PREFERRED_VERSION_nmap ?= "4.20"
+PREFERRED_VERSION_nmixer ?= "2.0"
+PREFERRED_VERSION_nmm ?= "0.0.2"
+PREFERRED_VERSION_nogravity ?= "2.0"
+PREFERRED_VERSION_notecase ?= "1.2.6"
+PREFERRED_VERSION_notez ?= "1.1.0"
+PREFERRED_VERSION_notification-daemon ?= "0.3.7"
+PREFERRED_VERSION_nsd ?= "2.0.0"
+PREFERRED_VERSION_ntfs-3g ?= "1.0"
+PREFERRED_VERSION_ntop ?= "3.0"
+PREFERRED_VERSION_ntp ?= "4.2.2p3"
+PREFERRED_VERSION_ntpclient ?= "2003_194"
+PREFERRED_VERSION_ntp-ssl ?= "4.1.2"
+PREFERRED_VERSION_nunome ?= "1.0.2"
+PREFERRED_VERSION_nylon-feed ?= "1.0"
+PREFERRED_VERSION_obby ?= "0.4.1"
+PREFERRED_VERSION_obexftp ?= "0.22"
+PREFERRED_VERSION_obexpush ?= "1.0.0"
+PREFERRED_VERSION_obexpush-native ?= "1.0.0"
+PREFERRED_VERSION_octave ?= "2.1.73"
+PREFERRED_VERSION_offlineimap ?= "4.0.14"
+PREFERRED_VERSION_olsrd ?= "0.5.3"
+PREFERRED_VERSION_omext ?= "0.2"
+PREFERRED_VERSION_omniorb ?= "4.0.7"
+PREFERRED_VERSION_omniorb-native ?= "4.0.7"
+PREFERRED_VERSION_openal ?= "0.0.8"
+PREFERRED_VERSION_openh323 ?= "1.13.5.4"
+PREFERRED_VERSION_openjade ?= "1.3.2"
+PREFERRED_VERSION_openjade-native ?= "1.3.2"
+PREFERRED_VERSION_openldap ?= "2.3.11"
+PREFERRED_VERSION_openntpd ?= "3.9p1"
+PREFERRED_VERSION_openobex ?= "1.5"
+PREFERRED_VERSION_openpbx.org ?= "1.2_rc3"
+PREFERRED_VERSION_openpbx.org-perl ?= "1.0"
+PREFERRED_VERSION_openprotium-init ?= "0.10"
+PREFERRED_VERSION_openprotium-packages ?= "1.0"
+PREFERRED_VERSION_opensp ?= "1.5"
+PREFERRED_VERSION_opensp-native ?= "1.5"
+PREFERRED_VERSION_openssh ?= "4.6p1"
+PREFERRED_VERSION_openssl ?= "0.9.8j"
+PREFERRED_VERSION_openssl-native ?= "0.9.8j"
+PREFERRED_VERSION_openswan ?= "2.4.7"
+PREFERRED_VERSION_openttd ?= "0.6.3"
+PREFERRED_VERSION_openvpn ?= "2.0.9"
+PREFERRED_VERSION_oplinux-packages ?= "1.0"
+PREFERRED_VERSION_oprofile ?= "0.9.4"
+PREFERRED_VERSION_orage ?= "4.4.1"
+PREFERRED_VERSION_orbit2 ?= "2.14.12"
+PREFERRED_VERSION_orbit2-native ?= "2.14.12"
+PREFERRED_VERSION_orinoco-conf ?= "1.0"
+PREFERRED_VERSION_orinoco-modules ?= "0.15rc2"
+PREFERRED_VERSION_orpheus ?= "1.5"
+PREFERRED_VERSION_ortp ?= "0.7.1"
+PREFERRED_VERSION_osso-af-settings ?= "0.8.5"
+PREFERRED_VERSION_osso-af-startup ?= "0.28-1"
+PREFERRED_VERSION_osso-af-utils ?= "0.4"
+PREFERRED_VERSION_osso-app-killer ?= "0.4-3"
+PREFERRED_VERSION_osso-application-installer ?= "1.0.03-1"
+PREFERRED_VERSION_osso-bttools ?= "0.25.1"
+PREFERRED_VERSION_osso-core-config ?= "200515.1"
+PREFERRED_VERSION_osso-dsp-headers ?= "0.1"
+PREFERRED_VERSION_osso-esd ?= "0.5"
+PREFERRED_VERSION_osso-gwconnect ?= "1.0.8"
+PREFERRED_VERSION_osso-gwobex ?= "0.26.1"
+PREFERRED_VERSION_osso-ic-oss ?= "1.0.4"
+PREFERRED_VERSION_osso-screenshot-tool ?= "1.20-1"
+PREFERRED_VERSION_osso-sounds ?= "0.3-1"
+PREFERRED_VERSION_osso-thumbnail ?= "0.7"
+PREFERRED_VERSION_otpkeygen ?= "1.3.0"
+PREFERRED_VERSION_outo ?= "0.1.1"
+PREFERRED_VERSION_p3scan ?= "2.9.05d"
+PREFERRED_VERSION_p4 ?= "05.2"
+PREFERRED_VERSION_packagekit ?= "0.5.2"
+PREFERRED_VERSION_package-index ?= "1.0"
+PREFERRED_VERSION_pad-native ?= "1.0"
+PREFERRED_VERSION_pairs ?= "1.1.1"
+PREFERRED_VERSION_pango ?= "1.22.0"
+PREFERRED_VERSION_panoramixext ?= "1.1"
+PREFERRED_VERSION_parted ?= "1.8.7"
+PREFERRED_VERSION_patch ?= "2.5.9"
+PREFERRED_VERSION_patcher ?= "20040913"
+PREFERRED_VERSION_patcher-native ?= "20040913"
+PREFERRED_VERSION_patchutils ?= "0.2.31"
+PREFERRED_VERSION_pax-utils ?= "0.1.13"
+PREFERRED_VERSION_pax-utils-native ?= "0.1.13"
+PREFERRED_VERSION_pbltool-native ?= "0.2"
+PREFERRED_VERSION_pciutils ?= "2.2.4"
+PREFERRED_VERSION_pcmanfm ?= "0.5"
+PREFERRED_VERSION_pcmcia-cs ?= "3.2.8"
+PREFERRED_VERSION_pcmciautils ?= "014"
+PREFERRED_VERSION_pdamaze ?= "1.0.0"
+PREFERRED_VERSION_pdm ?= "1.0"
+PREFERRED_VERSION_perl ?= "5.8.8"
+PREFERRED_VERSION_perl-native ?= "5.8.8"
+PREFERRED_VERSION_petitepainture ?= "1.5"
+PREFERRED_VERSION_phalanx ?= "22"
+PREFERRED_VERSION_phoneserver ?= "1.0"
+PREFERRED_VERSION_php ?= "5.2.0"
+PREFERRED_VERSION_php-native ?= "5.2.0"
+PREFERRED_VERSION_picocom ?= "1.4"
+PREFERRED_VERSION_pidgin ?= "2.5.3"
+PREFERRED_VERSION_pine ?= "4.64"
+PREFERRED_VERSION_pipeman ?= "1.0.0"
+PREFERRED_VERSION_pipepanic ?= "0.1.1"
+PREFERRED_VERSION_pisi ?= "0.4.7"
+PREFERRED_VERSION_pivotinit ?= "1.0.0"
+PREFERRED_VERSION_pixman ?= "0.12.0"
+PREFERRED_VERSION_pixops-test ?= "1.0"
+PREFERRED_VERSION_pkgconfig ?= "0.23"
+PREFERRED_VERSION_pkgconfig-native ?= "0.23"
+PREFERRED_VERSION_plinciv ?= "0.16"
+PREFERRED_VERSION_plone ?= "2.1.2"
+PREFERRED_VERSION_plot ?= "0.28"
+PREFERRED_VERSION_pme ?= "1.0.3"
+PREFERRED_VERSION_pmount ?= "0.9.4"
+PREFERRED_VERSION_pmtools ?= "20050926"
+PREFERRED_VERSION_poboxserver ?= "1.2.5"
+PREFERRED_VERSION_pocketcellar ?= "1.1"
+PREFERRED_VERSION_pocketsphinx ?= "0.2.1"
+PREFERRED_VERSION_poppler ?= "0.8.4"
+PREFERRED_VERSION_poppler-data ?= "0.1"
+PREFERRED_VERSION_popt ?= "1.7"
+PREFERRED_VERSION_popt-native ?= "1.7"
+PREFERRED_VERSION_poptop ?= "1.3.4"
+PREFERRED_VERSION_poqetpresenter ?= "0.0.6"
+PREFERRED_VERSION_portabase ?= "1.9"
+PREFERRED_VERSION_portmap ?= "6.0"
+PREFERRED_VERSION_postfix ?= "2.0.20"
+PREFERRED_VERSION_postfix-native ?= "2.0.20"
+PREFERRED_VERSION_postgresql ?= "8.1.8"
+PREFERRED_VERSION_povray ?= "3.6.1"
+PREFERRED_VERSION_powermanga ?= "0.79"
+PREFERRED_VERSION_powernowd ?= "0.96"
+PREFERRED_VERSION_powertop ?= "1.8"
+PREFERRED_VERSION_ppp ?= "2.4.3"
+PREFERRED_VERSION_ppp-dsl ?= "0.1-monolithic"
+PREFERRED_VERSION_pptp-linux ?= "1.7.1"
+PREFERRED_VERSION_prboom ?= "2.2.6"
+PREFERRED_VERSION_prboom-devconfig ?= "1.0"
+PREFERRED_VERSION_prelink ?= "20060712"
+PREFERRED_VERSION_printproto ?= "1.0.3"
+PREFERRED_VERSION_prism2-firmware-update ?= "1.7.4"
+PREFERRED_VERSION_prism54-firmware ?= "1.0.4.3"
+PREFERRED_VERSION_prism54-module ?= "1.2"
+PREFERRED_VERSION_prism-firmware ?= "1.0"
+PREFERRED_VERSION_prismstumbler ?= "0.7.3"
+PREFERRED_VERSION_privoxy ?= "3.0.3"
+PREFERRED_VERSION_procps ?= "3.2.7"
+PREFERRED_VERSION_proj-4 ?= "4.9"
+PREFERRED_VERSION_proj-4-native ?= "4.9"
+PREFERRED_VERSION_psmisc ?= "22.2"
+PREFERRED_VERSION_psplash-zap ?= "1.0"
+PREFERRED_VERSION_pth ?= "2.0.2"
+PREFERRED_VERSION_pulseaudio ?= "0.9.10"
+PREFERRED_VERSION_puppy ?= "1.11"
+PREFERRED_VERSION_puzz-le ?= "2.0.0"
+PREFERRED_VERSION_puzzles ?= "r7436"
+PREFERRED_VERSION_pvrusb2-mci ?= "20060903"
+PREFERRED_VERSION_pwdutils ?= "2.6"
+PREFERRED_VERSION_pwlib ?= "1.5.2"
+PREFERRED_VERSION_pwmpi ?= "2.2.7"
+PREFERRED_VERSION_pxaregs ?= "1.14"
+PREFERRED_VERSION_python24 ?= "2.4.4"
+PREFERRED_VERSION_python24-native ?= "2.4.0"
+PREFERRED_VERSION_python24-pyqt2 ?= "3.13"
+PREFERRED_VERSION_python24-pyqwt2 ?= "3.10"
+PREFERRED_VERSION_python24-sip ?= "4.1.1"
+PREFERRED_VERSION_python ?= "2.6.2"
+PREFERRED_VERSION_python-ao ?= "0.82"
+PREFERRED_VERSION_python-constraint ?= "1.1"
+PREFERRED_VERSION_python-dbus ?= "0.83.0"
+PREFERRED_VERSION_python-fam ?= "1.1.1"
+PREFERRED_VERSION_python-fnorb ?= "1.3"
+PREFERRED_VERSION_python-fpconst ?= "0.6.0"
+PREFERRED_VERSION_python-gammu ?= "0.24"
+PREFERRED_VERSION_python-gmpy ?= "1.0.1"
+PREFERRED_VERSION_python-gnosis ?= "1.2.2"
+PREFERRED_VERSION_python-gst ?= "0.10.10"
+PREFERRED_VERSION_python-hmm ?= "0.4"
+PREFERRED_VERSION_python-imaging ?= "1.1.6"
+PREFERRED_VERSION_python-imdbpy ?= "3.1"
+PREFERRED_VERSION_python-inotify ?= "0.1.0"
+PREFERRED_VERSION_python-irclib ?= "0.4.6"
+PREFERRED_VERSION_python-itools ?= "0.16.5"
+PREFERRED_VERSION_python-libgmail ?= "0.1.6"
+PREFERRED_VERSION_python-logilab-common ?= "0.9.3"
+PREFERRED_VERSION_python-lxml ?= "1.3.3"
+PREFERRED_VERSION_python-mad ?= "0.6"
+PREFERRED_VERSION_python-mysqldb ?= "1.2.1"
+PREFERRED_VERSION_python-native ?= "2.6.1"
+PREFERRED_VERSION_python-numarray ?= "1.1.1"
+PREFERRED_VERSION_python-numeric ?= "23.7"
+PREFERRED_VERSION_python-ogg ?= "1.3"
+PREFERRED_VERSION_python-pexpect ?= "2.1"
+PREFERRED_VERSION_python-pybluez ?= "0.13"
+PREFERRED_VERSION_python-pycairo ?= "1.4.0"
+PREFERRED_VERSION_python-pychecker ?= "0.8.17"
+PREFERRED_VERSION_python-pycodes ?= "1.2"
+PREFERRED_VERSION_python-pycrypto ?= "2.0.1"
+PREFERRED_VERSION_python-pycurl ?= "7.18.2"
+PREFERRED_VERSION_python-pyephem ?= "3.7.2a"
+PREFERRED_VERSION_python-pyfits ?= "1.1"
+PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
+PREFERRED_VERSION_python-pygame ?= "1.8.1"
+PREFERRED_VERSION_python-pygnome ?= "2.16.2"
+PREFERRED_VERSION_python-pygobject ?= "2.14.2"
+PREFERRED_VERSION_python-pygobject-native ?= "2.14.2"
+PREFERRED_VERSION_python-pygoogle ?= "0.6"
+PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12"
+PREFERRED_VERSION_python-pygtk ?= "2.10.4"
+PREFERRED_VERSION_python-pyid3lib ?= "0.5.1"
+PREFERRED_VERSION_python-pyiw ?= "0.3.3"
+PREFERRED_VERSION_python-pylinda ?= "0.6"
+PREFERRED_VERSION_python-pylint ?= "0.13.2"
+PREFERRED_VERSION_python-pymetar ?= "0.11"
+PREFERRED_VERSION_python-pymp3 ?= "0.3.4"
+PREFERRED_VERSION_python-pyrad ?= "0.8"
+PREFERRED_VERSION_python-pyraf ?= "1.4"
+PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
+PREFERRED_VERSION_python-pyrex ?= "0.9.8.4"
+PREFERRED_VERSION_python-pyrex-native ?= "0.9.8.5"
+PREFERRED_VERSION_python-pyro ?= "3.7"
+PREFERRED_VERSION_python-pyserial ?= "2.4"
+PREFERRED_VERSION_python-pytester ?= "0.6.0"
+PREFERRED_VERSION_python-pythondaap ?= "0.4"
+PREFERRED_VERSION_python-pyvisa ?= "1.1"
+PREFERRED_VERSION_python-pyweather ?= "0.7.0"
+PREFERRED_VERSION_python-pywpa ?= "0.3.4"
+PREFERRED_VERSION_python-pyxml ?= "0.8.4"
+PREFERRED_VERSION_python-pyxmlrpc ?= "0.8.8.3"
+PREFERRED_VERSION_python-pyzeroconf ?= "0.12"
+PREFERRED_VERSION_python-scapy ?= "1.1.1"
+PREFERRED_VERSION_python-scons ?= "0.97"
+PREFERRED_VERSION_python-scons-native ?= "0.97"
+PREFERRED_VERSION_python-setuptools ?= "0.6c8"
+PREFERRED_VERSION_python-setuptools-native ?= "0.6c9"
+PREFERRED_VERSION_python-sgmlop ?= "1.1"
+PREFERRED_VERSION_python-simplejson ?= "1.7.1"
+PREFERRED_VERSION_python-snmplib ?= "0.1.1"
+PREFERRED_VERSION_python-soappy ?= "0.11.6"
+PREFERRED_VERSION_python-spydi ?= "0.9.7"
+PREFERRED_VERSION_python-spyro ?= "0.9.22"
+PREFERRED_VERSION_python-sqlobject ?= "0.9.1"
+PREFERRED_VERSION_python-sword ?= "1.5.9"
+PREFERRED_VERSION_python-urwid ?= "0.9.8.1"
+PREFERRED_VERSION_python-vmaps ?= "1.1"
+PREFERRED_VERSION_python-vorbis ?= "1.3"
+PREFERRED_VERSION_python-webpy ?= "0.21"
+PREFERRED_VERSION_qclockchange ?= "0.1a"
+PREFERRED_VERSION_qcoptest ?= "0.1.1"
+PREFERRED_VERSION_qc-usb-messenger ?= "1.1"
+PREFERRED_VERSION_qfish2 ?= "1.1.0"
+PREFERRED_VERSION_qgis ?= "0.8.1"
+PREFERRED_VERSION_qiv ?= "1.9"
+PREFERRED_VERSION_qjackctl ?= "0.3.1a"
+PREFERRED_VERSION_qmake2-native ?= "2.10a"
+PREFERRED_VERSION_qmake-native ?= "1.07a"
+PREFERRED_VERSION_qmatrix ?= "1.1.0"
+PREFERRED_VERSION_qof ?= "0.7.2"
+PREFERRED_VERSION_qolyester ?= "20050728"
+PREFERRED_VERSION_qpdf2 ?= "2.2.1"
+PREFERRED_VERSION_qpealarmclock ?= "1.0.9"
+PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9"
+PREFERRED_VERSION_qpe-gaim ?= "20041030"
+PREFERRED_VERSION_qpegps ?= "0.9.3.1"
+PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0"
+PREFERRED_VERSION_qpe-libgaim ?= "1.5.0"
+PREFERRED_VERSION_qpenmapfe ?= "1.0.0"
+PREFERRED_VERSION_qpf-arabic ?= "1.0"
+PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10"
+PREFERRED_VERSION_qpf-bitstream-vera-sans-mono ?= "1.10"
+PREFERRED_VERSION_qpf-font-common ?= "1.0"
+PREFERRED_VERSION_qpf-freemono ?= "1.0"
+PREFERRED_VERSION_qpf-freeserif ?= "1.0"
+PREFERRED_VERSION_qpf-helvetica ?= "1.0"
+PREFERRED_VERSION_qpf-hunkysans ?= "0.3.0"
+PREFERRED_VERSION_qpf-hunkyserif ?= "0.3.0"
+PREFERRED_VERSION_qpf-qte ?= "2.3.10"
+PREFERRED_VERSION_qpf-unifont ?= "1.0"
+PREFERRED_VERSION_qpf-unismall ?= "1.0.0"
+PREFERRED_VERSION_qpf-utopia ?= "1.0"
+PREFERRED_VERSION_qplot ?= "2.0.1-cvs-20020420"
+PREFERRED_VERSION_qpobox ?= "0.5.4"
+PREFERRED_VERSION_qpphoto ?= "1.0.2"
+PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6"
+PREFERRED_VERSION_qsvn ?= "0.3.0"
+PREFERRED_VERSION_qt4-x11-free ?= "4.4.1"
+PREFERRED_VERSION_qtplot ?= "0.2"
+PREFERRED_VERSION_qt-x11-free ?= "3.3.7"
+PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5"
+PREFERRED_VERSION_quagga ?= "0.99.8"
+PREFERRED_VERSION_quake1 ?= "0.0.1"
+PREFERRED_VERSION_quetoo ?= "0.6.1"
+PREFERRED_VERSION_quilt ?= "0.45"
+PREFERRED_VERSION_quilt-native ?= "0.45"
+PREFERRED_VERSION_qwt ?= "4.2.0rc1"
+PREFERRED_VERSION_qxmp ?= "1.0"
+PREFERRED_VERSION_radlib ?= "2.6.2"
+PREFERRED_VERSION_radlib-mysql ?= "2.6.2"
+PREFERRED_VERSION_radvd ?= "1.0"
+PREFERRED_VERSION_rage ?= "0.2.0.003"
+PREFERRED_VERSION_randrext ?= "1.0"
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+PREFERRED_VERSION_rdesktop ?= "1.5.0"
+PREFERRED_VERSION_rdiff-backup ?= "1.1.5"
+PREFERRED_VERSION_readline ?= "4.3"
+PREFERRED_VERSION_readline-native ?= "4.3"
+PREFERRED_VERSION_reaim ?= "7.0.1.13"
+PREFERRED_VERSION_recode ?= "3.6"
+PREFERRED_VERSION_recode-native ?= "3.6"
+PREFERRED_VERSION_recordproto ?= "1.13.2"
+PREFERRED_VERSION_redfang ?= "2.5"
+PREFERRED_VERSION_refdbg ?= "1.2"
+PREFERRED_VERSION_regex-markup ?= "0.10.0"
+PREFERRED_VERSION_reiser4progs ?= "1.0.4"
+PREFERRED_VERSION_reiserfsprogs ?= "3.6.19"
+PREFERRED_VERSION_renderproto ?= "0.9.3"
+PREFERRED_VERSION_resistorui ?= "0.9"
+PREFERRED_VERSION_resolvconf ?= "1.41"
+PREFERRED_VERSION_resourceext ?= "1.0"
+PREFERRED_VERSION_resourceproto ?= "1.0.2"
+PREFERRED_VERSION_rfakeap ?= "0.2"
+PREFERRED_VERSION_rglueap ?= "0.1"
+PREFERRED_VERSION_rhythmbox ?= "0.8.7"
+PREFERRED_VERSION_rlpr ?= "2.05"
+PREFERRED_VERSION_r-native ?= "2.0.0"
+PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0"
+PREFERRED_VERSION_rott ?= "1.0"
+PREFERRED_VERSION_rox-filer ?= "2.5"
+PREFERRED_VERSION_rpm ?= "4.4"
+PREFERRED_VERSION_rp-pppoe ?= "3.8"
+PREFERRED_VERSION_rrdtool ?= "1.0.49"
+PREFERRED_VERSION_rsync ?= "2.6.9"
+PREFERRED_VERSION_rt2570 ?= "1.1.0-b2"
+PREFERRED_VERSION_rt2570-k2wrlz ?= "1.6.1"
+PREFERRED_VERSION_rt73-k2wrlz ?= "2.0.1"
+PREFERRED_VERSION_rtaudio-tests ?= "3.0.1"
+PREFERRED_VERSION_ruby ?= "1.8.5"
+PREFERRED_VERSION_ruby-native ?= "1.8.5"
+PREFERRED_VERSION_rxvt ?= "2.8.0"
+PREFERRED_VERSION_rxvt-unicode ?= "7.9"
+PREFERRED_VERSION_sablevm ?= "1.12"
+PREFERRED_VERSION_sablevm-classpath ?= "1.12"
+PREFERRED_VERSION_salsa-lib ?= "0.0.1"
+PREFERRED_VERSION_samba ?= "3.2.5"
+PREFERRED_VERSION_samba-essential ?= "3.2.5"
+PREFERRED_VERSION_sane-backends ?= "1.0.17"
+PREFERRED_VERSION_sane-frontends ?= "1.0.13"
+PREFERRED_VERSION_sato-icon-theme ?= "0.1"
+PREFERRED_VERSION_sbagen ?= "1.4.1"
+PREFERRED_VERSION_sbrsh ?= "7.1"
+PREFERRED_VERSION_scap ?= "0.1"
+PREFERRED_VERSION_sccd ?= "1.0"
+PREFERRED_VERSION_scew ?= "0.3.1"
+PREFERRED_VERSION_schedstat-utils ?= "1.0"
+PREFERRED_VERSION_schroedinger ?= "1.0.5"
+PREFERRED_VERSION_screen ?= "4.0.2"
+PREFERRED_VERSION_scrnsaverproto ?= "1.1.0"
+PREFERRED_VERSION_scsi-idle ?= "2.4.23"
+PREFERRED_VERSION_sctzap ?= "0.0cvs20060814"
+PREFERRED_VERSION_scummvm ?= "0.10.0"
+PREFERRED_VERSION_scummvm-qpe ?= "0.6.1b"
+PREFERRED_VERSION_scw ?= "0.4.3"
+PREFERRED_VERSION_sdcc ?= "2.5.0"
+PREFERRED_VERSION_sdcc-native ?= "2.5.0"
+PREFERRED_VERSION_sdk-default-icons ?= "0.2-1"
+PREFERRED_VERSION_sdk-default-theme ?= "0.1-1"
+PREFERRED_VERSION_sdk-default-theme-config ?= "1.0-1"
+PREFERRED_VERSION_sdl-perl ?= "1.20.3"
+PREFERRED_VERSION_sed ?= "4.1.2"
+PREFERRED_VERSION_sed-native ?= "4.1.2"
+PREFERRED_VERSION_ser ?= "0.9.0"
+PREFERRED_VERSION_serload-native ?= "1.0"
+PREFERRED_VERSION_sessreg ?= "1.0.3"
+PREFERRED_VERSION_setmixer ?= "27DEC94"
+PREFERRED_VERSION_setserial ?= "2.17"
+PREFERRED_VERSION_setxkbmap ?= "1.0.4"
+PREFERRED_VERSION_sgml-common ?= "0.6.3"
+PREFERRED_VERSION_sgml-common-native ?= "0.6.3"
+PREFERRED_VERSION_shared-mime-info ?= "0.51"
+PREFERRED_VERSION_sharp-compat-libs ?= "0.5"
+PREFERRED_VERSION_sharprom-toolchain-native ?= "1.0"
+PREFERRED_VERSION_shasum-native ?= "1.0"
+PREFERRED_VERSION_shfs-modules ?= "0.35"
+PREFERRED_VERSION_shfs-utils ?= "0.35"
+PREFERRED_VERSION_shisensho ?= "1.0.0"
+PREFERRED_VERSION_shopper ?= "1.2.1"
+PREFERRED_VERSION_shorewall ?= "2.0.9-monolithic"
+PREFERRED_VERSION_sidplay-base ?= "1.0.9"
+PREFERRED_VERSION_sidplayer ?= "1.5.0"
+PREFERRED_VERSION_silo ?= "1.4.8"
+PREFERRED_VERSION_simh ?= "3.7-1"
+PREFERRED_VERSION_simpad-utilities ?= "1.0"
+PREFERRED_VERSION_sip3-native ?= "4.0.1"
+PREFERRED_VERSION_sipsak ?= "0.9.6"
+PREFERRED_VERSION_skippy-xd ?= "0.5.0"
+PREFERRED_VERSION_sl ?= "3.03"
+PREFERRED_VERSION_slang ?= "1.4.9"
+PREFERRED_VERSION_slcalc ?= "1.2.1"
+PREFERRED_VERSION_sliderulez ?= "0.92"
+PREFERRED_VERSION_slotsig ?= "0.6"
+PREFERRED_VERSION_slrn ?= "0.9.8.0"
+PREFERRED_VERSION_slsnif ?= "0.4.4"
+PREFERRED_VERSION_slugimage-native ?= "1.0"
+PREFERRED_VERSION_slugos-init ?= "0.10"
+PREFERRED_VERSION_slugos-native ?= "1.0"
+PREFERRED_VERSION_slugos-native-packages ?= "1.0"
+PREFERRED_VERSION_slugtool ?= "1.0"
+PREFERRED_VERSION_slugtool-native ?= "1.0"
+PREFERRED_VERSION_slutils ?= "0.1.0"
+PREFERRED_VERSION_smartmontools ?= "5.37"
+PREFERRED_VERSION_sms ?= "1.1"
+PREFERRED_VERSION_sn9c102 ?= "1.32"
+PREFERRED_VERSION_snes232 ?= "cvs"
+PREFERRED_VERSION_snes9x ?= "1.43-WIP1"
+PREFERRED_VERSION_snes9x-sdl ?= "1.39"
+PREFERRED_VERSION_snes9x-sdl-qpe ?= "1.39"
+PREFERRED_VERSION_socat ?= "1.3.2.1"
+PREFERRED_VERSION_sofia-sip ?= "1.11.7"
+PREFERRED_VERSION_softfan ?= "0.10"
+PREFERRED_VERSION_sokoban ?= "1.3.8ern"
+PREFERRED_VERSION_soundserver ?= "1.0"
+PREFERRED_VERSION_soundtracker ?= "0.6.8"
+PREFERRED_VERSION_soundtracker-gtk2 ?= "0.6.7"
+PREFERRED_VERSION_sox ?= "13.0.0"
+PREFERRED_VERSION_sox-native ?= "13.0.0"
+PREFERRED_VERSION_spandsp ?= "0.0.3"
+PREFERRED_VERSION_spca5xx ?= "20060501"
+PREFERRED_VERSION_spectrum-fw ?= "1.0"
+PREFERRED_VERSION_speex ?= "1.1+1.2rc1"
+PREFERRED_VERSION_sphinxbase ?= "0.1"
+PREFERRED_VERSION_squashfs-lzma-tools ?= "3.1r2"
+PREFERRED_VERSION_squashfs-lzma-tools-native ?= "3.1r2"
+PREFERRED_VERSION_squashfs-tools ?= "3.1r2"
+PREFERRED_VERSION_squashfs-tools-native ?= "3.1r2"
+PREFERRED_VERSION_squeak-nox ?= "3.4-2"
+PREFERRED_VERSION_squid ?= "2.6.STABLE14"
+PREFERRED_VERSION_sshfs-fuse ?= "1.8"
+PREFERRED_VERSION_ssmtp ?= "2.61"
+PREFERRED_VERSION_stagemanager-native ?= "0.0.1"
+PREFERRED_VERSION_startup-monitor ?= "0.18-2"
+PREFERRED_VERSION_startup-notification ?= "0.9"
+PREFERRED_VERSION_stat ?= "3.3"
+PREFERRED_VERSION_stat-native ?= "3.3"
+PREFERRED_VERSION_strace ?= "4.5.15"
+PREFERRED_VERSION_streamripper ?= "1.61.10"
+PREFERRED_VERSION_stress ?= "0.18.8"
+PREFERRED_VERSION_stunnel ?= "4.09"
+PREFERRED_VERSION_subapplet ?= "1.0.8"
+PREFERRED_VERSION_subversion ?= "1.6.5"
+PREFERRED_VERSION_sudo ?= "1.6.8p12"
+PREFERRED_VERSION_supertux ?= "0.1.2"
+PREFERRED_VERSION_supybot ?= "0.77.0"
+PREFERRED_VERSION_suspend-desktop ?= "1.0"
+PREFERRED_VERSION_swfdec ?= "0.5.1"
+PREFERRED_VERSION_swig ?= "1.3.31"
+PREFERRED_VERSION_swig-native ?= "1.3.31"
+PREFERRED_VERSION_sword ?= "1.5.9"
+PREFERRED_VERSION_sylpheed ?= "2.2.9"
+PREFERRED_VERSION_synaesthesia ?= "2.4"
+PREFERRED_VERSION_syncml-client ?= "0.1"
+PREFERRED_VERSION_synergy ?= "1.3.1"
+PREFERRED_VERSION_sysfsutils ?= "2.0.0"
+PREFERRED_VERSION_sysklogd ?= "1.4.1"
+PREFERRED_VERSION_syslinux-native ?= "3.36"
+PREFERRED_VERSION_syslog-ng ?= "1.6.11"
+PREFERRED_VERSION_sysvinit ?= "2.86"
+PREFERRED_VERSION_t1lib ?= "5.0.2"
+PREFERRED_VERSION_taglib ?= "1.4"
+PREFERRED_VERSION_taglibc ?= "1.4"
+PREFERRED_VERSION_tango-icon-theme ?= "0.7.2"
+PREFERRED_VERSION_tango-icon-theme-extras ?= "0.1.0"
+PREFERRED_VERSION_tapioca ?= "0.3.9"
+PREFERRED_VERSION_tapiocaui ?= "0.3.9.1"
+PREFERRED_VERSION_tapioca-xmpp ?= "0.3.9"
+PREFERRED_VERSION_tar ?= "1.18"
+PREFERRED_VERSION_tasklistapplet ?= "1.0.5"
+PREFERRED_VERSION_tasks ?= "0.10"
+PREFERRED_VERSION_tcl ?= "8.4.11"
+PREFERRED_VERSION_tcpdump ?= "3.9.7"
+PREFERRED_VERSION_tcpick ?= "0.1.22"
+PREFERRED_VERSION_tcptraceroute ?= "1.5beta6"
+PREFERRED_VERSION_tcptrack ?= "1.1.2"
+PREFERRED_VERSION_tcp-wrappers ?= "7.6"
+PREFERRED_VERSION_tda1004x-firmware ?= "1.0"
+PREFERRED_VERSION_telepathy-gabble ?= "0.5.10"
+PREFERRED_VERSION_telepathy-glib ?= "0.5.10"
+PREFERRED_VERSION_telepathy-mission-control ?= "4.22"
+PREFERRED_VERSION_teleport ?= "0.34"
+PREFERRED_VERSION_temtor ?= "0.0.1"
+PREFERRED_VERSION_termcap ?= "11.0.1"
+PREFERRED_VERSION_terminus ?= "1.0"
+PREFERRED_VERSION_tesseract ?= "1.0"
+PREFERRED_VERSION_tetex ?= "3.0"
+PREFERRED_VERSION_tetex-native ?= "3.0"
+PREFERRED_VERSION_tetex-texmf ?= "3.0"
+PREFERRED_VERSION_texinfo ?= "4.8a"
+PREFERRED_VERSION_texlive ?= "2007"
+PREFERRED_VERSION_texmaker ?= "1.3"
+PREFERRED_VERSION_thcrut ?= "1.2.5"
+PREFERRED_VERSION_thttpd ?= "2.25b"
+PREFERRED_VERSION_thumbpad ?= "0.8"
+PREFERRED_VERSION_thunar ?= "0.8.0"
+PREFERRED_VERSION_thunderbird ?= "1.0.7"
+PREFERRED_VERSION_tickypip ?= "0.1.2"
+PREFERRED_VERSION_tickypip-levels ?= "1.1"
+PREFERRED_VERSION_tiff ?= "3.8.2+4.0.0beta2"
+PREFERRED_VERSION_tightvnc ?= "1.3dev7"
+PREFERRED_VERSION_tiinit ?= "3.2.26"
+PREFERRED_VERSION_time ?= "1.7"
+PREFERRED_VERSION_timesleuth ?= "1.05ern"
+PREFERRED_VERSION_timezones ?= "1.2.0"
+PREFERRED_VERSION_tin ?= "1.9.1"
+PREFERRED_VERSION_tinc ?= "1.0.2"
+PREFERRED_VERSION_tinylogin ?= "1.4"
+PREFERRED_VERSION_tinyscheme ?= "1.35"
+PREFERRED_VERSION_tk ?= "8.4.11"
+PREFERRED_VERSION_tmake ?= "1.11"
+PREFERRED_VERSION_tmdns ?= "20030116"
+PREFERRED_VERSION_tn5250 ?= "0.16.5"
+PREFERRED_VERSION_tomoe ?= "0.2.1"
+PREFERRED_VERSION_tor ?= "0.1.1.26"
+PREFERRED_VERSION_totem ?= "1.0.4"
+PREFERRED_VERSION_tracker ?= "0.5.4"
+PREFERRED_VERSION_transconnect ?= "1.3-beta"
+PREFERRED_VERSION_trapproto ?= "3.4.3"
+PREFERRED_VERSION_tree ?= "1.5.1"
+PREFERRED_VERSION_treecc ?= "0.3.6"
+PREFERRED_VERSION_treecc-native ?= "0.3.6"
+PREFERRED_VERSION_tremor ?= "20041119"
+PREFERRED_VERSION_tron ?= "1.0.0"
+PREFERRED_VERSION_tscalib ?= "0.0.1-3"
+PREFERRED_VERSION_tsclient ?= "0.140"
+PREFERRED_VERSION_tslib ?= "1.0"
+PREFERRED_VERSION_ttf-bitstream-vera ?= "1.10"
+PREFERRED_VERSION_ttf-dejavu ?= "2.23"
+PREFERRED_VERSION_ttf-gentium ?= "1.02"
+PREFERRED_VERSION_ttf-hunkyfonts ?= "0.3.0"
+PREFERRED_VERSION_ttf-liberation ?= "0.2"
+PREFERRED_VERSION_ttf-sazanami ?= "20040629"
+PREFERRED_VERSION_ttyconv ?= "0.2.3"
+PREFERRED_VERSION_ttyrec ?= "1.0.8"
+PREFERRED_VERSION_tuxnes ?= "0.75"
+PREFERRED_VERSION_twin ?= "0.4.6"
+PREFERRED_VERSION_twisted ?= "2.5.0"
+PREFERRED_VERSION_twm ?= "1.0.3"
+PREFERRED_VERSION_twutils ?= "0.2"
+PREFERRED_VERSION_txdrug ?= "0.1"
+PREFERRED_VERSION_tximage ?= "0.2"
+PREFERRED_VERSION_tzcode-native ?= "2007k"
+PREFERRED_VERSION_tzdata ?= "2009n"
+PREFERRED_VERSION_u2nl ?= "1.3"
+PREFERRED_VERSION_uae4all ?= "0.7.1"
+PREFERRED_VERSION_ubahnnav ?= "0.4.1"
+PREFERRED_VERSION_u-boot ?= "1.2.0"
+PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
+PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
+PREFERRED_VERSION_udev ?= "124"
+PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
+PREFERRED_VERSION_udhcp ?= "0.9.8"
+PREFERRED_VERSION_ufraw ?= "0.12"
+PREFERRED_VERSION_uicmoc3-native ?= "3.3.5"
+PREFERRED_VERSION_uicmoc4-native ?= "4.3.3"
+PREFERRED_VERSION_uicmoc-native ?= "2.3.10"
+PREFERRED_VERSION_uim ?= "1.3.1"
+PREFERRED_VERSION_uim-native ?= "1.3.1"
+PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0"
+PREFERRED_VERSION_ulxmlrpcpp ?= "1.5.2"
+PREFERRED_VERSION_uml-utilities ?= "20040406"
+PREFERRED_VERSION_unfreeze ?= "1.0"
+PREFERRED_VERSION_unionfs-modules ?= "1.0.13"
+PREFERRED_VERSION_unionfs-utils ?= "1.0.13"
+PREFERRED_VERSION_unionroot ?= "0.1.1"
+PREFERRED_VERSION_units ?= "1.80"
+PREFERRED_VERSION_unixbench ?= "4.1.0"
+PREFERRED_VERSION_unrar ?= "3.4.3"
+PREFERRED_VERSION_unrar-native ?= "3.4.3"
+PREFERRED_VERSION_unzip ?= "552"
+PREFERRED_VERSION_unzip-native ?= "552"
+PREFERRED_VERSION_update-alternatives-cworth ?= "0.99.154"
+PREFERRED_VERSION_update-alternatives-cworth-native ?= "0.99.154"
+PREFERRED_VERSION_update-alternatives-dpkg ?= "1.13.22"
+PREFERRED_VERSION_update-alternatives-dpkg-native ?= "1.13.22"
+PREFERRED_VERSION_update-modules ?= "1.0"
+PREFERRED_VERSION_upstart ?= "0.3.8"
+PREFERRED_VERSION_uqm ?= "0.5.0"
+PREFERRED_VERSION_usb-gadget-mode ?= "0.0.2"
+PREFERRED_VERSION_usbutils ?= "0.70"
+PREFERRED_VERSION_usbview ?= "1.0"
+PREFERRED_VERSION_ushare ?= "0.9.7"
+PREFERRED_VERSION_usound ?= "0.2.0"
+PREFERRED_VERSION_usrp ?= "0.12"
+PREFERRED_VERSION_util-linux ?= "2.12r"
+PREFERRED_VERSION_util-linux-native ?= "2.12r"
+PREFERRED_VERSION_util-macros ?= "1.1.5"
+PREFERRED_VERSION_util-macros-native ?= "1.1.5"
+PREFERRED_VERSION_uucp ?= "1.07"
+PREFERRED_VERSION_v4l2apps ?= "20020317"
+PREFERRED_VERSION_vala ?= "0.7.7"
+PREFERRED_VERSION_vala-native ?= "0.7.7"
+PREFERRED_VERSION_vde ?= "2.0.2"
+PREFERRED_VERSION_vectoroids ?= "1.1.0"
+PREFERRED_VERSION_videoplayer ?= "0.1"
+PREFERRED_VERSION_videoproto ?= "2.2.2"
+PREFERRED_VERSION_vim ?= "7.0"
+PREFERRED_VERSION_vim-tiny ?= "7.0"
+PREFERRED_VERSION_vino ?= "2.16.0"
+PREFERRED_VERSION_visiscript ?= "0.4.3"
+PREFERRED_VERSION_visual-boot ?= "0.0.1"
+PREFERRED_VERSION_vlan ?= "1.9"
+PREFERRED_VERSION_vlc-gpe ?= "0.8.4"
+PREFERRED_VERSION_vmedit ?= "0.02"
+PREFERRED_VERSION_vnc ?= "3.3.7"
+PREFERRED_VERSION_vochistory ?= "0.1"
+PREFERRED_VERSION_voicecall ?= "0.1"
+PREFERRED_VERSION_void11 ?= "0.2.0"
+PREFERRED_VERSION_vorbis-tools ?= "1.0.1"
+PREFERRED_VERSION_vpnc ?= "0.3.3"
+PREFERRED_VERSION_vsftpd ?= "2.0.5"
+PREFERRED_VERSION_vte ?= "0.16.13"
+PREFERRED_VERSION_vtun ?= "2.6"
+PREFERRED_VERSION_w3cam ?= "0.7.2"
+PREFERRED_VERSION_wakelan ?= "1.1"
+PREFERRED_VERSION_watchdog ?= "5.3.1"
+PREFERRED_VERSION_wbxml2 ?= "0.9.0"
+PREFERRED_VERSION_webcam-server ?= "0.50"
+PREFERRED_VERSION_wget ?= "1.9.1"
+PREFERRED_VERSION_whois ?= "4.5.25"
+PREFERRED_VERSION_wifistix-modules ?= "5.0.16.p0"
+PREFERRED_VERSION_wiggle ?= "0.6"
+PREFERRED_VERSION_wiggle-native ?= "0.6"
+PREFERRED_VERSION_win4 ?= "1.0.1"
+PREFERRED_VERSION_windowswmproto ?= "1.0.3"
+PREFERRED_VERSION_wireshark ?= "0.99.4"
+PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
+PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
+PREFERRED_VERSION_wmctrl ?= "1.07"
+PREFERRED_VERSION_wpa-gui ?= "0.4.8"
+PREFERRED_VERSION_wpa-supplicant ?= "0.6.9"
+PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
+PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
+PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"
+PREFERRED_VERSION_wrt-init ?= "1.0"
+PREFERRED_VERSION_wrt-utils ?= "1.0"
+PREFERRED_VERSION_wv ?= "1.2.0"
+PREFERRED_VERSION_wview-sim ?= "3.1.3"
+PREFERRED_VERSION_wview-sim-mysql ?= "3.1.3"
+PREFERRED_VERSION_wview-vpro ?= "3.1.3"
+PREFERRED_VERSION_wview-vpro-mysql ?= "3.1.3"
+PREFERRED_VERSION_wview-wxt510 ?= "3.1.3"
+PREFERRED_VERSION_wview-wxt510-mysql ?= "3.1.3"
+PREFERRED_VERSION_wxwidgets ?= "2.8.7"
+PREFERRED_VERSION_x11perf ?= "1.4.1"
+PREFERRED_VERSION_x11vnc ?= "0.9.3"
+PREFERRED_VERSION_xaos ?= "3.2.3"
+PREFERRED_VERSION_xauth ?= "1.0.2"
+PREFERRED_VERSION_xawtv ?= "3.93"
+PREFERRED_VERSION_xbacklight ?= "1.1"
+PREFERRED_VERSION_xbase-clients ?= "1.0"
+PREFERRED_VERSION_xbitmaps ?= "1.0.1"
+PREFERRED_VERSION_xcb-demo ?= "0.1"
+PREFERRED_VERSION_xcb-proto ?= "1.0"
+PREFERRED_VERSION_xcb-util ?= "0.2"
+PREFERRED_VERSION_xchat ?= "2.8.4"
+PREFERRED_VERSION_xcmiscproto ?= "1.1.2"
+PREFERRED_VERSION_xcmiscproto-native ?= "1.1.2"
+PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1"
+PREFERRED_VERSION_xdbedizzy ?= "1.0.2"
+PREFERRED_VERSION_xdemineur ?= "2.1.1"
+PREFERRED_VERSION_xdm ?= "1.1.6"
+PREFERRED_VERSION_xdpyinfo ?= "1.0.2"
+PREFERRED_VERSION_xerces-c ?= "2.7.0"
+PREFERRED_VERSION_xev ?= "1.0.2"
+PREFERRED_VERSION_xextproto ?= "7.0.2"
+PREFERRED_VERSION_xextproto-native ?= "7.0.2"
+PREFERRED_VERSION_xf86bigfontproto ?= "1.1.2"
+PREFERRED_VERSION_xf86bigfontproto-native ?= "1.1.2"
+PREFERRED_VERSION_xf86dga ?= "1.0.2"
+PREFERRED_VERSION_xf86dgaproto ?= "2.0.3"
+PREFERRED_VERSION_xf86driproto ?= "2.0.3"
+PREFERRED_VERSION_xf86-input-evdev ?= "1.1.5"
+PREFERRED_VERSION_xf86-input-keyboard ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-mouse ?= "1.2.2"
+PREFERRED_VERSION_xf86-input-penmount ?= "1.2.0"
+PREFERRED_VERSION_xf86miscproto ?= "0.9.2"
+PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
+PREFERRED_VERSION_xf86-video-ati ?= "6.6.193"
+PREFERRED_VERSION_xf86-video-fbdev ?= "0.3.1"
+PREFERRED_VERSION_xf86-video-i128 ?= "1.1.0.6"
+PREFERRED_VERSION_xf86-video-i810 ?= "1.6.5"
+PREFERRED_VERSION_xf86-video-newport ?= "0.2.1"
+PREFERRED_VERSION_xf86-video-nsc ?= "2.8.2"
+PREFERRED_VERSION_xf86-video-nv ?= "2.1.3"
+PREFERRED_VERSION_xf86-video-s3 ?= "0.5.0"
+PREFERRED_VERSION_xf86-video-savage ?= "2.1.3"
+PREFERRED_VERSION_xf86-video-siliconmotion ?= "1.5.1"
+PREFERRED_VERSION_xf86-video-sis ?= "0.9.3"
+PREFERRED_VERSION_xf86-video-tdfx ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-trident ?= "1.2.3"
+PREFERRED_VERSION_xf86-video-tseng ?= "1.1.1"
+PREFERRED_VERSION_xf86-video-vesa ?= "1.3.0"
+PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.14.1"
+PREFERRED_VERSION_xf86-video-voodoo ?= "1.1.1"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
+PREFERRED_VERSION_xfcalendar ?= "4.2.3"
+PREFERRED_VERSION_xfce4-appfinder ?= "4.4.1"
+PREFERRED_VERSION_xfce4-dev-tools ?= "4.4.0"
+PREFERRED_VERSION_xfce4-icon-theme ?= "4.4.1"
+PREFERRED_VERSION_xfce4-mixer ?= "4.4.1"
+PREFERRED_VERSION_xfce4-panel ?= "4.4.1"
+PREFERRED_VERSION_xfce4-session ?= "4.4.1"
+PREFERRED_VERSION_xfce-mcs-manager ?= "4.4.1"
+PREFERRED_VERSION_xfce-mcs-plugins ?= "4.4.1"
+PREFERRED_VERSION_xfce-terminal ?= "0.2.6"
+PREFERRED_VERSION_xfdesktop ?= "4.4.1"
+PREFERRED_VERSION_xffm ?= "4.3.99.2"
+PREFERRED_VERSION_xfonts-xorg ?= "6.8"
+PREFERRED_VERSION_xfprint ?= "4.4.1"
+PREFERRED_VERSION_xfs ?= "1.0.4"
+PREFERRED_VERSION_xfsprogs ?= "2.8.16"
+PREFERRED_VERSION_xfwm4 ?= "4.4.1"
+PREFERRED_VERSION_xfwm4-themes ?= "4.4.1"
+PREFERRED_VERSION_xhost ?= "1.0.2"
+PREFERRED_VERSION_xineramaproto ?= "1.1.2"
+PREFERRED_VERSION_xinetd ?= "2.3.13"
+PREFERRED_VERSION_xinit ?= "1.0.5"
+PREFERRED_VERSION_xkbd ?= "0.8.15"
+PREFERRED_VERSION_xmame ?= "0.100"
+PREFERRED_VERSION_xmame-tiny ?= "0.100"
+PREFERRED_VERSION_xmms ?= "1.2.10"
+PREFERRED_VERSION_xmms-embedded ?= "20040327"
+PREFERRED_VERSION_xmms-mad ?= "0.10"
+PREFERRED_VERSION_xmms-tremor ?= "1.0"
+PREFERRED_VERSION_xmodmap ?= "1.0.3"
+PREFERRED_VERSION_xmonobut ?= "0.4.1"
+PREFERRED_VERSION_xorg-cf-files ?= "1.0.2"
+PREFERRED_VERSION_xorg-headers-native ?= "1.0"
+PREFERRED_VERSION_xorg-sgml-doctools ?= "1.2"
+PREFERRED_VERSION_xoscope ?= "1.12"
+PREFERRED_VERSION_xournal ?= "0.4.0.1"
+PREFERRED_VERSION_xpext ?= "1.0-5"
+PREFERRED_VERSION_xprint ?= "0.9.001"
+PREFERRED_VERSION_xprop ?= "1.0.2"
+PREFERRED_VERSION_xproto ?= "7.0.10"
+PREFERRED_VERSION_xproto-native ?= "7.0.10"
+PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.2"
+PREFERRED_VERSION_xqt ?= "0.0.9"
+PREFERRED_VERSION_xqt2 ?= "20060509"
+PREFERRED_VERSION_xrandr ?= "1.2.2"
+PREFERRED_VERSION_xrdb ?= "1.0.4"
+PREFERRED_VERSION_xscreensaver ?= "4.22"
+PREFERRED_VERSION_xscrnsaverh ?= "1.0"
+PREFERRED_VERSION_xserver-common ?= "1.18"
+PREFERRED_VERSION_xserver-kdrive ?= "1.4.0.90"
+PREFERRED_VERSION_xserver-kdrive-common ?= "0.1"
+PREFERRED_VERSION_xserver-nodm-init ?= "1.0"
+PREFERRED_VERSION_xserver-xorg ?= "1.3.0.0"
+PREFERRED_VERSION_xset ?= "1.0.3"
+PREFERRED_VERSION_xsetroot ?= "1.0.2"
+PREFERRED_VERSION_xsp ?= "1.0.0-8"
+PREFERRED_VERSION_xst ?= "0.15"
+PREFERRED_VERSION_xstroke ?= "0.6"
+PREFERRED_VERSION_xterm ?= "207"
+PREFERRED_VERSION_xtrans ?= "1.0.4"
+PREFERRED_VERSION_xtrans-native ?= "1.0.3"
+PREFERRED_VERSION_xtscal ?= "0.6.3"
+PREFERRED_VERSION_xvinfo ?= "1.0.2"
+PREFERRED_VERSION_yeaphone ?= "0.1"
+PREFERRED_VERSION_ypbind-mt ?= "1.19"
+PREFERRED_VERSION_ypserv ?= "2.17"
+PREFERRED_VERSION_yp-tools ?= "2.9"
+PREFERRED_VERSION_zauralign ?= "1.0.2"
+PREFERRED_VERSION_zaurus-tarball-native ?= "1.0"
+PREFERRED_VERSION_zbedic ?= "1.0"
+PREFERRED_VERSION_zbench ?= "2.0"
+PREFERRED_VERSION_zcip ?= "4"
+PREFERRED_VERSION_zd1211-firmware ?= "1.3"
+PREFERRED_VERSION_zd1211 ?= "r85"
+PREFERRED_VERSION_zddice ?= "1.0.0"
+PREFERRED_VERSION_zeroconf ?= "0.9"
+PREFERRED_VERSION_zgscore ?= "1.0.2"
+PREFERRED_VERSION_zile ?= "2.2.15"
+PREFERRED_VERSION_zip ?= "2.32"
+PREFERRED_VERSION_zip-native ?= "2.32"
+PREFERRED_VERSION_zipsc ?= "0.4.3"
+PREFERRED_VERSION_ziq ?= "1.1ern"
+PREFERRED_VERSION_zlapspeed ?= "1.0.0"
+PREFERRED_VERSION_zlib ?= "1.2.3"
+PREFERRED_VERSION_zlib-native ?= "1.2.3"
+PREFERRED_VERSION_zmerlin ?= "0.9.1"
+PREFERRED_VERSION_zope ?= "3.3.1"
+PREFERRED_VERSION_zrally ?= "0.90"
+PREFERRED_VERSION_zrev7 ?= "1.0.1"
+PREFERRED_VERSION_zroadmap ?= "1.1.0"
+PREFERRED_VERSION_zsafe ?= "2.1.3"
+PREFERRED_VERSION_zsh ?= "4.1.1"
+PREFERRED_VERSION_zshopi ?= "0.2"
+PREFERRED_VERSION_zsubhunt ?= "1.0.0ern"
+PREFERRED_VERSION_ztappy ?= "0.9.3ern"
+PREFERRED_VERSION_zten ?= "1.6.2"
+PREFERRED_VERSION_zuc ?= "1.1.2ern"
+PREFERRED_VERSION_zudoku ?= "1.1"
+PREFERRED_VERSION_zziplib ?= "0.10.82"
+
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 580702b991..2faef19905 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -12,6 +12,7 @@
 # you know what that means? like... a, b, c, d, e, f, g...
 
 SRCREV_pn-accelges ?= "206"
+SRCREV_pn-advancedcaching ?= "a3428b09086c45981f5c21850a5305b5dadb6c97"
 SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
 SRCREV_pn-app-restarter ?= "4552"
@@ -20,6 +21,7 @@ SRCREV_pn-assassin-thumbnail ?= "4690"
 SRCREV_pn-aufs2-util ?= "f35ba2292fe40aa94aa83713e0b2719f35a25768"
 SRCREV_pn-bfin-uclibc ?= "1857"
 SRCREV_pn-bootchart-lite ?= "4"
+SRCREV_pn-bt-configure ?= "9654c88ff74bca89cf747937cbec67421d2f1cbc"
 SRCREV_pn-bubble-keyboard ?= "194"
 SRCREV_pn-calibrateproto ?= "1da6fd1e2c7a49648245c98481fabea8b9690a8c"
 SRCREV_pn-clutter-box2d ?= "3197"
@@ -47,9 +49,12 @@ SRCREV_pn-exalt-module ?= "78"
 SRCREV_pn-ezx-boot-usb-native ?= "2371"
 SRCREV_pn-ezx-gen-blob ?= "2426"
 SRCREV_pn-ezxd ?= "2074"
+SRCREV_pn-elementary-theme-neo ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
+SRCREV_pn-etk-theme-neo ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc"
 SRCREV_pn-etk-theme-ninja ?= "5"
+SRCREV_pn-e-wm-theme-illume-neo ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-fstests ?= "204"
@@ -69,11 +74,26 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gpe-gallery ?= "9376"
 SRCREV_pn-gpe-mini-browser2 ?= "9900"
 SRCREV_pn-gpe-sketchbook ?= "9547"
+SRCREV_pn-gpe-theme-neo ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc"
 SRCREV_pn-gridpad ?= "194"
 SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
+SRCREV_pn-gtk-theme-neo ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
+SRCREV_pn-icon-theme-neo ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc"
+SRCREV_pn-illume-keyboard-arabic ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-browse ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-danish ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-default-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-dutch ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-dvorak ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-french ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-german ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-hebrew ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-numeric-alt ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-russian ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
+SRCREV_pn-illume-keyboard-russian-terminal ?= "89e689967d8a9e29d5a3bf84bfa32214f438a323"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
 SRCREV_pn-intuition ?= "194"
@@ -84,6 +104,7 @@ SRCREV_pn-libefso ?= "194"
 SRCREV_pn-libexalt ?= "78"
 SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
+SRCREV_pn-libframeworkd-phonegui-efl-theme-neo ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
 SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libgee ?= "ea130c0837eefe404b53240f8c2ed642ae98a677"
@@ -201,10 +222,12 @@ SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "4907"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
+SRCREV_pn-pyphonelog ?= "0355bf623b31d695e53cc3cf77fb992e58b449a5"
 SRCREV_pn-python-coherence ?= "1161"
 SRCREV_pn-python-connexion ?= "1439"
 SRCREV_pn-python-formencode ?= "3148"
 SRCREV_pn-python-gsmd ?= "148"
+SRCREV_pn-python-phoneutils ?= "081fdd5e2d10c2ec65b6a85a436bbdd9a8b7ba37"
 SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c"
 SRCREV_pn-python-pyyaml ?= "344"
 QEMUSRCREV ?= "4242"
@@ -219,6 +242,9 @@ SRCREV_pn-s3c24xx-gpio ?= "4949"
 SRCREV_pn-s3c64xx-gpio ?= "4949"
 SRCREV_pn-serial-forward ?= "4907"
 SRCREV_pn-settings-daemon ?= "2006"
+SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
+SRCREV_pn-shr-settings ?= "d540bb94c25bb0ffc477ac6489002adad6bc30a1"
+SRCREV_pn-shr-theme-gtk-e17lookalike ?= "9b2ea6fcd034c494a6346f1ec7464ccbefc08ecc"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-socketcan-modules ?= "917"
 SRCREV_pn-socketcan-utils-test ?= "917"
@@ -233,6 +259,7 @@ SRCREV_pn-u-boot-openmoko ?= "650149a53dbdd48bf6dfef90930c8ab182adb512"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
+SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472"
 SRCREV_pn-webkit-gtk ?= "48579"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
@@ -299,6 +326,7 @@ SRCREV_pn-elementary-alarm ?= "${EFL_SRCREV}"
 SRCREV_pn-elementary-sms ?= "${EFL_SRCREV}"
 SRCREV_pn-emphasis ?= "${EFL_SRCREV}"
 SRCREV_pn-ephoto ?= "${EFL_SRCREV}"
+SRCREV_pn-eve ?= "${EFL_SRCREV}"
 SRCREV_pn-examine ?= "${EFL_SRCREV}"
 SRCREV_pn-exhibit ?= "${EFL_SRCREV}"
 SRCREV_pn-expedite ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
index 5e7a0ddfa3..5fcd51ef3e 100644
--- a/conf/distro/include/shr-autorev-unstable.inc
+++ b/conf/distro/include/shr-autorev-unstable.inc
@@ -4,20 +4,31 @@
 
 # KERNEL
 SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}"
+SRCREV_pn-linux-openmoko-shr-drm-devel = "${AUTOREV}"
 
-PREFERRED_VERSION_vala-native = "0.7.4+0.7.5-fso2"
-
+# X11
+require conf/distro/include/preferred-xorg-versions-live.inc
+SRCREV_pn-xf86-video-glamo = "${AUTOREV}"
+SRCREV_pn-xf86-input-mouse = "${AUTOREV}"
+SRCREV_pn-xf86-input-keyboard = "${AUTOREV}"
+SRCREV_pn-xf86-video-glamo-kms = "${AUTOREV}"
+SRCREV_pn-glamo-dri-tests = "${AUTOREV}"
+SRCREV_pn-mesa-dri-glamo = "${AUTOREV}"
+SRCREV_pn-libdrm-glamo = "${AUTOREV}"
+SRCREV_pn-xserver-xorg = "${AUTOREV}"
 
 # FSO stuff
+FSOREV_cornucopia = "${AUTOREV}"
 SRCREV_pn-dbus-hlid = "${AUTOREV}"
 SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
 SRCREV_pn-fsod = "${AUTOREV}"
-SRCREV_pn-fsodeviced = "${AUTOREV}"
-SRCREV_pn-fsonetworkd = "${AUTOREV}"
-SRCREV_pn-fsousaged = "${AUTOREV}"
+SRCREV_pn-fsodeviced = "${FSOREV_cornucopia}"
+SRCREV_pn-fsonetworkd = "${FSOREV_cornucopia}"
+SRCREV_pn-fsousaged = "${FSOREV_cornucopia}"
+SRCREV_pn-fsotimed = "${FSOREV_cornucopia}"
 SRCREV_pn-fsoraw = "${AUTOREV}"
 SRCREV_pn-fso-abyss = "${AUTOREV}"
 SRCREV_pn-fso-apm = "${AUTOREV}"
@@ -31,20 +42,21 @@ SRCREV_pn-fso-term = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
 SRCREV_pn-libascenario = "${AUTOREV}"
-SRCREV_pn-libfsobasics = "${AUTOREV}"
-SRCREV_pn-libfsoframework = "${AUTOREV}"
-SRCREV_pn-libfsotransport = "${AUTOREV}"
+SRCREV_pn-libfsobasics = "${FSOREV_cornucopia}"
+SRCREV_pn-libfsoframework = "${FSOREV_cornucopia}"
+SRCREV_pn-libfsotransport = "${FSOREV_cornucopia}"
 SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
 SRCREV_pn-libfso-glib = "${AUTOREV}"
 SRCREV_pn-libgsm0710 = "${AUTOREV}"
 SRCREV_pn-libgsm0710mux = "${AUTOREV}"
 SRCREV_pn-mickeydbus = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
-SRCREV_pn-misc-vapi = "${AUTOREV}"
+SRCREV_pn-misc-vapi = "${FSOREV_cornucopia}"
 SRCREV_pn-python-pytrc = "${AUTOREV}"
-SRCREV_pn-vala-dbus-binding-tool-native = "6071da6ad645e1200eb2aee88d254ada348d361b"
+SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
 SRCREV_pn-vala = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
+SRCREV_pn-libgee = "${AUTOREV}"
 
 
 # SHR stuff
@@ -71,7 +83,7 @@ SRCREV_pn-shr-splash = "${AUTOREV}"
 SRCREV_pn-shr-splash-theme-simple = "${AUTOREV}"
 SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}"
 SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}"
-SRCREV_pn-shr-splash-theme-dociswatchingyou = "${AUTOREV}"
+SRCREV_pn-shr-splash-theme-niebiee = "${AUTOREV}"
 SRCREV_pn-shr-installer = "${AUTOREV}"
 SRCREV_pn-shr-config = "${AUTOREV}"
 SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
@@ -80,13 +92,16 @@ SRCREV_pn-python-phoneutils = "${AUTOREV}"
 
 
 # E17 stuff
-EFL_SRCREV = "41040"
-SRCREV_pn-python-elementary = "41040"
+EFL_SRCREV = "42837"
+SRCREV_pn-eve = "${AUTOREV}"
+SRCREV_pn-python-elementary = "${EFL_SRCREV}"
 SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}"
+SRCREV_pn-e-wm-theme-illume-niebiee = "${AUTOREV}"
 SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}"
+SRCREV_pn-elementary-theme-niebiee = "${AUTOREV}"
 SRCREV_pn-e-wm-menu-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}"
 SRCREV_pn-etk-theme-shr = "${AUTOREV}"
@@ -106,6 +121,8 @@ SRCREV_pn-illume-keyboard-russian-terminal = "${AUTOREV}"
 SRCREV_pn-illume-keyboard-russian = "${AUTOREV}"
 
 # Other stuff
+SRCREV_pn-bt-configure = "${AUTOREV}"
+SRCREV_pn-advancedcaching = "${AUTOREV}"
 SRCREV_pn-navit = "${AUTOREV}"
 SRCREV_pn-omview = "${AUTOREV}"
 SRCREV_pn-pythm = "${AUTOREV}"
@@ -118,11 +135,17 @@ SRCREV_pn-dbus-c++ = "${AUTOREV}"
 SRCREV_pn-openmoocow = "${AUTOREV}"
 SRCREV_pn-libmokoui2 = "4695"
 SRCREV_pn-intone = "${AUTOREV}"
+SRCREV_pn-intone-video = "${AUTOREV}"
 SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
 SRCREV_pn-msn-pecan = "${AUTOREV}"
 SRCREV_pn-omgps = "${AUTOREV}"
+SRCREV_pn-shr-today = "${AUTOREV}"
 SRCREV_pn-shr-launcher = "${AUTOREV}"
 SRCREV_pn-e-tasks = "${AUTOREV}"
 SRCREV_pn-mokonnect = "${AUTOREV}"
 SRCREV_pn-elmdentica = "${AUTOREV}"
 SRCREV_pn-vala-terminal = "${AUTOREV}"
+SRCREV_pn-pisi = "150"
+SRCREV_pn-webkit-efl = "${AUTOREV}"
+SRCREV_pn-epdfview = "${AUTOREV}"
+SRCREV_pn-om-neon = "${AUTOREV}"
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 1605e8607a..be0025fc83 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -2,7 +2,7 @@
 
 # We need to override some machine stuff as well; include the machine-
 # specific file here (if it exists).
-#include conf/distro/include/shr-${MACHINE}.conf
+include conf/distro/include/shr-${MACHINE}.conf
 
 # Nail down some SRCREV's for the kernels.  There is a real potential problem
 # here, in that git hashes are hashes, not incrementing version numbers.  Thus
@@ -10,20 +10,20 @@
 # with each change.  So if you change one of these, go to the kernel recipe
 # and bump the OEV value up as well.
 SRCREV_pn-linux-eten = "df9715883efa3e6a88866813168fabb1c16b0b7a"
-SRCREV_pn-linux-openmoko-shr-devel = "2d158aae9d8d36f575504f59884ed8e80802efe2"
+SRCREV_pn-linux-openmoko-shr-devel = "a3587e4ed77974adfb057af261aaeea4022018e8"
 
 # FSO stuff
-SRCREV_pn-dbus-hlid = "39e804f28808247df2573788cb99897d4d765e69"
-SRCREV_pn-frameworkd = "e96a204768744130859ab091162ec5c976854d49"
+SRCREV_pn-dbus-hlid = "5df7f49fe8881804aaab544a569fd164c3e93afb"
+SRCREV_pn-frameworkd = "ed29786daceccefe918ce3911e3b6fb7f2efb08c"
 SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
-SRCREV_pn-frameworkd-config-shr_FSO_REV = "e96a204768744130859ab091162ec5c976854d49"
+SRCREV_pn-frameworkd-config-shr_FSO_REV = "ed29786daceccefe918ce3911e3b6fb7f2efb08c"
 SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
 SRCREV_pn-fsod = "${AUTOREV}"
 SRCREV_pn-fsodeviced = "${AUTOREV}"
 SRCREV_pn-fsonetworkd = "${AUTOREV}"
-SRCREV_pn-fsousaged = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
+SRCREV_pn-fsousaged = "9adf9a0e06d07d970e9752ece3f4b9731b19ff24"
 SRCREV_pn-fsoraw = "${AUTOREV}"
-SRCREV_pn-fso-abyss = "ff68be1581069ca494a559e85f6299246888d3b5"
+SRCREV_pn-fso-abyss = "a4f65077c3faff89af2b965e9e3fa9bcfea52f83"
 SRCREV_pn-fso-apm = "${AUTOREV}"
 SRCREV_pn-fso-term = "${AUTOREV}"
 SRCREV_pn-fso-gsm0710muxd = "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
@@ -35,13 +35,13 @@ SRCREV_pn-fso-term = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
 SRCREV_pn-libascenario = "${AUTOREV}"
-SRCREV_pn-libfsobasics = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-libfsoframework = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
-SRCREV_pn-libfsotransport = "3c3e1b862cdde806cef8f502dfe79f1d48f1c5d7"
+SRCREV_pn-libfsobasics = "9adf9a0e06d07d970e9752ece3f4b9731b19ff24"
+SRCREV_pn-libfsoframework = "9adf9a0e06d07d970e9752ece3f4b9731b19ff24"
+SRCREV_pn-libfsotransport = "9adf9a0e06d07d970e9752ece3f4b9731b19ff24"
 SRCREV_pn-libframeworkd-glib = "680276e4cddabeb1edd088ddd421f363dd106a50"
 SRCREV_pn-libfso-glib = "9d292508739452b55b80ec40ec57405a5de2159f"
-SRCREV_pn-libgsm0710 = "3bb80ba6cc9f86ed3996f88bfa2986cc572489d6"
-SRCREV_pn-libgsm0710mux = "8e3e7533b286d8086bce8fa09bce23bb9f18bb98"
+SRCREV_pn-libgsm0710 = "08d915268024dc3418578d40307d496454d58e34"
+SRCREV_pn-libgsm0710mux = "df01e9e81775c1d7b515b9caff7c420fae59f140"
 SRCREV_pn-mickeydbus = "6d7f51b5189a00a07d9b88100a565f46fcb62644"
 SRCREV_pn-mickeyterm = "6d7f51b5189a00a07d9b88100a565f46fcb62644"
 SRCREV_pn-misc-vapi = "${AUTOREV}"
@@ -52,11 +52,14 @@ SRCREV_pn-zhone = "${AUTOREV}"
 
 
 # SHR stuff
-SHRREV = "c3d97171723d8e824cb5acf58b711aa78b3b82d9"
+SHRREV = "767cc2cd22f5f15c69440018365d41980b1507aa"
 
+SRCREV_pn-gpe-theme-neo = "${AUTOREV}"
+SRCREV_pn-gtk-theme-neo = "${AUTOREV}"
+SRCREV_pn-icon-theme-neo = "${AUTOREV}"
 SRCREV_pn-libhito = "${AUTOREV}"
 SRCREV_pn-neod = "${AUTOREV}"
-SRCREV_pn-shr-settings = "4e0fbe17e4fddd18b0455ec4d007ab3f1d19918e"
+SRCREV_pn-shr-settings = "39ddfa7c49a8da19800fefe237fecce984296269"
 SRCREV_pn-ophonekitd = "${SHRREV}"
 SRCREV_pn-ophonekitd-vala = "${AUTOREV}"
 SRCREV_pn-libmodulo = "${AUTOREV}"
@@ -66,10 +69,11 @@ SRCREV_pn-shr-dialer = "${SHRREV}"
 SRCREV_pn-libframeworkd-phonegui = "${SHRREV}"
 SRCREV_pn-libframeworkd-phonegui-efl = "${SHRREV}"
 SRCREV_pn-libframeworkd-phonegui-efl2 = "${AUTOREV}"
+SRCREV_pn-libframeworkd-phonegui-efl-theme-neo = "${AUTOREV}"
 SRCREV_pn-libframeworkd-phonegui-gtk = "${AUTOREV}"
 SRCREV_pn-libframeworkd-phonegui-gtk2 = "${AUTOREV}"
 SRCREV_pn-opimd-utils = "${AUTOREV}"
-SRCREV_pn-pyphonelog = "9da559f0242a32aa5d0b72c795f53d7d9ef8c973"
+SRCREV_pn-pyphonelog = "5e5050dfba4ff1181175e05f5ea4cfcc6d54769d"
 SRCREV_pn-shr-theme = "${AUTOREV}"
 SRCREV_pn-shr-theme-brave = "${AUTOREV}"
 SRCREV_pn-shr-theme-gtk-e17lookalike = "${AUTOREV}"
@@ -84,19 +88,22 @@ SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
 SRCREV_pn-libphone-utils = "${AUTOREV}"
 SRCREV_pn-python-phoneutils = "${AUTOREV}"
 
-
 # E17 stuff
 EFL_SRCREV = "41040"
+SRCREV_pn-eve = "${AUTOREV}"
 SRCREV_pn-python-elementary = "41040"
 SRCREV_pn-e-wm-config-illume-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-sysactions-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-theme-illume-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-theme-illume-sixteen = "${AUTOREV}"
+SRCREV_pn-e-wm-theme-illume-neo = "${AUTOREV}"
 SRCREV_pn-e-wm-theme-illume-niebiee = "${AUTOREV}"
 SRCREV_pn-elementary-theme-sixteen = "${AUTOREV}"
+SRCREV_pn-elementary-theme-neo = "${AUTOREV}"
 SRCREV_pn-elementary-theme-niebiee = "${AUTOREV}"
 SRCREV_pn-e-wm-menu-shr = "${AUTOREV}"
 SRCREV_pn-e-wm-illume-dict-pl = "${AUTOREV}"
+SRCREV_pn-etk-theme-neo = "${AUTOREV}"
 SRCREV_pn-etk-theme-shr = "${AUTOREV}"
 SRCREV_pn-libeflvala = "${AUTOREV}"
 
@@ -116,6 +123,7 @@ SRCREV_pn-illume-keyboard-russian = "${AUTOREV}"
 
 # Other stuff
 SRCREV_pn-bt-configure = "${AUTOREV}"
+SRCREV_pn-advancedcaching = "${AUTOREV}"
 SRCREV_pn-navit = "2309"
 SRCREV_pn-omview = "${AUTOREV}"
 SRCREV_pn-pythm = "${AUTOREV}"
@@ -128,6 +136,7 @@ SRCREV_pn-dbus-c++ = "${AUTOREV}"
 SRCREV_pn-openmoocow = "${AUTOREV}"
 SRCREV_pn-libmokoui2 = "4695"
 SRCREV_pn-intone = "${AUTOREV}"
+SRCREV_pn-intone-video = "${AUTOREV}"
 SRCREV_pn-connman = "aac35324deb8c0b57f881338d87cb36b0979e7df"
 SRCREV_pn-msn-pecan = "${AUTOREV}"
 SRCREV_pn-omgps = "${AUTOREV}"
@@ -137,4 +146,6 @@ SRCREV_pn-e-tasks = "${AUTOREV}"
 SRCREV_pn-mokonnect = "${AUTOREV}"
 SRCREV_pn-elmdentica = "${AUTOREV}"
 SRCREV_pn-vala-terminal = "${AUTOREV}"
-
+SRCREV_pn-pisi = "150"
+SRCREV_pn-paroli = "${AUTOREV}"
+SRCREV_pn-webkit-efl = "${AUTOREV}"
diff --git a/conf/distro/include/shr-om-gta01.conf b/conf/distro/include/shr-om-gta01.conf
new file mode 100644
index 0000000000..4aff7e4b55
--- /dev/null
+++ b/conf/distro/include/shr-om-gta01.conf
@@ -0,0 +1,10 @@
+# SHR-specific overrides to the machine.conf file
+PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_PROVIDER_xf86-video-fbdev = "xf86-video-fbdev"
+PREFERRED_PROVIDER_mesa = "mesa"
+PREFERRED_PROVIDER_drm = "libdrm"
+
+XSERVER = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
+
+
diff --git a/conf/distro/include/shr-om-gta02-kms.conf b/conf/distro/include/shr-om-gta02-kms.conf
new file mode 100644
index 0000000000..63cc6a9705
--- /dev/null
+++ b/conf/distro/include/shr-om-gta02-kms.conf
@@ -0,0 +1,9 @@
+# SHR-specific overrides for building KMS enabled system
+PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
+PREFERRED_PROVIDER_mesa = "mesa-dri-glamo"
+PREFERRED_PROVIDER_drm = "libdrm-glamo"
+PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo-kms"
+
+MACHINE_DRI_MODULES = "glamo"
+
+XSERVER = "xserver-xorg xf86-video-glamo-kms xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
diff --git a/conf/distro/include/shr-om-gta02.conf b/conf/distro/include/shr-om-gta02.conf
new file mode 100644
index 0000000000..e66fba55ea
--- /dev/null
+++ b/conf/distro/include/shr-om-gta02.conf
@@ -0,0 +1,9 @@
+# SHR-specific overrides to the machine.conf file
+PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
+PREFERRED_PROVIDER_mesa = "mesa"
+PREFERRED_PROVIDER_drm = "libdrm"
+
+XSERVER = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
+
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
new file mode 100644
index 0000000000..a9bb98f21b
--- /dev/null
+++ b/conf/distro/shr.conf
@@ -0,0 +1,104 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: SHR
+#@DESCRIPTION: Linux Distribution Configuration for Mobile Phones
+#-----------------------------------------------------------------------------
+
+# set default locale for images - we have to do that before
+# including angstrom-2007-for-openmoko.inc because otherwise
+# it will be already set to en-gb
+IMAGE_LINGUAS ?= "en-us"
+
+require conf/distro/include/preferred-shr-versions.inc
+require conf/distro/include/angstrom-2007-for-openmoko.inc
+
+#
+# Header
+#
+DISTRO_NAME = "shr"
+DISTRO_VERSION = "-${DATE}"
+#DISTRO_TYPE = "release"
+DISTRO_TYPE = "debug"
+DISTRO = "shr"
+
+OVERRIDES = "local:${MACHINE}:shr:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+INHERIT += "packaged-staging"
+
+CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
+
+PREMIRRORS = "(ftp|https?)$://.*/.* http://build.shr-project.org/sources/"
+
+DISTRO_FEED_PREFIX ?= "shr-dev"
+DISTRO_FEED_URI ?= "http://build.shr-project.org/shr-testing/ipk"
+
+AB_DEPLOY_EXTRA ?= ""
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
+
+IMAGE_INITSCRIPTS = "initscripts-shr"
+DISTRO_INITSCRIPTS = "initscripts-shr"
+DISTRO_DEV_MANAGER = "udev"
+
+IPKG_VARIANT = "opkg"
+
+# We try to minimize the distro features in the default image.
+DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
+
+# Some features (bluetooth, usbgadget) include packages we do not like.
+# Pick some of the packages manually.
+DISTRO_EXTRA_RDEPENDS += " \
+    bluez4 \
+    "
+DISTRO_EXTRA_RDEPENDS_append_om-gta02 = " \
+    kernel-module-g-ether \
+    "
+
+# 2.18 seems to break badly on 64-bit systems
+PREFERRED_VERSION_binutils ?= "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
+
+# Same kernel so same usb
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "armv4t"
+# same kernel so same keymaps
+PACKAGE_ARCH_pn-keymaps_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-keymaps_om-gta02 = "armv4t"
+# neod knows about both machines
+PACKAGE_ARCH_pn-neod_om-gta01 = "armv4t"
+PACKAGE_ARCH_pn-neod_om-gta02 = "armv4t"
+
+# Select package providers
+PREFERRED_PROVIDER_gtk+ = "gtk+"
+PREFERRED_PROVIDER_opkg = "opkg"
+PREFERRED_PROVIDER_libgsmd = "libgsmd"
+PREFERRED_PROVIDER_bluez-libs = "bluez4"
+
+# for jalimo
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk"
+PREFERRED_PROVIDER_midpath = "midpath-openmoko"
+# We don't use this, but select one to shut bitbake up.
+PREFERRED_PROVIDER_virtual/libqte2 = "qte"
+
+PREFERRED_PROVIDER_shr-splash-theme-simple = "shr-splash-theme-simple"
+PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-simple"
+PREFERRED_PROVIDER_frameworkd-config-shr = "frameworkd-config-shr"
+PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
+PREFERRED_PROVIDER_frameworkd = "frameworkd"
+PREFERRED_PROVIDER_gpsd = "fso-gpsd"
+PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
+PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr"
+# Helper to say what image we built
+SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo VERSION: `git-log -n1 --pretty=oneline|awk '{print $1}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Branch: ` git branch |awk '/*/{print $2}'` >> ${SHR_VERSION_FILE}; cd $OLD_PWD;"
+ROOTFS_POSTPROCESS_COMMAND += "echo Build Host: `cat /etc/hostname` >> ${SHR_VERSION_FILE};"
+ROOTFS_POSTPROCESS_COMMAND += "echo Time Stamp: `date -R` >> ${SHR_VERSION_FILE};"
+
+SRCPV = "${@bb.fetch.get_srcrev(d)}"
+
+#Package customization
+EXTRA_OECONF-pn_qemu += " --target-list=arm-linux-user,arm-softmmu"
diff --git a/recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb b/recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb
new file mode 100644
index 0000000000..265b8c6651
--- /dev/null
+++ b/recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "EFL launcher for ace-of-penguins"
+HOMEPAGE = "http://shr-project.org"
+SHR_RELEASE ?= "shr"
+LICENSE ?= "GPL"
+DEPENDS = "python-native python-elementary"
+RDEPENDS = "aceofpenguins"
+SECTION = "x11/application"
+
+PACKAGE_ARCH = "all"
+
+PR = "r0"
+
+inherit setuptools
+
+SRC_URI = "http://downloads.vdm-design.de/aceofpenguins-launcher-${PV}.tar.gz"
+
+S = "${WORKDIR}/aceofpenguins-launcher"
+
+FILES_${PN} += "${prefix}/share/pixmaps"
+FILES_${PN} += "${prefix}/share/applications"
+
diff --git a/recipes/aceofpenguins/aceofpenguins_1.2.bb b/recipes/aceofpenguins/aceofpenguins_1.2.bb
new file mode 100644
index 0000000000..c9db20e322
--- /dev/null
+++ b/recipes/aceofpenguins/aceofpenguins_1.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "The Ace of Penguins is a set of Unix/X solitaire games based on the ones available for Windows(tm) but with a number of enhancements that my wife says make my versions better :-) \
+The latest version includes clones of freecell, golf, mastermind, merlin, minesweeper, pegged, solitaire, taipei (with editor!), and thornq (by Martin Thornquist)."
+AUTHOR = "dj@delorie.com"
+HOMEPAGE = "http://www.delorie.com/store/ace/"
+SECTION = "games"
+DEPENDS = "libpng zlib libxpm"
+PR = "r0"
+
+SRC_URI = "\
+  http://www.delorie.com/store/ace/ace-${PV}.tar.gz\
+  file://gcc4.patch;patch=1\
+"
+S = "${WORKDIR}/ace-${PV}"
+
+inherit autotools
+
+
diff --git a/recipes/aceofpenguins/files/gcc4.patch b/recipes/aceofpenguins/files/gcc4.patch
new file mode 100644
index 0000000000..431c44e933
--- /dev/null
+++ b/recipes/aceofpenguins/files/gcc4.patch
@@ -0,0 +1,23 @@
+--- ace-of-penguins-1.2.orig/games/golf.c
++++ ace-of-penguins-1.2/games/golf.c
+@@ -31,7 +31,7 @@
+ 
+ Stack *deck, *discard, *stacks[7];
+ 
+-static int table_width, table_height;
++int table_width, table_height;
+ 
+ int supress_arrows = 0;
+
+--- ace-of-penguins-1.2.orig/games/solitaire.c
++++ ace-of-penguins-1.2/games/solitaire.c
+@@ -337,7 +337,7 @@
+   return something_moved;
+ }
+ 
+-static void
++void
+ check_for_end_of_game()
+ {
+   while (auto_move());
+
diff --git a/recipes/bt-configure/bt-configure_git.bb b/recipes/bt-configure/bt-configure_git.bb
new file mode 100644
index 0000000000..a968454e23
--- /dev/null
+++ b/recipes/bt-configure/bt-configure_git.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Python keyring"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python python-pygtk bluez4"
+
+PV = "gitr${SRCREV}"
+PR = "r1"
+
+ARCH_bt-configure = "all"
+
+SRC_URI = "git://github.com/nytowl/BT-Configure.git;protocol=http"
+
+inherit distutils
+
+S = ${WORKDIR}/git
+
+FILES_${PN} += "${datadir}"
+
diff --git a/recipes/bt-gps/bt-gps.bb b/recipes/bt-gps/bt-gps.bb
new file mode 100644
index 0000000000..414c37fb80
--- /dev/null
+++ b/recipes/bt-gps/bt-gps.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Turns your Neo Freerunner into a bluetooth GPS"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python python-pygtk gps-utils"
+
+SRC_URI = "http://handheldshell.com/software/fso/btgps.tgz  \
+	  "
+
+#inherit autotools
+
+S = ${WORKDIR}/bluetooth
+
+do_install() {
+        install -d ${D}/usr/share/applications
+        install -d ${D}/usr/bin
+        install -m 0755 ${S}/BtGPS.py ${D}/usr/bin
+        install -m 0755 ${S}/btgps.desktop ${D}/usr/share/applications
+}
+
+do_configure() {
+        exit 0
+}
+
+do_compile() {
+        exit 0
+}
diff --git a/recipes/calc/calc_0.0.1.bb b/recipes/calc/calc_0.0.1.bb
new file mode 100644
index 0000000000..bee5b01703
--- /dev/null
+++ b/recipes/calc/calc_0.0.1.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "A simple calculator which is elementary-themed"
+HOMEPAGE = "http://github.com/spaetz/calc"
+AUTHOR = "Sebastian Spaeth <Sebastian@SSpaeth.de>"
+LICENSE  = "MIT"
+RDEPENDS = "python-elementary python python-edbus"
+SECTION = "x11/application"
+PV = "0.0.1"
+PR = "r1"
+
+
+SRC_URI = "git://github.com/spaetz/calc.git;protocol=http;branch=master;tag=0.0.1"
+S = "${WORKDIR}/git"
+
+do_install(){
+        install -d ${D}${datadir}/applications
+        install -m 0644 ${S}/data/elementary-calculator.desktop ${D}${datadir}/applications/
+        install -d ${D}${datadir}/pixmaps
+        install -m 0644 ${S}/data/calculator.png ${D}${datadir}/pixmaps/
+        install -d ${D}${bindir}
+        install -m 0744 ${S}/calc ${D}${bindir}/
+}
+
+FILES_${PN} += "${prefix}/share/pixmaps"
+FILES_${PN} += "${prefix}/share/applications"
diff --git a/recipes/calc/calc_git.bb b/recipes/calc/calc_git.bb
new file mode 100644
index 0000000000..f37e780b8e
--- /dev/null
+++ b/recipes/calc/calc_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "A dead simple calculator. It's advantage is that it's elementary-themed"
+HOMEPAGE = "http://github.com/spaetz/calc"
+AUTHOR = "Sebastian Spaeth <Sebastian@SSpaeth.de>"
+SHR_RELEASE ?= "shr"
+LICENSE  = "MIT"
+RDEPENDS = "python-elementary python python-edbus"
+SECTION = "x11/application"
+SRCREV ?= "1c17792094eb"
+PV = "0.0.1+r${SRCREV}"
+PR = "r1"
+
+
+SRC_URI = "git://github.com/spaetz/calc.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+do_install(){
+        install -d ${D}${datadir}/applications
+        install -m 0644 ${S}/data/elementary-calculator.desktop ${D}${datadir}/applications/
+        install -d ${D}${datadir}/pixmaps
+        install -m 0644 ${S}/data/calculator.png ${D}${datadir}/pixmaps/
+        install -d ${D}${bindir}
+        install -m 0744 ${S}/calc ${D}${bindir}/
+}
+
+FILES_${PN} += "${prefix}/share/pixmaps"
+FILES_${PN} += "${prefix}/share/applications"
diff --git a/recipes/callrec/callrec_svn.bb b/recipes/callrec/callrec_svn.bb
new file mode 100644
index 0000000000..3e0c580f7f
--- /dev/null
+++ b/recipes/callrec/callrec_svn.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "a call recording application"
+HOMEPAGE = "none"
+SECTION = "system/applications"
+LICENSE = "GPLv3 or later"
+SRCNAME = "callrec"
+DEPENDS = "gtk+"
+RDEPENDS += "alsa-utils-alsactl alsa-utils-aplay"
+PV = "0.2.4"
+PR = "r0"
+
+S = "${WORKDIR}/trunk"
+inherit autotools 
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/callrec;module=trunk"
+FILES_${PN} += "${datadir} ${sysconfdir}"
+
+pkg_postinst_callrec_append() {
+	#!/bin/sh
+	#still a bit buggy, if the state path change for instance
+	files0="gsmhandset.state"
+	files1="gsmheadset.state"
+	files2="gsmspeakerout.state"
+	state_dir=`sed -n "s/^scenario_dir\s*=\s*//p" /etc/frameworkd.conf`
+	callrec_dir="/usr/share/callrec"
+	
+	for index in 0 1 2
+	do
+ 		eval filename=\${files${index}}
+		current_file=${state_dir}/${filename}
+		patched="0"
+		
+		if [ -r ${callrec_dir}/${filename} ]; then
+			echo "Backup of ${filename} already exists"
+			echo "Replacing ${filename} with callrec-${filename}"
+			cp ${callrec_dir}/callrec-${filename} ${current_file}
+		else
+			echo "Backing up ${filename}"
+			cp ${current_file} ${callrec_dir}/
+			
+			#fix the patch
+			sed -i "s!@STATE_PATH@!${current_file}!g" ${callrec_dir}/${filename}.patch
+			echo "Patching ${filename}"
+			patch -p0 < ${callrec_dir}/${filename}.patch && patched="1"
+		fi
+	
+		if [ $patched -eq 0 ]; then
+			echo "Failed patching ${filename}"
+			echo "Replacing ${filename} with callrec-${filename}"
+			echo "Backup is at ${callrec_dir}"
+			cp ${callrec_dir}/callrec-${filename} ${current_file}
+		fi
+	done
+}
+pkg_prerm_callrec_append() {
+	#!/bin/sh
+	files0="gsmhandset.state"
+	files1="gsmheadset.state"
+	files2="gsmspeakerout.state"
+	state_dir=`sed -n "s/^scenario_dir\s*=\s*//p" /etc/frameworkd.conf`
+	
+	for index in 0 1 2
+	do
+		eval filename=\${files${index}}
+		current_file=${state_dir}/${filename}
+		echo "Restoring ${filename} from backup"
+		cp /usr/share/callrec/${filename} ${current_file}
+		echo "Removing backups"
+		rm /usr/share/callrec/${filename}
+	done
+}
diff --git a/recipes/cellhunter/cellhunter/retab.patch b/recipes/cellhunter/cellhunter/retab.patch
new file mode 100644
index 0000000000..b31a43740e
--- /dev/null
+++ b/recipes/cellhunter/cellhunter/retab.patch
@@ -0,0 +1,1401 @@
+From: Jan Luebbe <jluebbe@debian.org>
+Date: Thu, 5 Mar 2009 18:01:46 +0000 (+0100)
+Subject: retab with expandtab und tabstop=4
+X-Git-Url: http://git.sicherheitsschwankung.de/?p=jan%2Fcellhunter.git;a=commitdiff_plain;h=fe827632acfc28ae24414509e4f154734945228d
+
+retab with expandtab und tabstop=4
+---
+
+diff --git a/cellhunter.py b/cellhunter.py
+index 59171f3..53c5af0 100644
+--- a/cellhunter.py
++++ b/cellhunter.py
+@@ -85,697 +85,697 @@
+ import dbus, gobject, gtk, subprocess, urllib, random, os, ConfigParser, sys, socket
+ 
+ class CellHunterGUI:
+-	DEBUG = False
+-	
+-	homedir = "/home/root"
+-	
+-	lang = ""
+-	configpresent = False
+-	auto = 0
+-	auto_running = 0
+-	offline = False
+-	data_auto = 0
+-	cell_la = ""
+-	cell_id = ""
+-	provider = ""
+-	mcc = ""
+-	mnc = ""
+-	signal = ""
+-	cell_arfcn = ""
+-	ncells_la = ["", "", "", "", "", ""]
+-	ncells_id = ["", "", "", "", "", ""]
+-	ncells_signal = ["", "", "", "", "", ""]
+-	ncells_arfcn = ["", "", "", "", "", ""]
+-	gps_fix = ""
+-	gps_lat = ""
+-	gps_long = ""
+-	gps_alt = ""
+-	gps_time = ""
+-	groupname = ""
+-	grouppass = ""
+-	device_id = ""
+-	labeltext1 = ""
+-	labeltext2 = ""
+-	labeltext3 = ""
+-
+-	# shut down the modem an get it back to normal state
+-	def gui_destroy(self):
+-		if self.DEBUG: print "gui_destroy"
+-		
+-		if self.DEBUG: print "gui_destroy / kill all old wgets"
+-		subprocess.Popen(["/usr/bin/killall", "wget"])
+-
+-	def delete_event(self, widget, event=None, data=None):
+-		if self.DEBUG: print "delete_event"
+-
+-		if self.offline == True:
+-			if self.lang == "de": offlabel = gtk.Label("Du warst im Offline Modus. Um die Daten\nzu uebertragen musst du, sobald wieder\neine Internetverbindung " +
+-				"besteht, auf der\nKonsole \"cellhunter_upload.sh\" ausfuehren.\nDann werden die Daten gesendet.\n\nDu kannst beliebig oft und " +
+-				"beliebig lange mit\nCellHunter Daten sammeln, erst nach dem\nUebertragen werden die gesammelten Daten\nzurueckgesetzt.")
+-			else: offlabel = gtk.Label("You have been in Offline Mode. To submit the data you\nhave to run \"cellhunter_upload.sh\" on your terminal as\nsoon you " + 
+-				"have a working internet connection again.\nThen the collected data will be transmitted. You can\ncollect cells as long as you want. After " + 
+-				"transmitting the\ndata your offline collected cells will be resetted.");
+-			offlabel.show()
+-			if self.lang == "de": dia = gtk.Dialog('Offline Modus', self.win.get_toplevel(), 0, (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
+-			else: dia = gtk.Dialog('Offline Mode', self.win.get_toplevel(), 0, (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
+-			dia.vbox.pack_start(offlabel)
+-			dia.show()
+-			result = dia.run()
+-			if result == gtk.RESPONSE_CLOSE:
+-				dia.destroy()
+-				gtk.main_quit()
+-				return False
+-		else:
+-			gtk.main_quit()
+-			return False
+-
+-	# try to save the config to file if data is correct
+-	def saveconfig(self, button, groupentry, passentry, info_label):
+-		if self.DEBUG: print "saveconfig"
+-
+-		save_config = False
+-
+-		try:
+-			if self.DEBUG: print "saveconfig / checking for group..."
+-			socket.setdefaulttimeout(10)
+-			params = urllib.urlencode({'groupcheck': 1, 'gname': groupentry.get_text(), 'gpass': passentry.get_text()})
+-			f = urllib.urlopen("http://78.47.116.33/~hole/cellhunter/submit.php?%s" % params)
+-			response = f.read()
+-			
+-			if response == "group_add":
+-				if self.DEBUG: print "saveconfig / group added"
+-				save_config = True
+-			if response == "password_ok":
+-				if self.DEBUG: print "saveconfig / group exists, password ok"
+-				save_config = True
+-			if response == "password_wrong":
+-				if self.DEBUG: print "saveconfig / group exists, password wrong"
+-				save_config = False
+-				if self.lang == "de": self.info_label.set_text("\nDas Passwort fuer diese Gruppe ist falsch. Entweder du\nlegst eine neue Gruppe mit einem anderen " +
+-					"Namen an,\noder versuchst es noch einmal mit dem richtigen\nPasswort\n\n")
+-				else: self.info_label.set_text("\nThe password you entered for this group is wrong.\nYou can add a new group with another name or try\nit again with the right password.\n\n\n")
+-		except IOError:
+-			if self.lang == "de": self.info_label.set_text("\nFehler:\nKonnte keine Verbindung zum Server aufbauen.\nBitte die Netzwerkverbindung ueberpruefen.\n\n\n")
+-			else: self.info_label.set_text("\nError:\nNo connection to the Server.\nPlase check your network connection.\n\n\n")
+-			if self.DEBUG: print "saveconfig / no connection to server"
+-
+-		if save_config == True:
+-			if self.DEBUG: print "saveconfig / writing config"
+-			config = ConfigParser.RawConfigParser()
+-			
+-			config.add_section('main')
+-			config.set('main', 'gname', groupentry.get_text())
+-			self.groupname = groupentry.get_text()
+-			if self.groupname == "":
+-				if self.DEBUG: print "saveconfig / user is anonymous"
+-				config.set('main', 'gpass', "")
+-				config.set('main', 'device_id', "")
+-				self.grouppass = ""
+-				self.device_id = ""
+-			else:
+-				if self.DEBUG: print "saveconfig / user is not anonymous"
+-				random.seed()
+-				randomid = random.randint(0, 999999999)
+-				if self.DEBUG: print "save_config / device_id=" + str(randomid)
+-				config.set('main', 'device_id', randomid)
+-				config.set('main', 'gpass', passentry.get_text())
+-				self.grouppass = passentry.get_text()
+-				self.device_id = str(randomid)
+-			
+-			config.set('main', 'lang', self.lang)
+-			
+-			f = open(self.homedir + '/.cellhunter.conf', 'w')
+-			config.write(f)
+-			
+-			self.win2.hide()
+-			self.win.show()
+-
+-	# check cellid and gps data
+-	def check_cellid(self, button, label):
+-		if self.DEBUG: print "check_cellid"
+-
+-		try:
+-			data = self.ogsmd_monitor_iface.GetServingCellInformation()
+-			self.cell_la = data['lac']
+-			self.cell_id = data['cid']
+-			self.signal = str(data['rxlev']/2+2)
+-			self.cell_arfcn = str(data['arfcn'])
+-	
+-			while len(self.cell_la) < 4:
+-				self.cell_la = "0" + self.cell_la
+-			while len(self.cell_id) < 4:
+-				self.cell_id = "0" + self.cell_id
+-	
+-			if self.DEBUG: print "check_cellid / " + self.cell_la + " " + self.cell_id + " " + self.signal + " " + self.cell_arfcn
+-		except dbus.DBusException, e:
+-			print "Error while getting main cell:", e
+-			self.cell_la = "0000"
+-			self.cell_id = "0000"
+-			self.signal = "0"
+-			self.cell_arfcn = "0"
+-		
+-		try:
+-			data = self.ogsmd_network_iface.GetStatus()
+-			self.provider = data['provider']
+-			self.mcc = str(data['code'])[:3]
+-			self.mnc = str(data['code'])[3:]
+-			if self.DEBUG: print "check_cellid / Provider: " + self.provider + " " + self.mcc + " " + self.mnc
+-		except dbus.DBusException, e:
+-			print "Error while getting provider:", e
+-			self.provider = "99999"
+-			self.mcc = "999"
+-			self.mnc = "999"
+-		
+-		try:
+-			#neighbour cells
+-			data = self.ogsmd_monitor_iface.GetNeighbourCellInformation()
+-			# FIXME handle less then 6 neighbours correctly
+-			self.ncells_la = []
+-			self.ncells_id = []
+-			self.ncells_signal = []
+-			self.ncells_arfcn = []
+-	
+-			for cell in data:
+-				self.ncells_la.append(cell['lac'])
+-				self.ncells_id.append(cell['cid'])
+-				self.ncells_signal.append(str(cell['rxlev']/2+2))
+-				self.ncells_arfcn.append(str(cell['arfcn'])) 
+-				while len(self.ncells_la[-1]) < 4:
+-					self.ncells_la[-1] = "0" + self.ncells_la[-1]
+-				while len(self.ncells_id[-1]) < 4:
+-					self.ncells_id[-1] = "0" + self.ncells_id[-1]
+-				#while len(self.ncells_signal[-1]) < 2:
+-				#	self.ncells_signal[-1] = "0" + self.ncells_signal[-1]
+-				
+-				if self.DEBUG: print "check_cellid / neighbours: " + self.ncells_la[-1] + \
+-					" " + self.ncells_id[-1] + " " + self.ncells_signal[-1] + \
+-					" " + self.ncells_arfcn[-1]
+-			while len(self.ncells_la) < 6:
+-				self.ncells_la.append("0000")
+-				self.ncells_id.append("0000")
+-				self.ncells_signal.append("0")
+-				self.ncells_arfcn.append("0") 
+-		except dbus.DBusException, e:
+-			print "Error while getting neighbour cells:", e
+-			self.ncells_la = ["0000", "0000", "0000", "0000", "0000", "0000"]
+-			self.ncells_id = ["0000", "0000", "0000", "0000", "0000", "0000"]
+-			self.ncells_signal = ["0", "0", "0", "0", "0", "0"]
+-			self.ncells_arfcn = ["0", "0", "0", "0", "0", "0"]
+-
+-		# first part of the info label
+-		if self.lang == "de": self.labeltext1 = "Provider:\t\t" + self.provider + " (" + self.mcc + "/" + self.mnc + ")" + "\nZelle:\t\t" + self.cell_la + " / " + self.cell_id + " / " + self.signal + "\n" + "Nachbarn:\t" + self.ncells_la[0] + " / " + self.ncells_id[0] + " / " + self.ncells_signal[0] + "  \t" + self.ncells_la[1] + " / " + self.ncells_id[1] + " / " + self.ncells_signal[1] + "\n\t\t\t" + self.ncells_la[2] + " / " + self.ncells_id[2] + " / " + self.ncells_signal[2] + "	\t" + self.ncells_la[3] + " / " + self.ncells_id[3] + " / " + self.ncells_signal[3] + "\n\t\t\t" + self.ncells_la[4] + " / " + self.ncells_id[4] + " / " + self.ncells_signal[4] + "  \t" + self.ncells_la[5] + " / " + self.ncells_id[5] + " / " + self.ncells_signal[5]
+-		else: self.labeltext1 = "Provider:\t\t" + self.provider + " (" + self.mcc + "/" + self.mnc + ")" + "\nCell:\t\t\t" + self.cell_la + " / " + self.cell_id + " / " + self.signal + "\n" + "Neighbours:\t" + self.ncells_la[0] + " / " + self.ncells_id[0] + " / " + self.ncells_signal[0] + "  \t" + self.ncells_la[1] + " / " + self.ncells_id[1] + " / " + self.ncells_signal[1] + "\n\t\t\t" + self.ncells_la[2] + " / " + self.ncells_id[2] + " / " + self.ncells_signal[2] + "  \t" + self.ncells_la[3] + " / " + self.ncells_id[3] + " / " + self.ncells_signal[3] + "\n\t\t\t" + self.ncells_la[4] + " / " + self.ncells_id[4] + " / " + self.ncells_signal[4] + "  \t" + self.ncells_la[5] + " / " + self.ncells_id[5] + " / " + self.ncells_signal[5]
+-
+-
+-		# get gps data
+-		self.position = self.position_iface.GetPosition()
+-		
+-		# type of gps fix
+-		if self.position[0] >= 3:
+-			self.gps_fix = "2D"
+-		if self.position[0] == 7:
+-			self.gps_fix = "3D"
+-		if self.position[0] < 3:
+-			if self.lang == "de": self.gps_fix = "Kein Fix"
+-			else: self.gps_fix = "No Fix"
+-		
+-		# when got fix, check position
+-		if self.position[0] >= 3:
+-			self.gps_time = str(self.position[1])
+-			self.gps_lat = str(self.position[2])
+-			self.gps_long = str(self.position[3])
+-			self.gps_alt = str(self.position[4])
+-		else:
+-			self.gps_time = ""
+-			self.gps_lat = ""
+-			self.gps_long = ""
+-			self.gps_alt = ""
+-
+-		# debut output
+-		gps_data = "FIX/TIME: " + self.gps_fix + " / " + str(self.position[0]) + " / " + self.gps_time
+-		if self.DEBUG: print "check_cellid / " + gps_data
+-		gps_data = "POS: " + self.gps_lat + " / " + self.gps_long + " / " + self.gps_alt
+-		if self.DEBUG: print "check_cellid / " + gps_data
+-		
+-		# second part of the info label
+-		if self.lang == "de": self.labeltext2 = "Fix: " + self.gps_fix + " / Zeit: " + self.gps_time + "\nPosition: " + self.gps_lat + " / " + self.gps_long + " / " + self.gps_alt
+-		else: self.labeltext2 = "Fix: " + self.gps_fix + " / Time: " + self.gps_time + "\nPosition: " + self.gps_lat + " / " + self.gps_long + " / " + self.gps_alt
+-		
+-		# send data automatically?
+-		if self.data_auto != 0:
+-			if self.DEBUG: print "check_cellid / sending data automatically..."
+-			self.send_data()
+-		
+-		self.check_serverresponse()
+-
+-		# put all labeldata together and set it
+-		labeltext = self.labeltext1 + "\n\n" + self.labeltext2 + "\n\n" + self.labeltext3
+-		label.set_text(labeltext)
+-
+-		# if auto != 0 a next function call is schedules in auto milliseconds
+-		self.auto_running = 0
+-		if self.auto != 0:
+-			if self.DEBUG: print "check_cellid / scheduling next check in " + str(self.auto) + " ms"
+-			self.auto_running = 1
+-			gobject.timeout_add (self.auto, self.check_cellid, button, label)
+-
+-	# toggle auto check for cellid
+-	def check_cellid_auto(self, button, label):
+-		if self.DEBUG: print "check_cellid_auto"
+-
+-		if self.auto == 0:
+-			self.auto = 10000
+-			self.button_100.set_sensitive(False)
+-			self.button_150.set_sensitive(False)
+-			if self.lang == "de": button.set_label("CellID alle 10\nSekunden abfragen")
+-			else: button.set_label("Check CellID\nevery 10 Seconds")
+-			if self.auto_running == 0:
+-				self.check_cellid(button, label)
+-		elif self.auto == 10000:
+-			self.auto = 30000
+-			if self.lang == "de": button.set_label("CellID alle 30\nSekunden abfragen")
+-			else: button.set_label("Check CellID\nevery 30 Seconds")
+-		elif self.auto == 30000:
+-			self.auto = 60000
+-			if self.lang == "de": button.set_label("CellID alle 60\nSekunden abfragen")
+-			else: button.set_label("Check CellID\nevery 60 Seconds")
+-		elif self.auto == 60000:
+-			self.auto = 120000
+-			if self.lang == "de": button.set_label("CellID alle 120\nSekunden abfragen")
+-			else: button.set_label("Check CellID\nevery 120 Seconds")
+-		elif self.auto == 120000:
+-			self.auto = 0
+-			self.button_100.set_sensitive(True)
+-			self.button_150.set_sensitive(True)
+-			if self.lang == "de": button.set_label("CellID automatisch\nabfragen: AUS")
+-			else: button.set_label("Auto check\nCellID: OFF")
+-
+-		if self.DEBUG: print "check_cellid_auto / auto=" + str(self.auto)
+-
+-	# send data button
+-	def check_cellid_data(self, button, label):
+-		if self.DEBUG: print "check_cellid_data"
+-		
+-		self.send_data()
+-		
+-		self.check_serverresponse()
+-		
+-		# label zusammensetzen und anzeigen
+-		if(self.labeltext1 != ""):
+-			labeltext = self.labeltext1 + "\n\n" + self.labeltext2 + "\n\n" + self.labeltext3
+-			label.set_text(labeltext)
+-
+-	# toggle send data automatically
+-	def check_cellid_data_auto(self, button):
+-		if self.DEBUG: print "check_cellid_data_auto"
+-
+-		if self.data_auto == 0:
+-			self.data_auto = 1
+-			if self.lang == "de": button.set_label("Daten automatisch\nuebertragen: AN")
+-			else: button.set_label("Auto submit\nData: ON")
+-		else:
+-			self.data_auto = 0
+-			if self.lang == "de": button.set_label("Daten automatisch\nuebertragen: AUS")
+-			else: button.set_label("Auto submit\nData: OFF")
+-
+-		if self.DEBUG: print "check_cellid_data_auto / data_auto=" + str(self.data_auto)
+-
+-	# toggle offline mode
+-	def offline_mode(self, button):
+-		if self.DEBUG: print "offline_mode"
+-
+-		if self.offline == False:
+-			self.offline = True
+-			if self.lang == "de": button.set_label("Offline Modus: AN")
+-			else: button.set_label("Offline Mode: ON")
+-			if self.lang == "de": offlabel = gtk.Label("Du bist jetzt im Offline Modus. Alle Anfragen\nan den Server werden jetzt nicht gesendet,\nsondern " + 
+-				"gespeichert. Du muss aber trotzdem\n\"Daten uebertragen\", tu einfach so, als waerst du\nonline. Wie du die Daten dann uebertraegst\n" +
+-				"erfaehrst du wenn du das Programm im\nOfflinemodus beendest.")
+-			else: offlabel = gtk.Label("You are in Offline Mode now. All requests to the server\nwill not be sent but saved in a file. But you have to" + 
+-				"\n\"Submit Data\". Just act as you were in online mode.\nYou will get help on transmitting the data to the server\nwhen leaving the program " + 
+-				"in offline mode")
+-			offlabel.show()
+-			if self.lang == "de": dia = gtk.Dialog('Offline Modus', self.win.get_toplevel(), 0, (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
+-			else: dia = gtk.Dialog('Offline Mode', self.win.get_toplevel(), 0, (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
+-			dia.vbox.pack_start(offlabel)
+-			dia.show()
+-			result = dia.run()
+-			if result == gtk.RESPONSE_CLOSE:
+-				dia.destroy()
+-		else:
+-			self.offline = False
+-			if self.lang == "de": button.set_label("Offline Modus: AUS")
+-			else: button.set_label("Offline Mode: OFF")
+-
+-		if self.DEBUG: print "offline_mode / offline=" + str(self.offline)
+-
+-	def check_serverresponse(self):
+-		if self.DEBUG: print "check_serverresponse"
+-		
+-		if self.offline == False:
+-			if os.path.isfile("/tmp/cellhunter.wget") == True:
+-				#print "vorhanden"
+-				infile = open("/tmp/cellhunter.wget","r")
+-				self.labeltext3 = "Server Status: " + infile.readline()
+-				infile.close()
+-			else:
+-				#print "nicht vorhanden"
+-				if self.lang == "de": self.labeltext3 = "Server Status: Uebertragung fehlgeschlagen"
+-				else: self.labeltext3 = "Server Status: Connection to Server failed"
+-		else:
+-			if self.lang == "de": self.labeltext3 = "Server Status: Offline Modus"
+-			else: self.labeltext3 = "Server Status: Offline Mode"
+-
+-	# submit data
+-	# using wget is better because gui does not freeze. but i have to get the result from file
+-	# should be done with threads but i am too lazy to do this right now
+-	def send_data(self):
+-		url = "http://78.47.116.33/~hole/cellhunter/submit.php?provider=" + urllib.quote(self.provider) + "&cell_mcc=" + urllib.quote(self.mcc) + "&cell_mnc=" + urllib.quote(self.mnc) + "&cell_la=" + urllib.quote(self.cell_la) + "&cell_id=" + urllib.quote(self.cell_id) + "&signal=" + urllib.quote(self.signal) + "&time=" + urllib.quote(self.gps_time) + "&lat=" + urllib.quote(self.gps_lat) + "&long=" + urllib.quote(self.gps_long) + "&alt=" + urllib.quote(self.gps_alt) + "&gname=" + urllib.quote(self.groupname) + "&gpass=" + urllib.quote(self.grouppass) + "&device_id=" + urllib.quote(self.device_id) + "&cell_arfcn=" + urllib.quote(self.cell_arfcn) + "&serving=1"
+-		
+-		url_n = ["", "", "", "", "", ""]
+-		for i in range(0,6):
+-			url_n[i] = "http://78.47.116.33/~hole/cellhunter/submit.php?provider=" + urllib.quote(self.provider) + "&cell_mcc=" + urllib.quote(self.mcc) + "&cell_mnc=" + urllib.quote(self.mnc) + "&cell_la=" + urllib.quote(self.ncells_la[i]) + "&cell_id=" + urllib.quote(self.ncells_id[i]) + "&signal=" + urllib.quote(self.ncells_signal[i]) + "&time=" + urllib.quote(self.gps_time) + "&lat=" + urllib.quote(self.gps_lat) + "&long=" + urllib.quote(self.gps_long) + "&alt=" + urllib.quote(self.gps_alt) + "&gname=" + urllib.quote(self.groupname) + "&gpass=" + urllib.quote(self.grouppass) + "&device_id=" + urllib.quote(self.device_id) + "&cell_arfcn=" + urllib.quote(self.ncells_arfcn[i]) + "&serving=0"
+-		
+-		if self.offline == False:
+-			if self.DEBUG: print "send_data / online"
+-			if self.cell_la != "0000" or self.cell_id != "0000":
+-				if self.DEBUG: print "send_data / " + url
+-				subprocess.Popen(["/usr/bin/wget", "--user-agent", "cellhunter 0.4.2 online",  "-q", "--output-document=/tmp/cellhunter.wget", url])
+-			for i in range(0,6):
+-				if self.ncells_la[i] != "0000" or self.ncells_id[i] != "0000":
+-					if self.DEBUG: print "send_data / " + url_n[i]
+-					subprocess.Popen(["/usr/bin/wget", "--user-agent", "cellhunter 0.4.2 online", "-q", "--output-document=/tmp/cellhunter.wget" + str(i), url_n[i]])
+-			
+-		elif self.offline == True:
+-			if self.DEBUG: print "send_data / offline"
+-			offlineFile = open(self.homedir + '/cellhunter_offline.log', 'a')
+-			if self.cell_la != "0000" or self.cell_id != "0000":
+-				if self.DEBUG: print "send_data / " + url
+-				offlineFile.write(url + "\n")
+-			for i in range(0,6):
+-				if self.ncells_la[i] != "0000" or self.ncells_id[i] != "0000":
+-					if self.DEBUG: print "send_data / " + url_n[i]
+-					offlineFile.write(url_n[i] + "\n")
+-			offlineFile.close()
+-			
+-			
+-		"""
+-		try:
+-			params = urllib.urlencode({'provider': self.provider, 'cell_la': self.cell_la, 'cell_id': self.cell_id, 'signal': self.signal, 'time': self.gps_time, 'lat': self.gps_lat, 'long': self.gps_long, 'alt': self.gps_alt, 'gname': self.groupname, 'gpass': self.grouppass, 'device_id': self.device_id})
+-			f = urllib.urlopen("http://78.47.116.33/~hole/cellhunter/submit.php?%s" % params)
+-			response = f.read()
+-			self.labeltext3 = "Server Status: " + response
+-			print response
+-		except IOError:
+-			self.labeltext3 = "Server Status: Uebertragung fehlgeschlagen"
+-			print "Konnte keine Verbindung aufbauen"
+-		"""
+-
+-	# close help, display config
+-	def closehelp(self, button):
+-		if self.DEBUG: print "closehelp"
+-		
+-		self.win3.hide()
+-		self.win2.show()
+-
+-	# init
+-	def __init__(self):
+-		for arg in sys.argv:
+-			if arg == "-d" or arg == "--debug":
+-				self.DEBUG = True
+-		
+-		if self.DEBUG: print "__init__"
+-
+-		if self.DEBUG: print "__init__ / checking for homedir"
+-		if os.environ['HOME'] != "":
+-			self.homedir = os.environ['HOME']
+-			if self.DEBUG: print "__init__ / found homedir = " + self.homedir
+-		else:
+-			if self.DEBUG: print "__init__ / homedir = " + self.homedir
+-
+-		# look for config file
+-		if self.DEBUG: print "__init__ / init config"
+-		if os.path.isfile(self.homedir + "/.cellhunter.conf") == True :
+-			self.configpresent = True
+-			config = ConfigParser.RawConfigParser()
+-			config.read(self.homedir + '/.cellhunter.conf')
+-			self.groupname = config.get('main', 'gname')
+-			self.grouppass = config.get('main', 'gpass')
+-			self.device_id = config.get('main', 'device_id')
+-			try:
+-				self.lang = config.get('main', 'lang')
+-			except ConfigParser.NoOptionError:
+-				self.lang = ""
+-
+-		# create initial wget file
+-		if self.DEBUG: print "__init__ / init wget file"
+-		file = open("/tmp/cellhunter.wget","w")
+-		if self.lang == "de": file.write("Warte auf Daten...")
+-		else: file.write("Idle...")
+-		file.close()
+-
+-		# initialise dbus
+-		if self.DEBUG: print "__init__ / init dbus"
+-		bus = dbus.SystemBus()
+-
+-		# get dbus ogsmd object and set modem in verbose mode
+-		ogsmd_obj = bus.get_object( "org.freesmartphone.ogsmd", "/org/freesmartphone/GSM/Device" )
+-		self.ogsmd_monitor_iface = dbus.Interface( ogsmd_obj, "org.freesmartphone.GSM.Monitor" )
+-		self.ogsmd_network_iface = dbus.Interface( ogsmd_obj, "org.freesmartphone.GSM.Network" )
+-
+-		# request gps device
+-		usage_obj = bus.get_object('org.freesmartphone.ousaged', '/org/freesmartphone/Usage')
+-		usage_iface = dbus.Interface(usage_obj, 'org.freesmartphone.Usage')
+-		usage_iface.RequestResource("GPS")
+-
+-		# get interface for polling gps position
+-		gypsy_obj = bus.get_object( 'org.freesmartphone.ogpsd', '/org/freedesktop/Gypsy' )
+-		self.position_iface = dbus.Interface( gypsy_obj, 'org.freedesktop.Gypsy.Position' )
+-
+-		"""
+-		window layout:
+-		-------------------
+-		|  cellid daten   |
+-		-------------------
+-		|   01   |   02   |
+-		-------------------
+-		|   03   |   04   |
+-		-------------------
+-		|      exit       |
+-		-------------------
+-		"""
+-
+-		if self.DEBUG: print "__init__ / init gtk main window"
+-
+-		# main window
+-		self.win = gtk.Window(gtk.WINDOW_TOPLEVEL)
+-		self.win.set_title("CellHunter")
+-		self.win.connect("delete_event", self.delete_event)
+-
+-
+-		if self.configpresent == False or self.lang == "":
+-			langlabel = gtk.Label("Please choose your language\nBitte waehle deine Sprache")
+-			langlabel.show()
+-			dia = gtk.Dialog('CellHunter Language / Sprache', self.win.get_toplevel(), 0, ("English", 1, "Deutsch", 2))
+-			dia.vbox.pack_start(langlabel)
+-			dia.show()
+-			result = dia.run()
+-			if result == 1:
+-				self.lang = "en"
+-				dia.destroy()
+-			if result == 2:
+-				self.lang = "de"
+-				dia.destroy()
+-			if self.configpresent == True:
+-				print "__init__ / appending lang to config"
+-				config = ConfigParser.RawConfigParser()
+-				config.add_section('main')
+-				config.set('main', 'gname', self.groupname)
+-				config.set('main', 'gpass', self.grouppass)
+-				config.set('main', 'device_id', self.device_id)
+-				config.set('main', 'lang', self.lang)
+-				f = open(self.homedir + '/.cellhunter.conf', 'w')
+-				config.write(f)
+-
+-		# vertical main box
+-		self.vbox = gtk.VBox(homogeneous=False, spacing=5)
+-		self.win.add(self.vbox)
+-		self.vbox.show()
+-
+-		# dummy
+-		self.d_label = gtk.Label("")
+-		self.vbox.pack_start(self.d_label, False, False)
+-		self.d_label.show()
+-
+-		# info label with cell, gps, server data
+-		if self.lang == "de": self.cell_label = gtk.Label("Provider:\nZelle:\nNachbarn:\n\n\n\nFix: / Zeit:\nPosition:\n\nServer Status: Warte auf Daten...")
+-		else: self.cell_label = gtk.Label("Provider:\nCell:\nNeighbours:\n\n\n\nFix: / Time:\nPosition:\n\nServer Status: Idle...")
+-		context = self.cell_label.get_pango_context() 
+-		font = context.get_font_description()
+-		font.set_size(4096) 
+-		self.cell_label.modify_font(font)
+-		self.vbox.pack_start(self.cell_label, False, False)
+-		self.cell_label.show()
+-		
+-		# dummy
+-		self.d_label = gtk.Label("")
+-		self.vbox.pack_start(self.d_label, False, False)
+-		self.d_label.show()
+-
+-		# first button row
+-		self.hbox = gtk.HBox(homogeneous=True, spacing=5)
+-		self.vbox.add(self.hbox)  
+-		self.hbox.show()
+-
+-		# button check cellid
+-		if self.lang == "de": self.button_100 = gtk.Button("CellID abfragen")
+-		else: self.button_100 = gtk.Button("Check CellID")
+-		self.hbox.pack_start(self.button_100)
+-		self.button_100.connect("clicked", self.check_cellid, self.cell_label)
+-		self.button_100.show()
+-
+-		# button submit data
+-		if self.lang == "de": self.button_150 = gtk.Button("Daten uebertragen")
+-		else: self.button_150 = gtk.Button("Submit Data")
+-		self.hbox.pack_start(self.button_150)
+-		self.button_150.connect("clicked", self.check_cellid_data, self.cell_label)
+-		self.button_150.show()
+-
+-		# second button row
+-		self.hbox = gtk.HBox(homogeneous=True, spacing=5)
+-		self.vbox.add(self.hbox)  
+-		self.hbox.show()
+-
+-		# button check cellid auto
+-		if self.lang == "de": self.button_101 = gtk.Button("CellID automatisch\nabfragen: AUS")
+-		else: self.button_101 = gtk.Button("Auto check\nCellID: OFF")
+-		self.hbox.pack_start(self.button_101)
+-		self.button_101.connect("clicked", self.check_cellid_auto, self.cell_label)
+-		self.button_101.show()
+-
+-		# button submit data auto
+-		if self.lang == "de": self.button_151 = gtk.Button("Daten automatisch\nuebertragen: AUS")
+-		else: self.button_151 = gtk.Button("Auto submit\nData: OFF")
+-		self.hbox.pack_start(self.button_151)
+-		self.button_151.connect("clicked", self.check_cellid_data_auto)
+-		self.button_151.show()
+-
+-		# third button row
+-		self.hbox = gtk.HBox(homogeneous=True, spacing=5)
+-		self.vbox.add(self.hbox)  
+-		self.hbox.show()
+-
+-		# button exit
+-		self.button_200 = gtk.Button("Exit")
+-		self.hbox.pack_start(self.button_200)
+-		self.button_200.connect("clicked", self.delete_event)
+-		self.button_200.show()
+-
+-		# button offline mode
+-		if self.lang == "de": self.button_201 = gtk.Button("Offline Modus: AUS")
+-		else: self.button_201 = gtk.Button("Offline Mode: OFF")
+-		self.hbox.pack_start(self.button_201)
+-		self.button_201.connect("clicked", self.offline_mode)
+-		self.button_201.show()
+-
+-		if self.configpresent == False:
+-
+-			if self.DEBUG: print "__init__ / init gtk introduction window"
+-
+-			self.win3 = gtk.Window(gtk.WINDOW_TOPLEVEL)
+-			if self.lang == "de": self.win3.set_title("CellHunter Hilfe")
+-			else: self.win3.set_title("CellHunter Help")
+-			self.win3.connect("delete_event", self.delete_event)
+-
+-			self.vbox3 = gtk.VBox(homogeneous=False, spacing=0)
+-			self.win3.add(self.vbox3)
+-			self.vbox3.show()
+-
+-			if self.lang == "de": self.help_label = gtk.Label("\nBitte vor dem Benutzen lesen:\n\nCellHunter ist ein Spiel, bei dem das Ziel ist, moeglichst\nviele " + 
+-				"noch unentdeckte Mobilfunkzellen zu orten. Hierzu\nwird die aktuelle Zelle mit den dazugehoerigen GPS-\nKoordinaten " +
+-				"uebertragen. Spieler koennen sich in\nGruppen zusammentun um ein besseres Ergebnis zu\nerreichen.\n\nMit dem Button \"CellId " +
+-				"abfragen\" fragst du die aktuellen\nZell- und GPS-Daten ab. Ein Klick auf \"Daten uebertragen\"\nsendet diese Daten an den " +
+-				"Server.\n\nSicherheitshinweis!\nFolgende Daten werden an den Server uebertragen:\n- Dein Provider\n- Aktuelle Zellen-ID\n- " +
+-				"Aktuelle Signalstaerke\n- GPS Zeit und Koordinaten\n- Gruppenname und Passwort\n- DeviceID (zufaellige Zahl zwischen 0 und " +
+-				"999999999)\n\nBeim Benutzen dieses Programms stimmst du der\nUebertragung und Speicherung dieser Daten zu.\n")
+-			else: self.help_label = gtk.Label("\nPlease read carefully:\n\nThe goal of CellHunter is to collect as much unknown\nmobile phone cells as " + 
+-				"you can. To reach this goal you\ntransmit the current cell id and your current gps\ncoordinates. You can come together in groups to reach\n" + 
+-				"this goal.\n\nThe button \"Check CellID\" refreshes the current cell\ninformation and gps data. A click on \"Submit Data\"\nsubmits the data " + 
+-				"to the server.\n\nSecurity advise!\nThe following data will be transfered to the server:\n- Your provider name\n- Current CellID\n- Current Signal " + 
+-				"strength\n- GPS time and coordinates\n- Group name and password\n- DeviceID (random number between 0 and 999999999)\n\nWith using this " +
+-				"program you agree the transfer and\nsaving of this data.\n\n");
+-			context = self.help_label.get_pango_context() 
+-			font = context.get_font_description()
+-			font.set_size(4096) 
+-			self.help_label.modify_font(font)
+-			self.vbox3.pack_start(self.help_label, False, False)
+-			self.help_label.show()
+-
+-			if self.lang == "de": self.next = gtk.Button("Weiter")
+-			else: self.next = gtk.Button("Next")
+-			self.vbox3.pack_start(self.next)
+-			self.next.connect("clicked", self.closehelp)
+-			self.next.show()
+-
+-			self.win3.show()
+-
+-			if self.DEBUG: print "__init__ / init gtk group window"
+-
+-			self.win2 = gtk.Window(gtk.WINDOW_TOPLEVEL)
+-			self.win2.set_title("CellHunter Config")
+-			self.win2.connect("delete_event", self.delete_event)
+-
+-			self.vbox2 = gtk.VBox(homogeneous=False, spacing=0)
+-			self.win2.add(self.vbox2)
+-			self.vbox2.show()
+-
+-			if self.lang == "de": self.info_label = gtk.Label("Damit man gemeinsam Zellen sammeln kann, kannst du\nhier eine Gruppe und ein Passwort eingeben. Eine " +
+-				"nicht\nbestehende Gruppe wird beim ersten Zugriff erstellt.\nJeder der das Passwort kennt, kann fuer die Gruppe\nZellen " +
+-				"sammeln. Gibts du nichts ein, bleibst du anonym.\nEs wird dann auch keine DeviceID generiert und gesendet.\n")
+-			else: self.info_label = gtk.Label("To play the game and collect cells in your team you can\nenter a group name and a password. A non-existing group\nwill " + 
+-				"be created. Everyone how knows your password can\ncollect cells for the group. If you leave the fields empty\nyou will be anonymous. In this case even " + 
+-				"no DeviceID\nwill be generated and transmitted.\n")
+-			context = self.info_label.get_pango_context() 
+-			font = context.get_font_description()
+-			font.set_size(4096) 
+-			self.info_label.modify_font(font)
+-			self.vbox2.pack_start(self.info_label, False, False)
+-			self.info_label.show()
+-
+-			if self.lang == "de": self.d_label = gtk.Label("Gruppenname:")
+-			else: self.d_label = gtk.Label("Group name:")
+-			self.vbox2.pack_start(self.d_label, False, False)
+-			self.d_label.show()
+-
+-			self.groupentry = gtk.Entry()
+-			self.vbox2.add(self.groupentry)
+-			self.groupentry.show()
+-
+-			if self.lang == "de": self.d_label = gtk.Label("Gruppenpasswort:")
+-			else: self.d_label = gtk.Label("Group password:")
+-			self.vbox2.pack_start(self.d_label, False, False)
+-			self.d_label.show()
+-
+-			self.passentry = gtk.Entry()
+-			self.vbox2.add(self.passentry)
+-			self.passentry.show()
+-
+-			if self.lang == "de": self.configbutton = gtk.Button("Speichern")
+-			else: self.configbutton = gtk.Button("Save")
+-			self.vbox2.pack_start(self.configbutton)
+-			self.configbutton.connect("clicked", self.saveconfig, self.groupentry, self.passentry, self.info_label)
+-			self.configbutton.show()
+-
+-		else:
+-			self.win.show()
+-
+-	def main(self):
+-		if self.DEBUG: print "main"
+-
+-		gtk.main()
++    DEBUG = False
++    
++    homedir = "/home/root"
++    
++    lang = ""
++    configpresent = False
++    auto = 0
++    auto_running = 0
++    offline = False
++    data_auto = 0
++    cell_la = ""
++    cell_id = ""
++    provider = ""
++    mcc = ""
++    mnc = ""
++    signal = ""
++    cell_arfcn = ""
++    ncells_la = ["", "", "", "", "", ""]
++    ncells_id = ["", "", "", "", "", ""]
++    ncells_signal = ["", "", "", "", "", ""]
++    ncells_arfcn = ["", "", "", "", "", ""]
++    gps_fix = ""
++    gps_lat = ""
++    gps_long = ""
++    gps_alt = ""
++    gps_time = ""
++    groupname = ""
++    grouppass = ""
++    device_id = ""
++    labeltext1 = ""
++    labeltext2 = ""
++    labeltext3 = ""
++
++    # shut down the modem an get it back to normal state
++    def gui_destroy(self):
++        if self.DEBUG: print "gui_destroy"
++        
++        if self.DEBUG: print "gui_destroy / kill all old wgets"
++        subprocess.Popen(["/usr/bin/killall", "wget"])
++
++    def delete_event(self, widget, event=None, data=None):
++        if self.DEBUG: print "delete_event"
++
++        if self.offline == True:
++            if self.lang == "de": offlabel = gtk.Label("Du warst im Offline Modus. Um die Daten\nzu uebertragen musst du, sobald wieder\neine Internetverbindung " +
++                "besteht, auf der\nKonsole \"cellhunter_upload.sh\" ausfuehren.\nDann werden die Daten gesendet.\n\nDu kannst beliebig oft und " +
++                "beliebig lange mit\nCellHunter Daten sammeln, erst nach dem\nUebertragen werden die gesammelten Daten\nzurueckgesetzt.")
++            else: offlabel = gtk.Label("You have been in Offline Mode. To submit the data you\nhave to run \"cellhunter_upload.sh\" on your terminal as\nsoon you " + 
++                "have a working internet connection again.\nThen the collected data will be transmitted. You can\ncollect cells as long as you want. After " + 
++                "transmitting the\ndata your offline collected cells will be resetted.");
++            offlabel.show()
++            if self.lang == "de": dia = gtk.Dialog('Offline Modus', self.win.get_toplevel(), 0, (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
++            else: dia = gtk.Dialog('Offline Mode', self.win.get_toplevel(), 0, (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
++            dia.vbox.pack_start(offlabel)
++            dia.show()
++            result = dia.run()
++            if result == gtk.RESPONSE_CLOSE:
++                dia.destroy()
++                gtk.main_quit()
++                return False
++        else:
++            gtk.main_quit()
++            return False
++
++    # try to save the config to file if data is correct
++    def saveconfig(self, button, groupentry, passentry, info_label):
++        if self.DEBUG: print "saveconfig"
++
++        save_config = False
++
++        try:
++            if self.DEBUG: print "saveconfig / checking for group..."
++            socket.setdefaulttimeout(10)
++            params = urllib.urlencode({'groupcheck': 1, 'gname': groupentry.get_text(), 'gpass': passentry.get_text()})
++            f = urllib.urlopen("http://78.47.116.33/~hole/cellhunter/submit.php?%s" % params)
++            response = f.read()
++            
++            if response == "group_add":
++                if self.DEBUG: print "saveconfig / group added"
++                save_config = True
++            if response == "password_ok":
++                if self.DEBUG: print "saveconfig / group exists, password ok"
++                save_config = True
++            if response == "password_wrong":
++                if self.DEBUG: print "saveconfig / group exists, password wrong"
++                save_config = False
++                if self.lang == "de": self.info_label.set_text("\nDas Passwort fuer diese Gruppe ist falsch. Entweder du\nlegst eine neue Gruppe mit einem anderen " +
++                    "Namen an,\noder versuchst es noch einmal mit dem richtigen\nPasswort\n\n")
++                else: self.info_label.set_text("\nThe password you entered for this group is wrong.\nYou can add a new group with another name or try\nit again with the right password.\n\n\n")
++        except IOError:
++            if self.lang == "de": self.info_label.set_text("\nFehler:\nKonnte keine Verbindung zum Server aufbauen.\nBitte die Netzwerkverbindung ueberpruefen.\n\n\n")
++            else: self.info_label.set_text("\nError:\nNo connection to the Server.\nPlase check your network connection.\n\n\n")
++            if self.DEBUG: print "saveconfig / no connection to server"
++
++        if save_config == True:
++            if self.DEBUG: print "saveconfig / writing config"
++            config = ConfigParser.RawConfigParser()
++            
++            config.add_section('main')
++            config.set('main', 'gname', groupentry.get_text())
++            self.groupname = groupentry.get_text()
++            if self.groupname == "":
++                if self.DEBUG: print "saveconfig / user is anonymous"
++                config.set('main', 'gpass', "")
++                config.set('main', 'device_id', "")
++                self.grouppass = ""
++                self.device_id = ""
++            else:
++                if self.DEBUG: print "saveconfig / user is not anonymous"
++                random.seed()
++                randomid = random.randint(0, 999999999)
++                if self.DEBUG: print "save_config / device_id=" + str(randomid)
++                config.set('main', 'device_id', randomid)
++                config.set('main', 'gpass', passentry.get_text())
++                self.grouppass = passentry.get_text()
++                self.device_id = str(randomid)
++            
++            config.set('main', 'lang', self.lang)
++            
++            f = open(self.homedir + '/.cellhunter.conf', 'w')
++            config.write(f)
++            
++            self.win2.hide()
++            self.win.show()
++
++    # check cellid and gps data
++    def check_cellid(self, button, label):
++        if self.DEBUG: print "check_cellid"
++
++        try:
++            data = self.ogsmd_monitor_iface.GetServingCellInformation()
++            self.cell_la = data['lac']
++            self.cell_id = data['cid']
++            self.signal = str(data['rxlev']/2+2)
++            self.cell_arfcn = str(data['arfcn'])
++    
++            while len(self.cell_la) < 4:
++                self.cell_la = "0" + self.cell_la
++            while len(self.cell_id) < 4:
++                self.cell_id = "0" + self.cell_id
++    
++            if self.DEBUG: print "check_cellid / " + self.cell_la + " " + self.cell_id + " " + self.signal + " " + self.cell_arfcn
++        except dbus.DBusException, e:
++            print "Error while getting main cell:", e
++            self.cell_la = "0000"
++            self.cell_id = "0000"
++            self.signal = "0"
++            self.cell_arfcn = "0"
++        
++        try:
++            data = self.ogsmd_network_iface.GetStatus()
++            self.provider = data['provider']
++            self.mcc = str(data['code'])[:3]
++            self.mnc = str(data['code'])[3:]
++            if self.DEBUG: print "check_cellid / Provider: " + self.provider + " " + self.mcc + " " + self.mnc
++        except dbus.DBusException, e:
++            print "Error while getting provider:", e
++            self.provider = "99999"
++            self.mcc = "999"
++            self.mnc = "999"
++        
++        try:
++            #neighbour cells
++            data = self.ogsmd_monitor_iface.GetNeighbourCellInformation()
++            # FIXME handle less then 6 neighbours correctly
++            self.ncells_la = []
++            self.ncells_id = []
++            self.ncells_signal = []
++            self.ncells_arfcn = []
++    
++            for cell in data:
++                self.ncells_la.append(cell['lac'])
++                self.ncells_id.append(cell['cid'])
++                self.ncells_signal.append(str(cell['rxlev']/2+2))
++                self.ncells_arfcn.append(str(cell['arfcn'])) 
++                while len(self.ncells_la[-1]) < 4:
++                    self.ncells_la[-1] = "0" + self.ncells_la[-1]
++                while len(self.ncells_id[-1]) < 4:
++                    self.ncells_id[-1] = "0" + self.ncells_id[-1]
++                #while len(self.ncells_signal[-1]) < 2:
++                #   self.ncells_signal[-1] = "0" + self.ncells_signal[-1]
++                
++                if self.DEBUG: print "check_cellid / neighbours: " + self.ncells_la[-1] + \
++                    " " + self.ncells_id[-1] + " " + self.ncells_signal[-1] + \
++                    " " + self.ncells_arfcn[-1]
++            while len(self.ncells_la) < 6:
++                self.ncells_la.append("0000")
++                self.ncells_id.append("0000")
++                self.ncells_signal.append("0")
++                self.ncells_arfcn.append("0") 
++        except dbus.DBusException, e:
++            print "Error while getting neighbour cells:", e
++            self.ncells_la = ["0000", "0000", "0000", "0000", "0000", "0000"]
++            self.ncells_id = ["0000", "0000", "0000", "0000", "0000", "0000"]
++            self.ncells_signal = ["0", "0", "0", "0", "0", "0"]
++            self.ncells_arfcn = ["0", "0", "0", "0", "0", "0"]
++
++        # first part of the info label
++        if self.lang == "de": self.labeltext1 = "Provider:\t\t" + self.provider + " (" + self.mcc + "/" + self.mnc + ")" + "\nZelle:\t\t" + self.cell_la + " / " + self.cell_id + " / " + self.signal + "\n" + "Nachbarn:\t" + self.ncells_la[0] + " / " + self.ncells_id[0] + " / " + self.ncells_signal[0] + "  \t" + self.ncells_la[1] + " / " + self.ncells_id[1] + " / " + self.ncells_signal[1] + "\n\t\t\t" + self.ncells_la[2] + " / " + self.ncells_id[2] + " / " + self.ncells_signal[2] + "  \t" + self.ncells_la[3] + " / " + self.ncells_id[3] + " / " + self.ncells_signal[3] + "\n\t\t\t" + self.ncells_la[4] + " / " + self.ncells_id[4] + " / " + self.ncells_signal[4] + "  \t" + self.ncells_la[5] + " / " + self.ncells_id[5] + " / " + self.ncells_signal[5]
++        else: self.labeltext1 = "Provider:\t\t" + self.provider + " (" + self.mcc + "/" + self.mnc + ")" + "\nCell:\t\t\t" + self.cell_la + " / " + self.cell_id + " / " + self.signal + "\n" + "Neighbours:\t" + self.ncells_la[0] + " / " + self.ncells_id[0] + " / " + self.ncells_signal[0] + "  \t" + self.ncells_la[1] + " / " + self.ncells_id[1] + " / " + self.ncells_signal[1] + "\n\t\t\t" + self.ncells_la[2] + " / " + self.ncells_id[2] + " / " + self.ncells_signal[2] + "  \t" + self.ncells_la[3] + " / " + self.ncells_id[3] + " / " + self.ncells_signal[3] + "\n\t\t\t" + self.ncells_la[4] + " / " + self.ncells_id[4] + " / " + self.ncells_signal[4] + "  \t" + self.ncells_la[5] + " / " + self.ncells_id[5] + " / " + self.ncells_signal[5]
++
++
++        # get gps data
++        self.position = self.position_iface.GetPosition()
++        
++        # type of gps fix
++        if self.position[0] >= 3:
++            self.gps_fix = "2D"
++        if self.position[0] == 7:
++            self.gps_fix = "3D"
++        if self.position[0] < 3:
++            if self.lang == "de": self.gps_fix = "Kein Fix"
++            else: self.gps_fix = "No Fix"
++        
++        # when got fix, check position
++        if self.position[0] >= 3:
++            self.gps_time = str(self.position[1])
++            self.gps_lat = str(self.position[2])
++            self.gps_long = str(self.position[3])
++            self.gps_alt = str(self.position[4])
++        else:
++            self.gps_time = ""
++            self.gps_lat = ""
++            self.gps_long = ""
++            self.gps_alt = ""
++
++        # debut output
++        gps_data = "FIX/TIME: " + self.gps_fix + " / " + str(self.position[0]) + " / " + self.gps_time
++        if self.DEBUG: print "check_cellid / " + gps_data
++        gps_data = "POS: " + self.gps_lat + " / " + self.gps_long + " / " + self.gps_alt
++        if self.DEBUG: print "check_cellid / " + gps_data
++        
++        # second part of the info label
++        if self.lang == "de": self.labeltext2 = "Fix: " + self.gps_fix + " / Zeit: " + self.gps_time + "\nPosition: " + self.gps_lat + " / " + self.gps_long + " / " + self.gps_alt
++        else: self.labeltext2 = "Fix: " + self.gps_fix + " / Time: " + self.gps_time + "\nPosition: " + self.gps_lat + " / " + self.gps_long + " / " + self.gps_alt
++        
++        # send data automatically?
++        if self.data_auto != 0:
++            if self.DEBUG: print "check_cellid / sending data automatically..."
++            self.send_data()
++        
++        self.check_serverresponse()
++
++        # put all labeldata together and set it
++        labeltext = self.labeltext1 + "\n\n" + self.labeltext2 + "\n\n" + self.labeltext3
++        label.set_text(labeltext)
++
++        # if auto != 0 a next function call is schedules in auto milliseconds
++        self.auto_running = 0
++        if self.auto != 0:
++            if self.DEBUG: print "check_cellid / scheduling next check in " + str(self.auto) + " ms"
++            self.auto_running = 1
++            gobject.timeout_add (self.auto, self.check_cellid, button, label)
++
++    # toggle auto check for cellid
++    def check_cellid_auto(self, button, label):
++        if self.DEBUG: print "check_cellid_auto"
++
++        if self.auto == 0:
++            self.auto = 10000
++            self.button_100.set_sensitive(False)
++            self.button_150.set_sensitive(False)
++            if self.lang == "de": button.set_label("CellID alle 10\nSekunden abfragen")
++            else: button.set_label("Check CellID\nevery 10 Seconds")
++            if self.auto_running == 0:
++                self.check_cellid(button, label)
++        elif self.auto == 10000:
++            self.auto = 30000
++            if self.lang == "de": button.set_label("CellID alle 30\nSekunden abfragen")
++            else: button.set_label("Check CellID\nevery 30 Seconds")
++        elif self.auto == 30000:
++            self.auto = 60000
++            if self.lang == "de": button.set_label("CellID alle 60\nSekunden abfragen")
++            else: button.set_label("Check CellID\nevery 60 Seconds")
++        elif self.auto == 60000:
++            self.auto = 120000
++            if self.lang == "de": button.set_label("CellID alle 120\nSekunden abfragen")
++            else: button.set_label("Check CellID\nevery 120 Seconds")
++        elif self.auto == 120000:
++            self.auto = 0
++            self.button_100.set_sensitive(True)
++            self.button_150.set_sensitive(True)
++            if self.lang == "de": button.set_label("CellID automatisch\nabfragen: AUS")
++            else: button.set_label("Auto check\nCellID: OFF")
++
++        if self.DEBUG: print "check_cellid_auto / auto=" + str(self.auto)
++
++    # send data button
++    def check_cellid_data(self, button, label):
++        if self.DEBUG: print "check_cellid_data"
++        
++        self.send_data()
++        
++        self.check_serverresponse()
++        
++        # label zusammensetzen und anzeigen
++        if(self.labeltext1 != ""):
++            labeltext = self.labeltext1 + "\n\n" + self.labeltext2 + "\n\n" + self.labeltext3
++            label.set_text(labeltext)
++
++    # toggle send data automatically
++    def check_cellid_data_auto(self, button):
++        if self.DEBUG: print "check_cellid_data_auto"
++
++        if self.data_auto == 0:
++            self.data_auto = 1
++            if self.lang == "de": button.set_label("Daten automatisch\nuebertragen: AN")
++            else: button.set_label("Auto submit\nData: ON")
++        else:
++            self.data_auto = 0
++            if self.lang == "de": button.set_label("Daten automatisch\nuebertragen: AUS")
++            else: button.set_label("Auto submit\nData: OFF")
++
++        if self.DEBUG: print "check_cellid_data_auto / data_auto=" + str(self.data_auto)
++
++    # toggle offline mode
++    def offline_mode(self, button):
++        if self.DEBUG: print "offline_mode"
++
++        if self.offline == False:
++            self.offline = True
++            if self.lang == "de": button.set_label("Offline Modus: AN")
++            else: button.set_label("Offline Mode: ON")
++            if self.lang == "de": offlabel = gtk.Label("Du bist jetzt im Offline Modus. Alle Anfragen\nan den Server werden jetzt nicht gesendet,\nsondern " + 
++                "gespeichert. Du muss aber trotzdem\n\"Daten uebertragen\", tu einfach so, als waerst du\nonline. Wie du die Daten dann uebertraegst\n" +
++                "erfaehrst du wenn du das Programm im\nOfflinemodus beendest.")
++            else: offlabel = gtk.Label("You are in Offline Mode now. All requests to the server\nwill not be sent but saved in a file. But you have to" + 
++                "\n\"Submit Data\". Just act as you were in online mode.\nYou will get help on transmitting the data to the server\nwhen leaving the program " + 
++                "in offline mode")
++            offlabel.show()
++            if self.lang == "de": dia = gtk.Dialog('Offline Modus', self.win.get_toplevel(), 0, (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
++            else: dia = gtk.Dialog('Offline Mode', self.win.get_toplevel(), 0, (gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
++            dia.vbox.pack_start(offlabel)
++            dia.show()
++            result = dia.run()
++            if result == gtk.RESPONSE_CLOSE:
++                dia.destroy()
++        else:
++            self.offline = False
++            if self.lang == "de": button.set_label("Offline Modus: AUS")
++            else: button.set_label("Offline Mode: OFF")
++
++        if self.DEBUG: print "offline_mode / offline=" + str(self.offline)
++
++    def check_serverresponse(self):
++        if self.DEBUG: print "check_serverresponse"
++        
++        if self.offline == False:
++            if os.path.isfile("/tmp/cellhunter.wget") == True:
++                #print "vorhanden"
++                infile = open("/tmp/cellhunter.wget","r")
++                self.labeltext3 = "Server Status: " + infile.readline()
++                infile.close()
++            else:
++                #print "nicht vorhanden"
++                if self.lang == "de": self.labeltext3 = "Server Status: Uebertragung fehlgeschlagen"
++                else: self.labeltext3 = "Server Status: Connection to Server failed"
++        else:
++            if self.lang == "de": self.labeltext3 = "Server Status: Offline Modus"
++            else: self.labeltext3 = "Server Status: Offline Mode"
++
++    # submit data
++    # using wget is better because gui does not freeze. but i have to get the result from file
++    # should be done with threads but i am too lazy to do this right now
++    def send_data(self):
++        url = "http://78.47.116.33/~hole/cellhunter/submit.php?provider=" + urllib.quote(self.provider) + "&cell_mcc=" + urllib.quote(self.mcc) + "&cell_mnc=" + urllib.quote(self.mnc) + "&cell_la=" + urllib.quote(self.cell_la) + "&cell_id=" + urllib.quote(self.cell_id) + "&signal=" + urllib.quote(self.signal) + "&time=" + urllib.quote(self.gps_time) + "&lat=" + urllib.quote(self.gps_lat) + "&long=" + urllib.quote(self.gps_long) + "&alt=" + urllib.quote(self.gps_alt) + "&gname=" + urllib.quote(self.groupname) + "&gpass=" + urllib.quote(self.grouppass) + "&device_id=" + urllib.quote(self.device_id) + "&cell_arfcn=" + urllib.quote(self.cell_arfcn) + "&serving=1"
++        
++        url_n = ["", "", "", "", "", ""]
++        for i in range(0,6):
++            url_n[i] = "http://78.47.116.33/~hole/cellhunter/submit.php?provider=" + urllib.quote(self.provider) + "&cell_mcc=" + urllib.quote(self.mcc) + "&cell_mnc=" + urllib.quote(self.mnc) + "&cell_la=" + urllib.quote(self.ncells_la[i]) + "&cell_id=" + urllib.quote(self.ncells_id[i]) + "&signal=" + urllib.quote(self.ncells_signal[i]) + "&time=" + urllib.quote(self.gps_time) + "&lat=" + urllib.quote(self.gps_lat) + "&long=" + urllib.quote(self.gps_long) + "&alt=" + urllib.quote(self.gps_alt) + "&gname=" + urllib.quote(self.groupname) + "&gpass=" + urllib.quote(self.grouppass) + "&device_id=" + urllib.quote(self.device_id) + "&cell_arfcn=" + urllib.quote(self.ncells_arfcn[i]) + "&serving=0"
++        
++        if self.offline == False:
++            if self.DEBUG: print "send_data / online"
++            if self.cell_la != "0000" or self.cell_id != "0000":
++                if self.DEBUG: print "send_data / " + url
++                subprocess.Popen(["/usr/bin/wget", "--user-agent", "cellhunter 0.4.2 online",  "-q", "--output-document=/tmp/cellhunter.wget", url])
++            for i in range(0,6):
++                if self.ncells_la[i] != "0000" or self.ncells_id[i] != "0000":
++                    if self.DEBUG: print "send_data / " + url_n[i]
++                    subprocess.Popen(["/usr/bin/wget", "--user-agent", "cellhunter 0.4.2 online", "-q", "--output-document=/tmp/cellhunter.wget" + str(i), url_n[i]])
++            
++        elif self.offline == True:
++            if self.DEBUG: print "send_data / offline"
++            offlineFile = open(self.homedir + '/cellhunter_offline.log', 'a')
++            if self.cell_la != "0000" or self.cell_id != "0000":
++                if self.DEBUG: print "send_data / " + url
++                offlineFile.write(url + "\n")
++            for i in range(0,6):
++                if self.ncells_la[i] != "0000" or self.ncells_id[i] != "0000":
++                    if self.DEBUG: print "send_data / " + url_n[i]
++                    offlineFile.write(url_n[i] + "\n")
++            offlineFile.close()
++            
++            
++        """
++        try:
++            params = urllib.urlencode({'provider': self.provider, 'cell_la': self.cell_la, 'cell_id': self.cell_id, 'signal': self.signal, 'time': self.gps_time, 'lat': self.gps_lat, 'long': self.gps_long, 'alt': self.gps_alt, 'gname': self.groupname, 'gpass': self.grouppass, 'device_id': self.device_id})
++            f = urllib.urlopen("http://78.47.116.33/~hole/cellhunter/submit.php?%s" % params)
++            response = f.read()
++            self.labeltext3 = "Server Status: " + response
++            print response
++        except IOError:
++            self.labeltext3 = "Server Status: Uebertragung fehlgeschlagen"
++            print "Konnte keine Verbindung aufbauen"
++        """
++
++    # close help, display config
++    def closehelp(self, button):
++        if self.DEBUG: print "closehelp"
++        
++        self.win3.hide()
++        self.win2.show()
++
++    # init
++    def __init__(self):
++        for arg in sys.argv:
++            if arg == "-d" or arg == "--debug":
++                self.DEBUG = True
++        
++        if self.DEBUG: print "__init__"
++
++        if self.DEBUG: print "__init__ / checking for homedir"
++        if os.environ['HOME'] != "":
++            self.homedir = os.environ['HOME']
++            if self.DEBUG: print "__init__ / found homedir = " + self.homedir
++        else:
++            if self.DEBUG: print "__init__ / homedir = " + self.homedir
++
++        # look for config file
++        if self.DEBUG: print "__init__ / init config"
++        if os.path.isfile(self.homedir + "/.cellhunter.conf") == True :
++            self.configpresent = True
++            config = ConfigParser.RawConfigParser()
++            config.read(self.homedir + '/.cellhunter.conf')
++            self.groupname = config.get('main', 'gname')
++            self.grouppass = config.get('main', 'gpass')
++            self.device_id = config.get('main', 'device_id')
++            try:
++                self.lang = config.get('main', 'lang')
++            except ConfigParser.NoOptionError:
++                self.lang = ""
++
++        # create initial wget file
++        if self.DEBUG: print "__init__ / init wget file"
++        file = open("/tmp/cellhunter.wget","w")
++        if self.lang == "de": file.write("Warte auf Daten...")
++        else: file.write("Idle...")
++        file.close()
++
++        # initialise dbus
++        if self.DEBUG: print "__init__ / init dbus"
++        bus = dbus.SystemBus()
++
++        # get dbus ogsmd object and set modem in verbose mode
++        ogsmd_obj = bus.get_object( "org.freesmartphone.ogsmd", "/org/freesmartphone/GSM/Device" )
++        self.ogsmd_monitor_iface = dbus.Interface( ogsmd_obj, "org.freesmartphone.GSM.Monitor" )
++        self.ogsmd_network_iface = dbus.Interface( ogsmd_obj, "org.freesmartphone.GSM.Network" )
++
++        # request gps device
++        usage_obj = bus.get_object('org.freesmartphone.ousaged', '/org/freesmartphone/Usage')
++        usage_iface = dbus.Interface(usage_obj, 'org.freesmartphone.Usage')
++        usage_iface.RequestResource("GPS")
++
++        # get interface for polling gps position
++        gypsy_obj = bus.get_object( 'org.freesmartphone.ogpsd', '/org/freedesktop/Gypsy' )
++        self.position_iface = dbus.Interface( gypsy_obj, 'org.freedesktop.Gypsy.Position' )
++
++        """
++        window layout:
++        -------------------
++        |  cellid daten   |
++        -------------------
++        |   01   |   02   |
++        -------------------
++        |   03   |   04   |
++        -------------------
++        |      exit       |
++        -------------------
++        """
++
++        if self.DEBUG: print "__init__ / init gtk main window"
++
++        # main window
++        self.win = gtk.Window(gtk.WINDOW_TOPLEVEL)
++        self.win.set_title("CellHunter")
++        self.win.connect("delete_event", self.delete_event)
++
++
++        if self.configpresent == False or self.lang == "":
++            langlabel = gtk.Label("Please choose your language\nBitte waehle deine Sprache")
++            langlabel.show()
++            dia = gtk.Dialog('CellHunter Language / Sprache', self.win.get_toplevel(), 0, ("English", 1, "Deutsch", 2))
++            dia.vbox.pack_start(langlabel)
++            dia.show()
++            result = dia.run()
++            if result == 1:
++                self.lang = "en"
++                dia.destroy()
++            if result == 2:
++                self.lang = "de"
++                dia.destroy()
++            if self.configpresent == True:
++                print "__init__ / appending lang to config"
++                config = ConfigParser.RawConfigParser()
++                config.add_section('main')
++                config.set('main', 'gname', self.groupname)
++                config.set('main', 'gpass', self.grouppass)
++                config.set('main', 'device_id', self.device_id)
++                config.set('main', 'lang', self.lang)
++                f = open(self.homedir + '/.cellhunter.conf', 'w')
++                config.write(f)
++
++        # vertical main box
++        self.vbox = gtk.VBox(homogeneous=False, spacing=5)
++        self.win.add(self.vbox)
++        self.vbox.show()
++
++        # dummy
++        self.d_label = gtk.Label("")
++        self.vbox.pack_start(self.d_label, False, False)
++        self.d_label.show()
++
++        # info label with cell, gps, server data
++        if self.lang == "de": self.cell_label = gtk.Label("Provider:\nZelle:\nNachbarn:\n\n\n\nFix: / Zeit:\nPosition:\n\nServer Status: Warte auf Daten...")
++        else: self.cell_label = gtk.Label("Provider:\nCell:\nNeighbours:\n\n\n\nFix: / Time:\nPosition:\n\nServer Status: Idle...")
++        context = self.cell_label.get_pango_context() 
++        font = context.get_font_description()
++        font.set_size(4096) 
++        self.cell_label.modify_font(font)
++        self.vbox.pack_start(self.cell_label, False, False)
++        self.cell_label.show()
++        
++        # dummy
++        self.d_label = gtk.Label("")
++        self.vbox.pack_start(self.d_label, False, False)
++        self.d_label.show()
++
++        # first button row
++        self.hbox = gtk.HBox(homogeneous=True, spacing=5)
++        self.vbox.add(self.hbox)  
++        self.hbox.show()
++
++        # button check cellid
++        if self.lang == "de": self.button_100 = gtk.Button("CellID abfragen")
++        else: self.button_100 = gtk.Button("Check CellID")
++        self.hbox.pack_start(self.button_100)
++        self.button_100.connect("clicked", self.check_cellid, self.cell_label)
++        self.button_100.show()
++
++        # button submit data
++        if self.lang == "de": self.button_150 = gtk.Button("Daten uebertragen")
++        else: self.button_150 = gtk.Button("Submit Data")
++        self.hbox.pack_start(self.button_150)
++        self.button_150.connect("clicked", self.check_cellid_data, self.cell_label)
++        self.button_150.show()
++
++        # second button row
++        self.hbox = gtk.HBox(homogeneous=True, spacing=5)
++        self.vbox.add(self.hbox)  
++        self.hbox.show()
++
++        # button check cellid auto
++        if self.lang == "de": self.button_101 = gtk.Button("CellID automatisch\nabfragen: AUS")
++        else: self.button_101 = gtk.Button("Auto check\nCellID: OFF")
++        self.hbox.pack_start(self.button_101)
++        self.button_101.connect("clicked", self.check_cellid_auto, self.cell_label)
++        self.button_101.show()
++
++        # button submit data auto
++        if self.lang == "de": self.button_151 = gtk.Button("Daten automatisch\nuebertragen: AUS")
++        else: self.button_151 = gtk.Button("Auto submit\nData: OFF")
++        self.hbox.pack_start(self.button_151)
++        self.button_151.connect("clicked", self.check_cellid_data_auto)
++        self.button_151.show()
++
++        # third button row
++        self.hbox = gtk.HBox(homogeneous=True, spacing=5)
++        self.vbox.add(self.hbox)  
++        self.hbox.show()
++
++        # button exit
++        self.button_200 = gtk.Button("Exit")
++        self.hbox.pack_start(self.button_200)
++        self.button_200.connect("clicked", self.delete_event)
++        self.button_200.show()
++
++        # button offline mode
++        if self.lang == "de": self.button_201 = gtk.Button("Offline Modus: AUS")
++        else: self.button_201 = gtk.Button("Offline Mode: OFF")
++        self.hbox.pack_start(self.button_201)
++        self.button_201.connect("clicked", self.offline_mode)
++        self.button_201.show()
++
++        if self.configpresent == False:
++
++            if self.DEBUG: print "__init__ / init gtk introduction window"
++
++            self.win3 = gtk.Window(gtk.WINDOW_TOPLEVEL)
++            if self.lang == "de": self.win3.set_title("CellHunter Hilfe")
++            else: self.win3.set_title("CellHunter Help")
++            self.win3.connect("delete_event", self.delete_event)
++
++            self.vbox3 = gtk.VBox(homogeneous=False, spacing=0)
++            self.win3.add(self.vbox3)
++            self.vbox3.show()
++
++            if self.lang == "de": self.help_label = gtk.Label("\nBitte vor dem Benutzen lesen:\n\nCellHunter ist ein Spiel, bei dem das Ziel ist, moeglichst\nviele " + 
++                "noch unentdeckte Mobilfunkzellen zu orten. Hierzu\nwird die aktuelle Zelle mit den dazugehoerigen GPS-\nKoordinaten " +
++                "uebertragen. Spieler koennen sich in\nGruppen zusammentun um ein besseres Ergebnis zu\nerreichen.\n\nMit dem Button \"CellId " +
++                "abfragen\" fragst du die aktuellen\nZell- und GPS-Daten ab. Ein Klick auf \"Daten uebertragen\"\nsendet diese Daten an den " +
++                "Server.\n\nSicherheitshinweis!\nFolgende Daten werden an den Server uebertragen:\n- Dein Provider\n- Aktuelle Zellen-ID\n- " +
++                "Aktuelle Signalstaerke\n- GPS Zeit und Koordinaten\n- Gruppenname und Passwort\n- DeviceID (zufaellige Zahl zwischen 0 und " +
++                "999999999)\n\nBeim Benutzen dieses Programms stimmst du der\nUebertragung und Speicherung dieser Daten zu.\n")
++            else: self.help_label = gtk.Label("\nPlease read carefully:\n\nThe goal of CellHunter is to collect as much unknown\nmobile phone cells as " + 
++                "you can. To reach this goal you\ntransmit the current cell id and your current gps\ncoordinates. You can come together in groups to reach\n" + 
++                "this goal.\n\nThe button \"Check CellID\" refreshes the current cell\ninformation and gps data. A click on \"Submit Data\"\nsubmits the data " + 
++                "to the server.\n\nSecurity advise!\nThe following data will be transfered to the server:\n- Your provider name\n- Current CellID\n- Current Signal " + 
++                "strength\n- GPS time and coordinates\n- Group name and password\n- DeviceID (random number between 0 and 999999999)\n\nWith using this " +
++                "program you agree the transfer and\nsaving of this data.\n\n");
++            context = self.help_label.get_pango_context() 
++            font = context.get_font_description()
++            font.set_size(4096) 
++            self.help_label.modify_font(font)
++            self.vbox3.pack_start(self.help_label, False, False)
++            self.help_label.show()
++
++            if self.lang == "de": self.next = gtk.Button("Weiter")
++            else: self.next = gtk.Button("Next")
++            self.vbox3.pack_start(self.next)
++            self.next.connect("clicked", self.closehelp)
++            self.next.show()
++
++            self.win3.show()
++
++            if self.DEBUG: print "__init__ / init gtk group window"
++
++            self.win2 = gtk.Window(gtk.WINDOW_TOPLEVEL)
++            self.win2.set_title("CellHunter Config")
++            self.win2.connect("delete_event", self.delete_event)
++
++            self.vbox2 = gtk.VBox(homogeneous=False, spacing=0)
++            self.win2.add(self.vbox2)
++            self.vbox2.show()
++
++            if self.lang == "de": self.info_label = gtk.Label("Damit man gemeinsam Zellen sammeln kann, kannst du\nhier eine Gruppe und ein Passwort eingeben. Eine " +
++                "nicht\nbestehende Gruppe wird beim ersten Zugriff erstellt.\nJeder der das Passwort kennt, kann fuer die Gruppe\nZellen " +
++                "sammeln. Gibts du nichts ein, bleibst du anonym.\nEs wird dann auch keine DeviceID generiert und gesendet.\n")
++            else: self.info_label = gtk.Label("To play the game and collect cells in your team you can\nenter a group name and a password. A non-existing group\nwill " + 
++                "be created. Everyone how knows your password can\ncollect cells for the group. If you leave the fields empty\nyou will be anonymous. In this case even " + 
++                "no DeviceID\nwill be generated and transmitted.\n")
++            context = self.info_label.get_pango_context() 
++            font = context.get_font_description()
++            font.set_size(4096) 
++            self.info_label.modify_font(font)
++            self.vbox2.pack_start(self.info_label, False, False)
++            self.info_label.show()
++
++            if self.lang == "de": self.d_label = gtk.Label("Gruppenname:")
++            else: self.d_label = gtk.Label("Group name:")
++            self.vbox2.pack_start(self.d_label, False, False)
++            self.d_label.show()
++
++            self.groupentry = gtk.Entry()
++            self.vbox2.add(self.groupentry)
++            self.groupentry.show()
++
++            if self.lang == "de": self.d_label = gtk.Label("Gruppenpasswort:")
++            else: self.d_label = gtk.Label("Group password:")
++            self.vbox2.pack_start(self.d_label, False, False)
++            self.d_label.show()
++
++            self.passentry = gtk.Entry()
++            self.vbox2.add(self.passentry)
++            self.passentry.show()
++
++            if self.lang == "de": self.configbutton = gtk.Button("Speichern")
++            else: self.configbutton = gtk.Button("Save")
++            self.vbox2.pack_start(self.configbutton)
++            self.configbutton.connect("clicked", self.saveconfig, self.groupentry, self.passentry, self.info_label)
++            self.configbutton.show()
++
++        else:
++            self.win.show()
++
++    def main(self):
++        if self.DEBUG: print "main"
++
++        gtk.main()
+ 
+ if __name__ == '__main__':
+-	gui = CellHunterGUI()
+-	gui.main()
+-	gui.gui_destroy()
++    gui = CellHunterGUI()
++    gui.main()
++    gui.gui_destroy()
+ 
diff --git a/recipes/cellhunter/cellhunter/use-fso-interface.patch b/recipes/cellhunter/cellhunter/use-fso-interface.patch
new file mode 100644
index 0000000000..922d43bdc1
--- /dev/null
+++ b/recipes/cellhunter/cellhunter/use-fso-interface.patch
@@ -0,0 +1,185 @@
+From: Jan Luebbe <jluebbe@debian.org>
+Date: Thu, 5 Mar 2009 18:00:49 +0000 (+0100)
+Subject: use FSO Monitor interface and change version to 0.4.3
+X-Git-Url: http://git.sicherheitsschwankung.de/?p=jan%2Fcellhunter.git;a=commitdiff_plain;h=ef2e6da2ce720874032f84fd8037f9d3388ba512
+
+use FSO Monitor interface and change version to 0.4.3
+---
+
+diff --git a/cellhunter.py b/cellhunter.py
+index 3eedb6e..59171f3 100644
+--- a/cellhunter.py
++++ b/cellhunter.py
+@@ -78,6 +78,7 @@
+ ### 0.4.0 Now sending mcc&mnc and new arfcn                             ###
+ ### 0.4.1 Bugfix release, problem with getting mcc                      ###
+ ### 0.4.2 Now sending serving cell marker                               ###
++### 0.4.3 Use the FSO Monitor interface instead of DebugCommand         ###
+ ###                                                                     ###
+ ###########################################################################
+ 
+@@ -120,9 +121,6 @@ class CellHunterGUI:
+ 	# shut down the modem an get it back to normal state
+ 	def gui_destroy(self):
+ 		if self.DEBUG: print "gui_destroy"
+-
+-		if self.DEBUG: print "gui_destroy / sending AT+CREG=0\\r\\n"
+-		self.ogsmd_iface.DebugCommand("AT+CREG=0\r\n")
+ 		
+ 		if self.DEBUG: print "gui_destroy / kill all old wgets"
+ 		subprocess.Popen(["/usr/bin/killall", "wget"])
+@@ -216,25 +214,12 @@ class CellHunterGUI:
+ 	def check_cellid(self, button, label):
+ 		if self.DEBUG: print "check_cellid"
+ 
+-		# check cellid
+-		"""data = self.ogsmd_iface.DebugCommand("AT+CREG?\r\n")
+-
+-		tmpdata = data[0].split("\",\"")
+-		tmpdata2 = tmpdata[0].split("\"")
+-		tmpdata3 = tmpdata[1].split("\"")
+-
+-		self.cell_la = tmpdata2[1]
+-		self.cell_id = tmpdata3[0]
+-		
+-		if self.DEBUG: print "check_cellid / " + data[0]"""
+-		
+-		
+ 		try:
+-			data = self.ogsmd_iface.DebugCommand("AT%EM=2,1\r\n")
+-			self.cell_la = (hex(int(data[0].split(",")[15])).split("x")[1]).upper()
+-			self.cell_id = (hex(int(data[0].split(",")[5])).split("x")[1]).upper()
+-			self.signal = str((int(data[0].split(",")[3])/2)+2)
+-			self.cell_arfcn = str(data[0].split(",")[0]).split(" ")[1]
++			data = self.ogsmd_monitor_iface.GetServingCellInformation()
++			self.cell_la = data['lac']
++			self.cell_id = data['cid']
++			self.signal = str(data['rxlev']/2+2)
++			self.cell_arfcn = str(data['arfcn'])
+ 	
+ 			while len(self.cell_la) < 4:
+ 				self.cell_la = "0" + self.cell_la
+@@ -242,75 +227,63 @@ class CellHunterGUI:
+ 				self.cell_id = "0" + self.cell_id
+ 	
+ 			if self.DEBUG: print "check_cellid / " + self.cell_la + " " + self.cell_id + " " + self.signal + " " + self.cell_arfcn
+-		except:
+-			print "Error while getting main cell"
++		except dbus.DBusException, e:
++			print "Error while getting main cell:", e
+ 			self.cell_la = "0000"
+ 			self.cell_id = "0000"
+ 			self.signal = "0"
+ 			self.cell_arfcn = "0"
+ 		
+-		
+ 		try:
+-			# check provider
+-			data = self.ogsmd_iface.DebugCommand("AT+COPS?\r\n")
+-			tmpdata = data[0].split("\"")
+-			self.provider = tmpdata[1]
+-			if self.DEBUG: print "check_cellid / " + data[0]
+-		except:
+-			print "Error while getting provider"
++			data = self.ogsmd_network_iface.GetStatus()
++			self.provider = data['provider']
++			self.mcc = str(data['code'])[:3]
++			self.mnc = str(data['code'])[3:]
++			if self.DEBUG: print "check_cellid / Provider: " + self.provider + " " + self.mcc + " " + self.mnc
++		except dbus.DBusException, e:
++			print "Error while getting provider:", e
+ 			self.provider = "99999"
+-		
+-		
+-		try:
+-			data = self.ogsmd_iface.DebugCommand("AT%EM=2,4\r\n")
+-			self.mcc = str(int((data[0].split(","))[2]))
+-			self.mnc = str(int((data[0].split(","))[3]))
+-			if self.DEBUG: print "check_cellid / Provider: " + self.mcc + " " + self.mnc
+-		except:
+-			print "Error while getting mcc/mnc"
+ 			self.mcc = "999"
+ 			self.mnc = "999"
+ 		
+-		# check signal strength
+-		"""data = self.ogsmd_iface.DebugCommand("AT+CSQ\r\n")
+-		
+-		tmpdata = data[0].split(" ")
+-		tmpdata2 = tmpdata[1].split(",")
+-
+-		self.signal = tmpdata2[0]
+-
+-		if self.DEBUG: print "check_cellid / " + data[0]"""
+-
+ 		try:
+ 			#neighbour cells
+-			data = self.ogsmd_iface.DebugCommand("AT%EM=2,3\r\n")
+-			self.ncells_la = data[7].split(",")
+-			self.ncells_id = data[6].split(",")
+-			self.ncells_signal = data[4].split(",")
+-			self.ncells_arfcn = data[1].split(",")
++			data = self.ogsmd_monitor_iface.GetNeighbourCellInformation()
++			# FIXME handle less then 6 neighbours correctly
++			self.ncells_la = []
++			self.ncells_id = []
++			self.ncells_signal = []
++			self.ncells_arfcn = []
+ 	
+-			for i in range(0,6):
+-				self.ncells_la[i] = (hex(int(self.ncells_la[i])).split("x")[1]).upper()
+-				self.ncells_id[i] = (hex(int(self.ncells_id[i])).split("x")[1]).upper()
+-				self.ncells_signal[i] = str((int(self.ncells_signal[i])/2)+2)
+-				self.ncells_arfcn[i] = str(self.ncells_arfcn[i])
+-				while len(self.ncells_la[i]) < 4:
+-					self.ncells_la[i] = "0" + self.ncells_la[i]
+-				while len(self.ncells_id[i]) < 4:
+-					self.ncells_id[i] = "0" + self.ncells_id[i]
+-				#while len(self.ncells_signal[i]) < 2:
+-				#	self.ncells_signal[i] = "0" + self.ncells_signal[i]
++			for cell in data:
++				self.ncells_la.append(cell['lac'])
++				self.ncells_id.append(cell['cid'])
++				self.ncells_signal.append(str(cell['rxlev']/2+2))
++				self.ncells_arfcn.append(str(cell['arfcn'])) 
++				while len(self.ncells_la[-1]) < 4:
++					self.ncells_la[-1] = "0" + self.ncells_la[-1]
++				while len(self.ncells_id[-1]) < 4:
++					self.ncells_id[-1] = "0" + self.ncells_id[-1]
++				#while len(self.ncells_signal[-1]) < 2:
++				#	self.ncells_signal[-1] = "0" + self.ncells_signal[-1]
+ 				
+-				if self.DEBUG: print "check_cellid / neighbours: " + self.ncells_la[i] + " " + self.ncells_id[i] + " " + self.ncells_signal[i] + " " + self.ncells_arfcn[i]
+-		except:
+-			print "Error while getting neighbour cells"
++				if self.DEBUG: print "check_cellid / neighbours: " + self.ncells_la[-1] + \
++					" " + self.ncells_id[-1] + " " + self.ncells_signal[-1] + \
++					" " + self.ncells_arfcn[-1]
++			while len(self.ncells_la) < 6:
++				self.ncells_la.append("0000")
++				self.ncells_id.append("0000")
++				self.ncells_signal.append("0")
++				self.ncells_arfcn.append("0") 
++		except dbus.DBusException, e:
++			print "Error while getting neighbour cells:", e
+ 			self.ncells_la = ["0000", "0000", "0000", "0000", "0000", "0000"]
+ 			self.ncells_id = ["0000", "0000", "0000", "0000", "0000", "0000"]
+ 			self.ncells_signal = ["0", "0", "0", "0", "0", "0"]
+ 			self.ncells_arfcn = ["0", "0", "0", "0", "0", "0"]
+ 
+ 		# first part of the info label
+-		if self.lang == "de": self.labeltext1 = "Provider:\t\t" + self.provider + " (" + self.mcc + "/" + self.mnc + ")" + "\nZelle:\t\t" + self.cell_la + " / " + self.cell_id + " / " + self.signal + "\n" + "Nachbarn:\t" + self.ncells_la[0] + " / " + self.ncells_id[0] + " / " + self.ncells_signal[0] + "  \t" + self.ncells_la[1] + " / " + self.ncells_id[1] + " / " + self.ncells_signal[1] + "\n\t\t\t" + self.ncells_la[2] + " / " + self.ncells_id[2] + " / " + self.ncells_signal[2] + "  \t" + self.ncells_la[3] + " / " + self.ncells_id[3] + " / " + self.ncells_signal[3] + "\n\t\t\t" + self.ncells_la[4] + " / " + self.ncells_id[4] + " / " + self.ncells_signal[4] + "  \t" + self.ncells_la[5] + " / " + self.ncells_id[5] + " / " + self.ncells_signal[5]
++		if self.lang == "de": self.labeltext1 = "Provider:\t\t" + self.provider + " (" + self.mcc + "/" + self.mnc + ")" + "\nZelle:\t\t" + self.cell_la + " / " + self.cell_id + " / " + self.signal + "\n" + "Nachbarn:\t" + self.ncells_la[0] + " / " + self.ncells_id[0] + " / " + self.ncells_signal[0] + "  \t" + self.ncells_la[1] + " / " + self.ncells_id[1] + " / " + self.ncells_signal[1] + "\n\t\t\t" + self.ncells_la[2] + " / " + self.ncells_id[2] + " / " + self.ncells_signal[2] + "	\t" + self.ncells_la[3] + " / " + self.ncells_id[3] + " / " + self.ncells_signal[3] + "\n\t\t\t" + self.ncells_la[4] + " / " + self.ncells_id[4] + " / " + self.ncells_signal[4] + "  \t" + self.ncells_la[5] + " / " + self.ncells_id[5] + " / " + self.ncells_signal[5]
+ 		else: self.labeltext1 = "Provider:\t\t" + self.provider + " (" + self.mcc + "/" + self.mnc + ")" + "\nCell:\t\t\t" + self.cell_la + " / " + self.cell_id + " / " + self.signal + "\n" + "Neighbours:\t" + self.ncells_la[0] + " / " + self.ncells_id[0] + " / " + self.ncells_signal[0] + "  \t" + self.ncells_la[1] + " / " + self.ncells_id[1] + " / " + self.ncells_signal[1] + "\n\t\t\t" + self.ncells_la[2] + " / " + self.ncells_id[2] + " / " + self.ncells_signal[2] + "  \t" + self.ncells_la[3] + " / " + self.ncells_id[3] + " / " + self.ncells_signal[3] + "\n\t\t\t" + self.ncells_la[4] + " / " + self.ncells_id[4] + " / " + self.ncells_signal[4] + "  \t" + self.ncells_la[5] + " / " + self.ncells_id[5] + " / " + self.ncells_signal[5]
+ 
+ 
+@@ -567,8 +540,8 @@ class CellHunterGUI:
+ 
+ 		# get dbus ogsmd object and set modem in verbose mode
+ 		ogsmd_obj = bus.get_object( "org.freesmartphone.ogsmd", "/org/freesmartphone/GSM/Device" )
+-		self.ogsmd_iface = dbus.Interface( ogsmd_obj, "org.freesmartphone.GSM.Debug" )
+-		self.ogsmd_iface.DebugCommand("AT+CREG=2\r\n")
++		self.ogsmd_monitor_iface = dbus.Interface( ogsmd_obj, "org.freesmartphone.GSM.Monitor" )
++		self.ogsmd_network_iface = dbus.Interface( ogsmd_obj, "org.freesmartphone.GSM.Network" )
+ 
+ 		# request gps device
+ 		usage_obj = bus.get_object('org.freesmartphone.ousaged', '/org/freesmartphone/Usage')
diff --git a/recipes/cellhunter/cellhunter_0.4.2.bb b/recipes/cellhunter/cellhunter_0.4.2.bb
new file mode 100644
index 0000000000..52f3d201d9
--- /dev/null
+++ b/recipes/cellhunter/cellhunter_0.4.2.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "CellHunter - A game to collect information about mobile phone cells"
+SECTION = "x11/utils"
+DEPENDS = "python"
+RDEPENDS = "python-subprocess python-netclient python-math python-core python-io python-pygtk python-dbus frameworkd"
+PR = "r2"
+
+SRC_URI = "\
+  http://78.47.116.33/~hole/cellhunter/files/cellhunter-${PV}.tar.gz \
+  file://cellhunter/use-fso-interface.patch;patch=1 \
+  file://cellhunter/retab.patch;patch=1 \
+"
+
+do_configure () {
+    :
+}
+
+do_compile () {
+    :
+}
+
+do_install () {
+    install -d ${D}${bindir}
+    install -m 0755 cellhunter.py ${D}${bindir}/
+    install -m 0755 cellhunter_upload.sh ${D}${bindir}/
+    install -d ${D}${datadir}/pixmaps
+    install -d ${D}${datadir}/applications
+    install -m 0644 cellhunter.desktop ${D}${datadir}/applications/cellhunter.desktop
+    install -m 0644 cellhunter.png ${D}${datadir}/pixmaps/cellhunter.png
+}
diff --git a/recipes/dictator/dictator_0.2.bb b/recipes/dictator/dictator_0.2.bb
new file mode 100644
index 0000000000..663b376ea7
--- /dev/null
+++ b/recipes/dictator/dictator_0.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Call recodering program for Neo Smartphones"
+SECTION = "utils"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python python-pygtk python-xml python-netclient pydes python-audio"
+PR="r2"
+
+ARCH_pyring = "all"
+
+SRC_URI = "http://home.htw-berlin.de/~s0526295/dictator-0.2.tar.gz"
+
+inherit distutils
+
+S = ${WORKDIR}/dictator-${PV}
+
+FILES_${PN} += " ${sysconfdir}/dictator.conf ${datadir}"
+
+
diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb
new file mode 100644
index 0000000000..89dfabce77
--- /dev/null
+++ b/recipes/e17/e-tasks_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "tasks app for openmoko phones based on elementary"
+HOMEPAGE = "http://code.google.com/p/e-tasks/"
+AUTHOR = "cchandel"
+LICENSE = "GPLv2"
+SECTION = "e/apps"
+#DEPENDS = "elementary eina edbus"
+
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://e-tasks.googlecode.com/svn/trunk;module=.;proto=http"
+S = "${WORKDIR}"
+
+inherit autotools
+
diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb
new file mode 100644
index 0000000000..f2cb8357dc
--- /dev/null
+++ b/recipes/e17/elmdentica_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "A indenti.ca client for E"
+DEPENDS = "glib-2.0 gconf libxml2 curl elementary"
+LICENSE = "GPLv3+"
+SECTION = "e/apps"
+HOMEPAGE = "http://elmdentica.googlecode.com"
+AUTHOR = "seabra"
+PV = "0.6.0+svn${SRCREV}"
+PR = "r1"
+ 
+ 
+SRC_URI = "svn://elmdentica.googlecode.com/svn/trunk;module=.;proto=http"
+ 
+S = "${WORKDIR}"
+ 
+inherit autotools
diff --git a/recipes/e17/eve_svn.bb b/recipes/e17/eve_svn.bb
new file mode 100644
index 0000000000..5b6dd1842d
--- /dev/null
+++ b/recipes/e17/eve_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = " Enlightenment webbrowser"
+LICENSE = "GPL"
+DEPENDS = "webkit-efl evas ecore edje"
+PV="0.0.1+r${SRCREV}"
+PR="r2"
+
+LDFLAGS += "-lstdc++"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=eve;proto=http\
+"
+
+S = "${WORKDIR}/eve"
diff --git a/recipes/ebrainy/ebrainy_svn.bb b/recipes/ebrainy/ebrainy_svn.bb
new file mode 100644
index 0000000000..01abc0fbef
--- /dev/null
+++ b/recipes/ebrainy/ebrainy_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Store knowledge in form of questions and answers and train them."
+HOMEPAGE = "http://code.google.com/p/ebrainy/"
+AUTHOR = "quickdev"
+LICENSE = "GPL"
+SECTION = "e/apps"
+RDEPENDS = "elementary sqlite3 python-sqlalchemy python-mysqldb python-netserver"
+
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r1"
+SRC_URI = "svn://ebrainy.googlecode.com/svn/trunk;module=.;proto=http"
+S = "${WORKDIR}"
+
+inherit distutils
+FILES_${PN} += "${datadir}/applications/ebrainy.desktop"
+
diff --git a/recipes/enotes/enotes_svn.bb b/recipes/enotes/enotes_svn.bb
new file mode 100644
index 0000000000..f69096746b
--- /dev/null
+++ b/recipes/enotes/enotes_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "todo list manager in EFL"
+HOMEPAGE = "http://enotes.googlecode.com"
+AUTHOR = "furester"
+LICENSE = "GPL"
+SECTION = "e/apps"
+DEPENDS = "elementary evas sqlite3"
+
+PV = "0.2.2+svnr${SRCREV}"
+PR = "r1"
+SRC_URI = "svn://enotes.googlecode.com/svn/trunk;module=.;proto=http"
+S = "${WORKDIR}"
+
+inherit autotools
+
+
diff --git a/recipes/epdfview/epdfview_svn.bb b/recipes/epdfview/epdfview_svn.bb
new file mode 100644
index 0000000000..806fcb5f74
--- /dev/null
+++ b/recipes/epdfview/epdfview_svn.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "A minimal PDF viewer based on gtk and poppler"
+HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
+LICENSE = "GPLv2"
+SECTION = "x11/applications"
+DEPENDS = "poppler gtk+ cups"
+
+PV = "0.1.7+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://svn.emma-soft.com/epdfview;module=trunk;proto=svn \
+	  "
+SRC_URI_append_shr = "file://acroread.png \
+                     "
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+do_configure_prepend() {
+	sh autogen.sh
+}
+
+do_compile_append () {
+	sed -i 's|\$.*prefix./|/usr/|' data/epdfview.desktop
+}
+
+do_compile_append_shr () {
+	sed -i 's/Icon=.*/Icon=acroread/' data/epdfview.desktop
+}
+
+do_install_append_shr () {
+	install -d ${D}${datadir}/pixmaps/
+	install -m 0644 ${WORKDIR}/acroread.png ${D}${datadir}/pixmaps/
+}
+
+FILES_${PN}_append_shr = "${datadir}/pixmaps/acroread.png \
+                         "
diff --git a/recipes/epdfview/files/acroread.png b/recipes/epdfview/files/acroread.png
new file mode 100644
index 0000000000..0189fe3072
--- /dev/null
+++ b/recipes/epdfview/files/acroread.png
diff --git a/recipes/epdfview/files/poppler8.diff b/recipes/epdfview/files/poppler8.diff
new file mode 100644
index 0000000000..e4c4790c6d
--- /dev/null
+++ b/recipes/epdfview/files/poppler8.diff
@@ -0,0 +1,10395 @@
+diff -Nurd epdfview-0.1.6-svn/configure.ac epdfview/configure.ac
+--- epdfview-0.1.6-svn/configure.ac	2008-07-13 12:57:47.593198000 +0200
++++ epdfview/configure.ac	2008-07-13 12:55:55.143198000 +0200
+@@ -27,7 +27,7 @@
+ 
+ dnl Check for libraries
+ POPPLER_REQUIRED=0.5.0
+-GLIB_REQUIRED=2.6.0
++GLIB_REQUIRED=2.8.0
+ GTK2_REQUIRED=2.6.0
+ 
+ PKG_CHECK_MODULES([GLIB], [gthread-2.0 >= $GLIB_REQUIRED])
+@@ -44,6 +44,14 @@
+ if test "x$have_poppler_052" = "xyes"; then
+     AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
+ fi
++PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
++if test "x$have_poppler_060" = "xyes"; then
++    AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
++fi
++PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
++if test "x$have_poppler_080" = "xyes"; then
++    AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
++fi
+ 
+ EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
+ AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
+diff -Nurd epdfview-0.1.6-svn/data/epdfview-ui.xml epdfview/data/epdfview-ui.xml
+--- epdfview-0.1.6-svn/data/epdfview-ui.xml	2008-07-13 12:57:47.093198000 +0200
++++ epdfview/data/epdfview-ui.xml	2008-07-13 12:55:54.263198000 +0200
+@@ -11,6 +11,9 @@
+     <menu action="EditMenu">
+       <menuitem name="Find" action="Find"/>
+       <separator />
++      <menuitem name="PageModeScroll" action="PageModeScroll"/>
++      <menuitem name="PageModeText" action="PageModeText"/>
++      <separator />
+       <menuitem name="Preferences" action="Preferences"/>
+     </menu>
+     <menu action="ViewMenu">
+@@ -38,7 +41,7 @@
+       <menuitem name="About" action="About"/>
+     </menu>
+   </menubar>
+-  
++
+   <toolbar name="ToolBar">
+     <toolitem name="OpenFile" action="OpenFile"/>
+     <separator/>
+@@ -49,7 +52,12 @@
+     <toolitem name="ZoomOut" action="ZoomOut"/>
+     <toolitem name="ZoomFit" action="ZoomFit"/>
+     <toolitem name="ZoomWidth" action="ZoomWidth"/>
++    <separator/>
++    <toolitem name="PageModeScroll" action="PageModeScroll"/>
++    <toolitem name="PageModeText" action="PageModeText"/>
+   </toolbar>
+ 
+   <accelerator name="SlashAccelerator" action="Slash"/>
++  <accelerator name="KPAddAccelerator" action="KPAdd"/>
++  <accelerator name="KPSubtractAccelerator" action="KPSubtract"/>
+ </ui>
+diff -Nurd epdfview-0.1.6-svn/m4/Makefile.am epdfview/m4/Makefile.am
+--- epdfview-0.1.6-svn/m4/Makefile.am	2008-07-13 12:57:43.883198000 +0200
++++ epdfview/m4/Makefile.am	2008-07-13 12:55:50.603198000 +0200
+@@ -1,2 +1,2 @@
+ # Process this file with automake to produce a Makefile.in file.
+-EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4
++EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 pkg.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4
+diff -Nurd epdfview-0.1.6-svn/m4/pkg.m4 epdfview/m4/pkg.m4
+--- epdfview-0.1.6-svn/m4/pkg.m4	1970-01-01 01:00:00.000000000 +0100
++++ epdfview/m4/pkg.m4	2008-07-13 12:55:50.593198000 +0200
+@@ -0,0 +1,157 @@
++# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# 
++# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# PKG_PROG_PKG_CONFIG([MIN-VERSION])
++# ----------------------------------
++AC_DEFUN([PKG_PROG_PKG_CONFIG],
++[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
++m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++fi
++if test -n "$PKG_CONFIG"; then
++	_pkg_min_version=m4_default([$1], [0.9.0])
++	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
++	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++		AC_MSG_RESULT([yes])
++	else
++		AC_MSG_RESULT([no])
++		PKG_CONFIG=""
++	fi
++		
++fi[]dnl
++])# PKG_PROG_PKG_CONFIG
++
++# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
++#
++# Check to see whether a particular set of modules exists.  Similar
++# to PKG_CHECK_MODULES(), but does not set variables or print errors.
++#
++#
++# Similar to PKG_CHECK_MODULES, make sure that the first instance of
++# this or PKG_CHECK_MODULES is called, or make sure to call
++# PKG_CHECK_EXISTS manually
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_EXISTS],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++if test -n "$PKG_CONFIG" && \
++    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
++  m4_ifval([$2], [$2], [:])
++m4_ifvaln([$3], [else
++  $3])dnl
++fi])
++
++
++# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
++# ---------------------------------------------
++m4_define([_PKG_CONFIG],
++[if test -n "$PKG_CONFIG"; then
++    if test -n "$$1"; then
++        pkg_cv_[]$1="$$1"
++    else
++        PKG_CHECK_EXISTS([$3],
++                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++			 [pkg_failed=yes])
++    fi
++else
++	pkg_failed=untried
++fi[]dnl
++])# _PKG_CONFIG
++
++# _PKG_SHORT_ERRORS_SUPPORTED
++# -----------------------------
++AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi[]dnl
++])# _PKG_SHORT_ERRORS_SUPPORTED
++
++
++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
++# [ACTION-IF-NOT-FOUND])
++#
++#
++# Note that if there is a possibility the first call to
++# PKG_CHECK_MODULES might not happen, you should be sure to include an
++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
++#
++#
++# --------------------------------------------------------------
++AC_DEFUN([PKG_CHECK_MODULES],
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
++
++pkg_failed=no
++AC_MSG_CHECKING([for $1])
++
++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
++_PKG_CONFIG([$1][_LIBS], [libs], [$2])
++
++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
++and $1[]_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.])
++
++if test $pkg_failed = yes; then
++        _PKG_SHORT_ERRORS_SUPPORTED
++        if test $_pkg_short_errors_supported = yes; then
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++        else 
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
++
++	ifelse([$4], , [AC_MSG_ERROR(dnl
++[Package requirements ($2) were not met:
++
++$$1_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++_PKG_TEXT
++])],
++		[AC_MSG_RESULT([no])
++                $4])
++elif test $pkg_failed = untried; then
++	ifelse([$4], , [AC_MSG_FAILURE(dnl
++[The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++_PKG_TEXT
++
++To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
++		[$4])
++else
++	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
++	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
++        AC_MSG_RESULT([yes])
++	ifelse([$3], , :, [$3])
++fi[]dnl
++])# PKG_CHECK_MODULES
+diff -Nurd epdfview-0.1.6-svn/po/ca.po epdfview/po/ca.po
+--- epdfview-0.1.6-svn/po/ca.po	2008-07-13 12:57:47.543198000 +0200
++++ epdfview/po/ca.po	2008-07-13 12:55:55.073198000 +0200
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: ePDFView 0.1.4\n"
+ "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
+ "PO-Revision-Date: 2006-04-12 21:17+0200\n"
+ "Last-Translator:  Jordi Fita <jordi@emma-soft.com>\n"
+ "Language-Team: Catalan <ca@dodds.net>\n"
+@@ -76,11 +76,11 @@
+ msgid "Unknown error (%d)."
+ msgstr "Error desconegut (%d)."
+ 
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+ msgstr "[FITXER] - mostra documents PDF"
+ 
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+ msgstr "Viso de PDF"
+ 
+@@ -94,7 +94,7 @@
+ msgid "Loading file %s..."
+ msgstr "Obrint fitxer %s..."
+ 
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
+ #, c-format
+ msgid "of %d"
+ msgstr "de %d"
+@@ -104,39 +104,47 @@
+ msgid "Saving document to %s..."
+ msgstr "Desant el document a %s..."
+ 
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+ msgstr "Error carregant fitxer"
+ 
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+ msgstr "La contrsenya que heu donat no és vàlida per aquest fitxer."
+ 
+-#: src/MainPter.cxx:947
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+ msgstr "Error desant fitxer"
+ 
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+ msgstr "Carregant..."
+ 
+-#: src/PrintPter.cxx:295
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
+ msgid "Grayscale"
+ msgstr "Escala de gris"
+ 
+-#: src/PrintPter.cxx:395
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+ msgstr "Desocupada"
+ 
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+ msgstr "Parada"
+ 
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+ msgstr "Processada"
+ 
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+ msgstr "Desconegut"
+ 
+@@ -153,246 +161,262 @@
+ msgid "Find:"
+ msgstr "Cercar:"
+ 
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+ msgstr "_Fitxer"
+ 
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+ msgstr "_Edita"
+ 
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+ msgstr "_Visualitza"
+ 
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+ msgstr "Vé_s"
+ 
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+ msgstr "A_juda"
+ 
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+ msgstr "_Obre"
+ 
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+ msgstr "Obre un document PDF"
+ 
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+ msgstr "_Actualitza"
+ 
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+ msgstr "Torna a obrir el document actual"
+ 
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+ msgstr "_Desa una còpia..."
+ 
+-#: src/gtk/MainView.cxx:102
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+ msgstr "Desa una còpia del document actual"
+ 
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+ msgstr "_Imprimeix"
+ 
+-#: src/gtk/MainView.cxx:107
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+ msgstr "Imprimeix el document actual"
+ 
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+ msgstr "_Tanca"
+ 
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+ msgstr "Tanca aquesta finestra"
+ 
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+ msgstr "_Cerca"
+ 
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+ msgstr "Cerca una paraula en el document"
+ 
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+ msgstr "Preferències"
+ 
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+ msgstr "Canvia les preferències de l'aplicació"
+ 
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+ msgstr "_Amplia"
+ 
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+ msgstr "Amplia el document"
+ 
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+ msgstr "_Redueix"
+ 
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+ msgstr "Redueix el document"
+ 
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+ msgstr "Gira a la _dreta"
+ 
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+ msgstr "Gira el document 90 graus en el sentit de les agulles del rellotge"
+ 
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+ msgstr "Gira a l'es_querra"
+ 
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+ msgstr ""
+ "Gira el document 90 grays en el sentit contrari al de les agulles del "
+ "rellotge"
+ 
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+ msgstr "_Primera pàgina"
+ 
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+ msgstr "Va a la primera pàgina"
+ 
+-#: src/gtk/MainView.cxx:143
++#: src/gtk/MainView.cxx:145
+ msgid "_Next Page"
+ msgstr "_Següent pàgina"
+ 
+-#: src/gtk/MainView.cxx:144
++#: src/gtk/MainView.cxx:146
+ msgid "Go to the next page"
+ msgstr "Va a la següent pàgina"
+ 
+-#: src/gtk/MainView.cxx:147
++#: src/gtk/MainView.cxx:149
+ msgid "_Previous Page"
+ msgstr "Pàgina _anterior"
+ 
+-#: src/gtk/MainView.cxx:148
++#: src/gtk/MainView.cxx:150
+ msgid "Go to the previous page"
+ msgstr "Va a la pàgina anterior"
+ 
+-#: src/gtk/MainView.cxx:151
++#: src/gtk/MainView.cxx:153
+ msgid "_Last Page"
+ msgstr "_Darreta pàgina"
+ 
+-#: src/gtk/MainView.cxx:152
++#: src/gtk/MainView.cxx:154
+ msgid "Go to the last page"
+ msgstr "Va a la darrera pàgina"
+ 
+-#: src/gtk/MainView.cxx:155
++#: src/gtk/MainView.cxx:157
+ msgid "_About"
+ msgstr "_Quant a"
+ 
+-#: src/gtk/MainView.cxx:156
++#: src/gtk/MainView.cxx:158
+ msgid "Display application's credits"
+ msgstr "Mostra els crèdits de l'aplicació"
+ 
+-#: src/gtk/MainView.cxx:166
++#: src/gtk/MainView.cxx:175
+ msgid "F_ull screen"
+ msgstr ""
+ 
+-#: src/gtk/MainView.cxx:167
++#: src/gtk/MainView.cxx:176
+ msgid "Toggle full screen window"
+ msgstr ""
+ 
+-#: src/gtk/MainView.cxx:170
++#: src/gtk/MainView.cxx:179
+ msgid "Show _Toolbar"
+ msgstr "Mostra la barra d'_eines"
+ 
+-#: src/gtk/MainView.cxx:171
++#: src/gtk/MainView.cxx:180
+ msgid "Show or hide the toolbar"
+ msgstr "Mostra o amaga la barra d'eines"
+ 
+-#: src/gtk/MainView.cxx:174
++#: src/gtk/MainView.cxx:183
+ msgid "Show _Statusbar"
+ msgstr "Mostra la barra d'e_stat"
+ 
+-#: src/gtk/MainView.cxx:175
++#: src/gtk/MainView.cxx:184
+ msgid "Show or hide the statusbar"
+ msgstr "Mostra o amaga la barra d'estat"
+ 
+-#: src/gtk/MainView.cxx:178
++#: src/gtk/MainView.cxx:187
+ msgid "Show I_ndex"
+ msgstr "Mostra l'í_ndex"
+ 
+-#: src/gtk/MainView.cxx:179
++#: src/gtk/MainView.cxx:188
+ msgid "Show or hide the document's outline"
+ msgstr "Mostra o amaga l'índex del document"
+ 
+-#: src/gtk/MainView.cxx:182
++#: src/gtk/MainView.cxx:191
+ msgid "Zoom to _Fit"
+ msgstr "En_caixa"
+ 
+-#: src/gtk/MainView.cxx:183
++#: src/gtk/MainView.cxx:192
+ msgid "Make the current document fill the window"
+ msgstr "Fa que el document ompli la finestra"
+ 
+-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
+ msgid "Zoom to _Width"
+ msgstr "Encaixa l'a_mplada"
+ 
+-#: src/gtk/MainView.cxx:187
++#: src/gtk/MainView.cxx:196
+ msgid "Make the current document fill the window width"
+ msgstr "Fa que el document ompli l'amplada de la finestra"
+ 
+-#: src/gtk/MainView.cxx:278
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
+ msgid "Open PDF File"
+ msgstr "Obre un fitxer PDF"
+ 
+-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
+ msgid "Portable Document Format (PDF) Files"
+ msgstr "Fitxers en Format de Document Portable (PDF)"
+ 
+-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
+ msgid "All Files"
+ msgstr "Tots els fitxers"
+ 
+-#: src/gtk/MainView.cxx:362
++#: src/gtk/MainView.cxx:404
+ msgid "Password"
+ msgstr "Contrasenya"
+ 
+-#: src/gtk/MainView.cxx:386
++#: src/gtk/MainView.cxx:428
+ msgid "Save PDF File"
+ msgstr "Desa un fitxer PDF"
+ 
+-#: src/gtk/MainView.cxx:816
++#: src/gtk/MainView.cxx:858
+ msgid "Page"
+ msgstr "Pàgina"
+ 
+-#: src/gtk/MainView.cxx:826
++#: src/gtk/MainView.cxx:868
+ msgid "of 0"
+ msgstr "de 0"
+ 
+-#: src/gtk/MainView.cxx:879
++#: src/gtk/MainView.cxx:921
+ msgid "Index"
+ msgstr "�ndex"
+ 
+-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
+ #, c-format
+ msgid "Error building UI manager: %s\n"
+ msgstr "Error construïnt l'administrado de UI: %s\n"
+ 
+-#: src/gtk/MainView.cxx:1056
++#: src/gtk/MainView.cxx:1108
+ msgid "A lightweight PDF viewer"
+ msgstr "Un visor de PDF lleuger"
+ 
+-#: src/gtk/MainView.cxx:1059
++#: src/gtk/MainView.cxx:1111
+ msgid ""
+ "ePDFView is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+@@ -404,7 +428,7 @@
+ "publicada per la Free Software Foundation; ja sigui la versió 2 de la\n"
+ "Llicència o bé (si ho preferiu) qualsevol altra versió posterior.\n"
+ 
+-#: src/gtk/MainView.cxx:1063
++#: src/gtk/MainView.cxx:1115
+ msgid ""
+ "ePDFView is distributes in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+@@ -416,7 +440,7 @@
+ "COMERCIABILITAT o ADEQUACIÓ PER UN PROPÒSIT PARTICULAR. Vegeu la\n"
+ "Llicència Pública General GNU per obtenir-ne més detalls.\n"
+ 
+-#: src/gtk/MainView.cxx:1067
++#: src/gtk/MainView.cxx:1119
+ msgid ""
+ "You should have received a copy of the GNU General Public License\n"
+ "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
+@@ -426,11 +450,11 @@
+ "juntament amb ePDFView; en cas contrari, escriviu a la Free Software\n"
+ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"
+ 
+-#: src/gtk/MainView.cxx:1076
++#: src/gtk/MainView.cxx:1128
+ msgid "ePDFView"
+ msgstr "ePDFView"
+ 
+-#: src/gtk/MainView.cxx:1083
++#: src/gtk/MainView.cxx:1135
+ msgid "translator-credits"
+ msgstr "Jordi Fita <jordi@emma-soft.com>"
+ 
+diff -Nurd epdfview-0.1.6-svn/po/cs.po epdfview/po/cs.po
+--- epdfview-0.1.6-svn/po/cs.po	1970-01-01 01:00:00.000000000 +0100
++++ epdfview/po/cs.po	2008-07-13 12:55:55.043198000 +0200
+@@ -0,0 +1,604 @@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR Emma's Software
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: ePDFView 0.1.6\n"
++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2008-04-09 14:06+0100\n"
++"Last-Translator: Dragonlord <dragonlord@seznam.cz>\n"
++"Language-Team: Czech <none@none.org>\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/FindPter.cxx:187
++msgid "No Results Found!"
++msgstr "Nebyly nalezeny žádné výsledky!"
++
++#: src/FindPter.cxx:195
++#, fuzzy, c-format
++msgid "Searching in page %d of %d..."
++msgstr "Hledám na straně od %d do %d..."
++
++#: src/IDocument.cxx:82
++msgid "No error."
++msgstr "Žádná chyba."
++
++#: src/IDocument.cxx:85
++msgid "File not found."
++msgstr "Soubor nenalezen."
++
++#: src/IDocument.cxx:88
++msgid "Couldn't read the page catalog."
++msgstr "Nelze na�íst katalog stran."
++
++#: src/IDocument.cxx:91
++msgid "The PDF file is damaged and can't be repaired."
++msgstr "PDF soubor je poškozen a nelze jej opravit."
++
++#: src/IDocument.cxx:94
++msgid "The file is encrypted and the password was incorrect or not supplied."
++msgstr "Soubor je zakódovaný a heslo nebylo správně nebo vůbec vloženo."
++
++#: src/IDocument.cxx:97
++#, fuzzy
++msgid "Nonexistent or invalid highlight file."
++msgstr "Soubor zvýraznění neexistuje nebo je neplatný."
++
++#: src/IDocument.cxx:100
++msgid "Invalid printer."
++msgstr "Neplatná tiskárna."
++
++#: src/IDocument.cxx:103
++msgid "Error during printing."
++msgstr "Chyba během tisku."
++
++#: src/IDocument.cxx:106
++msgid "The PDF file doesn't allow that operation."
++msgstr "PDF soubor nedovoluje tuto operaci."
++
++#: src/IDocument.cxx:109
++msgid "Invalid page number."
++msgstr "Chybný po�et stran."
++
++#: src/IDocument.cxx:112
++#, fuzzy
++msgid "File I/O error."
++msgstr "I/O chyba souboru."
++
++#: src/IDocument.cxx:115
++#, c-format
++msgid "Unknown error (%d)."
++msgstr "Neznámá chyba (%d)."
++
++#: src/main.cxx:59
++msgid "[FILE] - view PDF documents"
++msgstr "[SOUBOR] - prohlížet PDF dokumenty"
++
++#: src/main.cxx:72 src/MainPter.cxx:153
++msgid "PDF Viewer"
++msgstr "Prohlíže� PDF souborů"
++
++#: src/MainPter.cxx:233
++#, c-format
++msgid "Reloading file %s..."
++msgstr "Nahrávám znovu soubor %s..."
++
++#: src/MainPter.cxx:237
++#, c-format
++msgid "Loading file %s..."
++msgstr "Na�ítám soubor %s..."
++
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
++#, fuzzy, c-format
++msgid "of %d"
++msgstr "z %d"
++
++#: src/MainPter.cxx:588
++#, c-format
++msgid "Saving document to %s..."
++msgstr "Ukládám soubor do %s..."
++
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
++msgid "Error Loading File"
++msgstr "Chyba na�ítání souboru"
++
++#: src/MainPter.cxx:872
++msgid "The password you have supplied is not a valid password for this file."
++msgstr "Vložené heslo není platné pro tento soubor."
++
++#: src/MainPter.cxx:953
++msgid "Error Saving File"
++msgstr "Chyba ukládání souboru"
++
++#: src/PagePter.cxx:338
++msgid "Loading..."
++msgstr "Na�ítám..."
++
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
++msgid "Grayscale"
++msgstr "Odstíny šedi"
++
++#: src/PrintPter.cxx:409
++msgid "Idle"
++msgstr "Zahálející"
++
++#: src/PrintPter.cxx:412
++msgid "Stopped"
++msgstr "Zastavený"
++
++#: src/PrintPter.cxx:415
++msgid "Processing"
++msgstr "Zpracovávám"
++
++#: src/PrintPter.cxx:418
++msgid "Unknown"
++msgstr "Neznámý"
++
++#: src/PDFDocument.cxx:272
++#, c-format
++msgid ""
++"Failed to load document '%s'.\n"
++"%s\n"
++msgstr ""
++"Chyba na�ítání dokumentu '%s'.\n"
++"%s\n"
++
++#: src/gtk/FindView.cxx:51
++msgid "Find:"
++msgstr "Hledat:"
++
++#: src/gtk/MainView.cxx:89
++msgid "_File"
++msgstr "_Soubor"
++
++#: src/gtk/MainView.cxx:90
++msgid "_Edit"
++msgstr "_Editovat"
++
++#: src/gtk/MainView.cxx:91
++msgid "_View"
++msgstr "_Pohled"
++
++#: src/gtk/MainView.cxx:92
++msgid "_Go"
++msgstr "_Jít na"
++
++#: src/gtk/MainView.cxx:93
++msgid "_Help"
++msgstr "_Nápověda"
++
++#: src/gtk/MainView.cxx:95
++msgid "_Open"
++msgstr "_Otevřít"
++
++#: src/gtk/MainView.cxx:96
++msgid "Open a PDF document"
++msgstr "Otevřít PDF dokument"
++
++#: src/gtk/MainView.cxx:99
++#, fuzzy
++msgid "_Reload"
++msgstr "_Aktualizovat"
++
++#: src/gtk/MainView.cxx:100
++msgid "Reload the current document"
++msgstr "Aktualizuje sou�asný dokument"
++
++#: src/gtk/MainView.cxx:103
++msgid "_Save a Copy..."
++msgstr "_Uložit jako..."
++
++#: src/gtk/MainView.cxx:104
++msgid "Save a copy of the current document"
++msgstr "Uloží kopii sou�asného dokumentu"
++
++#: src/gtk/MainView.cxx:108
++msgid "_Print..."
++msgstr "_Tisk..."
++
++#: src/gtk/MainView.cxx:109
++msgid "Print the current document"
++msgstr "Vytiskne sou�asný dokument"
++
++#: src/gtk/MainView.cxx:113
++msgid "_Close"
++msgstr "_Zavřít"
++
++#: src/gtk/MainView.cxx:114
++msgid "Close this window"
++msgstr "Zavře toto okno"
++
++#: src/gtk/MainView.cxx:117
++msgid "_Find"
++msgstr "_Hledat"
++
++#: src/gtk/MainView.cxx:118
++msgid "Find a word in the document"
++msgstr "Hledání zadaných výrazů v dokumentu"
++
++#: src/gtk/MainView.cxx:121
++msgid "Preferences..."
++msgstr "Nastavení..."
++
++#: src/gtk/MainView.cxx:122
++msgid "Change the application's preferences"
++msgstr "Změny v nastavení aplikace"
++
++#: src/gtk/MainView.cxx:125
++msgid "Zoom _In"
++msgstr "Z_většit"
++
++#: src/gtk/MainView.cxx:126
++msgid "Enlarge the document"
++msgstr "Zvětší náhled dokumentu"
++
++#: src/gtk/MainView.cxx:129
++msgid "Zoom _Out"
++msgstr "Z_menšit"
++
++#: src/gtk/MainView.cxx:130
++msgid "Shrink the document"
++msgstr "Zmenší náhled dokumentu"
++
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
++msgid "Rotate _Right"
++msgstr "Oto�it vp_ravo"
++
++#: src/gtk/MainView.cxx:134
++msgid "Rotate the document 90 degrees clockwise"
++msgstr "Oto�í dokument o 90 stupňů po směru hodinových ru�i�ek"
++
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
++msgid "Rotate _Left"
++msgstr "Oto�it v_levo"
++
++#: src/gtk/MainView.cxx:138
++msgid "Rotate the document 90 degrees counter-clockwise"
++msgstr "Oto�í dokument o 90 stupňů proti směru hodinových ru�i�ek"
++
++#: src/gtk/MainView.cxx:141
++msgid "_First Page"
++msgstr "_První stranu"
++
++#: src/gtk/MainView.cxx:142
++msgid "Go to the first page"
++msgstr "Přesko�it na první stranu"
++
++#: src/gtk/MainView.cxx:145
++msgid "_Next Page"
++msgstr "_Další stranu"
++
++#: src/gtk/MainView.cxx:146
++msgid "Go to the next page"
++msgstr "Přejde na další stranu"
++
++#: src/gtk/MainView.cxx:149
++msgid "_Previous Page"
++msgstr "Př_edchozí stranu"
++
++#: src/gtk/MainView.cxx:150
++msgid "Go to the previous page"
++msgstr "Přejde na předchozí stranu"
++
++#: src/gtk/MainView.cxx:153
++msgid "_Last Page"
++msgstr "Po_slední stranu"
++
++#: src/gtk/MainView.cxx:154
++msgid "Go to the last page"
++msgstr "Přesko�í na poslední stranu"
++
++#: src/gtk/MainView.cxx:157
++msgid "_About"
++msgstr "_O programu"
++
++#: src/gtk/MainView.cxx:158
++msgid "Display application's credits"
++msgstr "Zobrazí informace o aplikaci"
++
++#: src/gtk/MainView.cxx:175
++msgid "F_ull screen"
++msgstr "Na celou obrazovku"
++
++#: src/gtk/MainView.cxx:176
++msgid "Toggle full screen window"
++msgstr "Přepne použití celé obrazovky"
++
++#: src/gtk/MainView.cxx:179
++msgid "Show _Toolbar"
++msgstr "Zobrazit panel i_kon"
++
++#: src/gtk/MainView.cxx:180
++msgid "Show or hide the toolbar"
++msgstr "Zobrazí nebo skryje panel s ikonami"
++
++#: src/gtk/MainView.cxx:183
++msgid "Show _Statusbar"
++msgstr "Zobrazit _informa�ní panel"
++
++#: src/gtk/MainView.cxx:184
++msgid "Show or hide the statusbar"
++msgstr "Zobrazí nebo skryje spodní informa�ní panel"
++
++#: src/gtk/MainView.cxx:187
++msgid "Show I_ndex"
++msgstr "Zobrazit os_novu"
++
++#: src/gtk/MainView.cxx:188
++msgid "Show or hide the document's outline"
++msgstr "Zobrazí nebo skryje osnovu dokumentu"
++
++#: src/gtk/MainView.cxx:191
++msgid "Zoom to _Fit"
++msgstr "Přizpůsobit _do okna"
++
++#: src/gtk/MainView.cxx:192
++msgid "Make the current document fill the window"
++msgstr "Přizpůsobí zvětšení dokumentu velikosti okna"
++
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
++msgid "Zoom to _Width"
++msgstr "Přizpůsobit šíř_ce okna"
++
++#: src/gtk/MainView.cxx:196
++msgid "Make the current document fill the window width"
++msgstr "Přizpůsobí zvětšení dokumentu šířce okna"
++
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
++msgid "Open PDF File"
++msgstr "Otevřít PDF soubor"
++
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
++msgid "Portable Document Format (PDF) Files"
++msgstr "Soubory PDF (Portable Document Format)"
++
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
++msgid "All Files"
++msgstr "VÅ¡echny soubory"
++
++#: src/gtk/MainView.cxx:404
++msgid "Password"
++msgstr "Heslo"
++
++#: src/gtk/MainView.cxx:428
++msgid "Save PDF File"
++msgstr "Uložit PDF soubor"
++
++#: src/gtk/MainView.cxx:858
++msgid "Page"
++msgstr "Strana"
++
++#: src/gtk/MainView.cxx:868
++#, fuzzy
++msgid "of 0"
++msgstr "z 0"
++
++#: src/gtk/MainView.cxx:921
++#, fuzzy
++msgid "Index"
++msgstr "Osnova"
++
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
++#, fuzzy, c-format
++msgid "Error building UI manager: %s\n"
++msgstr "Chyba sestavení UI manažera: %s\n"
++
++#: src/gtk/MainView.cxx:1108
++msgid "A lightweight PDF viewer"
++msgstr "Nenáro�ný prohlíže� PDF souborů"
++
++#: src/gtk/MainView.cxx:1111
++msgid ""
++"ePDFView is free software; you can redistribute it and/or modify\n"
++"it under the terms of the GNU General Public License as published by\n"
++"the Free Software Foundation; either version 2 of the License, or\n"
++"(at your option) any later version.\n"
++msgstr ""
++"ePDFView je svobodný software; může být distribuován a/nebo modifikován\n"
++"za podmínek GNU všeobecné veřejné licence podle znění publikovaného\n"
++"Free Software Foundation; bu� ve verzi 2 této licence, nebo\n"
++"(podle vlastního uvážení) jakékoliv novější verze.\n"
++
++#: src/gtk/MainView.cxx:1115
++msgid ""
++"ePDFView is distributes in the hope that it will be useful,\n"
++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
++"GNU General Public License for more details.\n"
++msgstr ""
++"ePDFView je distribuován s úmyslem být užite�ný,\n"
++"ovšem BEZ JAKÉKOLI Z�RUKY; stejně tak bez zahrnuté záruky\n"
++"PRODEJNOSTI nebo VHODNOSTI NA URČIT� ÚKOL. Podrobnosti\n"
++"lze nalézt v GNU všeobecné veřejné licenci.\n"
++
++#: src/gtk/MainView.cxx:1119
++msgid ""
++"You should have received a copy of the GNU General Public License\n"
++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++msgstr ""
++"S ePDFView musí být dodávána kopie GNU všeobecné veřejné licence;\n"
++"pokud tomu tak není, obraťte se na Free Software Foundation,Inc.,\n"
++"59 temple Place, Suite 330, Boston, MA 02111-1307  USA\n"
++
++#: src/gtk/MainView.cxx:1128
++msgid "ePDFView"
++msgstr "ePDFView"
++
++#: src/gtk/MainView.cxx:1135
++#, fuzzy
++msgid "translator-credits"
++msgstr "Dragonlord <dragonlord@seznam.cz>"
++
++#: src/gtk/PreferencesView.cxx:32
++msgid "Preferences"
++msgstr "Konfigurace"
++
++#: src/gtk/PreferencesView.cxx:46
++msgid "External Commands"
++msgstr "Externí příkazy"
++
++#: src/gtk/PreferencesView.cxx:105
++msgid "Web _Browser:"
++msgstr "We_bový prohlíže�:"
++
++#: src/gtk/PreferencesView.cxx:118
++#, c-format
++msgid "Note: <i>%s</i> will be replaced by the URI."
++msgstr "Poznámka: <i>%s</i> bude nahrazeno URI."
++
++#: src/gtk/PrintView.cxx:51
++msgid "Print"
++msgstr "Tisk"
++
++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659
++msgid "Printer"
++msgstr "Tiskárna"
++
++#: src/gtk/PrintView.cxx:74
++#, fuzzy
++msgid "Job"
++msgstr "Úkol"
++
++#: src/gtk/PrintView.cxx:79
++msgid "Paper"
++msgstr "Papír"
++
++#: src/gtk/PrintView.cxx:359
++msgid "<b>Print Range</b>"
++msgstr "<b>Tisk oblasti<b>"
++
++#: src/gtk/PrintView.cxx:377
++msgid "_All pages"
++msgstr "VÅ¡_e"
++
++#: src/gtk/PrintView.cxx:380
++msgid "_Range:"
++msgstr "Výbě_r:"
++
++#: src/gtk/PrintView.cxx:392
++msgid "<b>Page Set</b>"
++msgstr "<b>Sada stran<b>"
++
++#: src/gtk/PrintView.cxx:408
++msgid "A_ll pages"
++msgstr "VÅ¡ech_ny"
++
++#: src/gtk/PrintView.cxx:412
++msgid "O_dd pages"
++msgstr "L_iché strany"
++
++#: src/gtk/PrintView.cxx:416
++msgid "_Even pages"
++msgstr "S_udé strany"
++
++#: src/gtk/PrintView.cxx:420
++msgid "<b>Copies</b>"
++msgstr "<b>Kopie<b>"
++
++#: src/gtk/PrintView.cxx:437
++msgid "N_umber of copies:"
++msgstr "_Po�et kopií:"
++
++#: src/gtk/PrintView.cxx:444
++msgid "C_ollate"
++msgstr "Seřadi_t"
++
++#: src/gtk/PrintView.cxx:465
++msgid "<b>Paper and Layout</b>"
++msgstr "<b>Papír a rozmístění<b>"
++
++#: src/gtk/PrintView.cxx:482
++msgid "Paper _Size:"
++msgstr "_Velikost papíru:"
++
++#: src/gtk/PrintView.cxx:508
++msgid "Page _orientation:"
++msgstr "_Orientace strany:"
++
++#: src/gtk/PrintView.cxx:539
++msgid "_Layout:"
++msgstr "Ro_zmístění:"
++
++#: src/gtk/PrintView.cxx:568
++msgid "<b>Output</b>"
++msgstr "<b>Výstup<b>"
++
++#: src/gtk/PrintView.cxx:585
++msgid "_Mode:"
++msgstr "_Mód:"
++
++#: src/gtk/PrintView.cxx:613
++msgid "_Resolution:"
++msgstr "_Rozlišení:"
++
++#: src/gtk/PrintView.cxx:668
++msgid "State"
++msgstr "Stav"
++
++#: src/gtk/PrintView.cxx:677
++#, fuzzy
++msgid "Jobs"
++msgstr "Úkoly"
++
++#: src/gtk/PrintView.cxx:686
++msgid "Location"
++msgstr "Umístění"
++
++#: src/gtk/PrintView.cxx:717
++msgid "Plain"
++msgstr "Jednoduché"
++
++#: src/gtk/PrintView.cxx:723
++msgid "2 pages in 1"
++msgstr "2 strany na list"
++
++#: src/gtk/PrintView.cxx:729
++msgid "4 pages in 1"
++msgstr "4 strany na list"
++
++#: src/gtk/PrintView.cxx:744
++msgid "Portrait"
++msgstr ""
++
++#: src/gtk/PrintView.cxx:750
++msgid "Landscape"
++msgstr ""
++
++#: src/gtk/StockIcons.cxx:40
++msgid "Find _Next"
++msgstr "Najít _další"
++
++#: src/gtk/StockIcons.cxx:41
++msgid "Find _Previous"
++msgstr "Najít _předchozí"
+diff -Nurd epdfview-0.1.6-svn/po/de.po epdfview/po/de.po
+--- epdfview-0.1.6-svn/po/de.po	2008-07-13 12:57:47.543198000 +0200
++++ epdfview/po/de.po	2008-07-13 12:55:55.083198000 +0200
+@@ -2,15 +2,16 @@
+ # Copyright (C) 2006 Emma's Software
+ # This file is distributed under the same license as the epdfview package.
+ # Moritz Heiber <moe@xfce.org>, 2006.
++# Enrico Tröger <enrico.troeger@uvena.de>, 2007.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: ePDFView 0.1.4\n"
++"Project-Id-Version: ePDFView 0.1.6\n"
+ "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
+-"PO-Revision-Date: 2006-05-13 00:40+0100\n"
+-"Last-Translator: Moritz Heiber <moe@xfce.org>\n"
+-"Language-Team: German <none@none.org>\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2007-04-16 15:33+0100\n"
++"Last-Translator: Enrico Tröger <enrico.troeger@uvena.de>\n"
++"Language-Team: German\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+@@ -75,11 +76,11 @@
+ msgid "Unknown error (%d)."
+ msgstr "Unbekannter Fehler (%d)."
+ 
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+ msgstr "[DATEI] - PDF Dateien anschauen"
+ 
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+ msgstr "PDF Betrachter"
+ 
+@@ -93,53 +94,59 @@
+ msgid "Loading file %s..."
+ msgstr "Lade Datei %s..."
+ 
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
+-#, fuzzy, c-format
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
++#, c-format
+ msgid "of %d"
+-msgstr "%d von %d"
++msgstr "von %d"
+ 
+ #: src/MainPter.cxx:588
+ #, c-format
+ msgid "Saving document to %s..."
+-msgstr ""
++msgstr "Speiche Dokument als %s..."
+ 
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+ msgstr "Fehler beim Laden der Datei"
+ 
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+ msgstr "Das angegebene Passwort ist ungültig für dieses Dokument."
+ 
+-#: src/MainPter.cxx:947
+-#, fuzzy
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+-msgstr "Fehler beim Laden der Datei"
++msgstr "Fehler beim Speichern der Datei."
+ 
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+ msgstr "Lade..."
+ 
+-#: src/PrintPter.cxx:295
+-msgid "Grayscale"
++#: src/PrintPter.cxx:252
++msgid "A4"
+ msgstr ""
+ 
+-#: src/PrintPter.cxx:395
+-#, fuzzy
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
++msgid "Grayscale"
++msgstr "Graustufen"
++
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+-msgstr "Inhalt"
++msgstr "Untätig"
+ 
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+-msgstr ""
++msgstr "Angehalten"
+ 
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+-msgstr ""
++msgstr "Drucke"
+ 
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+-msgstr ""
++msgstr "Unbekannt"
+ 
+ #: src/PDFDocument.cxx:272
+ #, c-format
+@@ -154,248 +161,260 @@
+ msgid "Find:"
+ msgstr "Suche:"
+ 
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+ msgstr "_Datei"
+ 
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+ msgstr "_Bearbeiten"
+ 
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+ msgstr "_Ansicht"
+ 
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+ msgstr "_Gehe zu"
+ 
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+ msgstr "_Hilfe"
+ 
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+ msgstr "_Öffnen"
+ 
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+ msgstr "Öffne ein PDF Dokument"
+ 
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+ msgstr "_Neu laden"
+ 
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+ msgstr "Lade das Dokument neu"
+ 
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+-msgstr ""
++msgstr "_Kopie speichern unter"
+ 
+-#: src/gtk/MainView.cxx:102
+-#, fuzzy
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+-msgstr "Lade das Dokument neu"
++msgstr "Speichert eine Kopie des Dokuments"
+ 
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+-msgstr ""
++msgstr "_Drucken..."
+ 
+-#: src/gtk/MainView.cxx:107
+-#, fuzzy
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+-msgstr "Lade das Dokument neu"
++msgstr "Druckt das Dokument"
+ 
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+ msgstr "_Schließen"
+ 
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+ msgstr "Schließe dieses Fenster"
+ 
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+ msgstr "_Suche"
+ 
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+ msgstr "Sucht im Dokument nach einem Wort"
+ 
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+-msgstr ""
++msgstr "Einstellungen..."
+ 
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+-msgstr ""
++msgstr "Ändert die Programmeinstellungen"
+ 
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+-msgstr "Heranzoomen"
++msgstr "Hera_nzoomen"
+ 
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+ msgstr "Dokument vergrößern"
+ 
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+-msgstr "Herauszoomen"
++msgstr "Hera_uszoomen"
+ 
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+ msgstr "Dokument verkleinern"
+ 
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+-msgstr "Nach rechts rotieren"
++msgstr "Nach _rechts rotieren"
+ 
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+ msgstr "Das Dokument um 90 Grad im Uhrzeigersinn drehen"
+ 
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+-msgstr "Nach links rotieren"
++msgstr "Nach _links rotieren"
+ 
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+ msgstr "Das Dokument um 90 Grad gegen den Uhrzeigersinn drehen"
+ 
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+ msgstr "_Erste Seite"
+ 
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+ msgstr "Gehe zur ersten Seite"
+ 
+-#: src/gtk/MainView.cxx:143
++#: src/gtk/MainView.cxx:145
+ msgid "_Next Page"
+ msgstr "_Nächste Seite"
+ 
+-#: src/gtk/MainView.cxx:144
++#: src/gtk/MainView.cxx:146
+ msgid "Go to the next page"
+ msgstr "Gehe zur ersten Seite"
+ 
+-#: src/gtk/MainView.cxx:147
++#: src/gtk/MainView.cxx:149
+ msgid "_Previous Page"
+ msgstr "_Vorherige Seite"
+ 
+-#: src/gtk/MainView.cxx:148
++#: src/gtk/MainView.cxx:150
+ msgid "Go to the previous page"
+ msgstr "Gehe zur vorherigen Seite"
+ 
+-#: src/gtk/MainView.cxx:151
++#: src/gtk/MainView.cxx:153
+ msgid "_Last Page"
+ msgstr "_Letzte Seite"
+ 
+-#: src/gtk/MainView.cxx:152
++#: src/gtk/MainView.cxx:154
+ msgid "Go to the last page"
+ msgstr "Gehe zur letzten Seite"
+ 
+-#: src/gtk/MainView.cxx:155
++#: src/gtk/MainView.cxx:157
+ msgid "_About"
+ msgstr "_Ãœber"
+ 
+-#: src/gtk/MainView.cxx:156
++#: src/gtk/MainView.cxx:158
+ msgid "Display application's credits"
+ msgstr "Credits anzeigen"
+ 
+-#: src/gtk/MainView.cxx:166
++#: src/gtk/MainView.cxx:175
+ msgid "F_ull screen"
+-msgstr ""
++msgstr "_Vollbild"
+ 
+-#: src/gtk/MainView.cxx:167
++#: src/gtk/MainView.cxx:176
+ msgid "Toggle full screen window"
+-msgstr ""
++msgstr "In Vollbildmodus umschalten"
+ 
+-#: src/gtk/MainView.cxx:170
++#: src/gtk/MainView.cxx:179
+ msgid "Show _Toolbar"
+-msgstr "Werkzeugleiste anzeigen"
++msgstr "_Werkzeugleiste anzeigen"
+ 
+-#: src/gtk/MainView.cxx:171
++#: src/gtk/MainView.cxx:180
+ msgid "Show or hide the toolbar"
+ msgstr "Werkzeugleiste anzeigen oder verstecken"
+ 
+-#: src/gtk/MainView.cxx:174
++#: src/gtk/MainView.cxx:183
+ msgid "Show _Statusbar"
+-msgstr "Statusleiste anzeigen"
++msgstr "_Statusleiste anzeigen"
+ 
+-#: src/gtk/MainView.cxx:175
++#: src/gtk/MainView.cxx:184
+ msgid "Show or hide the statusbar"
+ msgstr "Statusleiste anzeigen oder verstecken"
+ 
+-#: src/gtk/MainView.cxx:178
++#: src/gtk/MainView.cxx:187
+ msgid "Show I_ndex"
+-msgstr "Ãœbersicht anzeigen"
++msgstr "Ü_bersicht anzeigen"
+ 
+-#: src/gtk/MainView.cxx:179
++#: src/gtk/MainView.cxx:188
+ msgid "Show or hide the document's outline"
+ msgstr "Ãœbersicht des Dokuments anzeigen oder verstecken"
+ 
+-#: src/gtk/MainView.cxx:182
++#: src/gtk/MainView.cxx:191
+ msgid "Zoom to _Fit"
+-msgstr "Zoom zur Fenstergröße"
++msgstr "Zoom zur _Fenstergröße"
+ 
+-#: src/gtk/MainView.cxx:183
++#: src/gtk/MainView.cxx:192
+ msgid "Make the current document fill the window"
+ msgstr "Zoome das Dokument bis zur Größe des Fensters heran"
+ 
+-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
+ msgid "Zoom to _Width"
+-msgstr "Zoom zur Fensterweite"
++msgstr "Zoom zur F_ensterweite"
+ 
+-#: src/gtk/MainView.cxx:187
++#: src/gtk/MainView.cxx:196
+ msgid "Make the current document fill the window width"
+ msgstr "Zoome das Dokument heran, bis es die Fensterbreite füllt"
+ 
+-#: src/gtk/MainView.cxx:278
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
+ msgid "Open PDF File"
+ msgstr "PDF Datei öffnen"
+ 
+-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
+ msgid "Portable Document Format (PDF) Files"
+-msgstr ""
++msgstr "Portable Document Format (PDF) Dateien"
+ 
+-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
+ msgid "All Files"
+-msgstr ""
++msgstr "Alle Dateien"
+ 
+-#: src/gtk/MainView.cxx:362
++#: src/gtk/MainView.cxx:404
+ msgid "Password"
+ msgstr "Passwort"
+ 
+-#: src/gtk/MainView.cxx:386
+-#, fuzzy
++#: src/gtk/MainView.cxx:428
+ msgid "Save PDF File"
+-msgstr "PDF Datei öffnen"
++msgstr "PDF Datei speichern"
+ 
+-#: src/gtk/MainView.cxx:816
++#: src/gtk/MainView.cxx:858
+ msgid "Page"
+ msgstr "Seite"
+ 
+-#: src/gtk/MainView.cxx:826
+-#, fuzzy
++#: src/gtk/MainView.cxx:868
+ msgid "of 0"
+-msgstr "0 von 0"
++msgstr "von 0"
+ 
+-#: src/gtk/MainView.cxx:879
++#: src/gtk/MainView.cxx:921
+ msgid "Index"
+ msgstr "Inhalt"
+ 
+-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
+ #, c-format
+ msgid "Error building UI manager: %s\n"
+ msgstr "Fehler beim Erstellen des UI Managers: %s\n"
+ 
+-#: src/gtk/MainView.cxx:1056
++#: src/gtk/MainView.cxx:1108
+ msgid "A lightweight PDF viewer"
+ msgstr "Ein kleiner, schneller PDF Betrachter"
+ 
+-#: src/gtk/MainView.cxx:1059
++#: src/gtk/MainView.cxx:1111
+ msgid ""
+ "ePDFView is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+@@ -407,7 +426,7 @@
+ "Lizenz, wie von der Free Software Foundation herausgegeben,\n"
+ "beachten; Entweder Version 2 oder jede nächsthöhere Version.\n"
+ 
+-#: src/gtk/MainView.cxx:1063
++#: src/gtk/MainView.cxx:1115
+ msgid ""
+ "ePDFView is distributes in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+@@ -420,7 +439,7 @@
+ "FUNKTION mit ein. Für Details wird auf die GNU General Public Lizenz\n"
+ "verwiesen.\n"
+ 
+-#: src/gtk/MainView.cxx:1067
++#: src/gtk/MainView.cxx:1119
+ msgid ""
+ "You should have received a copy of the GNU General Public License\n"
+ "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
+@@ -434,152 +453,153 @@
+ "Boston, MA  02111-1307\n"
+ "USA\n"
+ 
+-#: src/gtk/MainView.cxx:1076
++#: src/gtk/MainView.cxx:1128
+ msgid "ePDFView"
+ msgstr "ePDFView"
+ 
+-#: src/gtk/MainView.cxx:1083
++#: src/gtk/MainView.cxx:1135
+ msgid "translator-credits"
+-msgstr "Moritz Heiber <moe@xfce.org>"
++msgstr ""
++"Moritz Heiber <moe@xfce.org>,\n"
++"Enrico Tröger <enrico.troeger@uvena.de>"
+ 
+ #: src/gtk/PreferencesView.cxx:32
+ msgid "Preferences"
+-msgstr ""
++msgstr "Einstellungen"
+ 
+ #: src/gtk/PreferencesView.cxx:46
+ msgid "External Commands"
+-msgstr ""
++msgstr "Externe Befehle"
+ 
+ #: src/gtk/PreferencesView.cxx:105
+ msgid "Web _Browser:"
+-msgstr ""
++msgstr "_Webbrowser:"
+ 
+ #: src/gtk/PreferencesView.cxx:118
+ #, c-format
+ msgid "Note: <i>%s</i> will be replaced by the URI."
+-msgstr ""
++msgstr "Hinweis: <i>%s</i> wird durch die URL ersetzt."
+ 
+ #: src/gtk/PrintView.cxx:51
+ msgid "Print"
+-msgstr ""
++msgstr "Drucken"
+ 
+ #: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659
+ msgid "Printer"
+-msgstr ""
++msgstr "Drucker"
+ 
+ #: src/gtk/PrintView.cxx:74
+ msgid "Job"
+-msgstr ""
++msgstr "Auftrag"
+ 
+ #: src/gtk/PrintView.cxx:79
+-#, fuzzy
+ msgid "Paper"
+-msgstr "Seite"
++msgstr "Papier"
+ 
+ #: src/gtk/PrintView.cxx:359
+ msgid "<b>Print Range</b>"
+-msgstr ""
++msgstr "<b>Druckbereich</b>"
+ 
+ #: src/gtk/PrintView.cxx:377
+ msgid "_All pages"
+-msgstr ""
++msgstr "_Alle Seiten"
+ 
+ #: src/gtk/PrintView.cxx:380
+ msgid "_Range:"
+-msgstr ""
++msgstr "_Bereich:"
+ 
+ #: src/gtk/PrintView.cxx:392
+ msgid "<b>Page Set</b>"
+-msgstr ""
++msgstr "<b>Seiteneinstellungen</b>"
+ 
+ #: src/gtk/PrintView.cxx:408
+ msgid "A_ll pages"
+-msgstr ""
++msgstr "A_lle Seiten"
+ 
+ #: src/gtk/PrintView.cxx:412
+ msgid "O_dd pages"
+-msgstr ""
++msgstr "_Ungerade Seiten"
+ 
+ #: src/gtk/PrintView.cxx:416
+ msgid "_Even pages"
+-msgstr ""
++msgstr "_Gerade Seiten"
+ 
+ #: src/gtk/PrintView.cxx:420
+ msgid "<b>Copies</b>"
+-msgstr ""
++msgstr "<b>Kopien</b>"
+ 
+ #: src/gtk/PrintView.cxx:437
+ msgid "N_umber of copies:"
+-msgstr ""
++msgstr "An_zahl der Kopien:"
+ 
+ #: src/gtk/PrintView.cxx:444
+ msgid "C_ollate"
+-msgstr ""
++msgstr "Kopien _sortieren"
+ 
+ #: src/gtk/PrintView.cxx:465
+ msgid "<b>Paper and Layout</b>"
+-msgstr ""
++msgstr "<b>Papier und Anordnung</b>"
+ 
+ #: src/gtk/PrintView.cxx:482
+ msgid "Paper _Size:"
+-msgstr ""
++msgstr "_Papiergröße:"
+ 
+ #: src/gtk/PrintView.cxx:508
+ msgid "Page _orientation:"
+-msgstr ""
++msgstr "_Seitenausrichtung:"
+ 
+ #: src/gtk/PrintView.cxx:539
+ msgid "_Layout:"
+-msgstr ""
++msgstr "A_nordnung:"
+ 
+ #: src/gtk/PrintView.cxx:568
+ msgid "<b>Output</b>"
+-msgstr ""
++msgstr "<b>Ausgabe</b>"
+ 
+ #: src/gtk/PrintView.cxx:585
+ msgid "_Mode:"
+-msgstr ""
++msgstr "_Modus: "
+ 
+ #: src/gtk/PrintView.cxx:613
+ msgid "_Resolution:"
+-msgstr ""
++msgstr "A_uflösung:"
+ 
+ #: src/gtk/PrintView.cxx:668
+ msgid "State"
+-msgstr ""
++msgstr "Status"
+ 
+ #: src/gtk/PrintView.cxx:677
+ msgid "Jobs"
+-msgstr ""
++msgstr "Aufträge"
+ 
+ #: src/gtk/PrintView.cxx:686
+ msgid "Location"
+-msgstr ""
++msgstr "Standort"
+ 
+ #: src/gtk/PrintView.cxx:717
+ msgid "Plain"
+-msgstr ""
++msgstr "Einfach"
+ 
+ #: src/gtk/PrintView.cxx:723
+ msgid "2 pages in 1"
+-msgstr ""
++msgstr "2 Seiten auf Eine"
+ 
+ #: src/gtk/PrintView.cxx:729
+ msgid "4 pages in 1"
+-msgstr ""
++msgstr "4 Seiten auf Eine"
+ 
+ #: src/gtk/PrintView.cxx:744
+ msgid "Portrait"
+-msgstr ""
++msgstr "Hochformat"
+ 
+ #: src/gtk/PrintView.cxx:750
+ msgid "Landscape"
+-msgstr ""
++msgstr "Querformat"
+ 
+ #: src/gtk/StockIcons.cxx:40
+ msgid "Find _Next"
+-msgstr "Suche vorwärts"
++msgstr "Suche _vorwärts"
+ 
+ #: src/gtk/StockIcons.cxx:41
+ msgid "Find _Previous"
+-msgstr "Suche rückwärts"
++msgstr "Suche _rückwärts"
+diff -Nurd epdfview-0.1.6-svn/po/el.po epdfview/po/el.po
+--- epdfview-0.1.6-svn/po/el.po	2008-07-13 12:57:47.543198000 +0200
++++ epdfview/po/el.po	2008-07-13 12:55:55.083198000 +0200
+@@ -7,7 +7,7 @@
+ msgstr ""
+ "Project-Id-Version: ePDFView 0.1.6\n"
+ "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
+ "PO-Revision-Date: 2006-11-10 16:55+0200\n"
+ "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
+ "Language-Team: Greek <nls@tux.hellug.gr>\n"
+@@ -77,11 +77,11 @@
+ msgid "Unknown error (%d)."
+ msgstr "Άγνωστο σφάλμα (%d)."
+ 
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+ msgstr "[ΑΡΧΕΙΟ] - π�οβολή εγγ�άφου PDF"
+ 
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+ msgstr "Εφα�μογή Π�οβολής PDF"
+ 
+@@ -95,7 +95,7 @@
+ msgid "Loading file %s..."
+ msgstr "Φό�τωση α�χείου %s..."
+ 
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
+ #, c-format
+ msgid "of %d"
+ msgstr "από %d"
+@@ -105,39 +105,47 @@
+ msgid "Saving document to %s..."
+ msgstr "Αποθήκευση εγγ�άφου στο %s..."
+ 
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+ msgstr "Σφάλμα φό�τωσης α�χείου"
+ 
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+ msgstr "Ο κωδικός π�όσβασης που εισάγατε δεν είναι έγκυ�ος γι' αυτό το α�χείο."
+ 
+-#: src/MainPter.cxx:947
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+ msgstr "Σφάλμα αποθήκευσης α�χείου"
+ 
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+ msgstr "Γίνεται φό�τωση..."
+ 
+-#: src/PrintPter.cxx:295
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
+ msgid "Grayscale"
+ msgstr "Κλίμακα του γκ�ι"
+ 
+-#: src/PrintPter.cxx:395
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+ msgstr "Αδ�ανής"
+ 
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+ msgstr "Διακόπηκε"
+ 
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+ msgstr "Επεξε�γασία"
+ 
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+ msgstr "Άγνωστο"
+ 
+@@ -154,244 +162,260 @@
+ msgid "Find:"
+ msgstr "Ε��εση:"
+ 
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+ msgstr "_Α�χείο"
+ 
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+ msgstr "_Επεξε�γασία"
+ 
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+ msgstr "_Π�οβολή"
+ 
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+ msgstr "_Μετάβαση"
+ 
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+ msgstr "_Βοήθεια"
+ 
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+ msgstr "Άν_οιγμα"
+ 
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+ msgstr "Άνοιγμα εγγ�άφου PDF"
+ 
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+ msgstr "Α_νανέωση"
+ 
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+ msgstr "Ανανέωση τ�έχοντος εγγ�άφου"
+ 
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+ msgstr "Απο_θήκευση ενός αντιγ�άφου..."
+ 
+-#: src/gtk/MainView.cxx:102
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+ msgstr "Αποθήκευση ενός αντιγ�άφου για το τ�έχον έγγ�αφο"
+ 
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+ msgstr "_Εκτ�πωση..."
+ 
+-#: src/gtk/MainView.cxx:107
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+ msgstr "Εκτ�πωση τ�έχοντος εγγ�άφου"
+ 
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+ msgstr "_Κλείσιμο"
+ 
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+ msgstr "Κλείσιμο αυτο� του πα�αθ��ου"
+ 
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+ msgstr "_Ε��εση"
+ 
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+ msgstr "Ε��εση μια λέξης στο έγγ�αφο"
+ 
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+ msgstr "Π�οτιμήσεις..."
+ 
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+ msgstr "Αλλαγή π�οτιμήσεων της εφα�μογής"
+ 
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+ msgstr "_Μεγέθυνση"
+ 
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+ msgstr "Μεγέθυνση εγγ�άφου"
+ 
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+ msgstr "Σ_μίκ�υνση"
+ 
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+ msgstr "Σμίκ�υνση εγγ�άφου"
+ 
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+ msgstr "Πε�ιστ�οφή _δεξιά"
+ 
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+ msgstr "Πε�ιστ�οφή του εγγ�άφου 90 μοί�ες δεξιόστ�οφα"
+ 
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+ msgstr "Πε�ιστ�οφή _α�ιστε�ά"
+ 
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+ msgstr "Πε�ιστ�οφή του εγγ�άφου 90 μοί�ες α�ιστε�όστ�οφα"
+ 
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+ msgstr "Π_�ώτη σελίδα"
+ 
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+ msgstr "Μετάβαση στην π�ώτη σελίδα"
+ 
+-#: src/gtk/MainView.cxx:143
++#: src/gtk/MainView.cxx:145
+ msgid "_Next Page"
+ msgstr "_Επόμενη Σελίδα"
+ 
+-#: src/gtk/MainView.cxx:144
++#: src/gtk/MainView.cxx:146
+ msgid "Go to the next page"
+ msgstr "Μετάβαση στην επόμενη σελίδα"
+ 
+-#: src/gtk/MainView.cxx:147
++#: src/gtk/MainView.cxx:149
+ msgid "_Previous Page"
+ msgstr "Π�οη_γο�μενη Σελίδα"
+ 
+-#: src/gtk/MainView.cxx:148
++#: src/gtk/MainView.cxx:150
+ msgid "Go to the previous page"
+ msgstr "Μετάβαση στην π�οηγο�μενη σελίδα"
+ 
+-#: src/gtk/MainView.cxx:151
++#: src/gtk/MainView.cxx:153
+ msgid "_Last Page"
+ msgstr "Τε_λευταία Σελίδα"
+ 
+-#: src/gtk/MainView.cxx:152
++#: src/gtk/MainView.cxx:154
+ msgid "Go to the last page"
+ msgstr "Μετάβαση στην τελευταία σελίδα"
+ 
+-#: src/gtk/MainView.cxx:155
++#: src/gtk/MainView.cxx:157
+ msgid "_About"
+ msgstr "_Πε�ί"
+ 
+-#: src/gtk/MainView.cxx:156
++#: src/gtk/MainView.cxx:158
+ msgid "Display application's credits"
+ msgstr "Εμφάνιση μνείας των δημιου�γών της εφα�μογής"
+ 
+-#: src/gtk/MainView.cxx:166
++#: src/gtk/MainView.cxx:175
+ msgid "F_ull screen"
+ msgstr "_Πλή�ης Οθόνη"
+ 
+-#: src/gtk/MainView.cxx:167
++#: src/gtk/MainView.cxx:176
+ msgid "Toggle full screen window"
+ msgstr "Εναλλαγή της λειτου�γία πλή�ους οθόνης"
+ 
+-#: src/gtk/MainView.cxx:170
++#: src/gtk/MainView.cxx:179
+ msgid "Show _Toolbar"
+ msgstr "Εμφάνιση _ε�γαλειοθήκης"
+ 
+-#: src/gtk/MainView.cxx:171
++#: src/gtk/MainView.cxx:180
+ msgid "Show or hide the toolbar"
+ msgstr "Εμφάνιση ή απόκ�υψη της ε�γαλειοθήκης"
+ 
+-#: src/gtk/MainView.cxx:174
++#: src/gtk/MainView.cxx:183
+ msgid "Show _Statusbar"
+ msgstr "Εμφάνιση _γ�αμμής κατάστασης"
+ 
+-#: src/gtk/MainView.cxx:175
++#: src/gtk/MainView.cxx:184
+ msgid "Show or hide the statusbar"
+ msgstr "Εμφάνιση ή απόκ�υψη της γ�αμμής κατάστασης"
+ 
+-#: src/gtk/MainView.cxx:178
++#: src/gtk/MainView.cxx:187
+ msgid "Show I_ndex"
+ msgstr "Εμφάνιση _πε�ιεχομένων"
+ 
+-#: src/gtk/MainView.cxx:179
++#: src/gtk/MainView.cxx:188
+ msgid "Show or hide the document's outline"
+ msgstr "Π�οβολή ή απόκ�υψη του πε�ιγ�άμματος του εγγ�άφου"
+ 
+-#: src/gtk/MainView.cxx:182
++#: src/gtk/MainView.cxx:191
+ msgid "Zoom to _Fit"
+ msgstr "Σμίκ�υνση στην _σελίδα"
+ 
+-#: src/gtk/MainView.cxx:183
++#: src/gtk/MainView.cxx:192
+ msgid "Make the current document fill the window"
+ msgstr "Π�οσα�μογή του τ�έχοντος εγγ�άφου στο πα�άθυ�ο"
+ 
+-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
+ msgid "Zoom to _Width"
+ msgstr "Π�οσα�μογή στο _πλάτος της σελίδας"
+ 
+-#: src/gtk/MainView.cxx:187
++#: src/gtk/MainView.cxx:196
+ msgid "Make the current document fill the window width"
+ msgstr "Ταί�ιασμα του τ�έχοντος εγγ�άφου στο πλάτος του πα�αθ��ου"
+ 
+-#: src/gtk/MainView.cxx:278
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
+ msgid "Open PDF File"
+ msgstr "Άνοιγμα α�χείου PDF"
+ 
+-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
+ msgid "Portable Document Format (PDF) Files"
+ msgstr "Α�χεία PDF"
+ 
+-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
+ msgid "All Files"
+ msgstr "Όλα τα α�χεία"
+ 
+-#: src/gtk/MainView.cxx:362
++#: src/gtk/MainView.cxx:404
+ msgid "Password"
+ msgstr "Κωδικός π�όσβασης"
+ 
+-#: src/gtk/MainView.cxx:386
++#: src/gtk/MainView.cxx:428
+ msgid "Save PDF File"
+ msgstr "Αποθήκευση α�χείου PDF"
+ 
+-#: src/gtk/MainView.cxx:816
++#: src/gtk/MainView.cxx:858
+ msgid "Page"
+ msgstr "Σελίδα"
+ 
+-#: src/gtk/MainView.cxx:826
++#: src/gtk/MainView.cxx:868
+ msgid "of 0"
+ msgstr "από 0"
+ 
+-#: src/gtk/MainView.cxx:879
++#: src/gtk/MainView.cxx:921
+ msgid "Index"
+ msgstr "Κατάλογος"
+ 
+-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
+ #, c-format
+ msgid "Error building UI manager: %s\n"
+ msgstr "Σφάλμα δημιου�γίας διαχει�ιστή UI: %s\n"
+ 
+-#: src/gtk/MainView.cxx:1056
++#: src/gtk/MainView.cxx:1108
+ msgid "A lightweight PDF viewer"
+ msgstr "Ελαφ�ιά εφα�μογή π�οβολής PDF"
+ 
+-#: src/gtk/MainView.cxx:1059
++#: src/gtk/MainView.cxx:1111
+ msgid ""
+ "ePDFView is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+@@ -404,7 +428,7 @@
+ " Free Software Foundation, έκδοση 2 , ή \n"
+ "(π�οαι�ετικά) οποιαδήποτε νεότε�η 'έκδοση.\n"
+ 
+-#: src/gtk/MainView.cxx:1063
++#: src/gtk/MainView.cxx:1115
+ msgid ""
+ "ePDFView is distributes in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+@@ -415,7 +439,7 @@
+ "αλλά ΧΩΡΙΣ ΚΑΜΜΙΑ ΑΠΟΛΥΤΩΣ ΕΓΓΥΗΣΗ για συγκεκ�ιμένο σκοπό.\n"
+ "Δείτε για πε�ισσότε�ες λεπτομέ�ειες την GNU General Public License .\n"
+ 
+-#: src/gtk/MainView.cxx:1067
++#: src/gtk/MainView.cxx:1119
+ msgid ""
+ "You should have received a copy of the GNU General Public License\n"
+ "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
+@@ -425,11 +449,11 @@
+ "μαζί με το �αυτίλο. Αν όχι γ�άψτε στο Free Software Foundation, Inc., \n"
+ "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+ 
+-#: src/gtk/MainView.cxx:1076
++#: src/gtk/MainView.cxx:1128
+ msgid "ePDFView"
+ msgstr "ePDFView"
+ 
+-#: src/gtk/MainView.cxx:1083
++#: src/gtk/MainView.cxx:1135
+ msgid "translator-credits"
+ msgstr "Στα��ος Γιαννο��ης <stavrosg2002@freemail.gr>"
+ 
+diff -Nurd epdfview-0.1.6-svn/po/es.po epdfview/po/es.po
+--- epdfview-0.1.6-svn/po/es.po	2008-07-13 12:57:47.523198000 +0200
++++ epdfview/po/es.po	2008-07-13 12:55:55.043198000 +0200
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: ePDFView 0.1.4\n"
+ "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
+ "PO-Revision-Date: 2006-04-12 21:17+0200\n"
+ "Last-Translator:  Jordi Fita <jordi@emma-soft.com>\n"
+ "Language-Team: Spanish <es@li.org>\n"
+@@ -76,11 +76,11 @@
+ msgid "Unknown error (%d)."
+ msgstr "Error desconocido (%d)."
+ 
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+ msgstr "[ARCHIVO] - muestra documentos PDF"
+ 
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+ msgstr "Visor de PDF"
+ 
+@@ -94,7 +94,7 @@
+ msgid "Loading file %s..."
+ msgstr "Abriendo archivo %s..."
+ 
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
+ #, c-format
+ msgid "of %d"
+ msgstr "de %d"
+@@ -104,41 +104,49 @@
+ msgid "Saving document to %s..."
+ msgstr "Guardando el documento en %s..."
+ 
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+ msgstr "Error Cargando el Archivo"
+ 
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+ msgstr ""
+ "La contraseña que has proporcionado no es una contraseña válida para este "
+ "archivo."
+ 
+-#: src/MainPter.cxx:947
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+ msgstr "Error Guardando el Archivo"
+ 
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+ msgstr "Cargando..."
+ 
+-#: src/PrintPter.cxx:295
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
+ msgid "Grayscale"
+ msgstr "Escala de grises"
+ 
+-#: src/PrintPter.cxx:395
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+ msgstr "Desocupada"
+ 
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+ msgstr "Parada"
+ 
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+ msgstr "Procesando"
+ 
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+ msgstr "Desconocido"
+ 
+@@ -155,245 +163,261 @@
+ msgid "Find:"
+ msgstr "Buscar:"
+ 
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+ msgstr "_Archivo"
+ 
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+ msgstr "_Edición"
+ 
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+ msgstr "_Ver"
+ 
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+ msgstr "_Ir"
+ 
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+ msgstr "A_yuda"
+ 
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+ msgstr "_Abrir"
+ 
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+ msgstr "Abre un documento PDF"
+ 
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+ msgstr "_Recargar"
+ 
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+ msgstr "Abre de nuevo el documento actual"
+ 
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+ msgstr "_Guardar una copia..."
+ 
+-#: src/gtk/MainView.cxx:102
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+ msgstr "Guarda una copia de el documento actual"
+ 
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+ msgstr "_Imprimir"
+ 
+-#: src/gtk/MainView.cxx:107
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+ msgstr "Imprime el documento actual"
+ 
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+ msgstr "_Cerrar"
+ 
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+ msgstr "Cierra esta ventana"
+ 
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+ msgstr "_Buscar"
+ 
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+ msgstr "Busca una palabra en el documento"
+ 
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+ msgstr "Preferencias..."
+ 
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+ msgstr "Cambia las preferencia de la applicación"
+ 
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+ msgstr "A_mpliar"
+ 
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+ msgstr "Amplia el documento"
+ 
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+ msgstr "_Reducir"
+ 
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+ msgstr "Reduce el documento"
+ 
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+ msgstr "Girar a la _derecha"
+ 
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+ msgstr "Gira el document 90 grados en la dirección de las agujas del reloj"
+ 
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+ msgstr "Gira a la _izquierda"
+ 
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+ msgstr ""
+ "Gira el documento 90 grados en la dirección contraria a las agujas del reloj"
+ 
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+ msgstr "_Primera página"
+ 
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+ msgstr "Va hacia la primera página"
+ 
+-#: src/gtk/MainView.cxx:143
++#: src/gtk/MainView.cxx:145
+ msgid "_Next Page"
+ msgstr "_Siguiente página"
+ 
+-#: src/gtk/MainView.cxx:144
++#: src/gtk/MainView.cxx:146
+ msgid "Go to the next page"
+ msgstr "Va hacia la siguiente página"
+ 
+-#: src/gtk/MainView.cxx:147
++#: src/gtk/MainView.cxx:149
+ msgid "_Previous Page"
+ msgstr "Página _anterior"
+ 
+-#: src/gtk/MainView.cxx:148
++#: src/gtk/MainView.cxx:150
+ msgid "Go to the previous page"
+ msgstr "Va hacia la página anterior"
+ 
+-#: src/gtk/MainView.cxx:151
++#: src/gtk/MainView.cxx:153
+ msgid "_Last Page"
+ msgstr "Ú_ltima página"
+ 
+-#: src/gtk/MainView.cxx:152
++#: src/gtk/MainView.cxx:154
+ msgid "Go to the last page"
+ msgstr "Va hacia la última página"
+ 
+-#: src/gtk/MainView.cxx:155
++#: src/gtk/MainView.cxx:157
+ msgid "_About"
+ msgstr "_Acerca de"
+ 
+-#: src/gtk/MainView.cxx:156
++#: src/gtk/MainView.cxx:158
+ msgid "Display application's credits"
+ msgstr "Muestra los créditos de la aplicación"
+ 
+-#: src/gtk/MainView.cxx:166
++#: src/gtk/MainView.cxx:175
+ msgid "F_ull screen"
+ msgstr ""
+ 
+-#: src/gtk/MainView.cxx:167
++#: src/gtk/MainView.cxx:176
+ msgid "Toggle full screen window"
+ msgstr ""
+ 
+-#: src/gtk/MainView.cxx:170
++#: src/gtk/MainView.cxx:179
+ msgid "Show _Toolbar"
+ msgstr "Muestr al barra de _herramientas"
+ 
+-#: src/gtk/MainView.cxx:171
++#: src/gtk/MainView.cxx:180
+ msgid "Show or hide the toolbar"
+ msgstr "Muestra o esconda la barra de herramientas"
+ 
+-#: src/gtk/MainView.cxx:174
++#: src/gtk/MainView.cxx:183
+ msgid "Show _Statusbar"
+ msgstr "Muestra la barra de _estado"
+ 
+-#: src/gtk/MainView.cxx:175
++#: src/gtk/MainView.cxx:184
+ msgid "Show or hide the statusbar"
+ msgstr "Muestra o esconde la barra de estado"
+ 
+-#: src/gtk/MainView.cxx:178
++#: src/gtk/MainView.cxx:187
+ msgid "Show I_ndex"
+ msgstr "Muestra el í_ndice"
+ 
+-#: src/gtk/MainView.cxx:179
++#: src/gtk/MainView.cxx:188
+ msgid "Show or hide the document's outline"
+ msgstr "Muestra o esconde el índice del documento"
+ 
+-#: src/gtk/MainView.cxx:182
++#: src/gtk/MainView.cxx:191
+ msgid "Zoom to _Fit"
+ msgstr "Ajuste ó_ptimo"
+ 
+-#: src/gtk/MainView.cxx:183
++#: src/gtk/MainView.cxx:192
+ msgid "Make the current document fill the window"
+ msgstr "Hace que el documento llene la ventana"
+ 
+-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
+ msgid "Zoom to _Width"
+ msgstr "Ajustar al _ancho de página"
+ 
+-#: src/gtk/MainView.cxx:187
++#: src/gtk/MainView.cxx:196
+ msgid "Make the current document fill the window width"
+ msgstr "Hace que el documento llene el ancho de la ventana"
+ 
+-#: src/gtk/MainView.cxx:278
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
+ msgid "Open PDF File"
+ msgstr "Abre un archivo PDF"
+ 
+-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
+ msgid "Portable Document Format (PDF) Files"
+ msgstr "Archivos en Formato de Documento Transportable (PDF)"
+ 
+-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
+ msgid "All Files"
+ msgstr "Todos los archivos"
+ 
+-#: src/gtk/MainView.cxx:362
++#: src/gtk/MainView.cxx:404
+ msgid "Password"
+ msgstr "Contraseña"
+ 
+-#: src/gtk/MainView.cxx:386
++#: src/gtk/MainView.cxx:428
+ msgid "Save PDF File"
+ msgstr "Guarda un archivo PDF"
+ 
+-#: src/gtk/MainView.cxx:816
++#: src/gtk/MainView.cxx:858
+ msgid "Page"
+ msgstr "Página"
+ 
+-#: src/gtk/MainView.cxx:826
++#: src/gtk/MainView.cxx:868
+ msgid "of 0"
+ msgstr "de 0"
+ 
+-#: src/gtk/MainView.cxx:879
++#: src/gtk/MainView.cxx:921
+ msgid "Index"
+ msgstr "�ndice"
+ 
+-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
+ #, c-format
+ msgid "Error building UI manager: %s\n"
+ msgstr "Error construiendo el administrador de IU: %s\n"
+ 
+-#: src/gtk/MainView.cxx:1056
++#: src/gtk/MainView.cxx:1108
+ msgid "A lightweight PDF viewer"
+ msgstr "Un visor de PDF ligero"
+ 
+-#: src/gtk/MainView.cxx:1059
++#: src/gtk/MainView.cxx:1111
+ msgid ""
+ "ePDFView is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+@@ -405,7 +429,7 @@
+ "la Free Software Foundation; ya sea en su versión 2 ó (a su criterio)\n"
+ "en una versión posterior.\n"
+ 
+-#: src/gtk/MainView.cxx:1063
++#: src/gtk/MainView.cxx:1115
+ msgid ""
+ "ePDFView is distributes in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+@@ -417,7 +441,7 @@
+ "COMERCIALIDAD o IDONEIDAD PARA UN FIN DETERMINADO.  Mire la \n"
+ "Licencia General GNU para más detalles.\n"
+ 
+-#: src/gtk/MainView.cxx:1067
++#: src/gtk/MainView.cxx:1119
+ msgid ""
+ "You should have received a copy of the GNU General Public License\n"
+ "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
+@@ -428,11 +452,11 @@
+ "Inc.,\n"
+ "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+ 
+-#: src/gtk/MainView.cxx:1076
++#: src/gtk/MainView.cxx:1128
+ msgid "ePDFView"
+ msgstr "ePDFView"
+ 
+-#: src/gtk/MainView.cxx:1083
++#: src/gtk/MainView.cxx:1135
+ msgid "translator-credits"
+ msgstr "Jordi Fita <jordi@emma-soft.com>"
+ 
+diff -Nurd epdfview-0.1.6-svn/po/fr.po epdfview/po/fr.po
+--- epdfview-0.1.6-svn/po/fr.po	2008-07-13 12:57:47.523198000 +0200
++++ epdfview/po/fr.po	2008-07-13 12:55:55.043198000 +0200
+@@ -8,7 +8,7 @@
+ msgstr ""
+ "Project-Id-Version: ePDFView 0.1.4\n"
+ "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
+ "PO-Revision-Date: 2006-04-19 02:00+0200\n"
+ "Last-Translator:  <mr.moustache@laposte.net>\n"
+ "Language-Team: French <@>\n"
+@@ -74,11 +74,11 @@
+ msgid "Unknown error (%d)."
+ msgstr "Erreur inconnue (%d)."
+ 
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+ msgstr "[FICHIER] - Visualiser des documents PDF"
+ 
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+ msgstr "Visualisateur de PDF"
+ 
+@@ -92,7 +92,7 @@
+ msgid "Loading file %s..."
+ msgstr "Chargement du fichier %s..."
+ 
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
+ #, c-format
+ msgid "of %d"
+ msgstr "sur %d"
+@@ -102,39 +102,47 @@
+ msgid "Saving document to %s..."
+ msgstr "Enregistrement du document sous %s..."
+ 
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+ msgstr "Erreur au chargement du fichier"
+ 
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+ msgstr "Le mot de passe que vous avez fourni est incorrect pour ce fichier."
+ 
+-#: src/MainPter.cxx:947
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+-msgstr "Erreur au chargement du fichier"
++msgstr "Erreur pendant la sauvegarde du fichier"
+ 
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+ msgstr "Chargement..."
+ 
+-#: src/PrintPter.cxx:295
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
+ msgid "Grayscale"
+ msgstr "Niveau de gris"
+ 
+-#: src/PrintPter.cxx:395
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+ msgstr "En attente"
+ 
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+ msgstr "Arrêté"
+ 
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+ msgstr "Traitement en cours"
+ 
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+ msgstr "Inconnu"
+ 
+@@ -151,244 +159,260 @@
+ msgid "Find:"
+ msgstr "Rechercher :"
+ 
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+ msgstr "_Fichier"
+ 
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+ msgstr "_Edition"
+ 
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+ msgstr "_Afficher"
+ 
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+ msgstr "A_ller à"
+ 
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+ msgstr "Ai_de"
+ 
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+ msgstr "_Ouvrir"
+ 
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+ msgstr "Ouvrir un document PDF"
+ 
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+ msgstr "_Recharger"
+ 
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+ msgstr "Recharger le document courant"
+ 
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+ msgstr "_Enregistrer sous..."
+ 
+-#: src/gtk/MainView.cxx:102
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+-msgstr "Recharger le document courant"
++msgstr "Sauvegarder le document courant"
+ 
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+ msgstr "_Imprimer"
+ 
+-#: src/gtk/MainView.cxx:107
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+-msgstr "Recharger le document courant"
++msgstr "Imprimer le document courant"
+ 
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+ msgstr "_Fermer"
+ 
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+ msgstr "Fermer cette fenêtre"
+ 
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+ msgstr "_Rechercher"
+ 
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+ msgstr "Rechercher un mot dans le document"
+ 
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+ msgstr "Préférences"
+ 
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+ msgstr "Changer les préférences de l'application"
+ 
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+ msgstr "_Agrandir"
+ 
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+ msgstr "Elargir le document"
+ 
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+ msgstr "_Réduire"
+ 
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+ msgstr "Réduire le document"
+ 
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+ msgstr "Rotation à _droite"
+ 
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+ msgstr "Rotation de 90 degrés dans le sens horaire"
+ 
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+ msgstr "Rotation à _gauche"
+ 
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+ msgstr "Rotation de 90 degrés dans le anti-horaire"
+ 
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+ msgstr "_Première page"
+ 
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+ msgstr "Aller à la première page"
+ 
+-#: src/gtk/MainView.cxx:143
++#: src/gtk/MainView.cxx:145
+ msgid "_Next Page"
+ msgstr "Page _suivante"
+ 
+-#: src/gtk/MainView.cxx:144
++#: src/gtk/MainView.cxx:146
+ msgid "Go to the next page"
+ msgstr "Aller à la page suivante"
+ 
+-#: src/gtk/MainView.cxx:147
++#: src/gtk/MainView.cxx:149
+ msgid "_Previous Page"
+ msgstr "Page p_récédente"
+ 
+-#: src/gtk/MainView.cxx:148
++#: src/gtk/MainView.cxx:150
+ msgid "Go to the previous page"
+ msgstr "Aller à la page précédente"
+ 
+-#: src/gtk/MainView.cxx:151
++#: src/gtk/MainView.cxx:153
+ msgid "_Last Page"
+ msgstr "_Dernière page"
+ 
+-#: src/gtk/MainView.cxx:152
++#: src/gtk/MainView.cxx:154
+ msgid "Go to the last page"
+ msgstr "Aller à la dernière page"
+ 
+-#: src/gtk/MainView.cxx:155
++#: src/gtk/MainView.cxx:157
+ msgid "_About"
+ msgstr "_A propos"
+ 
+-#: src/gtk/MainView.cxx:156
++#: src/gtk/MainView.cxx:158
+ msgid "Display application's credits"
+ msgstr "Afficher les informations sur l'application"
+ 
+-#: src/gtk/MainView.cxx:166
++#: src/gtk/MainView.cxx:175
+ msgid "F_ull screen"
+ msgstr ""
+ 
+-#: src/gtk/MainView.cxx:167
++#: src/gtk/MainView.cxx:176
+ msgid "Toggle full screen window"
+ msgstr ""
+ 
+-#: src/gtk/MainView.cxx:170
++#: src/gtk/MainView.cxx:179
+ msgid "Show _Toolbar"
+ msgstr "Afficher la barre d'_outils"
+ 
+-#: src/gtk/MainView.cxx:171
++#: src/gtk/MainView.cxx:180
+ msgid "Show or hide the toolbar"
+ msgstr "Afficher/Cacher la barre d'outils"
+ 
+-#: src/gtk/MainView.cxx:174
++#: src/gtk/MainView.cxx:183
+ msgid "Show _Statusbar"
+ msgstr "Afficher la _barre d'état"
+ 
+-#: src/gtk/MainView.cxx:175
++#: src/gtk/MainView.cxx:184
+ msgid "Show or hide the statusbar"
+ msgstr "Afficher/Cacher la barre d'état"
+ 
+-#: src/gtk/MainView.cxx:178
++#: src/gtk/MainView.cxx:187
+ msgid "Show I_ndex"
+ msgstr "Afficher l'_index"
+ 
+-#: src/gtk/MainView.cxx:179
++#: src/gtk/MainView.cxx:188
+ msgid "Show or hide the document's outline"
+ msgstr "Afficher/Cacher l'index du document"
+ 
+-#: src/gtk/MainView.cxx:182
++#: src/gtk/MainView.cxx:191
+ msgid "Zoom to _Fit"
+ msgstr "Ajuster le document _dans la fenêtre"
+ 
+-#: src/gtk/MainView.cxx:183
++#: src/gtk/MainView.cxx:192
+ msgid "Make the current document fill the window"
+ msgstr "Ajuster le document dans la fenêtre"
+ 
+-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
+ msgid "Zoom to _Width"
+ msgstr "Ajuster à la largeur de la _fenêtre"
+ 
+-#: src/gtk/MainView.cxx:187
++#: src/gtk/MainView.cxx:196
+ msgid "Make the current document fill the window width"
+ msgstr "Ajuster à la largeur de la fenêtre"
+ 
+-#: src/gtk/MainView.cxx:278
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
+ msgid "Open PDF File"
+ msgstr "Ouvrir un fichier PDF"
+ 
+-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
+ msgid "Portable Document Format (PDF) Files"
+ msgstr "Fichiers Portable Document Format (PDF)"
+ 
+-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
+ msgid "All Files"
+ msgstr "Tous les fichiers"
+ 
+-#: src/gtk/MainView.cxx:362
++#: src/gtk/MainView.cxx:404
+ msgid "Password"
+ msgstr "Mot de passe"
+ 
+-#: src/gtk/MainView.cxx:386
++#: src/gtk/MainView.cxx:428
+ msgid "Save PDF File"
+-msgstr "Ouvrir un fichier PDF"
++msgstr "Enregistrer un fichier PDF"
+ 
+-#: src/gtk/MainView.cxx:816
++#: src/gtk/MainView.cxx:858
+ msgid "Page"
+ msgstr "Page"
+ 
+-#: src/gtk/MainView.cxx:826
++#: src/gtk/MainView.cxx:868
+ msgid "of 0"
+ msgstr "sur 0"
+ 
+-#: src/gtk/MainView.cxx:879
++#: src/gtk/MainView.cxx:921
+ msgid "Index"
+ msgstr "Index"
+ 
+-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
+ #, c-format
+ msgid "Error building UI manager: %s\n"
+ msgstr "Erreur à la création du gestionnaire d'UI: %s\n"
+ 
+-#: src/gtk/MainView.cxx:1056
++#: src/gtk/MainView.cxx:1108
+ msgid "A lightweight PDF viewer"
+ msgstr "Un visualisateur léger de PDF"
+ 
+-#: src/gtk/MainView.cxx:1059
++#: src/gtk/MainView.cxx:1111
+ msgid ""
+ "ePDFView is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+@@ -401,7 +425,7 @@
+ "Free Software Foundation; (version 2 ou bien toute autre version ultérieure\n"
+ "choisie par vous).\n"
+ 
+-#: src/gtk/MainView.cxx:1063
++#: src/gtk/MainView.cxx:1115
+ msgid ""
+ "ePDFView is distributes in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+@@ -414,7 +438,7 @@
+ "spécifique. Reportez-vous à la Licence Publique Générale GNU pour\n"
+ "plus de détails.\n"
+ 
+-#: src/gtk/MainView.cxx:1067
++#: src/gtk/MainView.cxx:1119
+ msgid ""
+ "You should have received a copy of the GNU General Public License\n"
+ "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
+@@ -425,11 +449,11 @@
+ "Free Software Foundation, Inc.\n"
+ "59 Temple Place, Suite 330, Boston, MA 02111-1307, États-Unis.\n"
+ 
+-#: src/gtk/MainView.cxx:1076
++#: src/gtk/MainView.cxx:1128
+ msgid "ePDFView"
+ msgstr "ePDFView"
+ 
+-#: src/gtk/MainView.cxx:1083
++#: src/gtk/MainView.cxx:1135
+ msgid "translator-credits"
+ msgstr "Mr_Moustache <mr.moustache@laposte.net>"
+ 
+diff -Nurd epdfview-0.1.6-svn/po/it.po epdfview/po/it.po
+--- epdfview-0.1.6-svn/po/it.po	1970-01-01 01:00:00.000000000 +0100
++++ epdfview/po/it.po	2008-07-13 12:55:55.073198000 +0200
+@@ -0,0 +1,592 @@
++msgid ""
++msgstr ""
++"Project-Id-Version: ePDFView 0.1.6\n"
++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
++"POT-Creation-Date: 2008-03-18 20:33+0100\n"
++"PO-Revision-Date: 2008-03-18 00:00+0100\n"
++"Last-Translator: Fabio Vergnani <monghitri@aruba.it>\n"
++"Language-Team: Italian\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: src/FindPter.cxx:187
++msgid "No Results Found!"
++msgstr "Nessuna corrispondenza trovata!"
++
++#: src/FindPter.cxx:195
++#, c-format
++msgid "Searching in page %d of %d..."
++msgstr "Ricerca in corso in pagina %d di %d..."
++
++#: src/IDocument.cxx:82
++msgid "No error."
++msgstr "Nessun errore."
++
++#: src/IDocument.cxx:85
++msgid "File not found."
++msgstr "File non trovato"
++
++#: src/IDocument.cxx:88
++msgid "Couldn't read the page catalog."
++msgstr "Non riesco a leggere il catalogo della pagina."
++
++#: src/IDocument.cxx:91
++msgid "The PDF file is damaged and can't be repaired."
++msgstr "Il file PDF è danneggiato e non può essere recuperato."
++
++#: src/IDocument.cxx:94
++msgid "The file is encrypted and the password was incorrect or not supplied."
++msgstr ""
++"Il file è criptato e la password è sbagliata oppure non è stata fornita"
++
++#: src/IDocument.cxx:97
++msgid "Nonexistent or invalid highlight file."
++msgstr "Il file highlight non esiste oppure non è valido"
++
++#: src/IDocument.cxx:100
++msgid "Invalid printer."
++msgstr "Stampante non valida."
++
++#: src/IDocument.cxx:103
++msgid "Error during printing."
++msgstr "Errore durante la stampa"
++
++#: src/IDocument.cxx:106
++msgid "The PDF file doesn't allow that operation."
++msgstr "Il file PDF non permette questa operazione."
++
++#: src/IDocument.cxx:109
++msgid "Invalid page number."
++msgstr "Numero di pagina non valido."
++
++#: src/IDocument.cxx:112
++msgid "File I/O error."
++msgstr "Errore di Input/Output nel file."
++
++#: src/IDocument.cxx:115
++#, c-format
++msgid "Unknown error (%d)."
++msgstr "Errore sconosciuto (%d)."
++
++#: src/main.cxx:59
++msgid "[FILE] - view PDF documents"
++msgstr "[FILE] - visualizza documenti PDF"
++
++#: src/main.cxx:72 src/MainPter.cxx:153
++msgid "PDF Viewer"
++msgstr "Visualizzatore PDF"
++
++#: src/MainPter.cxx:233
++#, c-format
++msgid "Reloading file %s..."
++msgstr "Ricaricamento file %s..."
++
++#: src/MainPter.cxx:237
++#, c-format
++msgid "Loading file %s..."
++msgstr "Caricamento file %s..."
++
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
++#, c-format
++msgid "of %d"
++msgstr "di %d"
++
++#: src/MainPter.cxx:588
++#, c-format
++msgid "Saving document to %s..."
++msgstr "Salvataggio documento in %s..."
++
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
++msgid "Error Loading File"
++msgstr "Errore nel caricamento del file"
++
++#: src/MainPter.cxx:872
++msgid "The password you have supplied is not a valid password for this file."
++msgstr "La password fornita non è corretta per questo file."
++
++#: src/MainPter.cxx:953
++msgid "Error Saving File"
++msgstr "Errore nel salvataggio del file"
++
++#: src/PagePter.cxx:338
++msgid "Loading..."
++msgstr "Caricamento in corso..."
++
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
++msgid "Grayscale"
++msgstr "Scala di grigi"
++
++#: src/PrintPter.cxx:409
++msgid "Idle"
++msgstr "In attesa"
++
++#: src/PrintPter.cxx:412
++msgid "Stopped"
++msgstr "Fermata"
++
++#: src/PrintPter.cxx:415
++msgid "Processing"
++msgstr "Stampa in corso"
++
++#: src/PrintPter.cxx:418
++msgid "Unknown"
++msgstr "Sconosciuto"
++
++#: src/PDFDocument.cxx:272
++#, c-format
++msgid ""
++"Failed to load document '%s'.\n"
++"%s\n"
++msgstr ""
++"Errore nel caricamento del documento '%s'.\n"
++"%s\n"
++
++#: src/gtk/FindView.cxx:51
++msgid "Find:"
++msgstr "Trova:"
++
++#: src/gtk/MainView.cxx:89
++msgid "_File"
++msgstr "_File"
++
++#: src/gtk/MainView.cxx:90
++msgid "_Edit"
++msgstr "_Modifica"
++
++#: src/gtk/MainView.cxx:91
++msgid "_View"
++msgstr "_Visualizza"
++
++#: src/gtk/MainView.cxx:92
++msgid "_Go"
++msgstr "V_ai"
++
++#: src/gtk/MainView.cxx:93
++msgid "_Help"
++msgstr "A_iuto"
++
++#: src/gtk/MainView.cxx:95
++msgid "_Open"
++msgstr "_Apri"
++
++#: src/gtk/MainView.cxx:96
++msgid "Open a PDF document"
++msgstr "Apre un documento PDF"
++
++#: src/gtk/MainView.cxx:99
++msgid "_Reload"
++msgstr "_Ricarica"
++
++#: src/gtk/MainView.cxx:100
++msgid "Reload the current document"
++msgstr "Ricarica il documento corrente"
++
++#: src/gtk/MainView.cxx:103
++msgid "_Save a Copy..."
++msgstr "_Salva una copia..."
++
++#: src/gtk/MainView.cxx:104
++msgid "Save a copy of the current document"
++msgstr "Salva una copia del documento corrente"
++
++#: src/gtk/MainView.cxx:108
++msgid "_Print..."
++msgstr "Stam_pa..."
++
++#: src/gtk/MainView.cxx:109
++msgid "Print the current document"
++msgstr "Stampa il documento corrente"
++
++#: src/gtk/MainView.cxx:113
++msgid "_Close"
++msgstr "_Chiudi"
++
++#: src/gtk/MainView.cxx:114
++msgid "Close this window"
++msgstr "Chiudi questa finestra"
++
++#: src/gtk/MainView.cxx:117
++msgid "_Find"
++msgstr "_Trova"
++
++#: src/gtk/MainView.cxx:118
++msgid "Find a word in the document"
++msgstr "Trova una parola nel documento"
++
++#: src/gtk/MainView.cxx:121
++msgid "Preferences..."
++msgstr "Preferenze..."
++
++#: src/gtk/MainView.cxx:122
++msgid "Change the application's preferences"
++msgstr "Cambia le preferenze dell'applicazione"
++
++#: src/gtk/MainView.cxx:125
++msgid "Zoom _In"
++msgstr "_Aumenta"
++
++#: src/gtk/MainView.cxx:126
++msgid "Enlarge the document"
++msgstr "Ingrandisci il documento"
++
++#: src/gtk/MainView.cxx:129
++msgid "Zoom _Out"
++msgstr "_Riduci"
++
++#: src/gtk/MainView.cxx:130
++msgid "Shrink the document"
++msgstr "Rimpicciolisci il documento"
++
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
++msgid "Rotate _Right"
++msgstr "Ruota a _destra"
++
++#: src/gtk/MainView.cxx:134
++msgid "Rotate the document 90 degrees clockwise"
++msgstr "Ruota il documento di 90 gradi in senso orario"
++
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
++msgid "Rotate _Left"
++msgstr "Ruota a _sinistra"
++
++#: src/gtk/MainView.cxx:138
++msgid "Rotate the document 90 degrees counter-clockwise"
++msgstr "Ruota il documento di 90 gradi in senso antiorario"
++
++#: src/gtk/MainView.cxx:141
++msgid "_First Page"
++msgstr "_Prima Pagina"
++
++#: src/gtk/MainView.cxx:142
++msgid "Go to the first page"
++msgstr "Va alla prima pagina"
++
++#: src/gtk/MainView.cxx:145
++msgid "_Next Page"
++msgstr "P_rossima Pagina"
++
++#: src/gtk/MainView.cxx:146
++msgid "Go to the next page"
++msgstr "Va alla prossima pagina"
++
++#: src/gtk/MainView.cxx:149
++msgid "_Previous Page"
++msgstr "P_agina Precedente"
++
++#: src/gtk/MainView.cxx:150
++msgid "Go to the previous page"
++msgstr "Va alla pagina precedente"
++
++#: src/gtk/MainView.cxx:153
++msgid "_Last Page"
++msgstr "_Ultima Pagina"
++
++#: src/gtk/MainView.cxx:154
++msgid "Go to the last page"
++msgstr "Va all'ultima pagina"
++
++#: src/gtk/MainView.cxx:157
++msgid "_About"
++msgstr "I_nformazioni"
++
++#: src/gtk/MainView.cxx:158
++msgid "Display application's credits"
++msgstr "Crediti"
++
++#: src/gtk/MainView.cxx:175
++msgid "F_ull screen"
++msgstr "S_chermo intero"
++
++#: src/gtk/MainView.cxx:176
++msgid "Toggle full screen window"
++msgstr "Visualizza a schermo intero"
++
++#: src/gtk/MainView.cxx:179
++msgid "Show _Toolbar"
++msgstr "Mostra _barra degli strumenti"
++
++#: src/gtk/MainView.cxx:180
++msgid "Show or hide the toolbar"
++msgstr "Mostra o nasconde la barra degli strumenti"
++
++#: src/gtk/MainView.cxx:183
++msgid "Show _Statusbar"
++msgstr "_Mostra barra di stato"
++
++#: src/gtk/MainView.cxx:184
++msgid "Show or hide the statusbar"
++msgstr "Mostra o nasconde la barra di stato"
++
++#: src/gtk/MainView.cxx:187
++msgid "Show I_ndex"
++msgstr "Mostra _indice"
++
++#: src/gtk/MainView.cxx:188
++msgid "Show or hide the document's outline"
++msgstr "Mostra o nasconde l'indice del documento"
++
++#: src/gtk/MainView.cxx:191
++msgid "Zoom to _Fit"
++msgstr "Zoom ada_tta"
++
++#: src/gtk/MainView.cxx:192
++msgid "Make the current document fill the window"
++msgstr "Adatta il documento alla grandezza della finestra"
++
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
++msgid "Zoom to _Width"
++msgstr "Zoom _larghezza"
++
++#: src/gtk/MainView.cxx:196
++msgid "Make the current document fill the window width"
++msgstr "Adatta il documento alla larghezza della finestra"
++
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr "Scorri"
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr "Mouse scorre la pagina"
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr "Seleziona testo"
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr "Mouse seleziona testo"
++
++#: src/gtk/MainView.cxx:320
++msgid "Open PDF File"
++msgstr "Apri file PDF"
++
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
++msgid "Portable Document Format (PDF) Files"
++msgstr "Portable Document Format (PDF) Files"
++
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
++msgid "All Files"
++msgstr "Tutti i file"
++
++#: src/gtk/MainView.cxx:404
++msgid "Password"
++msgstr "Password"
++
++#: src/gtk/MainView.cxx:428
++msgid "Save PDF File"
++msgstr "Salva file PDF"
++
++#: src/gtk/MainView.cxx:858
++msgid "Page"
++msgstr "Pagina"
++
++#: src/gtk/MainView.cxx:868
++msgid "of 0"
++msgstr "di 0"
++
++#: src/gtk/MainView.cxx:921
++msgid "Index"
++msgstr "Indice"
++
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
++#, c-format
++msgid "Error building UI manager: %s\n"
++msgstr "Errore nella costruzione del gestore UI: %s\n"
++
++#: src/gtk/MainView.cxx:1108
++msgid "A lightweight PDF viewer"
++msgstr "Un visualizzatore PDF semplice e leggero"
++
++#: src/gtk/MainView.cxx:1111
++msgid ""
++"ePDFView is free software; you can redistribute it and/or modify\n"
++"it under the terms of the GNU General Public License as published by\n"
++"the Free Software Foundation; either version 2 of the License, or\n"
++"(at your option) any later version.\n"
++msgstr ""
++"ePDFView è software libero; è possibile redistribuirlo e/o modificarlo\n"
++"entro i termini della licenza GNU General Public License come pubblicata\n"
++"dalla Free Software Foundation; versione 2 della Licenza, o\n"
++"(a propria scelta) ogni versione successiva.\n"
++
++#: src/gtk/MainView.cxx:1115
++msgid ""
++"ePDFView is distributes in the hope that it will be useful,\n"
++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
++"GNU General Public License for more details.\n"
++msgstr ""
++"ePDFView è distribuito nella speranza che possa essere utile,\n"
++"ma SENZA ALCUNA GARANZIA; senza neanche l'implicita garanzia di\n"
++"COMMERCIABILITÀ o IDONEITÀ AD UNO SCOPO PARTICOLARE. Consultare la\n"
++"GNU General Public License per maggiori dettagli.\n"
++
++#: src/gtk/MainView.cxx:1119
++msgid ""
++"You should have received a copy of the GNU General Public License\n"
++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++msgstr ""
++"Insieme a ePDFView dovreste aver ricevuto una copia della GNU\n"
++"General Public License; in caso contrario scrivete a: Free Software "
++"Foundation,Inc.,\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++
++#: src/gtk/MainView.cxx:1128
++msgid "ePDFView"
++msgstr "ePDFView"
++
++#: src/gtk/MainView.cxx:1135
++msgid "translator-credits"
++msgstr "Fabio Vergnani <monghitri@aruba.it>"
++
++#: src/gtk/PreferencesView.cxx:32
++msgid "Preferences"
++msgstr "Preferenze"
++
++#: src/gtk/PreferencesView.cxx:46
++msgid "External Commands"
++msgstr "Comandi Esterni"
++
++#: src/gtk/PreferencesView.cxx:105
++msgid "Web _Browser:"
++msgstr "_Navigatore Web"
++
++#: src/gtk/PreferencesView.cxx:118
++#, c-format
++msgid "Note: <i>%s</i> will be replaced by the URI."
++msgstr "Nota: <i>%s</i> sarà rimpiazzato dall'URI"
++
++#: src/gtk/PrintView.cxx:51
++msgid "Print"
++msgstr "Stampa"
++
++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659
++msgid "Printer"
++msgstr "Stampante"
++
++#: src/gtk/PrintView.cxx:74
++msgid "Job"
++msgstr "Lavoro"
++
++#: src/gtk/PrintView.cxx:79
++msgid "Paper"
++msgstr "Carta"
++
++#: src/gtk/PrintView.cxx:359
++msgid "<b>Print Range</b>"
++msgstr "<b>Intervallo di stampa</b>"
++
++#: src/gtk/PrintView.cxx:377
++msgid "_All pages"
++msgstr "_Tutte le pagine"
++
++#: src/gtk/PrintView.cxx:380
++msgid "_Range:"
++msgstr "_Intervallo:"
++
++#: src/gtk/PrintView.cxx:392
++msgid "<b>Page Set</b>"
++msgstr "<b>Gruppi di pagine</b>"
++
++#: src/gtk/PrintView.cxx:408
++msgid "A_ll pages"
++msgstr "T_utte le pagine"
++
++#: src/gtk/PrintView.cxx:412
++msgid "O_dd pages"
++msgstr "Pagine _dispari"
++
++#: src/gtk/PrintView.cxx:416
++msgid "_Even pages"
++msgstr "Pagine p_ari"
++
++#: src/gtk/PrintView.cxx:420
++msgid "<b>Copies</b>"
++msgstr "<b>Copie</b>"
++
++#: src/gtk/PrintView.cxx:437
++msgid "N_umber of copies:"
++msgstr "Nu_mero di copie:"
++
++#: src/gtk/PrintView.cxx:444
++msgid "C_ollate"
++msgstr "Ra_gruppa"
++
++#: src/gtk/PrintView.cxx:465
++msgid "<b>Paper and Layout</b>"
++msgstr "<b>Carta e disposizione</b>"
++
++#: src/gtk/PrintView.cxx:482
++msgid "Paper _Size:"
++msgstr "_Dimensione carta"
++
++#: src/gtk/PrintView.cxx:508
++msgid "Page _orientation:"
++msgstr "_Orientamento pagina"
++
++#: src/gtk/PrintView.cxx:539
++msgid "_Layout:"
++msgstr "D_isposizione_"
++
++#: src/gtk/PrintView.cxx:568
++msgid "<b>Output</b>"
++msgstr "<b>Uscita</b>"
++
++#: src/gtk/PrintView.cxx:585
++msgid "_Mode:"
++msgstr "_Metodo"
++
++#: src/gtk/PrintView.cxx:613
++msgid "_Resolution:"
++msgstr "_Risoluzione"
++
++#: src/gtk/PrintView.cxx:668
++msgid "State"
++msgstr "Stato"
++
++#: src/gtk/PrintView.cxx:677
++msgid "Jobs"
++msgstr "Lavori"
++
++#: src/gtk/PrintView.cxx:686
++msgid "Location"
++msgstr "Posizione"
++
++#: src/gtk/PrintView.cxx:717
++msgid "Plain"
++msgstr "Normale"
++
++#: src/gtk/PrintView.cxx:723
++msgid "2 pages in 1"
++msgstr "2 pagine in 1"
++
++#: src/gtk/PrintView.cxx:729
++msgid "4 pages in 1"
++msgstr "4 pagine in 1"
++
++#: src/gtk/PrintView.cxx:744
++msgid "Portrait"
++msgstr "Verticale"
++
++#: src/gtk/PrintView.cxx:750
++msgid "Landscape"
++msgstr "Orizzontale"
++
++#: src/gtk/StockIcons.cxx:40
++msgid "Find _Next"
++msgstr "Trova _Prossimo"
++
++#: src/gtk/StockIcons.cxx:41
++msgid "Find _Previous"
++msgstr "Trova P_recedente"
+diff -Nurd epdfview-0.1.6-svn/po/ja.po epdfview/po/ja.po
+--- epdfview-0.1.6-svn/po/ja.po	1970-01-01 01:00:00.000000000 +0100
++++ epdfview/po/ja.po	2008-07-13 12:55:55.083198000 +0200
+@@ -0,0 +1,597 @@
++# Japanese translations for ePDFView package
++# 
++# Copyright (C) 2006 Emma's Software
++# This file is distributed under the same license as the ePDFView package.
++#  <jordi@emma-soft.com>, 2006.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: ePDFView 0.1.6\n"
++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2006-04-12 21:17+0200\n"
++"Last-Translator:  Jonny <jonny@csc.jp>\n"
++"Language-Team: nyu <nyu_8804@yahoo.co.jp>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: src/FindPter.cxx:187
++msgid "No Results Found!"
++msgstr "見��り��ん���!"
++
++#: src/FindPter.cxx:195
++#, c-format
++msgid "Searching in page %d of %d..."
++msgstr "%d/%d を検索中..."
++
++#: src/IDocument.cxx:82
++msgid "No error."
++msgstr "エラー��り��ん。"
++
++#: src/IDocument.cxx:85
++msgid "File not found."
++msgstr "ファイル�見��り��ん���。"
++
++#: src/IDocument.cxx:88
++msgid "Couldn't read the page catalog."
++msgstr "ページカタログを読���ん���。"
++
++#: src/IDocument.cxx:91
++msgid "The PDF file is damaged and can't be repaired."
++msgstr "PDF ファイル�壊れ���修正����ん���。"
++
++#: src/IDocument.cxx:94
++msgid "The file is encrypted and the password was incorrect or not supplied."
++msgstr "ファイル�暗�化�れ������正��パスワード�入力�れ����ん。"
++
++#: src/IDocument.cxx:97
++msgid "Nonexistent or invalid highlight file."
++msgstr "�イライト�れ�ファイル�存在��������当��。"
++
++#: src/IDocument.cxx:100
++msgid "Invalid printer."
++msgstr "プリンタ���当��。"
++
++#: src/IDocument.cxx:103
++msgid "Error during printing."
++msgstr "�刷中�エラー�発生����。"
++
++#: src/IDocument.cxx:106
++msgid "The PDF file doesn't allow that operation."
++msgstr "PDF ファイル����作を許������ん。"
++
++#: src/IDocument.cxx:109
++msgid "Invalid page number."
++msgstr "ページ番����当��。"
++
++#: src/IDocument.cxx:112
++msgid "File I/O error."
++msgstr "ファイル I/O エラー。"
++
++#: src/IDocument.cxx:115
++#, c-format
++msgid "Unknown error (%d)."
++msgstr "�明�エラー (%d)."
++
++#: src/main.cxx:59
++msgid "[FILE] - view PDF documents"
++msgstr "[ファイル] - PDF ドキュメントを表示�る"
++
++#: src/main.cxx:72 src/MainPter.cxx:153
++msgid "PDF Viewer"
++msgstr "PDF ビューア"
++
++#: src/MainPter.cxx:233
++#, c-format
++msgid "Reloading file %s..."
++msgstr "ファイル %s を更新�����..."
++
++#: src/MainPter.cxx:237
++#, c-format
++msgid "Loading file %s..."
++msgstr "ファイル %s を読�込ん����..."
++
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
++#, c-format
++msgid "of %d"
++msgstr "/%d"
++
++#: src/MainPter.cxx:588
++#, c-format
++msgid "Saving document to %s..."
++msgstr "ドキュメントを %s ��存�����..."
++
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
++msgid "Error Loading File"
++msgstr "ファイル読�込�中�エラー発生"
++
++#: src/MainPter.cxx:872
++msgid "The password you have supplied is not a valid password for this file."
++msgstr "入力��パスワード���ファイル用�パスワード����よ���。"
++
++#: src/MainPter.cxx:953
++msgid "Error Saving File"
++msgstr "ファイル�存中�エラー発生"
++
++#: src/PagePter.cxx:338
++msgid "Loading..."
++msgstr "読�込�中..."
++
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr "A4"
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr "300 DPI"
++
++#: src/PrintPter.cxx:308
++msgid "Grayscale"
++msgstr "グレースケール"
++
++#: src/PrintPter.cxx:409
++msgid "Idle"
++msgstr "アイドリング"
++
++#: src/PrintPter.cxx:412
++msgid "Stopped"
++msgstr "中止"
++
++#: src/PrintPter.cxx:415
++msgid "Processing"
++msgstr "処�中"
++
++#: src/PrintPter.cxx:418
++msgid "Unknown"
++msgstr "�明"
++
++#: src/PDFDocument.cxx:272
++#, c-format
++msgid ""
++"Failed to load document '%s'.\n"
++"%s\n"
++msgstr ""
++"ドキュメント '%s' �読�込��失敗����。\n"
++"%s\n"
++
++#: src/gtk/FindView.cxx:51
++msgid "Find:"
++msgstr "検索:"
++
++#: src/gtk/MainView.cxx:89
++msgid "_File"
++msgstr "ファイル(_F)"
++
++#: src/gtk/MainView.cxx:90
++msgid "_Edit"
++msgstr "編集(_E)"
++
++#: src/gtk/MainView.cxx:91
++msgid "_View"
++msgstr "表示(_V)"
++
++#: src/gtk/MainView.cxx:92
++msgid "_Go"
++msgstr "移動(_G)"
++
++#: src/gtk/MainView.cxx:93
++msgid "_Help"
++msgstr "ヘルプ(_H)"
++
++#: src/gtk/MainView.cxx:95
++msgid "_Open"
++msgstr "開�(_O)"
++
++#: src/gtk/MainView.cxx:96
++msgid "Open a PDF document"
++msgstr "PDF ドキュメントを開�"
++
++#: src/gtk/MainView.cxx:99
++msgid "_Reload"
++msgstr "æ›´æ–°(_R)"
++
++#: src/gtk/MainView.cxx:100
++msgid "Reload the current document"
++msgstr "ドキュメントを更新�る"
++
++#: src/gtk/MainView.cxx:103
++msgid "_Save a Copy..."
++msgstr "別���存(_S)..."
++
++#: src/gtk/MainView.cxx:104
++msgid "Save a copy of the current document"
++msgstr "ドキュメント�コピーを�存�る"
++
++#: src/gtk/MainView.cxx:108
++msgid "_Print..."
++msgstr "�刷(_P)..."
++
++#: src/gtk/MainView.cxx:109
++msgid "Print the current document"
++msgstr "ドキュメントを�刷�る"
++
++#: src/gtk/MainView.cxx:113
++msgid "_Close"
++msgstr "閉�る(_C)"
++
++#: src/gtk/MainView.cxx:114
++msgid "Close this window"
++msgstr "ウィンドウを閉�る"
++
++#: src/gtk/MainView.cxx:117
++msgid "_Find"
++msgstr "検索(_F)"
++
++#: src/gtk/MainView.cxx:118
++msgid "Find a word in the document"
++msgstr "ドキュメント中��語を検索�る"
++
++#: src/gtk/MainView.cxx:121
++msgid "Preferences..."
++msgstr "設定..."
++
++#: src/gtk/MainView.cxx:122
++msgid "Change the application's preferences"
++msgstr "アプリケーション�設定を変更�る"
++
++#: src/gtk/MainView.cxx:125
++msgid "Zoom _In"
++msgstr "拡大(_I)"
++
++#: src/gtk/MainView.cxx:126
++msgid "Enlarge the document"
++msgstr "ドキュメント�表示を拡大�る"
++
++#: src/gtk/MainView.cxx:129
++msgid "Zoom _Out"
++msgstr "縮�(_O)"
++
++#: src/gtk/MainView.cxx:130
++msgid "Shrink the document"
++msgstr "ドキュメント�表示を縮��る"
++
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
++msgid "Rotate _Right"
++msgstr "��回転(_R)"
++
++#: src/gtk/MainView.cxx:134
++msgid "Rotate the document 90 degrees clockwise"
++msgstr "ドキュメント�表示を時計回り� 90°回転�る"
++
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
++msgid "Rotate _Left"
++msgstr "左�回転(_L)"
++
++#: src/gtk/MainView.cxx:138
++msgid "Rotate the document 90 degrees counter-clockwise"
++msgstr "ドキュメント�表示を�時計回り� 90°回転�る"
++
++#: src/gtk/MainView.cxx:141
++msgid "_First Page"
++msgstr "最��ページ(_F)"
++
++#: src/gtk/MainView.cxx:142
++msgid "Go to the first page"
++msgstr "最��ページ�移動"
++
++#: src/gtk/MainView.cxx:145
++msgid "_Next Page"
++msgstr "次�ページ(_N)"
++
++#: src/gtk/MainView.cxx:146
++msgid "Go to the next page"
++msgstr "次�ページ�移動"
++
++#: src/gtk/MainView.cxx:149
++msgid "_Previous Page"
++msgstr "��ページ(_P)"
++
++#: src/gtk/MainView.cxx:150
++msgid "Go to the previous page"
++msgstr "��ページ�移動"
++
++#: src/gtk/MainView.cxx:153
++msgid "_Last Page"
++msgstr "最後�ページ(_L)"
++
++#: src/gtk/MainView.cxx:154
++msgid "Go to the last page"
++msgstr "最後�ページ�移動"
++
++#: src/gtk/MainView.cxx:157
++msgid "_About"
++msgstr "情報(_A)"
++
++#: src/gtk/MainView.cxx:158
++msgid "Display application's credits"
++msgstr "アプリケーション�クレジットを表示�る"
++
++#: src/gtk/MainView.cxx:175
++msgid "F_ull screen"
++msgstr "全画�表示(_U)"
++
++#: src/gtk/MainView.cxx:176
++msgid "Toggle full screen window"
++msgstr "全画�表示を切り替�る"
++
++#: src/gtk/MainView.cxx:179
++msgid "Show _Toolbar"
++msgstr "ツール�ーを表示(_T)"
++
++#: src/gtk/MainView.cxx:180
++msgid "Show or hide the toolbar"
++msgstr "ツール�ー�表示を切り替�る"
++
++#: src/gtk/MainView.cxx:183
++msgid "Show _Statusbar"
++msgstr "ステータス�ーを表示(_S)"
++
++#: src/gtk/MainView.cxx:184
++msgid "Show or hide the statusbar"
++msgstr "ステータス�ー�表示を切り替�る"
++
++#: src/gtk/MainView.cxx:187
++msgid "Show I_ndex"
++msgstr "インデックスを表示(_N)"
++
++#: src/gtk/MainView.cxx:188
++msgid "Show or hide the document's outline"
++msgstr "ドキュメントアウトライン�表示を切り替�る"
++
++#: src/gtk/MainView.cxx:191
++msgid "Zoom to _Fit"
++msgstr "フィット(_F)"
++
++#: src/gtk/MainView.cxx:192
++msgid "Make the current document fill the window"
++msgstr "ドキュメント�表示をウィンドウ全体����る"
++
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
++msgid "Zoom to _Width"
++msgstr "幅����る(_W)"
++
++#: src/gtk/MainView.cxx:196
++msgid "Make the current document fill the window width"
++msgstr "ドキュメント�表示をウィンドウ幅����る"
++
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr "スクロール"
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr "マウス�ページをスクロール"
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr "文字列�択"
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr " マウス�文字列を�択"
++
++#: src/gtk/MainView.cxx:320
++msgid "Open PDF File"
++msgstr "PDF ファイルを開�"
++
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
++msgid "Portable Document Format (PDF) Files"
++msgstr "�ータブルドキュメントフォーマット（PDF) ファイル"
++
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
++msgid "All Files"
++msgstr "����ファイル"
++
++#: src/gtk/MainView.cxx:404
++msgid "Password"
++msgstr "パスワード"
++
++#: src/gtk/MainView.cxx:428
++msgid "Save PDF File"
++msgstr "PDF ファイルを�存"
++
++#: src/gtk/MainView.cxx:858
++msgid "Page"
++msgstr "ページ"
++
++#: src/gtk/MainView.cxx:868
++msgid "of 0"
++msgstr "/0"
++
++#: src/gtk/MainView.cxx:921
++msgid "Index"
++msgstr "インデックス"
++
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
++#, c-format
++msgid "Error building UI manager: %s\n"
++msgstr "UI 生�マ�ージャ�エラー: %s\n"
++
++#: src/gtk/MainView.cxx:1108
++msgid "A lightweight PDF viewer"
++msgstr "軽� PDF ビューア"
++
++#: src/gtk/MainView.cxx:1111
++msgid ""
++"ePDFView is free software; you can redistribute it and/or modify\n"
++"it under the terms of the GNU General Public License as published by\n"
++"the Free Software Foundation; either version 2 of the License, or\n"
++"(at your option) any later version.\n"
++msgstr ""
++"ePDFView �フリーソフトウェア��。�����れを�Free Software Foundation\n"
++"�よ��発行�れ� GNU 一般公衆利用許諾契約書 (�ージョン 2 ��希望\n"
++"�よ����れ以���ージョン����れ�) �定�る�件�下��頒布\n"
++"���改変�る�������。\n"
++
++#: src/gtk/MainView.cxx:1115
++msgid ""
++"ePDFView is distributes in the hope that it will be useful,\n"
++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
++"GNU General Public License for more details.\n"
++msgstr ""
++"ePDFView �有用��る��を願��頒布�れ����全��無�証\n"
++"��。商業�能性��証や特定�目的����性��言外�示�れ�\n"
++"も�も��全�存在���ん。詳��� GNU 一般公衆利用許諾契約書\n"
++"を�覧����。\n"
++
++#: src/gtk/MainView.cxx:1119
++msgid ""
++"You should have received a copy of the GNU General Public License\n"
++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++msgstr ""
++"���� ePDFView �共��GNU 一般公衆利用許諾契約書�複製物を一部����"
++"�\n"
++"����。も���������れ��the Free Software Foundation,Inc., 59\n"
++"Temple Place, Suite 330, Boston, MA  02111-1307 USA ��請求������。\n"
++
++#: src/gtk/MainView.cxx:1128
++msgid "ePDFView"
++msgstr "ePDFView"
++
++#: src/gtk/MainView.cxx:1135
++msgid "translator-credits"
++msgstr "nyu <nyu_8804 at yahoo dot co dot jp>"
++
++#: src/gtk/PreferencesView.cxx:32
++msgid "Preferences"
++msgstr "設定"
++
++#: src/gtk/PreferencesView.cxx:46
++msgid "External Commands"
++msgstr "外部コマンド"
++
++#: src/gtk/PreferencesView.cxx:105
++msgid "Web _Browser:"
++msgstr "ウェブブラウザ(_B)"
++
++#: src/gtk/PreferencesView.cxx:118
++#, c-format
++msgid "Note: <i>%s</i> will be replaced by the URI."
++msgstr "Note: <i>%s</i> � URI �置���られ��。"
++
++#: src/gtk/PrintView.cxx:51
++msgid "Print"
++msgstr "�刷"
++
++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659
++msgid "Printer"
++msgstr "プリンタ"
++
++#: src/gtk/PrintView.cxx:74
++msgid "Job"
++msgstr "ジョブ"
++
++#: src/gtk/PrintView.cxx:79
++msgid "Paper"
++msgstr "用紙"
++
++#: src/gtk/PrintView.cxx:359
++msgid "<b>Print Range</b>"
++msgstr "<b>�刷�る範囲</b>"
++
++#: src/gtk/PrintView.cxx:377
++msgid "_All pages"
++msgstr "全ページ(_A)"
++
++#: src/gtk/PrintView.cxx:380
++msgid "_Range:"
++msgstr "範囲(_R):"
++
++#: src/gtk/PrintView.cxx:392
++msgid "<b>Page Set</b>"
++msgstr "<b>ページセット</b>"
++
++#: src/gtk/PrintView.cxx:408
++msgid "A_ll pages"
++msgstr "全ページ(_L)"
++
++#: src/gtk/PrintView.cxx:412
++msgid "O_dd pages"
++msgstr "奇数ページ(_D)"
++
++#: src/gtk/PrintView.cxx:416
++msgid "_Even pages"
++msgstr "�数ページ(_E)"
++
++#: src/gtk/PrintView.cxx:420
++msgid "<b>Copies</b>"
++msgstr "<b>コピー</b>"
++
++#: src/gtk/PrintView.cxx:437
++msgid "N_umber of copies:"
++msgstr "コピー�数(_U):"
++
++#: src/gtk/PrintView.cxx:444
++msgid "C_ollate"
++msgstr "ページを��る(_O)"
++
++#: src/gtk/PrintView.cxx:465
++msgid "<b>Paper and Layout</b>"
++msgstr "<b>用紙�レイアウト</b>"
++
++#: src/gtk/PrintView.cxx:482
++msgid "Paper _Size:"
++msgstr "用紙サイズ(_S):"
++
++#: src/gtk/PrintView.cxx:508
++msgid "Page _orientation:"
++msgstr "用紙���(_O):"
++
++#: src/gtk/PrintView.cxx:539
++msgid "_Layout:"
++msgstr "レイアウト(_L):"
++
++#: src/gtk/PrintView.cxx:568
++msgid "<b>Output</b>"
++msgstr "<b>出力</b>"
++
++#: src/gtk/PrintView.cxx:585
++msgid "_Mode:"
++msgstr "モード(_M):"
++
++#: src/gtk/PrintView.cxx:613
++msgid "_Resolution:"
++msgstr "解�度(_R):"
++
++#: src/gtk/PrintView.cxx:668
++msgid "State"
++msgstr "状態"
++
++#: src/gtk/PrintView.cxx:677
++msgid "Jobs"
++msgstr "ジョブ"
++
++#: src/gtk/PrintView.cxx:686
++msgid "Location"
++msgstr "場所"
++
++#: src/gtk/PrintView.cxx:717
++msgid "Plain"
++msgstr "通常"
++
++#: src/gtk/PrintView.cxx:723
++msgid "2 pages in 1"
++msgstr "1 画�� 2 ページ"
++
++#: src/gtk/PrintView.cxx:729
++msgid "4 pages in 1"
++msgstr "1 画�� 4 ページ"
++
++#: src/gtk/PrintView.cxx:744
++msgid "Portrait"
++msgstr "縦置�"
++
++#: src/gtk/PrintView.cxx:750
++msgid "Landscape"
++msgstr "横置�"
++
++#: src/gtk/StockIcons.cxx:40
++msgid "Find _Next"
++msgstr "次を検索(_N)"
++
++#: src/gtk/StockIcons.cxx:41
++msgid "Find _Previous"
++msgstr "�を検索(_P)"
+diff -Nurd epdfview-0.1.6-svn/po/LINGUAS epdfview/po/LINGUAS
+--- epdfview-0.1.6-svn/po/LINGUAS	2008-07-13 12:57:47.543198000 +0200
++++ epdfview/po/LINGUAS	2008-07-13 12:55:55.073198000 +0200
+@@ -1,2 +1,2 @@
+ # Set of available languages.
+-ca de el es fr pl ru vi zh_TW
++ca cs de el es fr ja it pl pt_BR pt_PT ru sv vi zh_CN zh_TW
+diff -Nurd epdfview-0.1.6-svn/po/pl.po epdfview/po/pl.po
+--- epdfview-0.1.6-svn/po/pl.po	2008-07-13 12:57:47.523198000 +0200
++++ epdfview/po/pl.po	2008-07-13 12:55:55.073198000 +0200
+@@ -1,19 +1,22 @@
++# translation of pl.po to
+ # epdfview Polish translation
+ # Copyright (C) 2006 Emma's Software
+ # This file is distributed under the same license as the epdfview package.
+ # Wojciech Myrda <vojcek@tlen.pl>, 2006.
++# Piotr Pacholak <obi.gts@o2.pl>, 2007.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: ePDFView 0.1.5\n"
++"Project-Id-Version: pl\n"
+ "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
+-"PO-Revision-Date: 2006-05-13 00:40+0100\n"
+-"Last-Translator: Wojciech Myrda <vojcek@tlen.pl>\n"
+-"Language-Team: Polish <none@none.org>\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2007-06-25 16:05+0200\n"
++"Last-Translator: Piotr Pacholak <obi.gts@gmail.com>\n"
++"Language-Team:  <pl@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.4\n"
+ 
+ #: src/FindPter.cxx:187
+ msgid "No Results Found!"
+@@ -38,7 +41,7 @@
+ 
+ #: src/IDocument.cxx:91
+ msgid "The PDF file is damaged and can't be repaired."
+-msgstr "Plik PDF jest uszkodzony i niemoże zostać naprawiony.."
++msgstr "Plik PDF jest uszkodzony i nie może zostać naprawiony.."
+ 
+ #: src/IDocument.cxx:94
+ msgid "The file is encrypted and the password was incorrect or not supplied."
+@@ -47,7 +50,7 @@
+ 
+ #: src/IDocument.cxx:97
+ msgid "Nonexistent or invalid highlight file."
+-msgstr "Zaznaczony plik niestnieje lub jest nieprawidłowy."
++msgstr "Zaznaczony plik nie istnieje lub jest nieprawidłowy."
+ 
+ #: src/IDocument.cxx:100
+ msgid "Invalid printer."
+@@ -74,11 +77,11 @@
+ msgid "Unknown error (%d)."
+ msgstr "Nieznany błąd (%d)."
+ 
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+ msgstr "[PLIK] - przeglÄ…dnij pliki PDF"
+ 
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+ msgstr "PrzeglÄ…darka PDF"
+ 
+@@ -92,7 +95,7 @@
+ msgid "Loading file %s..."
+ msgstr "Wczytywanie pliku %s..."
+ 
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
+ #, c-format
+ msgid "of %d"
+ msgstr "z %d"
+@@ -102,39 +105,47 @@
+ msgid "Saving document to %s..."
+ msgstr "Zapisywanie dokumentu do %s..."
+ 
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+ msgstr "BÅ‚Ä…d w wczytywaniu pliku"
+ 
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+ msgstr "Podane przez ciebie hasło do tego pliku jest nieprawidłowe."
+ 
+-#: src/MainPter.cxx:947
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+ msgstr "BÅ‚Ä…d w zapisywaniu pliku"
+ 
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+ msgstr "Wczytywanie..."
+ 
+-#: src/PrintPter.cxx:295
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
+ msgid "Grayscale"
+ msgstr "Skala szarości"
+ 
+-#: src/PrintPter.cxx:395
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+ msgstr "Bezczynny"
+ 
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+ msgstr "Zatrzymany"
+ 
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+ msgstr "Przetwarzanie"
+ 
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+ msgstr "Nieznany"
+ 
+@@ -144,251 +155,267 @@
+ "Failed to load document '%s'.\n"
+ "%s\n"
+ msgstr ""
+-"Niemożna wczytać dokumentu '%s'.\n"
++"Nie można wczytać dokumentu '%s'.\n"
+ "%s\n"
+ 
+ #: src/gtk/FindView.cxx:51
+ msgid "Find:"
+ msgstr "Znajdź:"
+ 
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+ msgstr "_Plik"
+ 
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+ msgstr "_Edytuj"
+ 
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+ msgstr "_Widok"
+ 
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+-msgstr "_Przejdź"
++msgstr "P_rzejdź"
+ 
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+-msgstr "_Pomoc"
++msgstr "Pomo_c"
+ 
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+ msgstr "_Otwórz"
+ 
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+ msgstr "Otwórz dokument PDF"
+ 
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+ msgstr "_Przeładuj"
+ 
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+ msgstr "Przeładuj obecny dokument"
+ 
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+ msgstr "_Zapisz KopiÄ™..."
+ 
+-#: src/gtk/MainView.cxx:102
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+ msgstr "Zapisz kopiÄ™ obecnego dokumentu"
+ 
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+ msgstr "_Drukuj..."
+ 
+-#: src/gtk/MainView.cxx:107
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+ msgstr "Wydrukuj obecny dokument"
+ 
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+-msgstr "_Zamknij"
++msgstr "Za_mknij"
+ 
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+ msgstr "Zamknij to okno"
+ 
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+ msgstr "_Znajdź"
+ 
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+ msgstr "Znajdź słowo w tym dokumencie"
+ 
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+ msgstr "Ustawienia"
+ 
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+ msgstr "Zmień ustawienia aplikacji"
+ 
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+-msgstr "_Zbliż"
++msgstr "Po_większ"
+ 
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+ msgstr "Powiększ dokument"
+ 
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+-msgstr "_Oddal"
++msgstr "Po_mniejsz"
+ 
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+ msgstr "Zmniejsz dokument"
+ 
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+-msgstr "Obruć w _prawo"
++msgstr "Obróć w _prawo"
+ 
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+-msgstr "Obruć dokument o 90 stopni zgodnie z wskazówkami zegara"
++msgstr "Obróć dokument o 90 stopni zgodnie z wskazówkami zegara"
+ 
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+-msgstr "Obruć w _lewo"
++msgstr "Obróć w _lewo"
+ 
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+-msgstr "Obruć dokument o 90 stopni przeciwnie do wskazówek zegara"
++msgstr "Obróć dokument o 90 stopni przeciwnie do wskazówek zegara"
+ 
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+-msgstr "_Pierwsza Strona"
++msgstr "Pie_rwsza Strona"
+ 
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+ msgstr "Przejdź do strony pierwszej"
+ 
+-#: src/gtk/MainView.cxx:143
++#: src/gtk/MainView.cxx:145
+ msgid "_Next Page"
+ msgstr "_Następna Strona"
+ 
+-#: src/gtk/MainView.cxx:144
++#: src/gtk/MainView.cxx:146
+ msgid "Go to the next page"
+ msgstr "Przejdź do strony następnej"
+ 
+-#: src/gtk/MainView.cxx:147
++#: src/gtk/MainView.cxx:149
+ msgid "_Previous Page"
+ msgstr "_Poprzednia Strona"
+ 
+-#: src/gtk/MainView.cxx:148
++#: src/gtk/MainView.cxx:150
+ msgid "Go to the previous page"
+ msgstr "Przejdź do strony poprzedniej"
+ 
+-#: src/gtk/MainView.cxx:151
++#: src/gtk/MainView.cxx:153
+ msgid "_Last Page"
+ msgstr "_Ostatnia Strona"
+ 
+-#: src/gtk/MainView.cxx:152
++#: src/gtk/MainView.cxx:154
+ msgid "Go to the last page"
+ msgstr "Przejdź do strony ostatniej"
+ 
+-#: src/gtk/MainView.cxx:155
++#: src/gtk/MainView.cxx:157
+ msgid "_About"
+ msgstr "_O programie"
+ 
+-#: src/gtk/MainView.cxx:156
++#: src/gtk/MainView.cxx:158
+ msgid "Display application's credits"
+ msgstr "Pokaż informację o programie"
+ 
+-#: src/gtk/MainView.cxx:166
++#: src/gtk/MainView.cxx:175
+ msgid "F_ull screen"
+-msgstr "_Pełny ekran"
++msgstr "Pełny _ekran"
+ 
+-#: src/gtk/MainView.cxx:167
++#: src/gtk/MainView.cxx:176
+ msgid "Toggle full screen window"
+ msgstr "Pełny ekran"
+ 
+-#: src/gtk/MainView.cxx:170
++#: src/gtk/MainView.cxx:179
+ msgid "Show _Toolbar"
+ msgstr "Pokaż pasek _narzędzi"
+ 
+-#: src/gtk/MainView.cxx:171
++#: src/gtk/MainView.cxx:180
+ msgid "Show or hide the toolbar"
+ msgstr "Pokaż lub ukryj pasek narzędzi"
+ 
+-#: src/gtk/MainView.cxx:174
++#: src/gtk/MainView.cxx:183
+ msgid "Show _Statusbar"
+-msgstr "Pokaż pasek stanu"
++msgstr "Pokaż pasek s_tanu"
+ 
+-#: src/gtk/MainView.cxx:175
++#: src/gtk/MainView.cxx:184
+ msgid "Show or hide the statusbar"
+ msgstr "Pokaż lub ukryj pasek stanu"
+ 
+-#: src/gtk/MainView.cxx:178
++#: src/gtk/MainView.cxx:187
+ msgid "Show I_ndex"
+ msgstr "Pokaż I_ndex"
+ 
+-#: src/gtk/MainView.cxx:179
++#: src/gtk/MainView.cxx:188
+ msgid "Show or hide the document's outline"
+ msgstr "Pokaż lub ukryj Index dokumentu"
+ 
+-#: src/gtk/MainView.cxx:182
++#: src/gtk/MainView.cxx:191
+ msgid "Zoom to _Fit"
+ msgstr "_Dopasuj do okna"
+ 
+-#: src/gtk/MainView.cxx:183
++#: src/gtk/MainView.cxx:192
+ msgid "Make the current document fill the window"
+ msgstr "Powiększa obecny dokument do rozmiaru okna"
+ 
+-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
+ msgid "Zoom to _Width"
+ msgstr "Dopasuj do _szerokości"
+ 
+-#: src/gtk/MainView.cxx:187
++#: src/gtk/MainView.cxx:196
+ msgid "Make the current document fill the window width"
+ msgstr "Powiększa obecny dokument do szerokości okna"
+ 
+-#: src/gtk/MainView.cxx:278
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
+ msgid "Open PDF File"
+ msgstr "Otwórz plik PDF"
+ 
+-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
+ msgid "Portable Document Format (PDF) Files"
+ msgstr "Pliki (PDF)"
+ 
+-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
+ msgid "All Files"
+ msgstr "Wszystkie Pliki"
+ 
+-#: src/gtk/MainView.cxx:362
++#: src/gtk/MainView.cxx:404
+ msgid "Password"
+ msgstr "Hasło"
+ 
+-#: src/gtk/MainView.cxx:386
++#: src/gtk/MainView.cxx:428
+ msgid "Save PDF File"
+ msgstr "Zapisz Plik PDF"
+ 
+-#: src/gtk/MainView.cxx:816
++#: src/gtk/MainView.cxx:858
+ msgid "Page"
+ msgstr "Strona"
+ 
+-#: src/gtk/MainView.cxx:826
++#: src/gtk/MainView.cxx:868
+ msgid "of 0"
+ msgstr "z 0"
+ 
+-#: src/gtk/MainView.cxx:879
++#: src/gtk/MainView.cxx:921
+ msgid "Index"
+ msgstr "Index"
+ 
+-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
+ #, c-format
+ msgid "Error building UI manager: %s\n"
+ msgstr "Błąd podczas wczytywania menadżera UI: %s\n"
+ 
+-#: src/gtk/MainView.cxx:1056
++#: src/gtk/MainView.cxx:1108
+ msgid "A lightweight PDF viewer"
+ msgstr "Lekka przeglądarka plików PDF"
+ 
+-#: src/gtk/MainView.cxx:1059
++#: src/gtk/MainView.cxx:1111
+ msgid ""
+ "ePDFView is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+@@ -400,7 +427,7 @@
+ "opublikowanymi poprzez Free Software Foundation; zarówno wesją drugą "
+ "Licencji,lub (wedle własnego uznania) wersjami późniejszymi.\n"
+ 
+-#: src/gtk/MainView.cxx:1063
++#: src/gtk/MainView.cxx:1115
+ msgid ""
+ "ePDFView is distributes in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+@@ -412,7 +439,7 @@
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.PrzeglÄ…dnij GNU General "
+ "Public License by dowiedzieć się więcej.\n"
+ 
+-#: src/gtk/MainView.cxx:1067
++#: src/gtk/MainView.cxx:1119
+ msgid ""
+ "You should have received a copy of the GNU General Public License\n"
+ "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
+@@ -424,11 +451,11 @@
+ "Boston, MA  02111-1307\n"
+ "USA\n"
+ 
+-#: src/gtk/MainView.cxx:1076
++#: src/gtk/MainView.cxx:1128
+ msgid "ePDFView"
+ msgstr "ePDFView"
+ 
+-#: src/gtk/MainView.cxx:1083
++#: src/gtk/MainView.cxx:1135
+ msgid "translator-credits"
+ msgstr ""
+ 
+@@ -451,7 +478,7 @@
+ 
+ #: src/gtk/PrintView.cxx:51
+ msgid "Print"
+-msgstr "Drukuj"
++msgstr "Wydrukuj"
+ 
+ #: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659
+ msgid "Printer"
+@@ -479,19 +506,19 @@
+ 
+ #: src/gtk/PrintView.cxx:392
+ msgid "<b>Page Set</b>"
+-msgstr "<b>Wybrane Strony</b>"
++msgstr "<b>Wybrane strony</b>"
+ 
+ #: src/gtk/PrintView.cxx:408
+ msgid "A_ll pages"
+-msgstr "_Wszystkie strony"
++msgstr "W_szystkie strony"
+ 
+ #: src/gtk/PrintView.cxx:412
+ msgid "O_dd pages"
+-msgstr "Strony _Nieparzyste"
++msgstr "Strony _nieparzyste"
+ 
+ #: src/gtk/PrintView.cxx:416
+ msgid "_Even pages"
+-msgstr "Strony parzyste"
++msgstr "Strony pa_rzyste"
+ 
+ #: src/gtk/PrintView.cxx:420
+ msgid "<b>Copies</b>"
+@@ -503,7 +530,7 @@
+ 
+ #: src/gtk/PrintView.cxx:444
+ msgid "C_ollate"
+-msgstr ""
++msgstr "_Posegregowane"
+ 
+ #: src/gtk/PrintView.cxx:465
+ msgid "<b>Paper and Layout</b>"
+diff -Nurd epdfview-0.1.6-svn/po/pt_BR.po epdfview/po/pt_BR.po
+--- epdfview-0.1.6-svn/po/pt_BR.po	1970-01-01 01:00:00.000000000 +0100
++++ epdfview/po/pt_BR.po	2008-07-13 12:55:55.043198000 +0200
+@@ -0,0 +1,597 @@
++# Spanish translations for ePDFView package
++# Traducciones al español para el paquete ePDFView.
++# Copyright (C) 2006 Emma's Software
++# This file is distributed under the same license as the ePDFView package.
++#  <jordi@emma-soft.com>, 2006.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: ePDFView 0.1.4\n"
++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2008-05-28 12:13-0300\n"
++"Last-Translator: \n"
++"Language-Team: Spanish <es@li.org>\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/FindPter.cxx:187
++msgid "No Results Found!"
++msgstr "Não foram encontrados resultados!"
++
++#: src/FindPter.cxx:195
++#, c-format
++msgid "Searching in page %d of %d..."
++msgstr "Localizando na página %d de %d..."
++
++#: src/IDocument.cxx:82
++msgid "No error."
++msgstr "Nenhum erro."
++
++#: src/IDocument.cxx:85
++msgid "File not found."
++msgstr "Arquivo não encontrado."
++
++#: src/IDocument.cxx:88
++msgid "Couldn't read the page catalog."
++msgstr "Catálogo de página não pode ser lido."
++
++#: src/IDocument.cxx:91
++msgid "The PDF file is damaged and can't be repaired."
++msgstr "O arquivo PDF está corrompido e não pode ser recuperado."
++
++#: src/IDocument.cxx:94
++msgid "The file is encrypted and the password was incorrect or not supplied."
++msgstr "O arquivo está encriptado e a senha incorreta"
++
++#: src/IDocument.cxx:97
++msgid "Nonexistent or invalid highlight file."
++msgstr "O arquivo não existe ou é inválido."
++
++#: src/IDocument.cxx:100
++msgid "Invalid printer."
++msgstr "Impressora inválida."
++
++#: src/IDocument.cxx:103
++msgid "Error during printing."
++msgstr "Erro durante a impressão."
++
++#: src/IDocument.cxx:106
++msgid "The PDF file doesn't allow that operation."
++msgstr "O arquivo PDF não permite esta operação."
++
++#: src/IDocument.cxx:109
++msgid "Invalid page number."
++msgstr "Número de página inválido."
++
++#: src/IDocument.cxx:112
++msgid "File I/O error."
++msgstr "Erro I/O do arquivo."
++
++#: src/IDocument.cxx:115
++#, c-format
++msgid "Unknown error (%d)."
++msgstr "Erro desconhecido (%d)."
++
++#: src/main.cxx:59
++msgid "[FILE] - view PDF documents"
++msgstr "[ARQUIVO] - mostra documentos PDF"
++
++#: src/main.cxx:72
++#: src/MainPter.cxx:153
++msgid "PDF Viewer"
++msgstr "Visualizador de PDF"
++
++#: src/MainPter.cxx:233
++#, c-format
++msgid "Reloading file %s..."
++msgstr "Recarregando arquivo %s..."
++
++#: src/MainPter.cxx:237
++#, c-format
++msgid "Loading file %s..."
++msgstr "Carregando arquivo %s..."
++
++#: src/MainPter.cxx:413
++#: src/MainPter.cxx:892
++#, c-format
++msgid "of %d"
++msgstr "de %d"
++
++#: src/MainPter.cxx:588
++#, c-format
++msgid "Saving document to %s..."
++msgstr "Salvando documento em %s..."
++
++#: src/MainPter.cxx:832
++#: src/MainPter.cxx:871
++msgid "Error Loading File"
++msgstr "Erro ao carregar"
++
++#: src/MainPter.cxx:872
++msgid "The password you have supplied is not a valid password for this file."
++msgstr "Senha incorreta para este arquivo."
++
++#: src/MainPter.cxx:953
++msgid "Error Saving File"
++msgstr "Erro ao Salvar Arquivo"
++
++#: src/PagePter.cxx:338
++msgid "Loading..."
++msgstr "Carregando..."
++
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr "A4"
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr "300 DPI"
++
++#: src/PrintPter.cxx:308
++msgid "Grayscale"
++msgstr "Escala de cinza"
++
++#: src/PrintPter.cxx:409
++msgid "Idle"
++msgstr "Escondido"
++
++#: src/PrintPter.cxx:412
++msgid "Stopped"
++msgstr "Parado"
++
++#: src/PrintPter.cxx:415
++msgid "Processing"
++msgstr "Processando"
++
++#: src/PrintPter.cxx:418
++msgid "Unknown"
++msgstr "Desconhecido"
++
++#: src/PDFDocument.cxx:272
++#, c-format
++msgid ""
++"Failed to load document '%s'.\n"
++"%s\n"
++msgstr ""
++"Falha ao abrir o documento '%s'.\n"
++"%s\n"
++
++#: src/gtk/FindView.cxx:51
++msgid "Find:"
++msgstr "Localizar:"
++
++#: src/gtk/MainView.cxx:89
++msgid "_File"
++msgstr "_Arquivo"
++
++#: src/gtk/MainView.cxx:90
++msgid "_Edit"
++msgstr "_Editar"
++
++#: src/gtk/MainView.cxx:91
++msgid "_View"
++msgstr "_Ver"
++
++#: src/gtk/MainView.cxx:92
++msgid "_Go"
++msgstr "_Ir"
++
++#: src/gtk/MainView.cxx:93
++msgid "_Help"
++msgstr "A_juda"
++
++#: src/gtk/MainView.cxx:95
++msgid "_Open"
++msgstr "_Abrir"
++
++#: src/gtk/MainView.cxx:96
++msgid "Open a PDF document"
++msgstr "Abrir documento PDF"
++
++#: src/gtk/MainView.cxx:99
++msgid "_Reload"
++msgstr "_Recarregar"
++
++#: src/gtk/MainView.cxx:100
++msgid "Reload the current document"
++msgstr "Recarregar arquivo PDF atual"
++
++#: src/gtk/MainView.cxx:103
++msgid "_Save a Copy..."
++msgstr "_Salvar cópia..."
++
++#: src/gtk/MainView.cxx:104
++msgid "Save a copy of the current document"
++msgstr "Salvar cópia do documento atual"
++
++#: src/gtk/MainView.cxx:108
++msgid "_Print..."
++msgstr "_Imprimir"
++
++#: src/gtk/MainView.cxx:109
++msgid "Print the current document"
++msgstr "Imprimir documento atual"
++
++#: src/gtk/MainView.cxx:113
++msgid "_Close"
++msgstr "_Fechar"
++
++#: src/gtk/MainView.cxx:114
++msgid "Close this window"
++msgstr "Fechar esta janela"
++
++#: src/gtk/MainView.cxx:117
++msgid "_Find"
++msgstr "Locali_zar"
++
++#: src/gtk/MainView.cxx:118
++msgid "Find a word in the document"
++msgstr "Localizar uma palavra no documento"
++
++#: src/gtk/MainView.cxx:121
++msgid "Preferences..."
++msgstr "Preferências..."
++
++#: src/gtk/MainView.cxx:122
++msgid "Change the application's preferences"
++msgstr "Alterar preferências do aplicativo"
++
++#: src/gtk/MainView.cxx:125
++msgid "Zoom _In"
++msgstr "Au_mentar"
++
++#: src/gtk/MainView.cxx:126
++msgid "Enlarge the document"
++msgstr "Aumentar o documento"
++
++#: src/gtk/MainView.cxx:129
++msgid "Zoom _Out"
++msgstr "Diminui_r"
++
++#: src/gtk/MainView.cxx:130
++msgid "Shrink the document"
++msgstr "Diminuir o documento"
++
++#: src/gtk/MainView.cxx:133
++#: src/gtk/StockIcons.cxx:43
++msgid "Rotate _Right"
++msgstr "Girar para a _direita"
++
++#: src/gtk/MainView.cxx:134
++msgid "Rotate the document 90 degrees clockwise"
++msgstr "Girar o documento 90 graus em sentido horário"
++
++#: src/gtk/MainView.cxx:137
++#: src/gtk/StockIcons.cxx:42
++msgid "Rotate _Left"
++msgstr "Girar para a _esquerda"
++
++#: src/gtk/MainView.cxx:138
++msgid "Rotate the document 90 degrees counter-clockwise"
++msgstr "Girar o documento 90 graus em sentido anti-horário"
++
++#: src/gtk/MainView.cxx:141
++msgid "_First Page"
++msgstr "_Primeira página"
++
++#: src/gtk/MainView.cxx:142
++msgid "Go to the first page"
++msgstr "Ir para a primeira página"
++
++#: src/gtk/MainView.cxx:145
++msgid "_Next Page"
++msgstr "_Próxima página"
++
++#: src/gtk/MainView.cxx:146
++msgid "Go to the next page"
++msgstr "Ir para a próxima página"
++
++#: src/gtk/MainView.cxx:149
++msgid "_Previous Page"
++msgstr "Página _anterior"
++
++#: src/gtk/MainView.cxx:150
++msgid "Go to the previous page"
++msgstr "Ir para a página anterior"
++
++#: src/gtk/MainView.cxx:153
++msgid "_Last Page"
++msgstr "Ú_ltima página"
++
++#: src/gtk/MainView.cxx:154
++msgid "Go to the last page"
++msgstr "Ir para a última página"
++
++#: src/gtk/MainView.cxx:157
++msgid "_About"
++msgstr "_Sobre"
++
++#: src/gtk/MainView.cxx:158
++msgid "Display application's credits"
++msgstr "Mostrar créditos do aplicativo"
++
++#: src/gtk/MainView.cxx:175
++msgid "F_ull screen"
++msgstr "T_ela cheia"
++
++#: src/gtk/MainView.cxx:176
++msgid "Toggle full screen window"
++msgstr "Mudar para janela cheia"
++
++#: src/gtk/MainView.cxx:179
++msgid "Show _Toolbar"
++msgstr "Mostrar barras de _ferramentas"
++
++#: src/gtk/MainView.cxx:180
++msgid "Show or hide the toolbar"
++msgstr "Mostrar ou esconder a barra de ferramentas"
++
++#: src/gtk/MainView.cxx:183
++msgid "Show _Statusbar"
++msgstr "Mostrar barra de _status"
++
++#: src/gtk/MainView.cxx:184
++msgid "Show or hide the statusbar"
++msgstr "Mostrar ou esconder a barra de status"
++
++#: src/gtk/MainView.cxx:187
++msgid "Show I_ndex"
++msgstr "Mostrar í_ndice"
++
++#: src/gtk/MainView.cxx:188
++msgid "Show or hide the document's outline"
++msgstr "Mostrar ou esconder o índice do documento"
++
++#: src/gtk/MainView.cxx:191
++msgid "Zoom to _Fit"
++msgstr "Aj_ustar à janela"
++
++#: src/gtk/MainView.cxx:192
++msgid "Make the current document fill the window"
++msgstr "Ajustar documento à janela"
++
++#: src/gtk/MainView.cxx:195
++#: src/gtk/StockIcons.cxx:44
++msgid "Zoom to _Width"
++msgstr "Ajustar à _largura da página"
++
++#: src/gtk/MainView.cxx:196
++msgid "Make the current document fill the window width"
++msgstr "Ajustar documento à largura da página"
++
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr "Rolar"
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr "Mouse rolar página"
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr "Selecionar Texto"
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr " Mouse selecionar texto"
++
++#: src/gtk/MainView.cxx:320
++msgid "Open PDF File"
++msgstr "Abrir arquivo PDF"
++
++#: src/gtk/MainView.cxx:340
++#: src/gtk/MainView.cxx:454
++msgid "Portable Document Format (PDF) Files"
++msgstr "Arquivos em Portable Document Format (PDF)"
++
++#: src/gtk/MainView.cxx:352
++#: src/gtk/MainView.cxx:466
++msgid "All Files"
++msgstr "Todos os arquivos"
++
++#: src/gtk/MainView.cxx:404
++msgid "Password"
++msgstr "Senha"
++
++#: src/gtk/MainView.cxx:428
++msgid "Save PDF File"
++msgstr "Salvar arquivo PDF"
++
++#: src/gtk/MainView.cxx:858
++msgid "Page"
++msgstr "Página"
++
++#: src/gtk/MainView.cxx:868
++msgid "of 0"
++msgstr "de 0"
++
++#: src/gtk/MainView.cxx:921
++msgid "Index"
++msgstr "�ndice"
++
++#: src/gtk/MainView.cxx:991
++#: src/gtk/MainView.cxx:1001
++#, c-format
++msgid "Error building UI manager: %s\n"
++msgstr "Erro ao construir o administrador de IU: %s\n"
++
++#: src/gtk/MainView.cxx:1108
++msgid "A lightweight PDF viewer"
++msgstr "Visualizador leve de PDF"
++
++#: src/gtk/MainView.cxx:1111
++msgid ""
++"ePDFView is free software; you can redistribute it and/or modify\n"
++"it under the terms of the GNU General Public License as published by\n"
++"the Free Software Foundation; either version 2 of the License, or\n"
++"(at your option) any later version.\n"
++msgstr "O ePDFView é um software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos da Licença Pública Geral GNU (GPL) como publicada pela Fundação do Software Livre; seja a versão 2 da Licença ou (se preferir) qualquer versão mais recente.\n"
++
++#: src/gtk/MainView.cxx:1115
++msgid ""
++"ePDFView is distributes in the hope that it will be useful,\n"
++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
++"GNU General Public License for more details.\n"
++msgstr "O ePDFView é distribuído na esperança de que seja útil, mas SEM NENHUMA GARANTIA; até mesmo sem a garantia implicada de COMERCIALIZAÇÃO ou de ADAPTAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a Licença Pública Geral GNU (GPL) para mais detalhes.\n"
++
++#: src/gtk/MainView.cxx:1119
++msgid ""
++"You should have received a copy of the GNU General Public License\n"
++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++msgstr "Você deve ter recebido uma cópia da Licença Pública Geral GNU (GPL) junto com o ePDFView; se não, escreva para a Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++
++#: src/gtk/MainView.cxx:1128
++msgid "ePDFView"
++msgstr "ePDFView"
++
++#: src/gtk/MainView.cxx:1135
++msgid "translator-credits"
++msgstr "Fábio Antunes"
++
++#: src/gtk/PreferencesView.cxx:32
++msgid "Preferences"
++msgstr "Preferências"
++
++#: src/gtk/PreferencesView.cxx:46
++msgid "External Commands"
++msgstr "Comandos Externos"
++
++#: src/gtk/PreferencesView.cxx:105
++msgid "Web _Browser:"
++msgstr "Navegador da _Web:"
++
++#: src/gtk/PreferencesView.cxx:118
++#, c-format
++msgid "Note: <i>%s</i> will be replaced by the URI."
++msgstr "Nota: O parámetro <i>%s</i> deve ser substituído pela URL."
++
++#: src/gtk/PrintView.cxx:51
++msgid "Print"
++msgstr "Imprimir"
++
++#: src/gtk/PrintView.cxx:69
++#: src/gtk/PrintView.cxx:659
++msgid "Printer"
++msgstr "Impressora"
++
++#: src/gtk/PrintView.cxx:74
++msgid "Job"
++msgstr "Trabalho"
++
++#: src/gtk/PrintView.cxx:79
++msgid "Paper"
++msgstr "Página"
++
++#: src/gtk/PrintView.cxx:359
++msgid "<b>Print Range</b>"
++msgstr "<b>Escala de impressão</b>"
++
++#: src/gtk/PrintView.cxx:377
++msgid "_All pages"
++msgstr "Tod_as as páginas"
++
++#: src/gtk/PrintView.cxx:380
++msgid "_Range:"
++msgstr "_Escala:"
++
++#: src/gtk/PrintView.cxx:392
++msgid "<b>Page Set</b>"
++msgstr "<b>Conjunto de páginas</b>"
++
++#: src/gtk/PrintView.cxx:408
++msgid "A_ll pages"
++msgstr "_Todas as páginas"
++
++#: src/gtk/PrintView.cxx:412
++msgid "O_dd pages"
++msgstr "Páginas _ímpares"
++
++#: src/gtk/PrintView.cxx:416
++msgid "_Even pages"
++msgstr "Páginas pare_s"
++
++#: src/gtk/PrintView.cxx:420
++msgid "<b>Copies</b>"
++msgstr "<b>Cópias</b>"
++
++#: src/gtk/PrintView.cxx:437
++msgid "N_umber of copies:"
++msgstr "_Número de cópias:"
++
++#: src/gtk/PrintView.cxx:444
++msgid "C_ollate"
++msgstr "O_rganizar"
++
++#: src/gtk/PrintView.cxx:465
++msgid "<b>Paper and Layout</b>"
++msgstr "<b>Página e disposição</b>"
++
++#: src/gtk/PrintView.cxx:482
++msgid "Paper _Size:"
++msgstr "_Tamanho da página:"
++
++#: src/gtk/PrintView.cxx:508
++msgid "Page _orientation:"
++msgstr "_Orientação:"
++
++#: src/gtk/PrintView.cxx:539
++msgid "_Layout:"
++msgstr "_Disposição:"
++
++#: src/gtk/PrintView.cxx:568
++msgid "<b>Output</b>"
++msgstr "<b>Saída</b>"
++
++#: src/gtk/PrintView.cxx:585
++msgid "_Mode:"
++msgstr "_Modo:"
++
++#: src/gtk/PrintView.cxx:613
++msgid "_Resolution:"
++msgstr "_Resolução:"
++
++#: src/gtk/PrintView.cxx:668
++msgid "State"
++msgstr "Estado"
++
++#: src/gtk/PrintView.cxx:677
++msgid "Jobs"
++msgstr "Trabalhos"
++
++#: src/gtk/PrintView.cxx:686
++msgid "Location"
++msgstr "Local"
++
++#: src/gtk/PrintView.cxx:717
++msgid "Plain"
++msgstr "Plano"
++
++#: src/gtk/PrintView.cxx:723
++msgid "2 pages in 1"
++msgstr "2 páginas em 1"
++
++#: src/gtk/PrintView.cxx:729
++msgid "4 pages in 1"
++msgstr "4 páginas em 1"
++
++#: src/gtk/PrintView.cxx:744
++msgid "Portrait"
++msgstr "Retrato"
++
++#: src/gtk/PrintView.cxx:750
++msgid "Landscape"
++msgstr "Paisagem"
++
++#: src/gtk/StockIcons.cxx:40
++msgid "Find _Next"
++msgstr "Localizar _Próxima"
++
++#: src/gtk/StockIcons.cxx:41
++msgid "Find _Previous"
++msgstr "Localizar _Anterior"
++
+diff -Nurd epdfview-0.1.6-svn/po/pt_PT.po epdfview/po/pt_PT.po
+--- epdfview-0.1.6-svn/po/pt_PT.po	1970-01-01 01:00:00.000000000 +0100
++++ epdfview/po/pt_PT.po	2008-07-13 12:55:55.083198000 +0200
+@@ -0,0 +1,597 @@
++# Portuguese translation for ePDFView package
++# Copyright (C) 2006 Emma's Software
++# This file is distributed under the same license as the ePDFView package.
++#  <jordi@emma-soft.com>, 2006.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: ePDFView 0.1.6\n"
++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2008-01-06 18:48+0100\n"
++"Last-Translator: Nuno Miguel <nunis@netcabo.pt>\n"
++"Language-Team: \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/FindPter.cxx:187
++msgid "No Results Found!"
++msgstr "Nenhum Resultado Encontrado!"
++
++#: src/FindPter.cxx:195
++#, c-format
++msgid "Searching in page %d of %d..."
++msgstr "Procurando na página %d de %d..."
++
++#: src/IDocument.cxx:82
++msgid "No error."
++msgstr "Nenhum erro."
++
++#: src/IDocument.cxx:85
++msgid "File not found."
++msgstr "Ficheiro não encontrado."
++
++#: src/IDocument.cxx:88
++msgid "Couldn't read the page catalog."
++msgstr "Catálogo de página não pode ser lido."
++
++#: src/IDocument.cxx:91
++msgid "The PDF file is damaged and can't be repaired."
++msgstr "O ficheiro PDF está corrompido e não pode ser reparado."
++
++#: src/IDocument.cxx:94
++msgid "The file is encrypted and the password was incorrect or not supplied."
++msgstr ""
++"O ficheiro está encriptado e a senha está incorrecta ou não foi fornecida."
++
++#: src/IDocument.cxx:97
++msgid "Nonexistent or invalid highlight file."
++msgstr "O ficheiro não existe ou é inválido."
++
++#: src/IDocument.cxx:100
++msgid "Invalid printer."
++msgstr "Impressora inválida."
++
++#: src/IDocument.cxx:103
++msgid "Error during printing."
++msgstr "Erro durante a impressão."
++
++#: src/IDocument.cxx:106
++msgid "The PDF file doesn't allow that operation."
++msgstr "O ficheiro PDF não permite esta operação."
++
++#: src/IDocument.cxx:109
++msgid "Invalid page number."
++msgstr "Número de página inválido."
++
++#: src/IDocument.cxx:112
++msgid "File I/O error."
++msgstr "Erro E/S do ficheiro."
++
++#: src/IDocument.cxx:115
++#, c-format
++msgid "Unknown error (%d)."
++msgstr "Erro desconhecido (%d)."
++
++#: src/main.cxx:59
++msgid "[FILE] - view PDF documents"
++msgstr "[FICHEIRO] - mostra documentos PDF"
++
++#: src/main.cxx:72 src/MainPter.cxx:153
++msgid "PDF Viewer"
++msgstr "Visualizador de PDF"
++
++#: src/MainPter.cxx:233
++#, c-format
++msgid "Reloading file %s..."
++msgstr "Recarregando ficheiro %s..."
++
++#: src/MainPter.cxx:237
++#, c-format
++msgid "Loading file %s..."
++msgstr "Carregando ficheiro %s..."
++
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
++#, c-format
++msgid "of %d"
++msgstr "de %d"
++
++#: src/MainPter.cxx:588
++#, c-format
++msgid "Saving document to %s..."
++msgstr "Gravando documento em %s..."
++
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
++msgid "Error Loading File"
++msgstr "Erro ao Carregar Ficheiro"
++
++#: src/MainPter.cxx:872
++msgid "The password you have supplied is not a valid password for this file."
++msgstr "A senha que indicou não é inválida para este ficheiro."
++
++#: src/MainPter.cxx:953
++msgid "Error Saving File"
++msgstr "Erro ao Gravar Ficheiro"
++
++#: src/PagePter.cxx:338
++msgid "Loading..."
++msgstr "Carregando..."
++
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr "A4"
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr "300 DPI"
++
++#: src/PrintPter.cxx:308
++msgid "Grayscale"
++msgstr "Escala de cinza"
++
++#: src/PrintPter.cxx:409
++msgid "Idle"
++msgstr "Ocioso"
++
++#: src/PrintPter.cxx:412
++msgid "Stopped"
++msgstr "Parado"
++
++#: src/PrintPter.cxx:415
++msgid "Processing"
++msgstr "Processando"
++
++#: src/PrintPter.cxx:418
++msgid "Unknown"
++msgstr "Desconhecido"
++
++#: src/PDFDocument.cxx:272
++#, c-format
++msgid ""
++"Failed to load document '%s'.\n"
++"%s\n"
++msgstr ""
++"Falha ao abrir o documento '%s'.\n"
++"%s\n"
++
++#: src/gtk/FindView.cxx:51
++msgid "Find:"
++msgstr "Procurar:"
++
++#: src/gtk/MainView.cxx:89
++msgid "_File"
++msgstr "_Ficheiro"
++
++#: src/gtk/MainView.cxx:90
++msgid "_Edit"
++msgstr "_Editar"
++
++#: src/gtk/MainView.cxx:91
++msgid "_View"
++msgstr "_Ver"
++
++#: src/gtk/MainView.cxx:92
++msgid "_Go"
++msgstr "_Ir"
++
++#: src/gtk/MainView.cxx:93
++msgid "_Help"
++msgstr "_Ajuda"
++
++#: src/gtk/MainView.cxx:95
++msgid "_Open"
++msgstr "_Abrir"
++
++#: src/gtk/MainView.cxx:96
++msgid "Open a PDF document"
++msgstr "Abrir um documento PDF"
++
++#: src/gtk/MainView.cxx:99
++msgid "_Reload"
++msgstr "_Recarregar"
++
++#: src/gtk/MainView.cxx:100
++msgid "Reload the current document"
++msgstr "Recarregar documento actual"
++
++#: src/gtk/MainView.cxx:103
++msgid "_Save a Copy..."
++msgstr "_Gravar uma Cópia..."
++
++#: src/gtk/MainView.cxx:104
++msgid "Save a copy of the current document"
++msgstr "Gravar uma cópia do documento actual"
++
++#: src/gtk/MainView.cxx:108
++msgid "_Print..."
++msgstr "_Imprimir..."
++
++#: src/gtk/MainView.cxx:109
++msgid "Print the current document"
++msgstr "Imprimir o documento actual"
++
++#: src/gtk/MainView.cxx:113
++msgid "_Close"
++msgstr "_Fechar"
++
++#: src/gtk/MainView.cxx:114
++msgid "Close this window"
++msgstr "Fechar esta janela"
++
++#: src/gtk/MainView.cxx:117
++msgid "_Find"
++msgstr "_Procurar"
++
++#: src/gtk/MainView.cxx:118
++msgid "Find a word in the document"
++msgstr "Localizar uma palavra no documento"
++
++#: src/gtk/MainView.cxx:121
++msgid "Preferences..."
++msgstr "Preferências..."
++
++#: src/gtk/MainView.cxx:122
++msgid "Change the application's preferences"
++msgstr "Alterar preferências da aplicação"
++
++#: src/gtk/MainView.cxx:125
++msgid "Zoom _In"
++msgstr "A_mpliar"
++
++#: src/gtk/MainView.cxx:126
++msgid "Enlarge the document"
++msgstr "Amplia o documento"
++
++#: src/gtk/MainView.cxx:129
++msgid "Zoom _Out"
++msgstr "_Reduzir"
++
++#: src/gtk/MainView.cxx:130
++msgid "Shrink the document"
++msgstr "Reduz o documento"
++
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
++msgid "Rotate _Right"
++msgstr "Girar para a _direita"
++
++#: src/gtk/MainView.cxx:134
++msgid "Rotate the document 90 degrees clockwise"
++msgstr "Girar o documento 90 graus em sentido horário"
++
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
++msgid "Rotate _Left"
++msgstr "Girar para a _esquerda"
++
++#: src/gtk/MainView.cxx:138
++msgid "Rotate the document 90 degrees counter-clockwise"
++msgstr "Girar o documento 90 graus em sentido anti-horário"
++
++#: src/gtk/MainView.cxx:141
++msgid "_First Page"
++msgstr "_Primeira Página"
++
++#: src/gtk/MainView.cxx:142
++msgid "Go to the first page"
++msgstr "Ir para a primeira página"
++
++#: src/gtk/MainView.cxx:145
++msgid "_Next Page"
++msgstr "_Próxima Página"
++
++#: src/gtk/MainView.cxx:146
++msgid "Go to the next page"
++msgstr "Ir para a próxima página"
++
++#: src/gtk/MainView.cxx:149
++msgid "_Previous Page"
++msgstr "Página _Anterior"
++
++#: src/gtk/MainView.cxx:150
++msgid "Go to the previous page"
++msgstr "Ir para a página anterior"
++
++#: src/gtk/MainView.cxx:153
++msgid "_Last Page"
++msgstr "Ú_ltima Página"
++
++#: src/gtk/MainView.cxx:154
++msgid "Go to the last page"
++msgstr "Ir para a última página"
++
++#: src/gtk/MainView.cxx:157
++msgid "_About"
++msgstr "_Sobre"
++
++#: src/gtk/MainView.cxx:158
++msgid "Display application's credits"
++msgstr "Mostrar créditos da aplicação"
++
++#: src/gtk/MainView.cxx:175
++msgid "F_ull screen"
++msgstr "Ecrã inteiro"
++
++#: src/gtk/MainView.cxx:176
++msgid "Toggle full screen window"
++msgstr "Mudar para ecrã completo"
++
++#: src/gtk/MainView.cxx:179
++msgid "Show _Toolbar"
++msgstr "Mostrar barras de _ferramentas"
++
++#: src/gtk/MainView.cxx:180
++msgid "Show or hide the toolbar"
++msgstr "Mostra ou esconde a barra de ferramentas"
++
++#: src/gtk/MainView.cxx:183
++msgid "Show _Statusbar"
++msgstr "Mostrar barra de _estado"
++
++#: src/gtk/MainView.cxx:184
++msgid "Show or hide the statusbar"
++msgstr "Mostra ou esconde a barra de estado"
++
++#: src/gtk/MainView.cxx:187
++msgid "Show I_ndex"
++msgstr "Mostrar �_ndice"
++
++#: src/gtk/MainView.cxx:188
++msgid "Show or hide the document's outline"
++msgstr "Mostra ou esconde o índice do documento"
++
++#: src/gtk/MainView.cxx:191
++msgid "Zoom to _Fit"
++msgstr "Aj_ustar à janela"
++
++#: src/gtk/MainView.cxx:192
++msgid "Make the current document fill the window"
++msgstr "Ajusta documento à janela"
++
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
++msgid "Zoom to _Width"
++msgstr "Ajustar à _largura da página"
++
++#: src/gtk/MainView.cxx:196
++msgid "Make the current document fill the window width"
++msgstr "Ajusta documento à largura da página"
++
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr "Deslocamento"
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr "Deslocamento de página com rato"
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr "Seleccionar Texto"
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr " Seleccionar texto com rato"
++
++#: src/gtk/MainView.cxx:320
++msgid "Open PDF File"
++msgstr "Abrir Ficheiro PDF"
++
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
++msgid "Portable Document Format (PDF) Files"
++msgstr "Ficheiros em Portable Document Format (PDF)"
++
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
++msgid "All Files"
++msgstr "Todos os Ficheiros"
++
++#: src/gtk/MainView.cxx:404
++msgid "Password"
++msgstr "Senha"
++
++#: src/gtk/MainView.cxx:428
++msgid "Save PDF File"
++msgstr "Gravar ficheiro PDF"
++
++#: src/gtk/MainView.cxx:858
++msgid "Page"
++msgstr "Página"
++
++#: src/gtk/MainView.cxx:868
++msgid "of 0"
++msgstr "de 0"
++
++#: src/gtk/MainView.cxx:921
++msgid "Index"
++msgstr "�ndice"
++
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
++#, c-format
++msgid "Error building UI manager: %s\n"
++msgstr "Erro ao construir o gestor de IU: %s\n"
++
++#: src/gtk/MainView.cxx:1108
++msgid "A lightweight PDF viewer"
++msgstr "Um visualizador leve de PDF"
++
++#: src/gtk/MainView.cxx:1111
++msgid ""
++"ePDFView is free software; you can redistribute it and/or modify\n"
++"it under the terms of the GNU General Public License as published by\n"
++"the Free Software Foundation; either version 2 of the License, or\n"
++"(at your option) any later version.\n"
++msgstr ""
++"O ePDFView é software livre; pode redistribuí-lo e/ou modificá-lo\n"
++"sob os termos da Licença Pública Geral GNU (GPL) como publicada\n"
++"pela Free Software Foundation; seja a versão 2 da Licença ou\n"
++"(se preferir) qualquer versão mais recente.\n"
++
++#: src/gtk/MainView.cxx:1115
++msgid ""
++"ePDFView is distributes in the hope that it will be useful,\n"
++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
++"GNU General Public License for more details.\n"
++msgstr ""
++"O ePDFView é distribuído na esperança de que seja útil,\n"
++"mas SEM NENHUMA GARANTIA; até mesmo sem a garantia implicada de\n"
++"COMERCIALIZAÇÃO ou de ADAPTAÇÃO A UM PROPÓSITO EM PARTICULAR.  Veja a\n"
++"Licença Pública Geral GNU (GPL) para mais detalhes.\n"
++
++#: src/gtk/MainView.cxx:1119
++msgid ""
++"You should have received a copy of the GNU General Public License\n"
++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++msgstr ""
++"Deve ter recebido uma cópia da Licença Pública Geral GNU (GPL)\n"
++"junto com o ePDFView; se não, escreva para a Free Software Foundation, Inc.\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++
++#: src/gtk/MainView.cxx:1128
++msgid "ePDFView"
++msgstr "ePDFView"
++
++#: src/gtk/MainView.cxx:1135
++msgid "translator-credits"
++msgstr "Nuno Miguel <nunis@netcabo.pt>"
++
++#: src/gtk/PreferencesView.cxx:32
++msgid "Preferences"
++msgstr "Preferências"
++
++#: src/gtk/PreferencesView.cxx:46
++msgid "External Commands"
++msgstr "Comandos Externos"
++
++#: src/gtk/PreferencesView.cxx:105
++msgid "Web _Browser:"
++msgstr "Navegador _Web:"
++
++#: src/gtk/PreferencesView.cxx:118
++#, c-format
++msgid "Note: <i>%s</i> will be replaced by the URI."
++msgstr "Nota: O parâmetro <i>%s</i> deve ser substituído pelo URI."
++
++#: src/gtk/PrintView.cxx:51
++msgid "Print"
++msgstr "Imprimir"
++
++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659
++msgid "Printer"
++msgstr "Impressora"
++
++#: src/gtk/PrintView.cxx:74
++msgid "Job"
++msgstr "Trabalho"
++
++#: src/gtk/PrintView.cxx:79
++msgid "Paper"
++msgstr "Página"
++
++#: src/gtk/PrintView.cxx:359
++msgid "<b>Print Range</b>"
++msgstr "<b>Intervalo de impressão</b>"
++
++#: src/gtk/PrintView.cxx:377
++msgid "_All pages"
++msgstr "_Todas as páginas"
++
++#: src/gtk/PrintView.cxx:380
++msgid "_Range:"
++msgstr "_Intervalo:"
++
++#: src/gtk/PrintView.cxx:392
++msgid "<b>Page Set</b>"
++msgstr "<b>Conjunto de páginas</b>"
++
++#: src/gtk/PrintView.cxx:408
++msgid "A_ll pages"
++msgstr "_Todas as páginas"
++
++#: src/gtk/PrintView.cxx:412
++msgid "O_dd pages"
++msgstr "Páginas í_mpares"
++
++#: src/gtk/PrintView.cxx:416
++msgid "_Even pages"
++msgstr "Páginas _pares"
++
++#: src/gtk/PrintView.cxx:420
++msgid "<b>Copies</b>"
++msgstr "<b>Cópias</b>"
++
++#: src/gtk/PrintView.cxx:437
++msgid "N_umber of copies:"
++msgstr "_Número de cópias:"
++
++#: src/gtk/PrintView.cxx:444
++msgid "C_ollate"
++msgstr "O_rganizar"
++
++#: src/gtk/PrintView.cxx:465
++msgid "<b>Paper and Layout</b>"
++msgstr "<b>Página e Disposição</b>"
++
++#: src/gtk/PrintView.cxx:482
++msgid "Paper _Size:"
++msgstr "_Tamanho do Papel:"
++
++#: src/gtk/PrintView.cxx:508
++msgid "Page _orientation:"
++msgstr "_Orientação de Página:"
++
++#: src/gtk/PrintView.cxx:539
++msgid "_Layout:"
++msgstr "_Disposição:"
++
++#: src/gtk/PrintView.cxx:568
++msgid "<b>Output</b>"
++msgstr "<b>Saída</b>"
++
++#: src/gtk/PrintView.cxx:585
++msgid "_Mode:"
++msgstr "_Modo:"
++
++#: src/gtk/PrintView.cxx:613
++msgid "_Resolution:"
++msgstr "_Resolução:"
++
++#: src/gtk/PrintView.cxx:668
++msgid "State"
++msgstr "Estado"
++
++#: src/gtk/PrintView.cxx:677
++msgid "Jobs"
++msgstr "Trabalhos"
++
++#: src/gtk/PrintView.cxx:686
++msgid "Location"
++msgstr "Local"
++
++#: src/gtk/PrintView.cxx:717
++msgid "Plain"
++msgstr "Plano"
++
++#: src/gtk/PrintView.cxx:723
++msgid "2 pages in 1"
++msgstr "2 páginas em 1"
++
++#: src/gtk/PrintView.cxx:729
++msgid "4 pages in 1"
++msgstr "4 páginas em 1"
++
++#: src/gtk/PrintView.cxx:744
++msgid "Portrait"
++msgstr "Retrato"
++
++#: src/gtk/PrintView.cxx:750
++msgid "Landscape"
++msgstr "Paisagem"
++
++#: src/gtk/StockIcons.cxx:40
++msgid "Find _Next"
++msgstr "Procurar _Próxima"
++
++#: src/gtk/StockIcons.cxx:41
++msgid "Find _Previous"
++msgstr "Localizar _Anterior"
+diff -Nurd epdfview-0.1.6-svn/po/ru.po epdfview/po/ru.po
+--- epdfview-0.1.6-svn/po/ru.po	2008-07-13 12:57:47.543198000 +0200
++++ epdfview/po/ru.po	2008-07-13 12:55:55.083198000 +0200
+@@ -1,144 +1,152 @@
+ # Russian translations for ePDFView package
+-# áÎÇÌÉÊÓËÉÅ ÐÅÒÅ×ÏÄÙ ÄÌÑ ÐÁËÅÔÁ ePDFView.
++# �нглий�кие переводы дл� пакета ePDFView.
+ # Copyright (C) 2006 Emma's Software
+ # This file is distributed under the same license as the ePDFView package.
+ #  <igor_vagulin@mail.ru>, 2006.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: ePDFView 0.1.5\n"
++"Project-Id-Version: ePDFView 0.1.6\n"
+ "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
+-"PO-Revision-Date: 2006-07-08 13:31+0400\n"
+-"Last-Translator:  <igor_vagulin@mail.ru>\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2007-04-23 15:56+0300\n"
++"Last-Translator: Sergey Starosek <sergey.starosek@gmail.com>\n"
+ "Language-Team: Russian <ru@li.org>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=KOI8-R\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%"
+ "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+ 
+ #: src/FindPter.cxx:187
+ msgid "No Results Found!"
+-msgstr "òÅÚÕÌØÔÁÔÙ ÎÅ ÎÁÊÄÅÎÙ!"
++msgstr "Результаты не найдены!"
+ 
+ #: src/FindPter.cxx:195
+ #, c-format
+ msgid "Searching in page %d of %d..."
+-msgstr "ðÏÉÓË ÎÁ ÓÔÒÁÎÉÃÅ %d ÉÚ %d..."
++msgstr "Пои�к на �транице %d из %d..."
+ 
+ #: src/IDocument.cxx:82
+ msgid "No error."
+-msgstr "âÅÚ ÏÛÉÂÏË."
++msgstr "Без ошибок."
+ 
+ #: src/IDocument.cxx:85
+ msgid "File not found."
+-msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ."
++msgstr "Файл не найден."
+ 
+ #: src/IDocument.cxx:88
+ msgid "Couldn't read the page catalog."
+-msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÉÎÆÏÒÍÁÃÉÉ Ï ÓÔÒÁÎÉÃÁÈ."
++msgstr "Ошибка при чтении информации о �траницах."
+ 
+ #: src/IDocument.cxx:91
+ msgid "The PDF file is damaged and can't be repaired."
+-msgstr "PDF ÆÁÊÌ ÐÏ×ÒÅÖÄ£Î É ÎÅ ÍÏÖÅÔ ÂÙÔØ ×ÏÓÓÔÁÎÏ×ÌÅÎ."
++msgstr "PDF файл повреждён и не может быть во��тановлен."
+ 
+ #: src/IDocument.cxx:94
+ msgid "The file is encrypted and the password was incorrect or not supplied."
+-msgstr "æÁÊÌ ÚÁÛÉÆÒÏ×ÁÎ. ðÁÒÏÌØ ÎÅ×ÅÒÅÎ ÉÌÉ ÎÅ ××ÅÄ£Î."
++msgstr "Файл зашифрован. Пароль неверен или не введён."
+ 
+ #: src/IDocument.cxx:97
+ msgid "Nonexistent or invalid highlight file."
+-msgstr "æÁÊÌ ÐÏÄÓ×ÅÔËÉ(highlight file) ÎÅ ÓÕÝÅÓÔ×ÕÅÔ ÉÌÉ × Î£Í ÏÛÉÂËÉ."
++msgstr "Файл под�ветки(highlight file) не �уще�твует или в нём ошибки."
+ 
+ #: src/IDocument.cxx:100
+ msgid "Invalid printer."
+-msgstr "ðÒÉÎÔÅÒ ÎÅ ÎÁÊÄÅÎ"
++msgstr "Принтер не найден"
+ 
+ #: src/IDocument.cxx:103
+ msgid "Error during printing."
+-msgstr "ïÛÉÂËÁ ÐÅÞÁÔÉ."
++msgstr "Ошибка печати."
+ 
+ #: src/IDocument.cxx:106
+ msgid "The PDF file doesn't allow that operation."
+-msgstr "ïÐÅÒÁÃÉÑ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÓÕÝÅÓÔ×ÌÅÎÁ ÄÌÑ ÜÔÏÇÏ PDF ÆÁÊÌÁ."
++msgstr "Операци� не может быть о�уще�твлена дл� �того PDF файла."
+ 
+ #: src/IDocument.cxx:109
+ msgid "Invalid page number."
+-msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÓÔÒÁÎÉÃÙ."
++msgstr "�еверный номер �траницы."
+ 
+ #: src/IDocument.cxx:112
+ msgid "File I/O error."
+-msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ"
++msgstr "Ошибка ввода/вывода."
+ 
+ #: src/IDocument.cxx:115
+ #, c-format
+ msgid "Unknown error (%d)."
+-msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ (%d)."
++msgstr "�еизве�тна� ошибка (%d)."
+ 
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+-msgstr "[æáêì] - ÐÒÏÓÍÏÔÒ PDF ÄÏËÕÍÅÎÔÁ"
++msgstr "[Ф�ЙЛ] - про�мотр PDF документа"
+ 
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+-msgstr "ðÒÏÓÍÏÔÒ PDF"
++msgstr "Про�мотр PDF"
+ 
+ #: src/MainPter.cxx:233
+ #, c-format
+ msgid "Reloading file %s..."
+-msgstr "ðÅÒÅÚÁÇÒÕÚËÁ ÆÁÊÌÁ %s..."
++msgstr "Перезагрузка файла %s..."
+ 
+ #: src/MainPter.cxx:237
+ #, c-format
+ msgid "Loading file %s..."
+-msgstr "úÁÇÒÕÚËÁ ÆÁÌÁ %s..."
++msgstr "Загрузка фала %s..."
+ 
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
+ #, c-format
+ msgid "of %d"
+-msgstr "ÉÚ %d"
++msgstr "из %d"
+ 
+ #: src/MainPter.cxx:588
+ #, c-format
+ msgid "Saving document to %s..."
+-msgstr "äÏËÕÍÅÎÔ ÓÏÈÒÁÎÑÅÔØÓÑ × %s..."
++msgstr "Документ �охран�ет�� в %s..."
+ 
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+-msgstr "ïÛÉÂËÁ ðÒÉ úÁÇÒÕÚËÅ æÁÊÌÁ"
++msgstr "Ошибка При Загрузке Файла"
+ 
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+-msgstr "÷×ÅÄ£ÎÙÊ ×ÁÍÉ ÐÁÒÏÌØ ÎÅ×ÅÒÅÎ ÄÌÑ ÜÔÏÇÏ ÆÁÊÌÁ"
++msgstr "Введёный вами пароль неверен дл� �того файла"
+ 
+-#: src/MainPter.cxx:947
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+-msgstr "ïÛÉÂËÁ ðÒÉ óÏÈÒÁÎÅÎÉÉ æÁÊÌÁ"
++msgstr "Ошибка При Сохранении Файла"
+ 
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+-msgstr "úÁÇÒÕÖÁÅÔØÓÑ..."
++msgstr "Загружает��..."
+ 
+-#: src/PrintPter.cxx:295
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
+ msgid "Grayscale"
+-msgstr "ïÔÔÅÎËÉ ÓÅÒÏÇÏ"
++msgstr "Оттенки �ерого"
+ 
+-#: src/PrintPter.cxx:395
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+-msgstr "ïÖÉÄÁÎÉÅ"
++msgstr "Ожидание"
+ 
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+-msgstr "ïÓÔÁÎÏ×ÌÅÎ"
++msgstr "О�тановлен"
+ 
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+-msgstr "ïÂÒÁÂÏÔËÁ"
++msgstr "Обработка"
+ 
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+-msgstr "îÅÉÚ×ÅÓÔÎÏ"
++msgstr "�еизве�тно"
+ 
+ #: src/PDFDocument.cxx:272
+ #, c-format
+@@ -146,435 +154,452 @@
+ "Failed to load document '%s'.\n"
+ "%s\n"
+ msgstr ""
+-"ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ÄÏËÕÍÅÎÔÁ '%s'.\n"
++"Ошибка при загрузке документа '%s'.\n"
+ "%s\n"
+ 
+ #: src/gtk/FindView.cxx:51
+ msgid "Find:"
+-msgstr "îÁÊÔÉ:"
++msgstr "�айти:"
+ 
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+-msgstr "_æÁÊÌ"
++msgstr "_Файл"
+ 
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+-msgstr "_ðÒÁ×ËÁ"
++msgstr "_Правка"
+ 
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+-msgstr "_÷ÉÄ"
++msgstr "_Вид"
+ 
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+-msgstr "ð_ÅÒÅÊÔÉ"
++msgstr "П_ерейти"
+ 
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+-msgstr "ð_ÏÍÏÝØ"
++msgstr "П_омощь"
+ 
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+-msgstr "_ïÔËÒÙÔØ"
++msgstr "_Открыть"
+ 
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+-msgstr "ïÔËÒÙÔØ PDF ÄÏËÕÍÅÎÔ"
++msgstr "Открыть PDF документ"
+ 
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+-msgstr "_ðÅÒÅÚÁÇÒÕÚÉÔØ"
++msgstr "_Перезагрузить"
+ 
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+-msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÔÅËÕÝÉÊ ÄÏËÕÍÅÎÔ"
++msgstr "Перезагрузить текущий документ"
+ 
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+-msgstr "_óÏÈÒÁÎÉÔØ ëÏÐÉÀ"
++msgstr "_Сохранить Копию"
+ 
+-#: src/gtk/MainView.cxx:102
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+-msgstr "óÏÈÒÁÎÉÔØ ËÏÐÉÀ ÔÅËÕÝÅÇÏ ÄÏËÕÍÅÎÔÁ"
++msgstr "Сохранить копию текущего документа"
+ 
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+-msgstr "_ðÅÞÁÔØ"
++msgstr "_Печать"
+ 
+-#: src/gtk/MainView.cxx:107
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+-msgstr "òÁÓÐÅÞÁÔÁÔØ ÔÅËÕÝÉÊ ÄÏËÕÍÅÎÔ"
++msgstr "Ра�печатать текущий документ"
+ 
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+-msgstr "_úÁËÒÙÔØ"
++msgstr "_Закрыть"
+ 
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+-msgstr "úÁËÒÙÔØ ÏËÎÏ"
++msgstr "Закрыть окно"
+ 
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+-msgstr "_îÁÊÔÉ"
++msgstr "_�айти"
+ 
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+-msgstr "îÁÊÔÉ ÓÌÏ×Ï × ÄÏËÕÍÅÎÔÅ"
++msgstr "�айти �лово в документе"
+ 
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+-msgstr "îÁÓÔÒÏÊËÉ..."
++msgstr "�а�тройки..."
+ 
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÎÁÓÔÒÏÊËÉ ÐÒÉÌÏÖÅÎÉÑ"
++msgstr "Редактировать на�тройки приложени�"
+ 
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+-msgstr "õ×ÅÌÉÞÉÔØ ÍÁÓÛÔÁÂ"
++msgstr "Увеличить"
+ 
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+-msgstr "õ×ÅÌÉÞÉÔØ ÄÏËÕÍÅÎÔ"
++msgstr "Увеличить документ"
+ 
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+-msgstr "õÍÅÎØÛÉÔØ ÍÁÓÛÔÁÂ"
++msgstr "Уменьшить"
+ 
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+-msgstr "õÍÅÎØÛÉÔØ ÄÏËÕÍÅÎÔ"
++msgstr "Уменьшить документ"
+ 
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+-msgstr "ðÏ×ÅÒÎÕÔØ ÎÁÐÒÁ×Ï"
++msgstr "Повернуть направо"
+ 
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+-msgstr "ðÏ×ÅÒÎÕÔØ ÄÏËÕÍÅÎÔ ÎÁ 90 ÇÒÁÄÕÓÏ× ÐÏ ÞÁÓÏ×ÏÊ ÓÔÒÅÌËÅ"
++msgstr "Повернуть документ на 90 граду�ов по ча�овой �трелке"
+ 
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+-msgstr "ðÏ×ÅÒÎÕÔØ ÎÁÌÅ×Ï"
++msgstr "Повернуть налево"
+ 
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+-msgstr "ðÏ×ÅÒÎÕÔØ ÄÏËÕÍÅÎÔ ÎÁ 90 ÇÒÁÄÕÓÏ× ÐÒÏÔÉ× ÞÁÓÏ×ÏÊ ÓÔÒÅÌËÉ"
++msgstr "Повернуть документ на 90 граду�ов против ча�овой �трелки"
+ 
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+-msgstr "ðÅÒ×ÁÑ ÓÔÒÁÎÉÃÁ"
++msgstr "Перва� �траница"
+ 
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+-msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÅÒ×ÕÀ ÓÔÒÁÎÉÃÕ"
++msgstr "Перейти на первую �траницу"
+ 
+-#: src/gtk/MainView.cxx:143
++#: src/gtk/MainView.cxx:145
+ msgid "_Next Page"
+-msgstr "óÌÅÄÕÀÝÁÑ ÓÔÒÁÎÉÃÁ"
++msgstr "Следующа�"
+ 
+-#: src/gtk/MainView.cxx:144
++#: src/gtk/MainView.cxx:146
+ msgid "Go to the next page"
+-msgstr "ðÅÒÅÊÔÉ ÎÁ ÓÌÅÄÕÀÝÕÀ ÓÔÒÁÎÉÃÕ"
++msgstr "Перейти на �ледующую �траницу"
+ 
+-#: src/gtk/MainView.cxx:147
++#: src/gtk/MainView.cxx:149
+ msgid "_Previous Page"
+-msgstr "ðÒÅÄÙÄÕÝÁÑ ÓÔÒÁÎÉÃÁ"
++msgstr "Предыдуща�"
+ 
+-#: src/gtk/MainView.cxx:148
++#: src/gtk/MainView.cxx:150
+ msgid "Go to the previous page"
+-msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÒÅÄÙÄÕÝÕÀ ÓÔÒÁÎÉÃÕ"
++msgstr "Перейти на предыдущую �траницу"
+ 
+-#: src/gtk/MainView.cxx:151
++#: src/gtk/MainView.cxx:153
+ msgid "_Last Page"
+-msgstr "ðÏÓÌÅÄÎÑÑ ÓÔÒÁÎÉÃÁ"
++msgstr "По�ледн�� �траница"
+ 
+-#: src/gtk/MainView.cxx:152
++#: src/gtk/MainView.cxx:154
+ msgid "Go to the last page"
+-msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄΠÓÔÒÁÎÉÃÕ"
++msgstr "Перейти на по�леднбб �траницу"
+ 
+-#: src/gtk/MainView.cxx:155
++#: src/gtk/MainView.cxx:157
+ msgid "_About"
+-msgstr "ï ÐÒÏÇÒÁÍÍÅ"
++msgstr "О программе"
+ 
+-#: src/gtk/MainView.cxx:156
++#: src/gtk/MainView.cxx:158
+ msgid "Display application's credits"
+-msgstr "ðÏËÁÚÁÔØ ÏÐÉÓÁÎÉÅ ÐÒÏÇÒÁÍÍÙ"
++msgstr "Показать опи�ание программы"
+ 
+-#: src/gtk/MainView.cxx:166
++#: src/gtk/MainView.cxx:175
+ msgid "F_ull screen"
+-msgstr ""
++msgstr "Полный �кран"
+ 
+-#: src/gtk/MainView.cxx:167
++#: src/gtk/MainView.cxx:176
+ msgid "Toggle full screen window"
+-msgstr ""
++msgstr "Переключить полно�кранный режим"
+ 
+-#: src/gtk/MainView.cxx:170
++#: src/gtk/MainView.cxx:179
+ msgid "Show _Toolbar"
+-msgstr "ðÏËÁÚÁÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×"
++msgstr "Показать панель ин�трументов"
+ 
+-#: src/gtk/MainView.cxx:171
++#: src/gtk/MainView.cxx:180
+ msgid "Show or hide the toolbar"
+-msgstr "ðÏËÁÚÁÔØ ÉÌÉ ÓËÒÙÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×"
++msgstr "Показать или �крыть панель ин�трументов"
+ 
+-#: src/gtk/MainView.cxx:174
++#: src/gtk/MainView.cxx:183
+ msgid "Show _Statusbar"
+-msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ"
++msgstr "Показать �троку �о�то�ни�"
+ 
+-#: src/gtk/MainView.cxx:175
++#: src/gtk/MainView.cxx:184
+ msgid "Show or hide the statusbar"
+-msgstr "ðÏËÁÚÁÔØ ÉÌÉ ÓËÒÙÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ"
++msgstr "Показать или �крыть �троку �о�то�ни�"
+ 
+-#: src/gtk/MainView.cxx:178
++#: src/gtk/MainView.cxx:187
+ msgid "Show I_ndex"
+-msgstr "ðÏËÁÚÁÔØ ÏÇÌÁ×ÌÅÎÉÅ"
++msgstr "Показать оглавление"
+ 
+-#: src/gtk/MainView.cxx:179
++#: src/gtk/MainView.cxx:188
+ msgid "Show or hide the document's outline"
+-msgstr "ðÏËÁÚÁÔØ ÉÌÉ ÓËÒÙÔØ ÏÇÌÁ×ÌÅÎÉÅ"
++msgstr "Показать или �крыть оглавление"
+ 
+-#: src/gtk/MainView.cxx:182
++#: src/gtk/MainView.cxx:191
+ msgid "Zoom to _Fit"
+-msgstr "ðÏ ÷ÙÓÏÔÅ"
++msgstr "По Вы�оте"
+ 
+-#: src/gtk/MainView.cxx:183
++#: src/gtk/MainView.cxx:192
+ msgid "Make the current document fill the window"
+-msgstr "íÁÓÛÔÁ ÐÏ ÒÁÚÍÅÒÕ ÓÔÒÁÎÉÃÙ"
++msgstr "Ма�штаб по размеру �траницы"
+ 
+-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
+ msgid "Zoom to _Width"
+-msgstr "ðÏ ûÉÒÉÎÅ"
++msgstr "По Ширине"
+ 
+-#: src/gtk/MainView.cxx:187
++#: src/gtk/MainView.cxx:196
+ msgid "Make the current document fill the window width"
+-msgstr "íÁÓÛÔÁ ÐÏ ÛÉÒÉÎÅ ÓÔÒÁÎÉÃÙ"
++msgstr "Ма�штаб по ширине �траницы"
+ 
+-#: src/gtk/MainView.cxx:278
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
+ msgid "Open PDF File"
+-msgstr "ïÔËÒÙÔØ PDF ÆÁÊÌ"
++msgstr "Открыть PDF файл"
+ 
+-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
+ msgid "Portable Document Format (PDF) Files"
+-msgstr "PDF ÆÁÊÌÙ"
++msgstr "PDF файлы"
+ 
+-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
+ msgid "All Files"
+-msgstr "÷ÓÅ æÁÊÌÙ"
++msgstr "В�е Файлы"
+ 
+-#: src/gtk/MainView.cxx:362
++#: src/gtk/MainView.cxx:404
+ msgid "Password"
+-msgstr "ðÁÒÏÌØ"
++msgstr "Пароль"
+ 
+-#: src/gtk/MainView.cxx:386
++#: src/gtk/MainView.cxx:428
+ msgid "Save PDF File"
+-msgstr "óÏÈÒÁÎÉÔØ PDF æÁÊÌ"
++msgstr "Сохранить PDF Файл"
+ 
+-#: src/gtk/MainView.cxx:816
++#: src/gtk/MainView.cxx:858
+ msgid "Page"
+-msgstr "óÔÒÁÎÉÃÁ"
++msgstr "Страница"
+ 
+-#: src/gtk/MainView.cxx:826
++#: src/gtk/MainView.cxx:868
+ msgid "of 0"
+-msgstr "ÉÚ 0"
++msgstr "из 0"
+ 
+-#: src/gtk/MainView.cxx:879
++#: src/gtk/MainView.cxx:921
+ msgid "Index"
+-msgstr "ïÇÌÁ×ÌÅÎÉÅ"
++msgstr "Оглавление"
+ 
+-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
+ #, c-format
+ msgid "Error building UI manager: %s\n"
+-msgstr "ïÛÉÂËÁ ÐÒÉ ÉÎÃÉÁÌÉÚÁÃÉÉ: %s\n"
++msgstr "Ошибка при инциализации: %s\n"
+ 
+-#: src/gtk/MainView.cxx:1056
+-#, fuzzy
++#: src/gtk/MainView.cxx:1108
+ msgid "A lightweight PDF viewer"
+-msgstr "ì£ÇËÁÑ ÐÒÏÇÒÁÍÍÁ ÄÌÑ ÐÒÏÓÍÏÔÒÁ PDF ÆÁÊÌÏ×"
++msgstr "Бы�тра� программа дл� про�мотра PDF файлов"
+ 
+-#: src/gtk/MainView.cxx:1059
++#: src/gtk/MainView.cxx:1111
+ msgid ""
+ "ePDFView is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+ "the Free Software Foundation; either version 2 of the License, or\n"
+ "(at your option) any later version.\n"
+ msgstr ""
+-"ePDFView Ñ×ÌÑÅÔÓÑ Ó×ÏÂÏÄÎÙÍ ÐÒÏÇÒÁÍÍÎÙÍ ÏÂÅÓÐÅÞÅÎÉÅÍ. \n"
+-"÷Ù ×ÐÒÁ×Å ÒÁÓÐÒÏÓÔÒÁÎÑÔØ Å£ É/ÉÌÉ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó\n"
+-"ÕÓÌÏ×ÉÑÍÉ ×ÅÒÓÉÉ 2 ÌÉÂÏ ÐÏ ×ÁÛÅÍÕ ×ÙÂÏÒÕ Ó ÕÓÌÏ×ÉÑÍÉ ÂÏÌÅÅ ÐÏÚÄÎÅÊ\n"
+-"×ÅÒÓÉÉ óÔÁÎÄÁÒÔÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU, ÏÐÕÂÌÉËÏ×ÁÎÎÏÊ\n"
++"ePDFView �вл�ет�� �вободным программным обе�печением. \n"
++"Вы вправе ра�про�тран�ть её и/или модифицировать в �оответ�твии �\n"
++"у�лови�ми вер�ии 2 либо по вашему выбору � у�лови�ми более поздней\n"
++"вер�ии Стандартной Обще�твенной Лицензии GNU, опубликованной\n"
+ "Free Software Foundation. \n"
+ 
+-#: src/gtk/MainView.cxx:1063
++#: src/gtk/MainView.cxx:1115
+ msgid ""
+ "ePDFView is distributes in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+ "GNU General Public License for more details.\n"
+ msgstr ""
+-"íÙ ÒÁÓÐÒÏÓÔÒÁÎÑÅÍ ÄÁÎÎÕÀ ÐÒÏÇÒÁÍÍÕ × ÎÁÄÅÖÄÅ ÎÁ ÔÏ, ÞÔÏ ÏÎÁ\n"
+-"ÂÕÄÅÔ ×ÁÍ ÐÏÌÅÚÎÏÊ, ÏÄÎÁËÏ îå ðòåäïóôá÷ìñåí îá îå³\n"
+-"îéëáëéè çáòáîôéê, × ÔÏÍ ÞÉÓÌÅ çáòáîôéé ôï÷áòîïçï\n"
+-"óïóôïñîéñ ðòé ðòïäáöå É ðòéçïäîïóôé äìñ\n"
+-"éóðïìøúï÷áîéñ ÷ ëïîëòåôîùè ãåìñè. äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ\n"
+-"ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÏÚÎÁËÏÍØÔÅÓØ ÓÏ óÔÁÎÄÁÒÔÎÏÊ\n"
+-"ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÅÊ GNU.\n"
++"Мы ра�про�тран�ем данную программу в надежде на то, что она\n"
++"будет вам полезной, однако �Е ПРЕДОСТ�ВЛЯЕМ �� �Е�\n"
++"�ИК�КИХ Г�Р��ТИЙ, в том чи�ле Г�Р��ТИИ ТОВ�Р�ОГО\n"
++"СОСТОЯ�ИЯ ПРИ ПРОД�ЖЕ и ПРИГОД�ОСТИ ДЛЯ\n"
++"ИСПОЛЬЗОВ��ИЯ В КО�КРЕТ�ЫХ ЦЕЛЯХ. Дл� получени� более\n"
++"подробной информации ознакомьте�ь �о Стандартной\n"
++"Обще�твенной Лицензией GNU.\n"
+ 
+-#: src/gtk/MainView.cxx:1067
++#: src/gtk/MainView.cxx:1119
+ msgid ""
+ "You should have received a copy of the GNU General Public License\n"
+ "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
+ "59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+ msgstr ""
+-"÷Ù ÄÏÌÖÎÙ ÂÙÌÉ ÐÏÌÕÞÉÔØ ËÏÐÉÀ óÔÁÎÄÁÒÔÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU\n"
+-"×ÍÅÓÔÅ Ó ePDFView; ÅÓÌÉ ÎÅÔ, ÎÁÐÉÛÉÔÅ ÐÉÓØÍÏ × Free Software Foundation,"
++"Вы должны были получить копию Стандартной Обще�твенной Лицензии GNU\n"
++"вме�те � ePDFView; е�ли нет, напишите пи�ьмо в Free Software Foundation,"
+ "Inc.,\n"
+-"ÎÁ ÁÄÒÅÓ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++"на адре� 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+ 
+-#: src/gtk/MainView.cxx:1076
++#: src/gtk/MainView.cxx:1128
+ msgid "ePDFView"
+-msgstr ""
++msgstr "ePDFView"
+ 
+-#: src/gtk/MainView.cxx:1083
++#: src/gtk/MainView.cxx:1135
+ msgid "translator-credits"
+-msgstr "Igor Vagulin <igor_vagulin@mail.ru>"
++msgstr ""
++"Igor Vagulin <igor_vagulin@mail.ru>\n"
++"Sergey Starosek <sergey.starosek@gmail.com>"
+ 
+ #: src/gtk/PreferencesView.cxx:32
+ msgid "Preferences"
+-msgstr "îÁÓÔÒÏÊËÉ"
++msgstr "�а�тройки"
+ 
+ #: src/gtk/PreferencesView.cxx:46
+ msgid "External Commands"
+-msgstr "÷ÎÅÛÎÉÅ ðÒÏÇÒÁÍÍÙ"
++msgstr "Внешние Программы"
+ 
+ #: src/gtk/PreferencesView.cxx:105
+ msgid "Web _Browser:"
+-msgstr "éÎÔÅÒÎÅÔ âÒÁÕÚÅÒ"
++msgstr "Интернет Браузер"
+ 
+ #: src/gtk/PreferencesView.cxx:118
+ #, c-format
+ msgid "Note: <i>%s</i> will be replaced by the URI."
+-msgstr "úÁÍÅÔËÁ: <i>%s</i> ÂÕÄÅÔ ÚÁÍÅÎÅÎÏ ÎÁ URI."
++msgstr "Заметка: <i>%s</i> будет заменено на URI."
+ 
+ #: src/gtk/PrintView.cxx:51
+ msgid "Print"
+-msgstr "ðÅÞÁÔØ"
++msgstr "Печать"
+ 
+ #: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659
+ msgid "Printer"
+-msgstr "ðÒÉÎÔÅÒ"
++msgstr "Принтер"
+ 
+ #: src/gtk/PrintView.cxx:74
+ msgid "Job"
+-msgstr "úÁÄÁÎÉÅ"
++msgstr "Задание"
+ 
+ #: src/gtk/PrintView.cxx:79
+ msgid "Paper"
+-msgstr "âÕÍÁÇÁ"
++msgstr "Бумага"
+ 
+ #: src/gtk/PrintView.cxx:359
+ msgid "<b>Print Range</b>"
+-msgstr "<b>äÉÁÐÁÚÏÎ ðÅÞÁÔÉ</b>"
++msgstr "<b>Диапазон Печати</b>"
+ 
+ #: src/gtk/PrintView.cxx:377
+ msgid "_All pages"
+-msgstr "_÷ÓÅ ÓÔÒÁÎÉÃÙ"
++msgstr "_В�е �траницы"
+ 
+ #: src/gtk/PrintView.cxx:380
+ msgid "_Range:"
+-msgstr "_äÉÁÐÁÚÏÎ"
++msgstr "_Диапазон"
+ 
+ #: src/gtk/PrintView.cxx:392
+ msgid "<b>Page Set</b>"
+-msgstr ""
++msgstr "<b>�абор �траниц</b>"
+ 
+ #: src/gtk/PrintView.cxx:408
+ msgid "A_ll pages"
+-msgstr ""
++msgstr "В�е �траницы"
+ 
+ #: src/gtk/PrintView.cxx:412
+ msgid "O_dd pages"
+-msgstr ""
++msgstr "�ечетные"
+ 
+ #: src/gtk/PrintView.cxx:416
+ msgid "_Even pages"
+-msgstr ""
++msgstr "Четные"
+ 
+ #: src/gtk/PrintView.cxx:420
+ msgid "<b>Copies</b>"
+-msgstr "<b>ëÏÐÉÉ</b>"
++msgstr "<b>Копии</b>"
+ 
+ #: src/gtk/PrintView.cxx:437
+ msgid "N_umber of copies:"
+-msgstr "ëÏÌÉÞÅÓÔ×Ï ËÏÐÉÊ:"
++msgstr "Количе�тво копий:"
+ 
+ #: src/gtk/PrintView.cxx:444
+ msgid "C_ollate"
+-msgstr ""
++msgstr "Упор�дочить"
+ 
+ #: src/gtk/PrintView.cxx:465
+ msgid "<b>Paper and Layout</b>"
+-msgstr "<b>óÔÒÁÎÉÃÁ É ÒÁÚÍÅÝÅÎÉÅ</b>"
++msgstr "<b>Страница и макет</b>"
+ 
+ #: src/gtk/PrintView.cxx:482
+ msgid "Paper _Size:"
+-msgstr "òÁÚÍÅÒ ÂÕÍÁÇÉ"
++msgstr "Размер бумаги"
+ 
+ #: src/gtk/PrintView.cxx:508
+ msgid "Page _orientation:"
+-msgstr ""
++msgstr "Ориентаци�:"
+ 
+ #: src/gtk/PrintView.cxx:539
+ msgid "_Layout:"
+-msgstr "òÁÚÍÅÔËÁ:"
++msgstr "Макет:"
+ 
+ #: src/gtk/PrintView.cxx:568
+ msgid "<b>Output</b>"
+-msgstr "<b>÷Ù×ÏÄ</b>"
++msgstr "<b>Вывод</b>"
+ 
+ #: src/gtk/PrintView.cxx:585
+ msgid "_Mode:"
+-msgstr "òÅÖÉÍ:"
++msgstr "Режим:"
+ 
+ #: src/gtk/PrintView.cxx:613
+ msgid "_Resolution:"
+-msgstr "òÁÚÒÅÛÅÎÉÅ"
++msgstr "Разрешение"
+ 
+ #: src/gtk/PrintView.cxx:668
+ msgid "State"
+-msgstr "óÏÓÔÏÑÎÉÅ"
++msgstr "Со�то�ние"
+ 
+ #: src/gtk/PrintView.cxx:677
+ msgid "Jobs"
+-msgstr "úÁÄÁÎÉÑ"
++msgstr "Задани�"
+ 
+ #: src/gtk/PrintView.cxx:686
+ msgid "Location"
+-msgstr ""
++msgstr "Ра�положение"
+ 
+ #: src/gtk/PrintView.cxx:717
+ msgid "Plain"
+-msgstr ""
++msgstr "Обычный"
+ 
+ #: src/gtk/PrintView.cxx:723
+ msgid "2 pages in 1"
+-msgstr "2 ÓÔÒÁÎÉÃÙ ÎÁ 1"
++msgstr "2 �траницы на 1"
+ 
+ #: src/gtk/PrintView.cxx:729
+ msgid "4 pages in 1"
+-msgstr "2 ÓÔÒÁÎÉÃÙ ÎÁ 1"
++msgstr "4 �траницы на 1"
+ 
+ #: src/gtk/PrintView.cxx:744
+ msgid "Portrait"
+-msgstr "ëÎÉÖÎÙÊ"
++msgstr "Книга"
+ 
+ #: src/gtk/PrintView.cxx:750
+ msgid "Landscape"
+-msgstr "áÌØÂÏÍÎÙÊ"
++msgstr "�льбом"
+ 
+ #: src/gtk/StockIcons.cxx:40
+ msgid "Find _Next"
+-msgstr "îÁÊÔÉ _ÓÌÅÄÕÀÝÅÅ"
++msgstr "�айти _�ледующее"
+ 
+ #: src/gtk/StockIcons.cxx:41
+ msgid "Find _Previous"
+-msgstr "îÁÊÔÉ _ÐÒÅÄÙÄÕÝÅÅ"
++msgstr "�айти _предыдущее"
+diff -Nurd epdfview-0.1.6-svn/po/sv.po epdfview/po/sv.po
+--- epdfview-0.1.6-svn/po/sv.po	1970-01-01 01:00:00.000000000 +0100
++++ epdfview/po/sv.po	2008-07-13 12:55:55.083198000 +0200
+@@ -0,0 +1,597 @@
++# Swedish translation for ePDFView.
++# Copyright (C) 2007 Free Software Foundation, Inc.
++# This file is distributed under the same license as the epdfview package.
++# Daniel Nylander <po@danielnylander.se>, 2007.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: ePDFviewer\n"
++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2007-06-10 16:45+0100\n"
++"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
++"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=utf-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: src/FindPter.cxx:187
++msgid "No Results Found!"
++msgstr "Inga sökträffar hittades!"
++
++#: src/FindPter.cxx:195
++#, c-format
++msgid "Searching in page %d of %d..."
++msgstr "Söker på sida %d av %d..."
++
++#: src/IDocument.cxx:82
++msgid "No error."
++msgstr "Inga fel."
++
++#: src/IDocument.cxx:85
++msgid "File not found."
++msgstr "Filen hittades inte."
++
++#: src/IDocument.cxx:88
++msgid "Couldn't read the page catalog."
++msgstr "Kunde inte läsa sidkatalogen."
++
++#: src/IDocument.cxx:91
++msgid "The PDF file is damaged and can't be repaired."
++msgstr "PDF-filen är skadad och kan inte repareras."
++
++#: src/IDocument.cxx:94
++msgid "The file is encrypted and the password was incorrect or not supplied."
++msgstr "Filen är krypterad och lösenordet var felaktigt eller angavs inte."
++
++#: src/IDocument.cxx:97
++msgid "Nonexistent or invalid highlight file."
++msgstr "Icke-existerande eller ogiltig markeringsfil."
++
++#: src/IDocument.cxx:100
++msgid "Invalid printer."
++msgstr "Ogiltig skrivare."
++
++#: src/IDocument.cxx:103
++msgid "Error during printing."
++msgstr "Fel vid utskrift."
++
++#: src/IDocument.cxx:106
++msgid "The PDF file doesn't allow that operation."
++msgstr "PDF-filen tillåter inte den åtgärden."
++
++#: src/IDocument.cxx:109
++msgid "Invalid page number."
++msgstr "Ogiltigt sidnummer."
++
++#: src/IDocument.cxx:112
++msgid "File I/O error."
++msgstr "In/ut-fel."
++
++#: src/IDocument.cxx:115
++#, c-format
++msgid "Unknown error (%d)."
++msgstr "Okänt fel (%d)."
++
++#: src/main.cxx:59
++msgid "[FILE] - view PDF documents"
++msgstr "[FIL] - visa PDF-dokument"
++
++#: src/main.cxx:72 src/MainPter.cxx:153
++msgid "PDF Viewer"
++msgstr "PDF-visare"
++
++#: src/MainPter.cxx:233
++#, c-format
++msgid "Reloading file %s..."
++msgstr "Läser om filen %s..."
++
++#: src/MainPter.cxx:237
++#, c-format
++msgid "Loading file %s..."
++msgstr "Läs in filen %s..."
++
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
++#, c-format
++msgid "of %d"
++msgstr "av %d"
++
++#: src/MainPter.cxx:588
++#, c-format
++msgid "Saving document to %s..."
++msgstr "Sparar dokumentet till %s..."
++
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
++msgid "Error Loading File"
++msgstr "Fel vid inläsning av fil"
++
++#: src/MainPter.cxx:872
++msgid "The password you have supplied is not a valid password for this file."
++msgstr ""
++"Lösenordet som du angav är inte ett giltigt lösenord för den här filen."
++
++#: src/MainPter.cxx:953
++msgid "Error Saving File"
++msgstr "Fel vid sparning av fil"
++
++#: src/PagePter.cxx:338
++msgid "Loading..."
++msgstr "Läser in..."
++
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
++msgid "Grayscale"
++msgstr "Gråskala"
++
++#: src/PrintPter.cxx:409
++msgid "Idle"
++msgstr "Inaktiv"
++
++#: src/PrintPter.cxx:412
++msgid "Stopped"
++msgstr "Stoppad"
++
++#: src/PrintPter.cxx:415
++msgid "Processing"
++msgstr "Behandlar"
++
++#: src/PrintPter.cxx:418
++msgid "Unknown"
++msgstr "Okänt"
++
++#: src/PDFDocument.cxx:272
++#, c-format
++msgid ""
++"Failed to load document '%s'.\n"
++"%s\n"
++msgstr ""
++"Misslyckades med att läsa in dokumentet \"%s\".\n"
++"%s\n"
++
++#: src/gtk/FindView.cxx:51
++msgid "Find:"
++msgstr "Sök:"
++
++#: src/gtk/MainView.cxx:89
++msgid "_File"
++msgstr "_Arkiv"
++
++#: src/gtk/MainView.cxx:90
++msgid "_Edit"
++msgstr "R_edigera"
++
++#: src/gtk/MainView.cxx:91
++msgid "_View"
++msgstr "_Visa"
++
++#: src/gtk/MainView.cxx:92
++msgid "_Go"
++msgstr "_GÃ¥"
++
++#: src/gtk/MainView.cxx:93
++msgid "_Help"
++msgstr "_Hjälp"
++
++#: src/gtk/MainView.cxx:95
++msgid "_Open"
++msgstr "_Öppna"
++
++#: src/gtk/MainView.cxx:96
++msgid "Open a PDF document"
++msgstr "Öppna ett PDF-dokument"
++
++#: src/gtk/MainView.cxx:99
++msgid "_Reload"
++msgstr "_Uppdatera"
++
++#: src/gtk/MainView.cxx:100
++msgid "Reload the current document"
++msgstr "Läs in det aktuella dokumentet igen"
++
++#: src/gtk/MainView.cxx:103
++msgid "_Save a Copy..."
++msgstr "_Spara en kopia..."
++
++#: src/gtk/MainView.cxx:104
++msgid "Save a copy of the current document"
++msgstr "Spara en kopia av det aktuella dokumentet"
++
++#: src/gtk/MainView.cxx:108
++msgid "_Print..."
++msgstr "Skriv _ut..."
++
++#: src/gtk/MainView.cxx:109
++msgid "Print the current document"
++msgstr "Skriv ut aktuellt dokument"
++
++#: src/gtk/MainView.cxx:113
++msgid "_Close"
++msgstr "_Stäng"
++
++#: src/gtk/MainView.cxx:114
++msgid "Close this window"
++msgstr "Stäng det här fönstret"
++
++#: src/gtk/MainView.cxx:117
++msgid "_Find"
++msgstr "_Sök"
++
++#: src/gtk/MainView.cxx:118
++msgid "Find a word in the document"
++msgstr "Hitta ett ord i dokumentet"
++
++#: src/gtk/MainView.cxx:121
++msgid "Preferences..."
++msgstr "Inställningar..."
++
++#: src/gtk/MainView.cxx:122
++msgid "Change the application's preferences"
++msgstr "Ändra programmets inställningar"
++
++#: src/gtk/MainView.cxx:125
++msgid "Zoom _In"
++msgstr "Zooma _in"
++
++#: src/gtk/MainView.cxx:126
++msgid "Enlarge the document"
++msgstr "Förstora dokumentet"
++
++#: src/gtk/MainView.cxx:129
++msgid "Zoom _Out"
++msgstr "Zooma _ut"
++
++#: src/gtk/MainView.cxx:130
++msgid "Shrink the document"
++msgstr "Förminska dokumentet"
++
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
++msgid "Rotate _Right"
++msgstr "Rotera åt _höger"
++
++#: src/gtk/MainView.cxx:134
++msgid "Rotate the document 90 degrees clockwise"
++msgstr "Rotera dokumentet 90 grader medsols"
++
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
++msgid "Rotate _Left"
++msgstr "Rotera åt _vänster"
++
++#: src/gtk/MainView.cxx:138
++msgid "Rotate the document 90 degrees counter-clockwise"
++msgstr "Rotera dokumentet 90 grader motsols"
++
++#: src/gtk/MainView.cxx:141
++msgid "_First Page"
++msgstr "_Första sidan"
++
++#: src/gtk/MainView.cxx:142
++msgid "Go to the first page"
++msgstr "Gå till första sidan"
++
++#: src/gtk/MainView.cxx:145
++msgid "_Next Page"
++msgstr "_Nästa sida"
++
++#: src/gtk/MainView.cxx:146
++msgid "Go to the next page"
++msgstr "Gå till nästa sida"
++
++#: src/gtk/MainView.cxx:149
++msgid "_Previous Page"
++msgstr "_Föregående sida"
++
++#: src/gtk/MainView.cxx:150
++msgid "Go to the previous page"
++msgstr "Gå till föregående sida"
++
++#: src/gtk/MainView.cxx:153
++msgid "_Last Page"
++msgstr "_Sista sidan"
++
++#: src/gtk/MainView.cxx:154
++msgid "Go to the last page"
++msgstr "GÃ¥ till sista sidan"
++
++#: src/gtk/MainView.cxx:157
++msgid "_About"
++msgstr "_Om"
++
++#: src/gtk/MainView.cxx:158
++msgid "Display application's credits"
++msgstr "Visa information om programmet"
++
++#: src/gtk/MainView.cxx:175
++msgid "F_ull screen"
++msgstr "_Helskärm"
++
++#: src/gtk/MainView.cxx:176
++msgid "Toggle full screen window"
++msgstr "Växla helskärmsläge"
++
++#: src/gtk/MainView.cxx:179
++msgid "Show _Toolbar"
++msgstr "Visa _verktygsrad"
++
++#: src/gtk/MainView.cxx:180
++msgid "Show or hide the toolbar"
++msgstr "Visa eller dölj verktygsraden"
++
++#: src/gtk/MainView.cxx:183
++msgid "Show _Statusbar"
++msgstr "Visa _statusrad"
++
++#: src/gtk/MainView.cxx:184
++msgid "Show or hide the statusbar"
++msgstr "Visa eller dölj statusraden"
++
++#: src/gtk/MainView.cxx:187
++msgid "Show I_ndex"
++msgstr "Visa i_ndex"
++
++# Kontur?
++#: src/gtk/MainView.cxx:188
++msgid "Show or hide the document's outline"
++msgstr "Visa eller dölj dokumentets sammandrag"
++
++#: src/gtk/MainView.cxx:191
++msgid "Zoom to _Fit"
++msgstr "Zooma till hela _fönstret"
++
++#: src/gtk/MainView.cxx:192
++msgid "Make the current document fill the window"
++msgstr "Gör så att det aktuella dokumentet fyller fönstret"
++
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
++msgid "Zoom to _Width"
++msgstr "Zooma till hela fönstrets _bredd"
++
++#: src/gtk/MainView.cxx:196
++msgid "Make the current document fill the window width"
++msgstr "Gör så att det aktuella dokumentet fyller fönstrets bredd"
++
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
++msgid "Open PDF File"
++msgstr "Öppna PDF-fil"
++
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
++msgid "Portable Document Format (PDF) Files"
++msgstr "Portable Document Format-filer (PDF)"
++
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
++msgid "All Files"
++msgstr "Alla filer"
++
++#: src/gtk/MainView.cxx:404
++msgid "Password"
++msgstr "Lösenord"
++
++#: src/gtk/MainView.cxx:428
++msgid "Save PDF File"
++msgstr "Spara PDF-fil"
++
++#: src/gtk/MainView.cxx:858
++msgid "Page"
++msgstr "Sida"
++
++#: src/gtk/MainView.cxx:868
++msgid "of 0"
++msgstr "av 0"
++
++#: src/gtk/MainView.cxx:921
++msgid "Index"
++msgstr "Index"
++
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
++#, c-format
++msgid "Error building UI manager: %s\n"
++msgstr "Fel vid byggandet av gränssnittshanteraren: %s\n"
++
++#: src/gtk/MainView.cxx:1108
++msgid "A lightweight PDF viewer"
++msgstr "En resurssnål PDF-visare"
++
++#: src/gtk/MainView.cxx:1111
++msgid ""
++"ePDFView is free software; you can redistribute it and/or modify\n"
++"it under the terms of the GNU General Public License as published by\n"
++"the Free Software Foundation; either version 2 of the License, or\n"
++"(at your option) any later version.\n"
++msgstr ""
++"ePDFView är fri programvara. Du kan distribuera det och/eller\n"
++"modifiera det under villkoren i GNU General Public License, publicerad\n"
++"av Free Software Foundation, antingen version 2 eller (om du så vill)\n"
++"någon senare version.\n"
++
++#: src/gtk/MainView.cxx:1115
++msgid ""
++"ePDFView is distributes in the hope that it will be useful,\n"
++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
++"GNU General Public License for more details.\n"
++msgstr ""
++"ePDFView distribueras i hopp om att det ska vara användbart,\n"
++"men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti\n"
++"om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU\n"
++"General Public License för ytterligare information.\n"
++
++#: src/gtk/MainView.cxx:1119
++msgid ""
++"You should have received a copy of the GNU General Public License\n"
++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++msgstr ""
++"Du bör ha fått en kopia av GNU General Public License tillsammans\n"
++"med detta program. Om inte, skriv till Free Software Foundation,Inc.,\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++
++#: src/gtk/MainView.cxx:1128
++msgid "ePDFView"
++msgstr "ePDFView"
++
++#: src/gtk/MainView.cxx:1135
++msgid "translator-credits"
++msgstr "Daniel Nylander <po@danielnylander.se>"
++
++#: src/gtk/PreferencesView.cxx:32
++msgid "Preferences"
++msgstr "Inställningar"
++
++#: src/gtk/PreferencesView.cxx:46
++msgid "External Commands"
++msgstr "Externa kommandon"
++
++#: src/gtk/PreferencesView.cxx:105
++msgid "Web _Browser:"
++msgstr "Webb_läsare:"
++
++#: src/gtk/PreferencesView.cxx:118
++#, c-format
++msgid "Note: <i>%s</i> will be replaced by the URI."
++msgstr "Observera: <i>%s</i> kommer att ersättas av URI:n."
++
++#: src/gtk/PrintView.cxx:51
++msgid "Print"
++msgstr "Skriv ut"
++
++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659
++msgid "Printer"
++msgstr "Skrivare"
++
++#: src/gtk/PrintView.cxx:74
++msgid "Job"
++msgstr "Jobb"
++
++#: src/gtk/PrintView.cxx:79
++msgid "Paper"
++msgstr "Papper"
++
++#: src/gtk/PrintView.cxx:359
++msgid "<b>Print Range</b>"
++msgstr "<b>Utskriftsintervall</b>"
++
++#: src/gtk/PrintView.cxx:377
++msgid "_All pages"
++msgstr "_Alla sidor"
++
++#: src/gtk/PrintView.cxx:380
++msgid "_Range:"
++msgstr "_Intervall:"
++
++#: src/gtk/PrintView.cxx:392
++msgid "<b>Page Set</b>"
++msgstr "<b>Sidinställningar</b>"
++
++#: src/gtk/PrintView.cxx:408
++msgid "A_ll pages"
++msgstr "A_lla sidor"
++
++#: src/gtk/PrintView.cxx:412
++msgid "O_dd pages"
++msgstr "U_dda sidnummer"
++
++#: src/gtk/PrintView.cxx:416
++msgid "_Even pages"
++msgstr "_Jämna sidnummer"
++
++#: src/gtk/PrintView.cxx:420
++msgid "<b>Copies</b>"
++msgstr "<b>Kopior</b>"
++
++#: src/gtk/PrintView.cxx:437
++msgid "N_umber of copies:"
++msgstr "An_tal kopior:"
++
++#: src/gtk/PrintView.cxx:444
++msgid "C_ollate"
++msgstr "S_ortera"
++
++#: src/gtk/PrintView.cxx:465
++msgid "<b>Paper and Layout</b>"
++msgstr "<b>Papper och layout</b>"
++
++#: src/gtk/PrintView.cxx:482
++msgid "Paper _Size:"
++msgstr "Pappersto_rlek:"
++
++#: src/gtk/PrintView.cxx:508
++msgid "Page _orientation:"
++msgstr "Sid_orientering:"
++
++#: src/gtk/PrintView.cxx:539
++msgid "_Layout:"
++msgstr "_Layout:"
++
++#: src/gtk/PrintView.cxx:568
++msgid "<b>Output</b>"
++msgstr "<b>Utmatning</b>"
++
++#: src/gtk/PrintView.cxx:585
++msgid "_Mode:"
++msgstr "_Läge:"
++
++#: src/gtk/PrintView.cxx:613
++msgid "_Resolution:"
++msgstr "_Upplösning:"
++
++#: src/gtk/PrintView.cxx:668
++msgid "State"
++msgstr "Tillstånd"
++
++#: src/gtk/PrintView.cxx:677
++msgid "Jobs"
++msgstr "Jobb"
++
++#: src/gtk/PrintView.cxx:686
++msgid "Location"
++msgstr "Plats"
++
++#: src/gtk/PrintView.cxx:717
++msgid "Plain"
++msgstr "Vanligt"
++
++#: src/gtk/PrintView.cxx:723
++msgid "2 pages in 1"
++msgstr "2 sidor på 1"
++
++#: src/gtk/PrintView.cxx:729
++msgid "4 pages in 1"
++msgstr "4 sidor på 1"
++
++#: src/gtk/PrintView.cxx:744
++msgid "Portrait"
++msgstr "Stående"
++
++#: src/gtk/PrintView.cxx:750
++msgid "Landscape"
++msgstr "Liggande"
++
++#: src/gtk/StockIcons.cxx:40
++msgid "Find _Next"
++msgstr "Sök _nästa"
++
++#: src/gtk/StockIcons.cxx:41
++msgid "Find _Previous"
++msgstr "Sök _föregående"
+diff -Nurd epdfview-0.1.6-svn/po/vi.po epdfview/po/vi.po
+--- epdfview-0.1.6-svn/po/vi.po	2008-07-13 12:57:47.543198000 +0200
++++ epdfview/po/vi.po	2008-07-13 12:55:55.073198000 +0200
+@@ -7,7 +7,7 @@
+ msgstr ""
+ "Project-Id-Version: ePDFView 0.1.5\n"
+ "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
+ "PO-Revision-Date:  2006-06-14 20:11+0100\n"
+ "Last-Translator:  VnPenguin <vnpenguin@gmail.com>\n"
+ "Language-Team: Vietnamese <i18n@vnoss.org>\n"
+@@ -74,11 +74,11 @@
+ msgid "Unknown error (%d)."
+ msgstr "Lỗi không xác định (%d)."
+ 
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+ msgstr "[FILE] - xem tài liệu PDF"
+ 
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+ msgstr "Trình xem PDF"
+ 
+@@ -92,7 +92,7 @@
+ msgid "Loading file %s..."
+ msgstr "Tải file %s..."
+ 
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
+ #, c-format
+ msgid "of %d"
+ msgstr "của %d"
+@@ -102,39 +102,47 @@
+ msgid "Saving document to %s..."
+ msgstr "�ang ghi tài liệu vào %s..."
+ 
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+ msgstr "Lỗi tải file"
+ 
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+ msgstr "Mật mã mà bạn cung cấp là không hợp lệ cho file này."
+ 
+-#: src/MainPter.cxx:947
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+ msgstr "Lá»—i ghi file"
+ 
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+ msgstr "�ang tải ..."
+ 
+-#: src/PrintPter.cxx:295
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
+ msgid "Grayscale"
+ msgstr "Kiểu đen trắng"
+ 
+-#: src/PrintPter.cxx:395
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+ msgstr "Nghỉ"
+ 
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+ msgstr "Dừng"
+ 
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+ msgstr "�ang xử lý"
+ 
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+ msgstr "Không xác định"
+ 
+@@ -151,244 +159,260 @@
+ msgid "Find:"
+ msgstr "Tìm kiếm:"
+ 
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+ msgstr "_File"
+ 
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+ msgstr "_Sửa đổi"
+ 
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+ msgstr "_Xem"
+ 
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+ msgstr "_Chuyển trang"
+ 
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+ msgstr "_Trợ giúp"
+ 
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+ msgstr "_Mở file"
+ 
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+ msgstr "Mở một tài liệu PDF"
+ 
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+ msgstr "_Tải lại"
+ 
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+ msgstr "Tải lại tài liệu hiện tại"
+ 
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+ msgstr "_Lưu một bản..."
+ 
+-#: src/gtk/MainView.cxx:102
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+ msgstr "Lưu một bản của tài liệu hiện tại"
+ 
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+ msgstr "_In ra..."
+ 
+-#: src/gtk/MainView.cxx:107
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+ msgstr "In tài liệu hiện tại"
+ 
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+ msgstr "_�óng"
+ 
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+ msgstr "�óng cửa sổ này"
+ 
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+ msgstr "_Tìm"
+ 
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+ msgstr "Tìm một từ trong tài liệu"
+ 
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+ msgstr "Xác lập..."
+ 
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+ msgstr "Thay đổi các xác lập của ứng dụng"
+ 
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+ msgstr "Phóng _to"
+ 
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+ msgstr "Phóng to tài liệu"
+ 
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+ msgstr "Thu _nh�"
+ 
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+ msgstr "Thu nh� tài liệu"
+ 
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+ msgstr "Quay _phải"
+ 
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+ msgstr "Quay tài liệu hiện tại 90 độ theo chi�u kim đồng hồ"
+ 
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+ msgstr "Quay _trái"
+ 
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+ msgstr "Quay tài liệu hiện tại 90 độ theo ngược chi�u kim đồng hồ"
+ 
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+ msgstr "_Trang đầu tiên"
+ 
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+ msgstr "�i đến trang đầu tiên"
+ 
+-#: src/gtk/MainView.cxx:143
++#: src/gtk/MainView.cxx:145
+ msgid "_Next Page"
+ msgstr "Trang _kế"
+ 
+-#: src/gtk/MainView.cxx:144
++#: src/gtk/MainView.cxx:146
+ msgid "Go to the next page"
+ msgstr "�i đến trang kế tiếp"
+ 
+-#: src/gtk/MainView.cxx:147
++#: src/gtk/MainView.cxx:149
+ msgid "_Previous Page"
+ msgstr "Trang trÆ°á»›c"
+ 
+-#: src/gtk/MainView.cxx:148
++#: src/gtk/MainView.cxx:150
+ msgid "Go to the previous page"
+ msgstr "�i đến trang trước"
+ 
+-#: src/gtk/MainView.cxx:151
++#: src/gtk/MainView.cxx:153
+ msgid "_Last Page"
+ msgstr "Trang cuối"
+ 
+-#: src/gtk/MainView.cxx:152
++#: src/gtk/MainView.cxx:154
+ msgid "Go to the last page"
+ msgstr "�i đến trang cuối"
+ 
+-#: src/gtk/MainView.cxx:155
++#: src/gtk/MainView.cxx:157
+ msgid "_About"
+ msgstr "_V�..."
+ 
+-#: src/gtk/MainView.cxx:156
++#: src/gtk/MainView.cxx:158
+ msgid "Display application's credits"
+ msgstr "Hiển thị danh sách đóng góp"
+ 
+-#: src/gtk/MainView.cxx:166
++#: src/gtk/MainView.cxx:175
+ msgid "F_ull screen"
+ msgstr ""
+ 
+-#: src/gtk/MainView.cxx:167
++#: src/gtk/MainView.cxx:176
+ msgid "Toggle full screen window"
+ msgstr ""
+ 
+-#: src/gtk/MainView.cxx:170
++#: src/gtk/MainView.cxx:179
+ msgid "Show _Toolbar"
+ msgstr "Hiển thị thanh công cụ"
+ 
+-#: src/gtk/MainView.cxx:171
++#: src/gtk/MainView.cxx:180
+ msgid "Show or hide the toolbar"
+ msgstr "Hiển thị hoặc dấu thanh công cụ"
+ 
+-#: src/gtk/MainView.cxx:174
++#: src/gtk/MainView.cxx:183
+ msgid "Show _Statusbar"
+ msgstr "Hiển thị thanh trạng thái"
+ 
+-#: src/gtk/MainView.cxx:175
++#: src/gtk/MainView.cxx:184
+ msgid "Show or hide the statusbar"
+ msgstr "Hiển thị hoặc dấu thanh trạng thái"
+ 
+-#: src/gtk/MainView.cxx:178
++#: src/gtk/MainView.cxx:187
+ msgid "Show I_ndex"
+ msgstr "Hiển thị chỉ mục"
+ 
+-#: src/gtk/MainView.cxx:179
++#: src/gtk/MainView.cxx:188
+ msgid "Show or hide the document's outline"
+ msgstr "Hiển thị hoặc dấu hình dáng bên ngoài của tài liệu"
+ 
+-#: src/gtk/MainView.cxx:182
++#: src/gtk/MainView.cxx:191
+ msgid "Zoom to _Fit"
+ msgstr "Hiệu chỉnh _hợp với cửa sổ"
+ 
+-#: src/gtk/MainView.cxx:183
++#: src/gtk/MainView.cxx:192
+ msgid "Make the current document fill the window"
+ msgstr "Hiệu chỉnh tài liệu hiện tại lấp đầy cửa sổ"
+ 
+-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
+ msgid "Zoom to _Width"
+ msgstr "Hiệu chỉnh theo b� _rộng trang"
+ 
+-#: src/gtk/MainView.cxx:187
++#: src/gtk/MainView.cxx:196
+ msgid "Make the current document fill the window width"
+ msgstr "Hiệu chỉnh tài liệu hiện tại hợp với b� rộng trang"
+ 
+-#: src/gtk/MainView.cxx:278
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
+ msgid "Open PDF File"
+ msgstr "Mở file PDF"
+ 
+-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
+ msgid "Portable Document Format (PDF) Files"
+ msgstr "file PDF"
+ 
+-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
+ msgid "All Files"
+ msgstr "Tất cả các file"
+ 
+-#: src/gtk/MainView.cxx:362
++#: src/gtk/MainView.cxx:404
+ msgid "Password"
+ msgstr "Mật mã"
+ 
+-#: src/gtk/MainView.cxx:386
++#: src/gtk/MainView.cxx:428
+ msgid "Save PDF File"
+ msgstr "LÆ°u file PDF"
+ 
+-#: src/gtk/MainView.cxx:816
++#: src/gtk/MainView.cxx:858
+ msgid "Page"
+ msgstr "Trang"
+ 
+-#: src/gtk/MainView.cxx:826
++#: src/gtk/MainView.cxx:868
+ msgid "of 0"
+ msgstr "0/0"
+ 
+-#: src/gtk/MainView.cxx:879
++#: src/gtk/MainView.cxx:921
+ msgid "Index"
+ msgstr "Chỉ mục"
+ 
+-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
+ #, c-format
+ msgid "Error building UI manager: %s\n"
+ msgstr "Lỗi khi tạo quản lý giao diện ngư�i dùng: %s\n"
+ 
+-#: src/gtk/MainView.cxx:1056
++#: src/gtk/MainView.cxx:1108
+ msgid "A lightweight PDF viewer"
+ msgstr "Một trình xem PDF nh� g�n"
+ 
+-#: src/gtk/MainView.cxx:1059
++#: src/gtk/MainView.cxx:1111
+ msgid ""
+ "ePDFView is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+@@ -400,7 +424,7 @@
+ "bởi Free Software Foundation; phiên bản 2 hoặc (theo lựa ch�n của bạn)\n"
+ " bất kì phiên bản mới nào.\n"
+ 
+-#: src/gtk/MainView.cxx:1063
++#: src/gtk/MainView.cxx:1115
+ msgid ""
+ "ePDFView is distributes in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+@@ -412,7 +436,7 @@
+ "ngay cả cho MERCHANTABILITY hoặc FITNESS FOR A PARTICULAR PURPOSE.\n"
+ " Xem giấy phép GNU GPL để biết thêm chi tiết.\n"
+ 
+-#: src/gtk/MainView.cxx:1067
++#: src/gtk/MainView.cxx:1119
+ msgid ""
+ "You should have received a copy of the GNU General Public License\n"
+ "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
+@@ -422,11 +446,11 @@
+ "ePDFView; nếu không, thì hãy liên lạc Free Software Foundation, Inc., 59 "
+ "Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"
+ 
+-#: src/gtk/MainView.cxx:1076
++#: src/gtk/MainView.cxx:1128
+ msgid "ePDFView"
+ msgstr "ePDFView"
+ 
+-#: src/gtk/MainView.cxx:1083
++#: src/gtk/MainView.cxx:1135
+ msgid "translator-credits"
+ msgstr "VnPenguin <vnpenguin@gmail.com>"
+ 
+diff -Nurd epdfview-0.1.6-svn/po/zh_CN.po epdfview/po/zh_CN.po
+--- epdfview-0.1.6-svn/po/zh_CN.po	1970-01-01 01:00:00.000000000 +0100
++++ epdfview/po/zh_CN.po	2008-07-13 12:55:55.083198000 +0200
+@@ -0,0 +1,593 @@
++# Simplified Chinese Messages for epdfview.
++# Copyright (C) 2007 Free Software Foundation, Inc.
++# This file is distributed under the same license as the epdfview package.
++# Changyan Xie <panchoat@gmail.com>, 2007.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: epdfview 0.1.5\n"
++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2006-06-19 10:47+0800\n"
++"Last-Translator: Changyan Xie <panchoat@gmail.com>\n"
++"Language-Team: Changyan Xie <panchoat@gmail.com>\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/FindPter.cxx:187
++msgid "No Results Found!"
++msgstr "找�到任何结果�"
++
++#: src/FindPter.cxx:195
++#, c-format
++msgid "Searching in page %d of %d..."
++msgstr "正在查找 %2$d 页中的第 %1$d 页…"
++
++#: src/IDocument.cxx:82
++msgid "No error."
++msgstr "没有错误。"
++
++#: src/IDocument.cxx:85
++msgid "File not found."
++msgstr "找�到文件。"
++
++#: src/IDocument.cxx:88
++msgid "Couldn't read the page catalog."
++msgstr "无法读�页�分类。"
++
++#: src/IDocument.cxx:91
++msgid "The PDF file is damaged and can't be repaired."
++msgstr "PDF 文件��而且无法修�。"
++
++#: src/IDocument.cxx:94
++msgid "The file is encrypted and the password was incorrect or not supplied."
++msgstr "文件已加密而且密�是�正确或是无法�供的。"
++
++#: src/IDocument.cxx:97
++msgid "Nonexistent or invalid highlight file."
++msgstr "�存在或无效的高亮度文件。"
++
++#: src/IDocument.cxx:100
++msgid "Invalid printer."
++msgstr "无效的打�机。"
++
++#: src/IDocument.cxx:103
++msgid "Error during printing."
++msgstr "打�时�生错误"
++
++#: src/IDocument.cxx:106
++msgid "The PDF file doesn't allow that operation."
++msgstr "PDF 文件��许该项�作。"
++
++#: src/IDocument.cxx:109
++msgid "Invalid page number."
++msgstr "无效的页�。"
++
++#: src/IDocument.cxx:112
++msgid "File I/O error."
++msgstr "文件 I/O 错误。"
++
++#: src/IDocument.cxx:115
++#, c-format
++msgid "Unknown error (%d)."
++msgstr "�明的错误 (%d)。"
++
++#: src/main.cxx:59
++msgid "[FILE] - view PDF documents"
++msgstr "[FILE] - �览 PDF 文件"
++
++#: src/main.cxx:72 src/MainPter.cxx:153
++msgid "PDF Viewer"
++msgstr "PDF �览器"
++
++#: src/MainPter.cxx:233
++#, c-format
++msgid "Reloading file %s..."
++msgstr "正在�新装载文件 %s…"
++
++#: src/MainPter.cxx:237
++#, c-format
++msgid "Loading file %s..."
++msgstr "装载文件 %s…"
++
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
++#, c-format
++msgid "of %d"
++msgstr "之于 %d"
++
++#: src/MainPter.cxx:588
++#, c-format
++msgid "Saving document to %s..."
++msgstr "�存文件至 %s…"
++
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
++msgid "Error Loading File"
++msgstr "装载文件时�生错误"
++
++#: src/MainPter.cxx:872
++msgid "The password you have supplied is not a valid password for this file."
++msgstr "您�供的密�对于此文件无效。"
++
++#: src/MainPter.cxx:953
++msgid "Error Saving File"
++msgstr "�存文件时�生错误"
++
++#: src/PagePter.cxx:338
++msgid "Loading..."
++msgstr "装载…"
++
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
++msgid "Grayscale"
++msgstr "�度"
++
++#: src/PrintPter.cxx:409
++msgid "Idle"
++msgstr "闲置"
++
++#: src/PrintPter.cxx:412
++msgid "Stopped"
++msgstr "已�止"
++
++#: src/PrintPter.cxx:415
++msgid "Processing"
++msgstr "处�中"
++
++#: src/PrintPter.cxx:418
++msgid "Unknown"
++msgstr "未知"
++
++#: src/PDFDocument.cxx:272
++#, c-format
++msgid ""
++"Failed to load document '%s'.\n"
++"%s\n"
++msgstr ""
++"装载文件 '%s' 时失败。\n"
++"%s\n"
++
++#: src/gtk/FindView.cxx:51
++msgid "Find:"
++msgstr "查找："
++
++#: src/gtk/MainView.cxx:89
++msgid "_File"
++msgstr "文件(_F)"
++
++#: src/gtk/MainView.cxx:90
++msgid "_Edit"
++msgstr "编辑(_E)"
++
++#: src/gtk/MainView.cxx:91
++msgid "_View"
++msgstr "�览(_V)"
++
++#: src/gtk/MainView.cxx:92
++msgid "_Go"
++msgstr "�往(_G)"
++
++#: src/gtk/MainView.cxx:93
++msgid "_Help"
++msgstr "帮助(_H)"
++
++#: src/gtk/MainView.cxx:95
++msgid "_Open"
++msgstr "打开(_O)"
++
++#: src/gtk/MainView.cxx:96
++msgid "Open a PDF document"
++msgstr "打开 PDF 文件"
++
++#: src/gtk/MainView.cxx:99
++msgid "_Reload"
++msgstr "�新装载(_R)"
++
++#: src/gtk/MainView.cxx:100
++msgid "Reload the current document"
++msgstr "�新装载当�文件"
++
++#: src/gtk/MainView.cxx:103
++msgid "_Save a Copy..."
++msgstr "�存副本(_S)…"
++
++#: src/gtk/MainView.cxx:104
++msgid "Save a copy of the current document"
++msgstr "�存当�文件的副本"
++
++#: src/gtk/MainView.cxx:108
++msgid "_Print..."
++msgstr "打�(_P)…"
++
++#: src/gtk/MainView.cxx:109
++msgid "Print the current document"
++msgstr "打�当�文件"
++
++#: src/gtk/MainView.cxx:113
++msgid "_Close"
++msgstr "关闭(_C)"
++
++#: src/gtk/MainView.cxx:114
++msgid "Close this window"
++msgstr "关闭此窗�"
++
++#: src/gtk/MainView.cxx:117
++msgid "_Find"
++msgstr "查找(_F)"
++
++#: src/gtk/MainView.cxx:118
++msgid "Find a word in the document"
++msgstr "在文件中查找字�"
++
++#: src/gtk/MainView.cxx:121
++msgid "Preferences..."
++msgstr "�好设定…"
++
++#: src/gtk/MainView.cxx:122
++msgid "Change the application's preferences"
++msgstr "改�应用软件的�好设定"
++
++#: src/gtk/MainView.cxx:125
++msgid "Zoom _In"
++msgstr "放大(_I)"
++
++#: src/gtk/MainView.cxx:126
++msgid "Enlarge the document"
++msgstr "放大文件"
++
++#: src/gtk/MainView.cxx:129
++msgid "Zoom _Out"
++msgstr "缩�(_O)"
++
++#: src/gtk/MainView.cxx:130
++msgid "Shrink the document"
++msgstr "缩�文件"
++
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
++msgid "Rotate _Right"
++msgstr "��旋转(_R)"
++
++#: src/gtk/MainView.cxx:134
++msgid "Rotate the document 90 degrees clockwise"
++msgstr "顺时针旋转文件 90 度"
++
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
++msgid "Rotate _Left"
++msgstr "�左旋转(_L)"
++
++#: src/gtk/MainView.cxx:138
++msgid "Rotate the document 90 degrees counter-clockwise"
++msgstr "逆时针旋转文件 90 度"
++
++#: src/gtk/MainView.cxx:141
++msgid "_First Page"
++msgstr "第一页(_F)"
++
++#: src/gtk/MainView.cxx:142
++msgid "Go to the first page"
++msgstr "�往第一页"
++
++#: src/gtk/MainView.cxx:145
++msgid "_Next Page"
++msgstr "下一页(_N)"
++
++#: src/gtk/MainView.cxx:146
++msgid "Go to the next page"
++msgstr "�往下一页"
++
++#: src/gtk/MainView.cxx:149
++msgid "_Previous Page"
++msgstr "上一页(_P)"
++
++#: src/gtk/MainView.cxx:150
++msgid "Go to the previous page"
++msgstr "�往上一页"
++
++#: src/gtk/MainView.cxx:153
++msgid "_Last Page"
++msgstr "最�一页(_L)"
++
++#: src/gtk/MainView.cxx:154
++msgid "Go to the last page"
++msgstr "�往最�一页"
++
++#: src/gtk/MainView.cxx:157
++msgid "_About"
++msgstr "关于(_A)"
++
++#: src/gtk/MainView.cxx:158
++msgid "Display application's credits"
++msgstr "显示应用程�的感谢"
++
++#: src/gtk/MainView.cxx:175
++msgid "F_ull screen"
++msgstr "全�(_F)"
++
++#: src/gtk/MainView.cxx:176
++msgid "Toggle full screen window"
++msgstr "开关全�模�"
++
++#: src/gtk/MainView.cxx:179
++msgid "Show _Toolbar"
++msgstr "显示工具�(_T)"
++
++#: src/gtk/MainView.cxx:180
++msgid "Show or hide the toolbar"
++msgstr "显示或��工具�"
++
++#: src/gtk/MainView.cxx:183
++msgid "Show _Statusbar"
++msgstr "显示状��(_S)"
++
++#: src/gtk/MainView.cxx:184
++msgid "Show or hide the statusbar"
++msgstr "显示或��状��"
++
++#: src/gtk/MainView.cxx:187
++msgid "Show I_ndex"
++msgstr "显示索引(_N)"
++
++#: src/gtk/MainView.cxx:188
++msgid "Show or hide the document's outline"
++msgstr "显示或��文件外框"
++
++#: src/gtk/MainView.cxx:191
++msgid "Zoom to _Fit"
++msgstr "符�窗�(_F)"
++
++#: src/gtk/MainView.cxx:192
++msgid "Make the current document fill the window"
++msgstr "将当�文件填满窗�"
++
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
++msgid "Zoom to _Width"
++msgstr "符�宽度(_W)"
++
++#: src/gtk/MainView.cxx:196
++msgid "Make the current document fill the window width"
++msgstr "将当�文件符�窗�宽度"
++
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
++msgid "Open PDF File"
++msgstr "打开 PDF 文件"
++
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
++msgid "Portable Document Format (PDF) Files"
++msgstr "���文件格� (PDF) 文件"
++
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
++msgid "All Files"
++msgstr "所有文件"
++
++#: src/gtk/MainView.cxx:404
++msgid "Password"
++msgstr "密�"
++
++#: src/gtk/MainView.cxx:428
++msgid "Save PDF File"
++msgstr "�存 PDF 文件"
++
++#: src/gtk/MainView.cxx:858
++msgid "Page"
++msgstr "页�"
++
++#: src/gtk/MainView.cxx:868
++msgid "of 0"
++msgstr "之于 0"
++
++#: src/gtk/MainView.cxx:921
++msgid "Index"
++msgstr "索引"
++
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
++#, c-format
++msgid "Error building UI manager: %s\n"
++msgstr "建立 UI 管�员时�生错误：%s\n"
++
++#: src/gtk/MainView.cxx:1108
++msgid "A lightweight PDF viewer"
++msgstr "轻�级的 PDF �览器"
++
++#: src/gtk/MainView.cxx:1111
++msgid ""
++"ePDFView is free software; you can redistribute it and/or modify\n"
++"it under the terms of the GNU General Public License as published by\n"
++"the Free Software Foundation; either version 2 of the License, or\n"
++"(at your option) any later version.\n"
++msgstr ""
++"ePDFView 为自由软件；您���自由软件基金会所�表的 GNU 通用公共授�\n"
++"�款规定，就本程��新分�与�或修改；无论您��的是本授�的第二版或\n"
++"（您自行选择的）任何���行的版本。\n"
++
++#: src/gtk/MainView.cxx:1115
++msgid ""
++"ePDFView is distributes in the hope that it will be useful,\n"
++"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
++"GNU General Public License for more details.\n"
++msgstr ""
++"ePDFView 系基于使用目的而加以分�，然而�负任何担�责任；亦无对适售性\n"
++"或特定目的适用性所为的默示性担�。详情请�照 GNU 通用公共授�。\n"
++
++#: src/gtk/MainView.cxx:1119
++msgid ""
++"You should have received a copy of the GNU General Public License\n"
++"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
++"59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
++msgstr ""
++"您应已收到附�于 ePDFView 的 GNU 通用公共授�的副本；如无，请写信至\n"
++"自由软件基金会: \n"
++"59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n"
++
++#: src/gtk/MainView.cxx:1128
++msgid "ePDFView"
++msgstr "ePDFView"
++
++#: src/gtk/MainView.cxx:1135
++msgid "translator-credits"
++msgstr "谢长� <panchoat@gmail.com>"
++
++#: src/gtk/PreferencesView.cxx:32
++msgid "Preferences"
++msgstr "�好设定"
++
++#: src/gtk/PreferencesView.cxx:46
++msgid "External Commands"
++msgstr "外部命令"
++
++#: src/gtk/PreferencesView.cxx:105
++msgid "Web _Browser:"
++msgstr "网页�览器(_B)："
++
++#: src/gtk/PreferencesView.cxx:118
++#, c-format
++msgid "Note: <i>%s</i> will be replaced by the URI."
++msgstr "注�：<i>%s</i> 将会被 URI 所�代。"
++
++#: src/gtk/PrintView.cxx:51
++msgid "Print"
++msgstr "打�"
++
++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659
++msgid "Printer"
++msgstr "打�机"
++
++#: src/gtk/PrintView.cxx:74
++msgid "Job"
++msgstr "工作"
++
++#: src/gtk/PrintView.cxx:79
++msgid "Paper"
++msgstr "纸张"
++
++#: src/gtk/PrintView.cxx:359
++msgid "<b>Print Range</b>"
++msgstr "<b>打�范围</b>"
++
++#: src/gtk/PrintView.cxx:377
++msgid "_All pages"
++msgstr "所有页�(_A)"
++
++#: src/gtk/PrintView.cxx:380
++msgid "_Range:"
++msgstr "范围(_R)："
++
++#: src/gtk/PrintView.cxx:392
++msgid "<b>Page Set</b>"
++msgstr "<b>页�设定</b>"
++
++#: src/gtk/PrintView.cxx:408
++msgid "A_ll pages"
++msgstr "所有页�(_L)"
++
++#: src/gtk/PrintView.cxx:412
++msgid "O_dd pages"
++msgstr "奇数页�(_D)"
++
++#: src/gtk/PrintView.cxx:416
++msgid "_Even pages"
++msgstr "�数页�(_E)"
++
++#: src/gtk/PrintView.cxx:420
++msgid "<b>Copies</b>"
++msgstr "<b>份数</b>"
++
++#: src/gtk/PrintView.cxx:437
++msgid "N_umber of copies:"
++msgstr "副本的数�："
++
++#: src/gtk/PrintView.cxx:444
++msgid "C_ollate"
++msgstr "自动分页(_O)"
++
++#: src/gtk/PrintView.cxx:465
++msgid "<b>Paper and Layout</b>"
++msgstr "<b>纸张和版�</b>"
++
++#: src/gtk/PrintView.cxx:482
++msgid "Paper _Size:"
++msgstr "纸张大�(_S)："
++
++#: src/gtk/PrintView.cxx:508
++msgid "Page _orientation:"
++msgstr "纸张方�(_O)："
++
++#: src/gtk/PrintView.cxx:539
++msgid "_Layout:"
++msgstr "版�(_L)"
++
++#: src/gtk/PrintView.cxx:568
++msgid "<b>Output</b>"
++msgstr "<b>输出</b>"
++
++#: src/gtk/PrintView.cxx:585
++msgid "_Mode:"
++msgstr "模�(_M)："
++
++#: src/gtk/PrintView.cxx:613
++msgid "_Resolution:"
++msgstr "分辨率(_R)："
++
++#: src/gtk/PrintView.cxx:668
++msgid "State"
++msgstr "状�"
++
++#: src/gtk/PrintView.cxx:677
++msgid "Jobs"
++msgstr "工作"
++
++#: src/gtk/PrintView.cxx:686
++msgid "Location"
++msgstr "�置"
++
++#: src/gtk/PrintView.cxx:717
++msgid "Plain"
++msgstr "普通"
++
++#: src/gtk/PrintView.cxx:723
++msgid "2 pages in 1"
++msgstr "两页�一"
++
++#: src/gtk/PrintView.cxx:729
++msgid "4 pages in 1"
++msgstr "四页�一"
++
++#: src/gtk/PrintView.cxx:744
++msgid "Portrait"
++msgstr "纵�"
++
++#: src/gtk/PrintView.cxx:750
++msgid "Landscape"
++msgstr "横�"
++
++#: src/gtk/StockIcons.cxx:40
++msgid "Find _Next"
++msgstr "查找下一个(_N)"
++
++#: src/gtk/StockIcons.cxx:41
++msgid "Find _Previous"
++msgstr "查找上一个(_P)"
+diff -Nurd epdfview-0.1.6-svn/po/zh_TW.po epdfview/po/zh_TW.po
+--- epdfview-0.1.6-svn/po/zh_TW.po	2008-07-13 12:57:47.543198000 +0200
++++ epdfview/po/zh_TW.po	2008-07-13 12:55:55.083198000 +0200
+@@ -1,14 +1,13 @@
+ # Traditional Chinese Messages for epdfview.
+-# Copyright (C) 2006 Free Software Foundation, Inc.
+ # This file is distributed under the same license as the epdfview package.
+-# Wei-Lun Chao <william.chao@ossii.com.tw>, 2006.
++# Wei-Lun Chao <william.chao@ossii.com.tw>, 2006, 07.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: epdfview 0.1.5\n"
++"Project-Id-Version: epdfview 0.1.6\n"
+ "Report-Msgid-Bugs-To: jordi@emma-soft.com\n"
+-"POT-Creation-Date: 2007-02-26 17:47+0100\n"
+-"PO-Revision-Date: 2006-06-19 10:47+0800\n"
++"POT-Creation-Date: 2008-04-14 13:27+0200\n"
++"PO-Revision-Date: 2007-04-20 12:47+0800\n"
+ "Last-Translator: Wei-Lun Chao <william.chao@ossii.com.tw>\n"
+ "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+ "MIME-Version: 1.0\n"
+@@ -74,11 +73,11 @@
+ msgid "Unknown error (%d)."
+ msgstr "�明的錯誤 (%d)。"
+ 
+-#: src/main.cxx:38
++#: src/main.cxx:59
+ msgid "[FILE] - view PDF documents"
+ msgstr "[FILE] - 檢視 PDF 文件"
+ 
+-#: src/main.cxx:51 src/MainPter.cxx:153
++#: src/main.cxx:72 src/MainPter.cxx:153
+ msgid "PDF Viewer"
+ msgstr "PDF 檢視器"
+ 
+@@ -92,7 +91,7 @@
+ msgid "Loading file %s..."
+ msgstr "載入檔案 %s…"
+ 
+-#: src/MainPter.cxx:413 src/MainPter.cxx:886
++#: src/MainPter.cxx:413 src/MainPter.cxx:892
+ #, c-format
+ msgid "of %d"
+ msgstr "之於 %d"
+@@ -102,39 +101,47 @@
+ msgid "Saving document to %s..."
+ msgstr "儲存文件至 %s…"
+ 
+-#: src/MainPter.cxx:826 src/MainPter.cxx:865
++#: src/MainPter.cxx:832 src/MainPter.cxx:871
+ msgid "Error Loading File"
+ msgstr "載入檔案時發生錯誤"
+ 
+-#: src/MainPter.cxx:866
++#: src/MainPter.cxx:872
+ msgid "The password you have supplied is not a valid password for this file."
+ msgstr "您�供的密碼�於此檔案無效。"
+ 
+-#: src/MainPter.cxx:947
++#: src/MainPter.cxx:953
+ msgid "Error Saving File"
+ msgstr "儲存檔案時發生錯誤"
+ 
+-#: src/PagePter.cxx:292
++#: src/PagePter.cxx:338
+ msgid "Loading..."
+ msgstr "載入…"
+ 
+-#: src/PrintPter.cxx:295
++#: src/PrintPter.cxx:252
++msgid "A4"
++msgstr ""
++
++#: src/PrintPter.cxx:280
++msgid "300 DPI"
++msgstr ""
++
++#: src/PrintPter.cxx:308
+ msgid "Grayscale"
+ msgstr "�階"
+ 
+-#: src/PrintPter.cxx:395
++#: src/PrintPter.cxx:409
+ msgid "Idle"
+ msgstr "é–’ç½®"
+ 
+-#: src/PrintPter.cxx:398
++#: src/PrintPter.cxx:412
+ msgid "Stopped"
+ msgstr "已�止"
+ 
+-#: src/PrintPter.cxx:401
++#: src/PrintPter.cxx:415
+ msgid "Processing"
+ msgstr "處�中"
+ 
+-#: src/PrintPter.cxx:404
++#: src/PrintPter.cxx:418
+ msgid "Unknown"
+ msgstr "未知"
+ 
+@@ -151,244 +158,260 @@
+ msgid "Find:"
+ msgstr "尋找："
+ 
+-#: src/gtk/MainView.cxx:87
++#: src/gtk/MainView.cxx:89
+ msgid "_File"
+ msgstr "檔案(_F)"
+ 
+-#: src/gtk/MainView.cxx:88
++#: src/gtk/MainView.cxx:90
+ msgid "_Edit"
+ msgstr "編輯(_E)"
+ 
+-#: src/gtk/MainView.cxx:89
++#: src/gtk/MainView.cxx:91
+ msgid "_View"
+ msgstr "檢視(_V)"
+ 
+-#: src/gtk/MainView.cxx:90
++#: src/gtk/MainView.cxx:92
+ msgid "_Go"
+ msgstr "�往(_G)"
+ 
+-#: src/gtk/MainView.cxx:91
++#: src/gtk/MainView.cxx:93
+ msgid "_Help"
+ msgstr "求助(_H)"
+ 
+-#: src/gtk/MainView.cxx:93
++#: src/gtk/MainView.cxx:95
+ msgid "_Open"
+ msgstr "é–‹å•Ÿ(_O)"
+ 
+-#: src/gtk/MainView.cxx:94
++#: src/gtk/MainView.cxx:96
+ msgid "Open a PDF document"
+ msgstr "開啟 PDF 文件"
+ 
+-#: src/gtk/MainView.cxx:97
++#: src/gtk/MainView.cxx:99
+ msgid "_Reload"
+ msgstr "�新載入(_R)"
+ 
+-#: src/gtk/MainView.cxx:98
++#: src/gtk/MainView.cxx:100
+ msgid "Reload the current document"
+ msgstr "�新載入目�文件"
+ 
+-#: src/gtk/MainView.cxx:101
++#: src/gtk/MainView.cxx:103
+ msgid "_Save a Copy..."
+ msgstr "儲存複本(_S)…"
+ 
+-#: src/gtk/MainView.cxx:102
++#: src/gtk/MainView.cxx:104
+ msgid "Save a copy of the current document"
+ msgstr "儲存目�文件的複本"
+ 
+-#: src/gtk/MainView.cxx:106
++#: src/gtk/MainView.cxx:108
+ msgid "_Print..."
+ msgstr "列�(_P)…"
+ 
+-#: src/gtk/MainView.cxx:107
++#: src/gtk/MainView.cxx:109
+ msgid "Print the current document"
+ msgstr "列�目�文件"
+ 
+-#: src/gtk/MainView.cxx:111
++#: src/gtk/MainView.cxx:113
+ msgid "_Close"
+ msgstr "關閉(_C)"
+ 
+-#: src/gtk/MainView.cxx:112
++#: src/gtk/MainView.cxx:114
+ msgid "Close this window"
+ msgstr "關閉此視窗"
+ 
+-#: src/gtk/MainView.cxx:115
++#: src/gtk/MainView.cxx:117
+ msgid "_Find"
+ msgstr "尋找(_F)"
+ 
+-#: src/gtk/MainView.cxx:116
++#: src/gtk/MainView.cxx:118
+ msgid "Find a word in the document"
+ msgstr "在文件中尋找字詞"
+ 
+-#: src/gtk/MainView.cxx:119
++#: src/gtk/MainView.cxx:121
+ msgid "Preferences..."
+ msgstr "�好設定…"
+ 
+-#: src/gtk/MainView.cxx:120
++#: src/gtk/MainView.cxx:122
+ msgid "Change the application's preferences"
+ msgstr "改變應用軟體的�好設定"
+ 
+-#: src/gtk/MainView.cxx:123
++#: src/gtk/MainView.cxx:125
+ msgid "Zoom _In"
+ msgstr "放大(_I)"
+ 
+-#: src/gtk/MainView.cxx:124
++#: src/gtk/MainView.cxx:126
+ msgid "Enlarge the document"
+ msgstr "放大文件"
+ 
+-#: src/gtk/MainView.cxx:127
++#: src/gtk/MainView.cxx:129
+ msgid "Zoom _Out"
+ msgstr "縮�(_O)"
+ 
+-#: src/gtk/MainView.cxx:128
++#: src/gtk/MainView.cxx:130
+ msgid "Shrink the document"
+ msgstr "收縮文件"
+ 
+-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43
++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43
+ msgid "Rotate _Right"
+ msgstr "��旋轉(_R)"
+ 
+-#: src/gtk/MainView.cxx:132
++#: src/gtk/MainView.cxx:134
+ msgid "Rotate the document 90 degrees clockwise"
+ msgstr "順時�旋轉文件 90 度"
+ 
+-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42
++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42
+ msgid "Rotate _Left"
+ msgstr "�左旋轉(_L)"
+ 
+-#: src/gtk/MainView.cxx:136
++#: src/gtk/MainView.cxx:138
+ msgid "Rotate the document 90 degrees counter-clockwise"
+ msgstr "逆時�旋轉文件 90 度"
+ 
+-#: src/gtk/MainView.cxx:139
++#: src/gtk/MainView.cxx:141
+ msgid "_First Page"
+ msgstr "首�(_F)"
+ 
+-#: src/gtk/MainView.cxx:140
++#: src/gtk/MainView.cxx:142
+ msgid "Go to the first page"
+ msgstr "�往第一�"
+ 
+-#: src/gtk/MainView.cxx:143
++#: src/gtk/MainView.cxx:145
+ msgid "_Next Page"
+ msgstr "下�(_N)"
+ 
+-#: src/gtk/MainView.cxx:144
++#: src/gtk/MainView.cxx:146
+ msgid "Go to the next page"
+ msgstr "�往下一�"
+ 
+-#: src/gtk/MainView.cxx:147
++#: src/gtk/MainView.cxx:149
+ msgid "_Previous Page"
+ msgstr "上�(_P)"
+ 
+-#: src/gtk/MainView.cxx:148
++#: src/gtk/MainView.cxx:150
+ msgid "Go to the previous page"
+ msgstr "�往上一�"
+ 
+-#: src/gtk/MainView.cxx:151
++#: src/gtk/MainView.cxx:153
+ msgid "_Last Page"
+ msgstr "末�(_L)"
+ 
+-#: src/gtk/MainView.cxx:152
++#: src/gtk/MainView.cxx:154
+ msgid "Go to the last page"
+ msgstr "�往最末�"
+ 
+-#: src/gtk/MainView.cxx:155
++#: src/gtk/MainView.cxx:157
+ msgid "_About"
+ msgstr "關於(_A)"
+ 
+-#: src/gtk/MainView.cxx:156
++#: src/gtk/MainView.cxx:158
+ msgid "Display application's credits"
+ msgstr "顯示應用程�的鳴�"
+ 
+-#: src/gtk/MainView.cxx:166
++#: src/gtk/MainView.cxx:175
+ msgid "F_ull screen"
+-msgstr ""
++msgstr "全螢幕(_U)"
+ 
+-#: src/gtk/MainView.cxx:167
++#: src/gtk/MainView.cxx:176
+ msgid "Toggle full screen window"
+-msgstr ""
++msgstr "切�到全螢幕視窗"
+ 
+-#: src/gtk/MainView.cxx:170
++#: src/gtk/MainView.cxx:179
+ msgid "Show _Toolbar"
+ msgstr "顯示工具列(_T)"
+ 
+-#: src/gtk/MainView.cxx:171
++#: src/gtk/MainView.cxx:180
+ msgid "Show or hide the toolbar"
+ msgstr "顯示或隱�工具列"
+ 
+-#: src/gtk/MainView.cxx:174
++#: src/gtk/MainView.cxx:183
+ msgid "Show _Statusbar"
+ msgstr "顯示狀態列(_S)"
+ 
+-#: src/gtk/MainView.cxx:175
++#: src/gtk/MainView.cxx:184
+ msgid "Show or hide the statusbar"
+ msgstr "顯示或隱�狀態列"
+ 
+-#: src/gtk/MainView.cxx:178
++#: src/gtk/MainView.cxx:187
+ msgid "Show I_ndex"
+ msgstr "顯示索引(_N)"
+ 
+-#: src/gtk/MainView.cxx:179
++#: src/gtk/MainView.cxx:188
+ msgid "Show or hide the document's outline"
+ msgstr "顯示或隱�文件外框"
+ 
+-#: src/gtk/MainView.cxx:182
++#: src/gtk/MainView.cxx:191
+ msgid "Zoom to _Fit"
+ msgstr "符�視窗(_F)"
+ 
+-#: src/gtk/MainView.cxx:183
++#: src/gtk/MainView.cxx:192
+ msgid "Make the current document fill the window"
+ msgstr "將目�文件填滿視窗"
+ 
+-#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44
++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44
+ msgid "Zoom to _Width"
+ msgstr "符�寬度(_W)"
+ 
+-#: src/gtk/MainView.cxx:187
++#: src/gtk/MainView.cxx:196
+ msgid "Make the current document fill the window width"
+ msgstr "將目�文件填滿視窗寬度"
+ 
+-#: src/gtk/MainView.cxx:278
++#: src/gtk/MainView.cxx:202
++msgid "Scroll"
++msgstr ""
++
++#: src/gtk/MainView.cxx:203
++msgid "Mouse scroll page"
++msgstr ""
++
++#: src/gtk/MainView.cxx:205
++msgid "Select Text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:206
++msgid " Mouse select text"
++msgstr ""
++
++#: src/gtk/MainView.cxx:320
+ msgid "Open PDF File"
+ msgstr "開啟 PDF 檔案"
+ 
+-#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412
++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454
+ msgid "Portable Document Format (PDF) Files"
+ msgstr "�攜�文件格� (PDF) 檔案"
+ 
+-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424
++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466
+ msgid "All Files"
+ msgstr "所有檔案"
+ 
+-#: src/gtk/MainView.cxx:362
++#: src/gtk/MainView.cxx:404
+ msgid "Password"
+ msgstr "密碼"
+ 
+-#: src/gtk/MainView.cxx:386
++#: src/gtk/MainView.cxx:428
+ msgid "Save PDF File"
+ msgstr "儲存 PDF 檔案"
+ 
+-#: src/gtk/MainView.cxx:816
++#: src/gtk/MainView.cxx:858
+ msgid "Page"
+ msgstr "��"
+ 
+-#: src/gtk/MainView.cxx:826
++#: src/gtk/MainView.cxx:868
+ msgid "of 0"
+ msgstr "之於 0"
+ 
+-#: src/gtk/MainView.cxx:879
++#: src/gtk/MainView.cxx:921
+ msgid "Index"
+ msgstr "索引"
+ 
+-#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956
++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001
+ #, c-format
+ msgid "Error building UI manager: %s\n"
+ msgstr "建立 UI 管�員時發生錯誤：%s\n"
+ 
+-#: src/gtk/MainView.cxx:1056
++#: src/gtk/MainView.cxx:1108
+ msgid "A lightweight PDF viewer"
+ msgstr "輕�級的 PDF 檢視器"
+ 
+-#: src/gtk/MainView.cxx:1059
++#: src/gtk/MainView.cxx:1111
+ msgid ""
+ "ePDFView is free software; you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+@@ -399,7 +422,7 @@
+ "�款�定，就本程��為散布與�或修改；無論您�據的是本授權的第二版或\n"
+ "（您自行�擇的）任何�後發行的版本。\n"
+ 
+-#: src/gtk/MainView.cxx:1063
++#: src/gtk/MainView.cxx:1115
+ msgid ""
+ "ePDFView is distributes in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+@@ -409,7 +432,7 @@
+ "ePDFView 係基於使用目的而加以散布，然而�負任何擔�責任；亦無��售性\n"
+ "或特定目的�用性所為的默示性擔�。詳情請�照 GNU 通用公共授權。\n"
+ 
+-#: src/gtk/MainView.cxx:1067
++#: src/gtk/MainView.cxx:1119
+ msgid ""
+ "You should have received a copy of the GNU General Public License\n"
+ "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n"
+@@ -419,11 +442,11 @@
+ "自由軟體基金會: \n"
+ "59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n"
+ 
+-#: src/gtk/MainView.cxx:1076
++#: src/gtk/MainView.cxx:1128
+ msgid "ePDFView"
+ msgstr "ePDFView"
+ 
+-#: src/gtk/MainView.cxx:1083
++#: src/gtk/MainView.cxx:1135
+ msgid "translator-credits"
+ msgstr "趙惟倫 <william.chao@ossii.com.tw>"
+ 
+diff -Nurd epdfview-0.1.6-svn/src/Config.cxx epdfview/src/Config.cxx
+--- epdfview-0.1.6-svn/src/Config.cxx	2008-07-13 12:57:45.043198000 +0200
++++ epdfview/src/Config.cxx	2008-07-13 12:55:52.473198000 +0200
+@@ -40,7 +40,6 @@
+ 
+ // Forward declarations.
+ gchar *getConfigFileName (void);
+-void makeDirWithParents (const gchar *);
+ 
+ ///
+ /// @brief Constructs a new Config object.
+@@ -502,42 +501,9 @@
+ {
+     gchar *configDir = 
+         g_build_filename (g_get_user_config_dir (), PACKAGE, NULL);
+-    makeDirWithParents (configDir);
++    g_mkdir_with_parents (configDir, 0700);
+     gchar *configFile = g_build_filename (configDir, "main.conf", NULL);
+     g_free (configDir);
+ 
+     return configFile;
+ }
+-
+-///
+-/// @brief Creates the directory and all its parent directories.
+-///
+-/// If the directory already exists it does nothing.
+-///
+-/// @param path The directory to create.
+-///
+-void
+-makeDirWithParents (const gchar *path)
+-{
+-    // Get the list of directories to create.
+-    GList *dirs = NULL;
+-    gchar *dirName = g_strdup (path);
+-    while ( !g_file_test (dirName, G_FILE_TEST_EXISTS) )
+-    {
+-        dirs = g_list_prepend (dirs, dirName);
+-        dirName = g_path_get_dirname (dirName);
+-    }
+-
+-    // Now create all of them.
+-    GList *dir = g_list_first (dirs);
+-    while ( NULL != dir )
+-    {
+-        if ( -1 == g_mkdir ((gchar *)dir->data, 0700) )
+-        {
+-            g_warning ("Couldn't make directory '%s'\n", (gchar *)dir->data);
+-        }
+-        g_free (dir->data);
+-        dir = g_list_next (dir);
+-    }
+-    g_list_free (dirs);
+-}
+diff -Nurd epdfview-0.1.6-svn/src/DocumentPage.cxx epdfview/src/DocumentPage.cxx
+--- epdfview-0.1.6-svn/src/DocumentPage.cxx	2008-07-13 12:57:45.043198000 +0200
++++ epdfview/src/DocumentPage.cxx	2008-07-13 12:55:52.473198000 +0200
+@@ -17,6 +17,7 @@
+ 
+ #include <config.h>
+ #include <string.h>
++#include <gdk/gdk.h>
+ #include "epdfview.h"
+ 
+ using namespace ePDFView;
+@@ -28,6 +29,7 @@
+ ///
+ DocumentPage::DocumentPage ()
+ {
++    m_Selection = NULL;
+     m_Data = NULL;
+     m_HasSelection = FALSE;
+     m_Height = 0;
+@@ -49,6 +51,9 @@
+         delete link;
+     }
+     g_list_free (m_LinkList);
++
++    if(m_Selection)
++        gdk_region_destroy(m_Selection);
+ }
+ 
+ ///
+@@ -79,6 +84,12 @@
+         invertArea (m_SelectionX1, m_SelectionY1, m_SelectionX2, m_SelectionY2);
+         m_HasSelection = FALSE;
+     }
++
++    if(NULL != m_Selection){
++        invertRegion(m_Selection);
++        gdk_region_destroy(m_Selection);
++        m_Selection = NULL;
++    }
+ }
+ 
+ ///
+@@ -195,6 +206,20 @@
+     }
+ }
+ 
++void
++DocumentPage::invertRegion (GdkRegion* region)
++{
++    int count;
++    GdkRectangle *rectangles;
++    gdk_region_get_rectangles(region, &rectangles, &count);
++    while(count--){
++        GdkRectangle r = rectangles[count];
++        invertArea(r.x, r.y, r.x + r.width, r.y + r.height);
++    }
++    g_free(rectangles);
++}
++
++
+ ///
+ /// @brief Allocates the memory for a new page.
+ ///
+@@ -253,3 +278,13 @@
+     
+     m_HasSelection = TRUE;
+ }
++
++void
++DocumentPage::setSelection (GdkRegion *region)
++{
++    clearSelection ();
++    
++    invertRegion (region);
++    
++    m_Selection = gdk_region_copy(region);
++}
+diff -Nurd epdfview-0.1.6-svn/src/DocumentPage.h epdfview/src/DocumentPage.h
+--- epdfview-0.1.6-svn/src/DocumentPage.h	2008-07-13 12:57:45.123198000 +0200
++++ epdfview/src/DocumentPage.h	2008-07-13 12:55:52.573198000 +0200
+@@ -18,6 +18,8 @@
+ #if !defined (__DOCUMENT_PAGE_H__)
+ #define __DOCUMENT_PAGE_H__
+ 
++typedef struct _GdkRegion GdkRegion;
++
+ namespace ePDFView
+ {
+     ///
+@@ -41,6 +43,7 @@
+             gint getWidth (void);
+             gboolean newPage (gint width, gint height);
+             void setSelection (DocumentRectangle &selection, gdouble scale);
++            void setSelection (GdkRegion *region);
+ 
+         protected:
+             /// The page's image.
+@@ -61,7 +64,10 @@
+             gint m_Width;
+             /// The list of links from the page.
+             GList *m_LinkList;
+-
++            /// Selection region
++            GdkRegion *m_Selection;
++            
++            void invertRegion (GdkRegion*);
+             void invertArea (gint x1, gint y1, gint x2, gint y2);
+     };
+ }
+diff -Nurd epdfview-0.1.6-svn/src/gtk/MainView.cxx epdfview/src/gtk/MainView.cxx
+--- epdfview-0.1.6-svn/src/gtk/MainView.cxx	2008-07-13 12:57:44.223198000 +0200
++++ epdfview/src/gtk/MainView.cxx	2008-07-13 12:55:50.923198000 +0200
+@@ -76,6 +76,8 @@
+ static void main_window_zoom_in_cb (GtkWidget *, gpointer);
+ static void main_window_zoom_out_cb (GtkWidget *, gpointer);
+ static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
++static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
++static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
+ 
+ #if defined (HAVE_CUPS)
+ static void main_window_print_cb (GtkWidget *, gpointer);
+@@ -128,11 +130,11 @@
+       N_("Shrink the document"),
+       G_CALLBACK (main_window_zoom_out_cb) },
+ 
+-    { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL,
++    { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<control>bracketright",
+       N_("Rotate the document 90 degrees clockwise"),
+       G_CALLBACK (main_window_rotate_right_cb) },
+ 
+-    { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL,
++    { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), "<control>bracketleft",
+       N_("Rotate the document 90 degrees counter-clockwise"),
+       G_CALLBACK (main_window_rotate_left_cb) },
+ 
+@@ -158,7 +160,14 @@
+ 
+     // Accelerator keys.
+     { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL,
+-      G_CALLBACK (main_window_find_cb) }
++      G_CALLBACK (main_window_find_cb) },
++
++    { "KPAdd", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL,
++      G_CALLBACK (main_window_zoom_in_cb) },
++
++    { "KPSubtract", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract",
++      NULL,
++      G_CALLBACK (main_window_zoom_out_cb) }
+ };
+ 
+ static GtkToggleActionEntry g_ToggleEntries[] =
+@@ -185,10 +194,19 @@
+ 
+     { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL,
+       N_("Make the current document fill the window width"),
+-      G_CALLBACK (main_window_zoom_width_cb), FALSE }
++      G_CALLBACK (main_window_zoom_width_cb), FALSE },
++};
+ 
++static GtkRadioActionEntry g_PageScrollEntries[] =
++{   
++    { "PageModeScroll", GTK_STOCK_FULLSCREEN, N_("Scroll"), NULL,
++      N_("Mouse scroll page"), (int)PagePterModeScroll },
++
++    { "PageModeText", GTK_STOCK_SELECT_ALL, N_("Select Text"), NULL,
++      N_(" Mouse select text"), (int)PagePterModeSelectText },
+ };
+ 
++
+ ////////////////////////////////////////////////////////////////
+ // Interface Methods.
+ ////////////////////////////////////////////////////////////////
+@@ -238,6 +256,9 @@
+     GtkWidget *pageViewPaned = createPageView ();
+     gtk_box_pack_start (GTK_BOX (m_MainBox), pageViewPaned, TRUE, TRUE, 0);
+     gtk_widget_show (pageViewPaned);
++    // By default set focus to page view so user can navigate pdf document with
++    // keyboard right away without need to click to page view first
++    gtk_widget_grab_focus (m_PageView->getTopWidget ());
+     // Add the find bar.
+     m_FindView = new FindView ();
+     gtk_box_pack_start (GTK_BOX (m_MainBox), m_FindView->getTopWidget (),
+@@ -247,6 +268,10 @@
+     // look weird.
+     m_StatusBar = gtk_statusbar_new ();
+     gtk_box_pack_start (GTK_BOX (m_MainBox), m_StatusBar, FALSE, FALSE, 0);
++
++    // Signal for Zooming into the page per ctrl + scroll-wheel.
++    g_signal_connect (G_OBJECT (m_PageView->getTopWidget ()), "scroll-event",
++                      G_CALLBACK (main_window_page_scrolled_cb), pter);
+ }
+ 
+ MainView::~MainView ()
+@@ -272,6 +297,23 @@
+     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomWidth), active);
+ }
+ 
++void
++MainView::activePageModeScroll (gboolean active)
++{
++    GtkAction *action =
++        gtk_ui_manager_get_action (m_UIManager, "/ToolBar/PageModeScroll");
++    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active);
++}
++
++
++void
++MainView::activePageModeText (gboolean active)
++{
++    GtkAction *action =
++        gtk_ui_manager_get_action (m_UIManager, "/ToolBar/PageModeText");
++    gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active);
++}
++
+ gchar *
+ MainView::openFileDialog (const gchar *lastFolder)
+ {
+@@ -935,6 +977,9 @@
+     gtk_action_group_add_toggle_actions (actionGroup, g_ToggleEntries,
+                                          G_N_ELEMENTS (g_ToggleEntries),
+                                          m_Pter);
++    gtk_action_group_add_radio_actions (actionGroup, g_PageScrollEntries,
++                                        G_N_ELEMENTS (g_PageScrollEntries), 0,
++                                        G_CALLBACK(main_window_set_page_mode), m_Pter);
+     m_UIManager = gtk_ui_manager_new ();
+     gtk_ui_manager_insert_action_group (m_UIManager, actionGroup, 0);
+ 
+@@ -1038,6 +1083,13 @@
+     }
+ }
+ 
++void
++MainView::copyTextToClibboard(const gchar* text)
++{
++    GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
++    gtk_clipboard_set_text(clipboard, text, -1);
++}
++
+ ////////////////////////////////////////////////////////////////
+ // GTK+ Callbacks.
+ ////////////////////////////////////////////////////////////////
+@@ -1416,3 +1468,29 @@
+     MainPter *pter = (MainPter *)data;
+     pter->zoomWidthActivated (gtk_toggle_action_get_active (action));
+ }
++
++void
++main_window_set_page_mode (GtkRadioAction *action, GtkRadioAction *current, gpointer data)
++{
++    g_assert ( NULL != data && "The data parameter is NULL.");
++
++    MainPter *pter = (MainPter *)data;
++    PagePterMode mode = (PagePterMode)gtk_radio_action_get_current_value(action);
++    pter->setPageMode (mode);
++}
++
++void 
++main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
++{
++    g_assert ( NULL != data && "The data parameter is NULL.");
++
++    MainPter *pter = (MainPter *)data;
++    // Only zoom when the CTRL-Button is down...
++    if ( !(event->state & GDK_CONTROL_MASK) ) return;
++    if ( event->direction == GDK_SCROLL_UP ) {
++        pter->zoomInActivated ();
++    } else if ( event->direction == GDK_SCROLL_DOWN ) {
++        pter->zoomOutActivated ();
++    }
++}
++
+diff -Nurd epdfview-0.1.6-svn/src/gtk/MainView.h epdfview/src/gtk/MainView.h
+--- epdfview-0.1.6-svn/src/gtk/MainView.h	2008-07-13 12:57:44.233198000 +0200
++++ epdfview/src/gtk/MainView.h	2008-07-13 12:55:50.923198000 +0200
+@@ -35,6 +35,8 @@
+ 
+             void activeZoomFit (gboolean active);
+             void activeZoomWidth (gboolean active);
++            void activePageModeScroll (gboolean active);
++            void activePageModeText (gboolean active);
+             gchar *openFileDialog (const gchar *lastFolder);
+             gchar *promptPasswordDialog (void);
+             gchar *saveFileDialog (const gchar *lastFolder,
+@@ -68,6 +70,7 @@
+             void setStatusBarText (const gchar *text);
+             void setZoomText (const gchar *text);
+             const gchar *getGoToPageText (void);
++            void copyTextToClibboard(const gchar* text);
+             IFindView *getFindView (void);
+             IPageView *getPageView (void);
+             IPreferencesView *getPreferencesView (void);
+diff -Nurd epdfview-0.1.6-svn/src/gtk/PageView.cxx epdfview/src/gtk/PageView.cxx
+--- epdfview-0.1.6-svn/src/gtk/PageView.cxx	2008-07-13 12:57:44.243198000 +0200
++++ epdfview/src/gtk/PageView.cxx	2008-07-13 12:55:50.943198000 +0200
+@@ -184,6 +184,9 @@
+         GdkCursor *cursor = NULL;
+         switch (cursorType)
+         {
++            case PAGE_VIEW_CURSOR_SELECT_TEXT:
++                cursor = gdk_cursor_new (GDK_XTERM);
++                break;
+             case PAGE_VIEW_CURSOR_LINK:
+                 cursor = gdk_cursor_new (GDK_HAND2);
+                 break;
+@@ -524,6 +527,13 @@
+ {
+     g_assert ( NULL != data && "The data parameter is NULL.");
+ 
++    // don't scroll when the CRTL-Button is down, because then the page should
++    // actually be zoomed and not scrolled. Zooming is handelt by the MainView
++    // class.
++    if ( event->state & GDK_CONTROL_MASK )
++    {
++        return FALSE;
++    }
+     PagePter *pter = (PagePter *)data;
+     GtkAdjustment *adjustment = 
+         gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
+@@ -553,11 +563,15 @@
+ 
+     GtkScrollType direction;
+     gboolean horizontal = FALSE;
++    gboolean returnValue = TRUE;
+     PagePter *pter = (PagePter *)data;
+ 
+-    GtkAdjustment *adjustment = 
++    GtkAdjustment *hadjustment = 
++        gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (widget));
++    gdouble hposition = gtk_adjustment_get_value (hadjustment);
++    GtkAdjustment *vadjustment = 
+         gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
+-    gdouble position = gtk_adjustment_get_value (adjustment);
++    gdouble vposition = gtk_adjustment_get_value (vadjustment);
+ 
+     if ( event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK) )
+     {
+@@ -568,51 +582,96 @@
+     {
+         case GDK_Left:
+         case GDK_KP_Left:
++        case GDK_h:
++            if ( hposition == hadjustment->lower )
++            {
++                pter->scrollToPreviousPage ();
++                return TRUE;
++            }
+             direction = GTK_SCROLL_STEP_LEFT;
+             horizontal = TRUE;
+             break;
+ 
+         case GDK_Right:
+         case GDK_KP_Right:
++        case GDK_l:
++            if ( hposition == ( hadjustment->upper - hadjustment->page_size) )
++            {
++                pter->scrollToNextPage ();
++                return TRUE;
++            }
+             horizontal = TRUE;
+             direction = GTK_SCROLL_STEP_RIGHT;
+             break;
+ 
+         case GDK_Up:
+         case GDK_KP_Up:
++        case GDK_k:
++            if ( vposition == vadjustment->lower )
++            {
++                pter->scrollToPreviousPage ();
++                return TRUE;
++            }
+             direction = GTK_SCROLL_STEP_UP;
+             break;
+ 
+         case GDK_Down:
+         case GDK_KP_Down:
++        case GDK_j:
++            if ( vposition == ( vadjustment->upper - vadjustment->page_size) )
++            {
++                pter->scrollToNextPage ();
++                return TRUE;
++            }
+             direction = GTK_SCROLL_STEP_DOWN;
+             break;
+ 
+         case GDK_Page_Up:
+         case GDK_KP_Page_Up:
+-            if ( position == adjustment->lower )
++            if ( vposition == vadjustment->lower )
+             {
+                 pter->scrollToPreviousPage ();
+                 return TRUE;
+             }
+-            direction = GTK_SCROLL_START;
++            direction = GTK_SCROLL_PAGE_UP;
+             break;
+ 
++        case GDK_space:
++        case GDK_KP_Space:
+         case GDK_Page_Down:
+         case GDK_KP_Page_Down:
+-            if ( position == ( adjustment->upper - adjustment->page_size) )
++            if ( vposition == ( vadjustment->upper - vadjustment->page_size) )
+             {
+                 pter->scrollToNextPage ();
+                 return TRUE;
+             }
++            direction = GTK_SCROLL_PAGE_DOWN;
++            break;
++
++       case GDK_Home:
++       case GDK_KP_Home:
++            direction = GTK_SCROLL_START;
++            break;
++
++       case GDK_End:
++       case GDK_KP_End:
+             direction = GTK_SCROLL_END;
+             break;
+ 
+-        default:
++       case GDK_Return:
++       case GDK_KP_Enter:
++            pter->scrollToNextPage ();
++            direction = GTK_SCROLL_START;
++
++       case GDK_BackSpace:
++            pter->scrollToNextPage ();
++            direction = GTK_SCROLL_START;
++
++       default:
+             return FALSE;
+     }
+ 
+     g_signal_emit_by_name(G_OBJECT(widget), "scroll-child",
+-                          direction, horizontal);
+-    return TRUE;
++                          direction, horizontal, &returnValue);
++    return returnValue;
+ }
+diff -Nurd epdfview-0.1.6-svn/src/IDocument.h epdfview/src/IDocument.h
+--- epdfview-0.1.6-svn/src/IDocument.h	2008-07-13 12:57:45.053198000 +0200
++++ epdfview/src/IDocument.h	2008-07-13 12:55:52.473198000 +0200
+@@ -21,12 +21,14 @@
+ /// This is the definition of the GQuark used for Document's errors.
+ #define EPDFVIEW_DOCUMENT_ERROR     ePDFView::IDocument::getErrorQuark ()
+ 
++typedef struct _GdkRegion GdkRegion;
++
+ namespace ePDFView 
+ {
+     // Forward declarations.
+     class DocumentIndex;
+     class IDocumentObserver;
+-    class DocumentPage;
++    class DocumentPage; 
+ 
+     ///
+     /// @brief Defines the possible errors loading a document.
+@@ -263,6 +265,9 @@
+             virtual gboolean saveFile (const gchar *filename,
+                                        GError **error) = 0;
+ 
++            virtual GdkRegion* getTextRegion (DocumentRectangle *rect) = 0;
++            virtual void setTextSelection (DocumentRectangle *rect) = 0;
++
+             void attach (const IDocumentObserver *observer);
+             void detach (const IDocumentObserver *observer);
+ 
+diff -Nurd epdfview-0.1.6-svn/src/IDocumentLink.h epdfview/src/IDocumentLink.h
+--- epdfview-0.1.6-svn/src/IDocumentLink.h	2008-07-13 12:57:45.053198000 +0200
++++ epdfview/src/IDocumentLink.h	2008-07-13 12:55:52.483198000 +0200
+@@ -33,7 +33,7 @@
+     class IDocumentLink
+     {
+         public:
+-            IDocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y1);
++            IDocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y2);
+             virtual ~IDocumentLink (void);
+ 
+             virtual void activate (IDocument *document) = 0;
+diff -Nurd epdfview-0.1.6-svn/src/IDocumentObserver.h epdfview/src/IDocumentObserver.h
+--- epdfview-0.1.6-svn/src/IDocumentObserver.h	2008-07-13 12:57:45.023198000 +0200
++++ epdfview/src/IDocumentObserver.h	2008-07-13 12:55:51.753198000 +0200
+@@ -150,6 +150,16 @@
+             ///
+             virtual void notifySaveError (const GError *error) { }
+ 
++            ///
++            /// @brief Someone select text in document.
++            ///
++            /// This function called when someone select some text
++            /// in document.
++            ///
++            /// @param text Selected text.
++            ///
++            virtual void notifyTextSelected (const gchar* text) { }
++
+         protected:
+             ///
+             /// @brief Constructs a new IDocumentObserver object.
+diff -Nurd epdfview-0.1.6-svn/src/IJob.cxx epdfview/src/IJob.cxx
+--- epdfview-0.1.6-svn/src/IJob.cxx	2008-07-13 12:57:45.053198000 +0200
++++ epdfview/src/IJob.cxx	2008-07-13 12:55:52.483198000 +0200
+@@ -16,6 +16,7 @@
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+ #include "epdfview.h"
++#include <unistd.h>
+ 
+ using namespace ePDFView;
+ 
+@@ -59,6 +60,7 @@
+             delete job;
+         }
+     }
++    sleep(0);
+ }
+ 
+ ///
+diff -Nurd epdfview-0.1.6-svn/src/IMainView.h epdfview/src/IMainView.h
+--- epdfview-0.1.6-svn/src/IMainView.h	2008-07-13 12:57:45.053198000 +0200
++++ epdfview/src/IMainView.h	2008-07-13 12:55:52.473198000 +0200
+@@ -576,6 +576,10 @@
+             ///
+             virtual void setOutline (DocumentOutline *outline) = 0;
+ 
++            virtual void copyTextToClibboard(const gchar* text) = 0;
++            virtual void activePageModeScroll (gboolean active) = 0;
++            virtual void activePageModeText (gboolean active) = 0;
++
+         protected:
+             ///
+             /// @brief Constructs a new main view.
+diff -Nurd epdfview-0.1.6-svn/src/IPageView.h epdfview/src/IPageView.h
+--- epdfview-0.1.6-svn/src/IPageView.h	2008-07-13 12:57:45.123198000 +0200
++++ epdfview/src/IPageView.h	2008-07-13 12:55:52.573198000 +0200
+@@ -32,6 +32,8 @@
+         PAGE_VIEW_CURSOR_NORMAL,
+         /// Drag cursor.
+         PAGE_VIEW_CURSOR_DRAG,
++        /// Text selection cursor.
++        PAGE_VIEW_CURSOR_SELECT_TEXT,
+         /// Link cursor.
+         PAGE_VIEW_CURSOR_LINK
+     };
+diff -Nurd epdfview-0.1.6-svn/src/main.cxx epdfview/src/main.cxx
+--- epdfview-0.1.6-svn/src/main.cxx	2008-07-13 12:57:45.053198000 +0200
++++ epdfview/src/main.cxx	2008-07-13 12:55:52.483198000 +0200
+@@ -25,6 +25,27 @@
+ 
+ using namespace ePDFView;
+ 
++struct LoadFileInfo
++{
++    gchar *fileName;
++    MainPter *mainPter;
++    PDFDocument *document;
++};
++
++static int
++loadFileFromCommandLine (gpointer data)
++{
++    LoadFileInfo *info = static_cast<LoadFileInfo *> (data);
++
++    info->mainPter->setOpenState (info->fileName, FALSE);
++    info->document->load (info->fileName, NULL);
++
++    g_free (info->fileName);
++    delete info;
++
++    return FALSE;
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -56,13 +77,15 @@
+     MainView *mainView = new MainView (mainPter);
+     // Let know to the presenter which is its view.
+     mainPter->setView (mainView);
+-    // Enter the main loop and wait for user interaction. */
+     // Now check if we have additional parameters. Any additional parameter
+     // will be a file name to open.
+     if ( argc > 1 )
+     {
+-        mainPter->setOpenState (argv[1], FALSE);
+-        document->load (argv[1], NULL);
++        LoadFileInfo *info = new LoadFileInfo;
++        info->mainPter = mainPter;
++        info->document = document;
++        info->fileName = g_strdup (argv[1]);
++        g_idle_add (loadFileFromCommandLine, info);
+     }
+ 
+     gtk_main();
+@@ -74,6 +97,8 @@
+     // Save the configuration.
+     Config::getConfig().save ();
+ 
++    g_option_context_free (optionContext);
++
+     // All done!.
+     return EXIT_SUCCESS;
+ }
+diff -Nurd epdfview-0.1.6-svn/src/MainPter.cxx epdfview/src/MainPter.cxx
+--- epdfview-0.1.6-svn/src/MainPter.cxx	2008-07-13 12:57:45.023198000 +0200
++++ epdfview/src/MainPter.cxx	2008-07-13 12:55:51.753198000 +0200
+@@ -695,6 +695,12 @@
+     }
+ }
+ 
++void
++MainPter::setPageMode (PagePterMode mode)
++{
++    m_PagePter->setMode(mode);
++}
++
+ ///
+ /// @brief The "Zoom In" was activated.
+ ///
+@@ -995,3 +1001,9 @@
+     G_UNLOCK (fileSaved);
+ }
+ #endif // DEBUG
++
++void 
++MainPter::notifyTextSelected (const gchar* text)
++{
++    getView ().copyTextToClibboard(text);
++}
+diff -Nurd epdfview-0.1.6-svn/src/MainPter.h epdfview/src/MainPter.h
+--- epdfview-0.1.6-svn/src/MainPter.h	2008-07-13 12:57:45.043198000 +0200
++++ epdfview/src/MainPter.h	2008-07-13 12:55:52.473198000 +0200
+@@ -40,6 +40,8 @@
+             MainPter (IDocument *document);
+             ~MainPter (void);
+ 
++            void setPageMode(PagePterMode mode);
++
+             void setInitialState (void);
+             void setOpenState (const gchar *fileName, gboolean reload);
+             IMainView &getView (void);
+@@ -84,6 +86,7 @@
+             void notifyReload (void);
+             void notifySave (void);
+             void notifySaveError (const GError *error);
++            void notifyTextSelected (const gchar* text);
+ 
+ #if defined (DEBUG)
+             void waitForFileLoaded (void);
+diff -Nurd epdfview-0.1.6-svn/src/PagePter.cxx epdfview/src/PagePter.cxx
+--- epdfview-0.1.6-svn/src/PagePter.cxx	2008-07-13 12:57:45.043198000 +0200
++++ epdfview/src/PagePter.cxx	2008-07-13 12:55:52.473198000 +0200
+@@ -15,6 +15,7 @@
+ // along with this program; if not, write to the Free Software
+ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
++#include <gdk/gdk.h>
+ #include "epdfview.h"
+ 
+ using namespace ePDFView;
+@@ -47,9 +48,9 @@
+     /// The Y position of the pointer when the drag started.
+     gint y;
+     /// The horizontal position of the page view scroll when the drag started.
+-    gdouble scrollX;
++    int startX;
+     /// The vertical position of the page view scroll when the drag started.
+-    gdouble scrollY;
++    int startY;
+ };
+ 
+ // Global variables.
+@@ -60,11 +61,13 @@
+ ///
+ PagePter::PagePter (IDocument *document)
+ {
++    m_LastSelection = NULL;
+     m_Document = document;
+     m_Document->attach (this);
+     m_DragInfo = NULL;
+     m_NextPageScroll = PAGE_SCROLL_START;
+     m_PageView = NULL;
++    m_ScrollMode = PagePterModeScroll;
+ }
+ 
+ ///
+@@ -129,9 +132,12 @@
+             m_DragInfo->y = y;
+ 
+             IPageView &view = getView ();
+-            m_DragInfo->scrollX = view.getHorizontalScroll ();
+-            m_DragInfo->scrollY = view.getVerticalScroll ();
+-            view.setCursor (PAGE_VIEW_CURSOR_DRAG);
++            m_DragInfo->startX = x;
++            m_DragInfo->startY = y;
++            if(m_ScrollMode == PagePterModeScroll)
++                view.setCursor (PAGE_VIEW_CURSOR_DRAG);
++            else
++                view.setCursor (PAGE_VIEW_CURSOR_SELECT_TEXT);
+         }
+     }
+ }
+@@ -149,8 +155,24 @@
+ {
+     if ( 1 == button )
+     {
++        if(m_LastSelection)
++            gdk_region_destroy(m_LastSelection);
++        m_LastSelection = NULL;
++
++        if ( m_Document->isLoaded() &&
++             m_ScrollMode == PagePterModeSelectText &&
++             NULL != m_DragInfo )
++        {
++            DocumentRectangle rect(m_DragInfo->startX, m_DragInfo->startY,
++                                   m_DragInfo->x, m_DragInfo->y);
++            m_Document->setTextSelection(&rect);
++        }
++
+         delete m_DragInfo;
+         m_DragInfo = NULL;
++
++        refreshPage(PAGE_SCROLL_NONE, FALSE);
++
+         getView ().setCursor (PAGE_VIEW_CURSOR_NORMAL);
+     }
+ }
+@@ -181,10 +203,32 @@
+             view.setCursor (PAGE_VIEW_CURSOR_NORMAL);
+         }
+     }
+-    else
+-    {
+-        view.scrollPage (m_DragInfo->scrollX, m_DragInfo->scrollY,
+-                         x - m_DragInfo->x, y - m_DragInfo->y);
++    else{
++        m_DragInfo->x = x;
++        m_DragInfo->y = y;  
++
++        if(m_ScrollMode == PagePterModeScroll){
++            view.scrollPage (view.getHorizontalScroll (), view.getVerticalScroll (),
++                             x - m_DragInfo->startX, y - m_DragInfo->startY);
++        }
++        else{
++            if(!m_Document->isLoaded())
++                return ;
++            
++            DocumentRectangle rect(m_DragInfo->startX, m_DragInfo->startY,
++                                          m_DragInfo->x, m_DragInfo->y);
++
++            GdkRegion *region = m_Document->getTextRegion (&rect);
++
++            if( !m_LastSelection || !gdk_region_equal(m_LastSelection, region)){
++                if(m_LastSelection)
++                    gdk_region_destroy(m_LastSelection);
++                m_LastSelection = gdk_region_copy(region);
++                DocumentPage *page = m_Document->getCurrentPage();
++                if ( NULL != page )
++                    refreshPage (PAGE_SCROLL_NONE, FALSE);
++            }
++        }
+     }
+ }
+ 
+@@ -273,6 +317,8 @@
+         if ( NULL != documentPage )
+         {
+             g_WaitingForPage = FALSE;
++            if ( NULL != m_LastSelection )
++                documentPage->setSelection(m_LastSelection);
+             view.showPage (documentPage, pageScroll);
+         }
+         else
+@@ -364,6 +410,17 @@
+ }
+ 
+ ///
++/// @brief Sets the page mouse scroll mode
++///
++/// @param mode Scroll mode to set.
++///
++void
++PagePter::setMode (PagePterMode mode)
++{
++    this->m_ScrollMode = mode;
++}
++
++///
+ /// @brief The page view has been resized.
+ ///
+ /// @param width The new with of the page view.
+diff -Nurd epdfview-0.1.6-svn/src/PagePter.h epdfview/src/PagePter.h
+--- epdfview-0.1.6-svn/src/PagePter.h	2008-07-13 12:57:45.053198000 +0200
++++ epdfview/src/PagePter.h	2008-07-13 12:55:52.483198000 +0200
+@@ -23,6 +23,11 @@
+ 
+ namespace ePDFView
+ {
++    enum PagePterMode{
++        PagePterModeScroll,
++        PagePterModeSelectText,
++    };
++
+     ///
+     /// @class PagePter.
+     /// @brief The page presenter.
+@@ -53,6 +58,7 @@
+             void setNextPageScroll (PageScroll next);
+             void setView (IMainView &view);
+             void viewResized (gint width, gint height);
++            void setMode(PagePterMode mode);
+ 
+         protected:
+             /// The document whose page is shown.
+@@ -63,7 +69,11 @@
+             PageScroll m_NextPageScroll;
+             /// The page view.
+             IPageView *m_PageView;
+-            
++            /// Last text selection
++            GdkRegion *m_LastSelection;
++            /// What page presenter must do when user move mouse with button pressed.
++            PagePterMode m_ScrollMode;
++
+             void refreshPage (PageScroll pageScroll, gboolean wasZoomed);
+     };
+ }
+diff -Nurd epdfview-0.1.6-svn/src/PDFDocument.cxx epdfview/src/PDFDocument.cxx
+--- epdfview-0.1.6-svn/src/PDFDocument.cxx	2008-07-13 12:57:45.043198000 +0200
++++ epdfview/src/PDFDocument.cxx	2008-07-13 12:55:52.473198000 +0200
+@@ -191,7 +191,7 @@
+ /// @param filename The name of the file name to open. It must be an absolute
+ ///                 path.
+ /// @param password The password to use to open @a filename.
+-/// @param error Location to store the error occurring or NULL to ignore 
++/// @param error Location to store the error occurring or NULL to ignore
+ ///              errors.
+ ///
+ /// @return TRUE if the file could be opened, FALSE otherwise.
+@@ -257,7 +257,7 @@
+         else
+         {
+             // OK, the glib's wrapper don't pass the error code directly
+-            // from Poppler. Instead returns G_FILE_ERROR_FAILED and a 
++            // from Poppler. Instead returns G_FILE_ERROR_FAILED and a
+             // non translated string.
+             // Maybe I'm wrong (very probable) but that's a wrong way.
+             // So I'm reading the error code from the error string...
+@@ -412,7 +412,7 @@
+     poppler_page_get_size (popplerPage, NULL, &pageHeight);
+     // We'll already calculate the positions scaled.
+     gdouble scale = getZoom ();
+-    GList *pageLinks = poppler_page_get_link_mapping (popplerPage); 
++    GList *pageLinks = poppler_page_get_link_mapping (popplerPage);
+     for (GList *pageLink = g_list_first (pageLinks) ;
+          NULL != pageLink ;
+          pageLink = g_list_next (pageLink) )
+@@ -440,7 +440,7 @@
+ ///                     poppler_index_iter_new().
+ ///
+ void
+-PDFDocument::setOutline (DocumentOutline *outline, 
++PDFDocument::setOutline (DocumentOutline *outline,
+                          PopplerIndexIter *childrenList)
+ {
+     if ( NULL != childrenList )
+@@ -474,11 +474,11 @@
+ #endif // HAVE_POPPLER_0_5_2
+ 
+                     outline->addChild (child);
+-                PopplerIndexIter *childIter = 
++                PopplerIndexIter *childIter =
+                     poppler_index_iter_get_child (childrenList);
+                 setOutline (child, childIter);
+             }
+-        } 
++        }
+         while ( poppler_index_iter_next (childrenList) );
+ 
+         poppler_index_iter_free (childrenList);
+@@ -490,7 +490,7 @@
+ ///
+ /// Retrieves the width and height of a document's page before to scale, but
+ /// after rotation.
+-/// 
++///
+ /// @param pageNum The page to get its size.
+ /// @param width The output pointer to save the page's width.
+ /// @param height The output pointer to save the page's height.
+@@ -656,6 +656,107 @@
+     return result;
+ }
+ 
++static void
++repairEmpty(PopplerRectangle& rect)
++{
++    //rect must have be least 1x1
++    if(rect.y1 == rect.y2)
++        rect.y2++;
++    if(rect.x1 == rect.x2)
++        rect.x2++;
++}
++
++void
++PDFDocument::setTextSelection (DocumentRectangle *rect)
++{
++    g_assert(rect);
++
++    PopplerPage *page = poppler_document_get_page (m_Document, getCurrentPageNum()-1);
++    if(!page)
++        return;
++
++    gdouble pageWidth, pageHeight;
++    poppler_page_get_size(page, &pageWidth, &pageHeight);
++
++    //for get text we must exchange y coordinate, don't ask me where logic here.
++    PopplerRectangle textRect = { rect->getX1() / getZoom(),
++                                  (pageHeight - rect->getY2() / getZoom()),
++                                  rect->getX2() * getZoom() / getZoom(),
++                                  (pageHeight - rect->getY1() / getZoom())};
++    repairEmpty(textRect);
++
++#if defined (HAVE_POPPLER_0_6_0)
++    gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
++            &textRect);
++#else // !HAVE_POPPLER_0_6_0
++    gchar *text = poppler_page_get_text(page, &textRect);
++#endif // HAVE_POPPLER_0_6_0
++    if(!text)
++        goto cleanup;
++
++    for ( GList *obs = g_list_first (m_Observers) ;
++          NULL != obs ;
++          obs = g_list_next (obs) )
++        {
++            IDocumentObserver *observer = (IDocumentObserver*)obs->data;
++            observer->notifyTextSelected(text);
++        }
++
++ cleanup:
++    if(page)
++        g_object_unref(page);
++    if(text)
++        g_free(text);
++}
++
++GdkRegion*
++PDFDocument::getTextRegion (DocumentRectangle *r)
++{
++    GdkRegion *res = NULL;
++    PopplerPage *page = poppler_document_get_page (m_Document, getCurrentPageNum()-1);
++    if(!page)
++        return NULL;
++
++    //calulate rect
++    PopplerRectangle rect;
++    rect.x1 = r->getX1() / getZoom();
++    rect.y1 = r->getY1() / getZoom();
++    rect.x2 = r->getX2() / getZoom();
++    rect.y2 = r->getY2() / getZoom();
++    repairEmpty(rect);
++
++    //calc selection size
++#if defined (HAVE_POPPLER_0_8_0)
++    GList *selections = poppler_page_get_selection_region(page, getZoom(),
++             POPPLER_SELECTION_GLYPH, &rect);
++    res = gdk_region_new();
++    for (GList *selection = g_list_first (selections) ;
++         NULL != selection ; selection = g_list_next (selection)) {
++        PopplerRectangle *rectangle = (PopplerRectangle *)selection->data;
++        GdkRectangle rect;
++
++        rect.x = (gint)rectangle->x1;
++        rect.y = (gint)rectangle->y1;
++        rect.width  = (gint) (rectangle->x2 - rectangle->x1);
++        rect.height = (gint) (rectangle->y2 - rectangle->y1);
++
++        gdk_region_union_with_rect (res, &rect);
++    }
++    poppler_page_selection_region_free (selections);
++#elif defined (HAVE_POPPLER_0_6_0)
++    res = poppler_page_get_selection_region(page, getZoom(),
++            POPPLER_SELECTION_GLYPH, &rect);
++#else // !HAVE_POPPLER_0_6_0
++    res = poppler_page_get_selection_region(page, getZoom(), &rect);
++#endif // HAVE_POPPLER_0_6_0
++
++    //free some local data
++    g_object_unref(page);
++
++    return res;
++}
++
++
+ ///
+ /// @brief Gets the document's page layout from Poppler's page layout.
+ ///
+diff -Nurd epdfview-0.1.6-svn/src/PDFDocument.h epdfview/src/PDFDocument.h
+--- epdfview-0.1.6-svn/src/PDFDocument.h	2008-07-13 12:57:45.063198000 +0200
++++ epdfview/src/PDFDocument.h	2008-07-13 12:55:52.493198000 +0200
+@@ -54,6 +54,8 @@
+ 
+             DocumentPage *renderPage (gint pageNum);
+             gboolean saveFile (const gchar *fileName, GError **error);
++            GdkRegion* getTextRegion (DocumentRectangle* rect);
++            void setTextSelection (DocumentRectangle *rect);
+ 
+         protected:
+             /// The PDF document.
+diff -Nurd epdfview-0.1.6-svn/src/PrintPter.cxx epdfview/src/PrintPter.cxx
+--- epdfview-0.1.6-svn/src/PrintPter.cxx	2008-07-13 12:57:45.043198000 +0200
++++ epdfview/src/PrintPter.cxx	2008-07-13 12:55:52.473198000 +0200
+@@ -230,20 +230,27 @@
+                     ppdFindOption (printerPPD, "PageSize");
+                 view.clearPageSizeList ();
+                 int pageSizeToSelect = 0;
+-                ppd_choice_t *pageSizeChoice = pageSizeOption->choices;
+-                for ( int currentSize = 0 ;
+-                      currentSize < pageSizeOption->num_choices ;
+-                      ++currentSize, ++pageSizeChoice )
++                if ( 0 != pageSizeOption )
+                 {
+-                    const gchar *sizeName = pageSizeChoice->text;
+-                    const gchar *sizeValue = pageSizeChoice->choice;
+-
+-                    view.addPageSize (_(sizeName), sizeValue);
+-                    if ( pageSizeChoice->marked )
++                    ppd_choice_t *pageSizeChoice = pageSizeOption->choices;
++                    for ( int currentSize = 0 ;
++                         currentSize < pageSizeOption->num_choices ;
++                         ++currentSize, ++pageSizeChoice )
+                     {
+-                        pageSizeToSelect = currentSize;
++                        const gchar *sizeName = pageSizeChoice->text;
++                        const gchar *sizeValue = pageSizeChoice->choice;
++
++                        view.addPageSize (_(sizeName), sizeValue);
++                        if ( pageSizeChoice->marked )
++                        {
++                            pageSizeToSelect = currentSize;
++                        }
+                     }
+                 }
++                else
++                {
++                    view.addPageSize (_("A4"), "A4");
++                }
+                 view.selectPageSize (pageSizeToSelect);
+ 
+                 // Get the resolutions.
+@@ -251,29 +258,36 @@
+                     ppdFindOption (printerPPD, "Resolution");
+                 view.clearResolutionList ();
+                 int resolutionToSelect = 0;
+-                ppd_choice_t *resolutionChoice = resolutionOption->choices;
+-                for ( int currentRes = 0 ;
+-                      currentRes < resolutionOption->num_choices ;
+-                      ++currentRes, ++resolutionChoice )
++                if ( 0 != resolutionOption )
+                 {
+-                    const gchar *resName = resolutionChoice->text;
+-                    const gchar *resValue = resolutionChoice->choice;
+-
+-                    view.addResolution (_(resName), resValue);
+-                    if ( resolutionChoice->marked )
++                    ppd_choice_t *resolutionChoice = resolutionOption->choices;
++                    for ( int currentRes = 0 ;
++                            currentRes < resolutionOption->num_choices ;
++                            ++currentRes, ++resolutionChoice )
+                     {
+-                        resolutionToSelect = currentRes;
++                        const gchar *resName = resolutionChoice->text;
++                        const gchar *resValue = resolutionChoice->choice;
++
++                        view.addResolution (_(resName), resValue);
++                        if ( resolutionChoice->marked )
++                        {
++                            resolutionToSelect = currentRes;
++                        }
+                     }
+                 }
++                else
++                {
++                    view.addResolution (_("300 DPI"), "300x300dpi");
++                }
+                 view.selectResolution (resolutionToSelect);
+ 
+                 // Get the color models.
+                 ppd_option_t *colorModelOption =
+                     ppdFindOption (printerPPD, "ColorModel");
+                 view.clearColorModelList ();
++                int colorModelToSelect = 0;
+                 if ( NULL != colorModelOption )
+                 {
+-                    int colorModelToSelect = 0;
+                     ppd_choice_t *colorModelChoice = colorModelOption->choices;
+                     for ( int currentColor = 0 ;
+                           currentColor < colorModelOption->num_choices ;
+@@ -288,12 +302,12 @@
+                             colorModelToSelect = currentColor;
+                         }
+                     }
+-                    view.selectColorModel (colorModelToSelect);
+                 }
+                 else
+                 {
+                     view.addColorModel (_("Grayscale"), "Gray");
+                 }
++                view.selectColorModel (colorModelToSelect);
+                 ppdClose (printerPPD);
+             }
+         }
+diff -Nurd epdfview-0.1.6-svn/THANKS epdfview/THANKS
+--- epdfview-0.1.6-svn/THANKS	2008-07-13 12:57:47.583198000 +0200
++++ epdfview/THANKS	2008-07-13 12:55:55.133198000 +0200
+@@ -1,16 +1,34 @@
+ I would like to give thanks to the following for their support and
+ contributions:
+ 
+-    - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch.
+-    - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation.
++    - Alex Dedul <rotmer@gmail.com>, for his patch.
++    - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch and others.
++    - Daniel Nylander <po@danielnylander.se>, for his Swedish translation.
++    - Dragonlord <dragonlord@seznam.cz>, for his Czech translation.
++    - Fábio Antunes <fabio.antunes@hotmail.com>, for his Brazilian Portuguese translation.
++    - Fabio Vergnani <monghitri@aruba.it>, for his Italion translation.
++    - Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, for his vim keybindings patch.
++    - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation and patches.
++    - Lester Godwin <lgodwin@pushcorp.com>, for his patches.
+     - LoneFox <>, for his patches.
++    - Michael Opitz <opitz.michael@gmail.com>, for his patches.
+     - Moritz Heiber <moe@xfce.org>, for his German translation.
+     - Mr_Moustache <mr.moustache@laposte.net>, for his French translation.
++    - Nuno Miguel <nunis@netcabo.pt>, for his European Portuguese translation.
++    - Nyu <nyu_8804@yahoo.co.jp>, for his Japanese translation.
++    - Panchoat <panchoat@gmail.com>, for his Simplified Chinese translation.
++    - Piotr Pacholak <obi_gl@o2.pl>, for corrections in the Polish translation.
++    - Rafał Mużyło <galtgendo@o2.pl>, for his patches.
++    - Sergey Starosek <sergey.starosek@gmail.com>, for his Russian patches.
+     - Stavros Giannouris <stavrosg2002@freemail.gr>, for his Greek translation.
++    - Tilman Sauerbeck <tilman@code-monkey.de>, for his patches.
+     - tbm <tbm@home.nl>, for his patches.
++    - Valery Koval <Valery.Koval@innovinn.com>, for his patches.
+     - VnPenguin <vnpenguin@gmail.com>, for his Vietnamese translation.
+     - Wei-Lun Chao <chaoweilun@pcmail.com.tw>, for his Traditional Chinese translation.
+     - Wojciech Myrda <vojcek@tlen.pl>, for his Polish translation.
+     - Yuri Pankov <yuri.pankov@gmail.com>, for his patches.
++    - Yves-Alexis Perez <corsac@debian.org>, for his patches.
++    - zhou sf <sxzzsf@gmail.com>, for his patches.
+ 
+ If you feel that you should be in this list and I didn't remember to add you in it, please send me an e-mail! :-)
diff --git a/recipes/erminig/erminig_3.0.3.bb b/recipes/erminig/erminig_3.0.3.bb
new file mode 100644
index 0000000000..b061c321b8
--- /dev/null
+++ b/recipes/erminig/erminig_3.0.3.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Erminig is a python application that provides two-way synchronization between Google Calendar and GPE Calendar."
+HOMEPAGE = "https://garage.maemo.org/projects/erminig/"
+SECTION = "devel/python"
+LICENSE = "GPL"
+PV="3.0.3"
+PR="r0"
+
+SRC_URI = "https://garage.maemo.org/frs/download.php/4737/erminig_3.0.3-3.tar.gz"
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit distutils
+
+RDEPENDS_${PN} = "\
+  python-pygtk \
+  python-pysqlite2 \
+
+"
+FILES_${PN} = "${datadir}"
+
+
diff --git a/recipes/ffalarms/atd-over-fso/atd-alarm-glue.patch b/recipes/ffalarms/atd-over-fso/atd-alarm-glue.patch
new file mode 100644
index 0000000000..66a268ce2b
--- /dev/null
+++ b/recipes/ffalarms/atd-over-fso/atd-alarm-glue.patch
@@ -0,0 +1,14 @@
+--- Makefile-orig	2003-03-23 19:46:26.000000000 +0100
++++ Makefile	2009-03-16 19:39:39.000000000 +0100
+@@ -10,6 +10,11 @@
+ 	rm -f atq
+ 	ln -s atd atq
+ 
++atd.o: atd-alarm-glue.h
++
++atd-alarm-glue.h: atd-alarm.xml
++	dbus-binding-tool --prefix=atd_alarm --mode=glib-server $< --output=$@
++
+ dist: atd
+ 	cp atd dist/usr/sbin/
+ 	rm dist/usr/bin/atq
diff --git a/recipes/ffalarms/atd-over-fso/atd-over-fso.conf.patch b/recipes/ffalarms/atd-over-fso/atd-over-fso.conf.patch
new file mode 100644
index 0000000000..6b6bebaa0f
--- /dev/null
+++ b/recipes/ffalarms/atd-over-fso/atd-over-fso.conf.patch
@@ -0,0 +1,13 @@
+--- /dev/null	2009-03-26 10:57:36.511814417 +0100
++++ dist/etc/dbus-1/system.d/atd-over-fso.conf	2009-03-29 03:15:37.000000000 +0200
+@@ -0,0 +1,10 @@
++<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
++ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
++<busconfig>
++	<policy user="root">
++		<allow own="org.openmoko.projects.ffalarms.atd"/>
++		<allow send_path="/"/>
++		<allow send_destination="org.openmoko.projects.ffalarms.atd"/>
++		<allow receive_sender="org.openmoko.projects.ffalarms.atd"/>
++	</policy>
++</busconfig>
diff --git a/recipes/ffalarms/atd-over-fso/atd-startup-restart.patch b/recipes/ffalarms/atd-over-fso/atd-startup-restart.patch
new file mode 100644
index 0000000000..adea0e1178
--- /dev/null
+++ b/recipes/ffalarms/atd-over-fso/atd-startup-restart.patch
@@ -0,0 +1,17 @@
+--- dist/etc/init.d/atd-orig	2009-03-29 14:20:09.000000000 +0200
++++ dist/etc/init.d/atd	2009-03-29 14:37:31.000000000 +0200
+@@ -20,9 +20,13 @@
+         rm -f /var/spool/at/trigger
+         echo "."
+         ;;
++  restart)
++        $0 stop
++        $0 start
++        ;;
+ 
+   *)
+-        echo "Usage: /etc/init.d/atd {start|stop}"
++        echo "Usage: /etc/init.d/atd {start|stop|restart}"
+         exit 1
+ esac
+ 
diff --git a/recipes/ffalarms/atd-over-fso/atd-startup.patch b/recipes/ffalarms/atd-over-fso/atd-startup.patch
new file mode 100644
index 0000000000..dc4c1195d1
--- /dev/null
+++ b/recipes/ffalarms/atd-over-fso/atd-startup.patch
@@ -0,0 +1,39 @@
+? atd-startup.patch
+Index: ChangeLog
+===================================================================
+RCS file: /cvs/apps/atd/ChangeLog,v
+retrieving revision 1.2
+diff -B -b -u -r1.2 ChangeLog
+--- ChangeLog	2 Feb 2004 15:30:39 -0000	1.2
++++ ChangeLog	13 Jan 2006 11:54:00 -0000
+@@ -1,3 +1,8 @@
++2006-01-13 Florian Boor <florian@kernelconcepts.de>
++
++	* dist/etc/init.d/atd: Remove obsolete --oknodo and add -m to 
++          enable pidfile. 
++
+ V0.7
+ 	- removed waiting for childpid after having spawned an event
+ 	  this caused trouble with events rescheduling themselves
+Index: dist/etc/init.d/atd
+===================================================================
+RCS file: /cvs/apps/atd/dist/etc/init.d/atd,v
+retrieving revision 1.3
+diff -B -b -u -r1.3 atd
+--- dist/etc/init.d/atd	24 Jan 2003 15:09:03 -0000	1.3
++++ dist/etc/init.d/atd	13 Jan 2006 11:54:00 -0000
+@@ -11,12 +11,12 @@
+         echo -n "Starting at daemon: atd"
+         mkdir -p /var/spool/at
+ 	chmod a+w /var/spool/at
+-        start-stop-daemon --start --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd /var/spool/at >/dev/null 2>&1 &
++        start-stop-daemon --start --quiet -m --pidfile /var/run/atd.pid --exec /usr/sbin/atd /var/spool/at >/dev/null 2>&1 &
+         echo "."
+         ;;
+   stop)
+         echo -n "Stopping at daemon: atd"
+-        start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/atd.pid --exec /usr/sbin/atd
++        start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd
+         rm -f /var/spool/at/trigger
+         echo "."
+         ;;
diff --git a/recipes/ffalarms/atd-over-fso/init.d-atd-restart.patch b/recipes/ffalarms/atd-over-fso/init.d-atd-restart.patch
new file mode 100644
index 0000000000..11742d9937
--- /dev/null
+++ b/recipes/ffalarms/atd-over-fso/init.d-atd-restart.patch
@@ -0,0 +1,17 @@
+--- S97atd-orig	2009-03-29 11:59:02.000000000 +0200
++++ S97atd	2009-03-29 12:03:07.000000000 +0200
+@@ -20,9 +20,13 @@
+         rm -f /var/spool/at/trigger
+         echo "."
+         ;;
++  restart)
++	$0 stop
++	$0 start
++	;;
+ 
+   *)
+-        echo "Usage: /etc/init.d/atd {start|stop}"
++        echo "Usage: /etc/init.d/atd {start|stop|restart}"
+         exit 1
+ esac
+ 
diff --git a/recipes/ffalarms/atd-over-fso/no-oknodo.patch b/recipes/ffalarms/atd-over-fso/no-oknodo.patch
new file mode 100644
index 0000000000..e1eb2528ac
--- /dev/null
+++ b/recipes/ffalarms/atd-over-fso/no-oknodo.patch
@@ -0,0 +1,11 @@
+--- atd/dist/etc/init.d/atd.orig	2003-01-24 07:09:03.000000000 -0800
++++ atd/dist/etc/init.d/atd	2005-09-22 14:50:55.000000000 -0700
+@@ -16,7 +16,7 @@ case "$1" in
+         ;;
+   stop)
+         echo -n "Stopping at daemon: atd"
+-        start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/atd.pid --exec /usr/sbin/atd
++        start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd
+         rm -f /var/spool/at/trigger
+         echo "."
+         ;;
diff --git a/recipes/ffalarms/atd-over-fso/run-over-fso.patch b/recipes/ffalarms/atd-over-fso/run-over-fso.patch
new file mode 100644
index 0000000000..425aca45fb
--- /dev/null
+++ b/recipes/ffalarms/atd-over-fso/run-over-fso.patch
@@ -0,0 +1,505 @@
+--- src/atd.c-orig	2004-02-02 16:30:39.000000000 +0100
++++ src/atd.c	2009-09-15 22:57:35.000000000 +0200
+@@ -7,10 +7,12 @@
+  *	Copyright (C) 1996, Paul Gortmaker
+  *	Copyright (C) 2001, Russell Nelson
+  *	Copyright (C) 2002-2004, Nils Faerber <nils@handhelds.org>
++ *	Copyright (C) 2009, �ukasz Pankowski <lukpank@o2.pl>
+  *
+  *	Released under the GNU General Public License, version 2,
+  *	included herein by reference.
+  *
++ *	�ukasz Pankowski: modified to work over org.freesmartphone.otimed
+  */
+ 
+ #include <stdio.h>
+@@ -31,6 +33,16 @@
+ #include <dirent.h>
+ #include <pwd.h>
+ #include <signal.h>
++#include <glib.h>
++#include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-lowlevel.h>
++#include <dbus/dbus.h>
++#include "atd-alarm.h"
++#include "atd-alarm-glue.h"
++
++#define DBUS_NAME "org.openmoko.projects.ffalarms.atd"
++#define DBUS_RECONNECT_TIMEOUT 10
++#define OTIMED "org.freesmartphone.otimed"
+ 
+ 
+ /* globals... */
+@@ -62,33 +74,23 @@
+ }
+ 
+ 
+-void waitfor (time_t t)
++void rtc_set_time (void)
+ {
+-int rtcfd, tfd, retval= 0;
+-unsigned long data;
++int rtcfd, retval= 0;
+ struct rtc_time rtc_tm;
+-time_t now, then;
++time_t now;
+ struct tm *tm;
+-struct timeval tv;
+-int nfds;
+-fd_set afds;
+ 
+ #ifdef DEBUG
+-	printf("waitfor %ld\n", t);
++	printf("rtc_set_time\n");
+ #endif
+ 	rtcfd = open ("/dev/rtc", O_RDONLY);
+ 
+ 	if (rtcfd ==  -1) {
++		/* treat it as warning, may be should retry? */
+ 		perror("/dev/rtc");
+-		exit(errno);
+-	}
+-
+-	/* Read the RTC time/date */
+-	tfd = open ("trigger", O_RDWR);
+-
+-	if (tfd ==  -1) {
+-		perror("trigger");
+-		exit(errno);
++		errno = 0;
++		return;
+ 	}
+ 
+ 	/* Set the RTC time/date */
+@@ -112,112 +114,7 @@
+ 		rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec);
+ #endif
+ 
+-	tm = gmtime (&t);
+-
+-#ifdef DEBUG
+-	printf ("Alarm date/time is %d-%d-%d, %02d:%02d:%02d.\n",
+-		tm->tm_mday, tm->tm_mon + 1, tm->tm_year + 1900,
+-		tm->tm_hour, tm->tm_min, tm->tm_sec);
+-#endif
+-	if (t && compare_rtc_to_tm (&rtc_tm, tm) >= 0) {
+-		close (rtcfd);
+-		close (tfd);
+-		return;
+-	}
+-
+-	if (t) {
+-		/* set the alarm */
+-		rtc_tm.tm_mday = tm->tm_mday;
+-		rtc_tm.tm_mon = tm->tm_mon;
+-		rtc_tm.tm_year = tm->tm_year;
+-		rtc_tm.tm_sec = tm->tm_sec;
+-		rtc_tm.tm_min = tm->tm_min;
+-		rtc_tm.tm_hour = tm->tm_hour;
+-		retval = ioctl (rtcfd, RTC_ALM_SET, &rtc_tm);
+-		if (retval == -1) {
+-			perror ("ioctl");
+-			exit (errno);
+-		}
+-#ifdef DEBUG
+-		printf ("Alarm date/time now set to %d-%d-%d, %02d:%02d:%02d.\n",
+-			rtc_tm.tm_mday, rtc_tm.tm_mon + 1, rtc_tm.tm_year + 1900,
+-			rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec);
+-#endif
+-
+-		/* Read the current alarm settings */
+-		retval = ioctl (rtcfd, RTC_ALM_READ, &rtc_tm);
+-		if (retval == -1) {
+-			perror ("ioctl");
+-			exit (errno);
+-		}
+-
+-#ifdef DEBUG
+-		printf ("Alarm date/time now in RTC: %d-%d-%d, %02d:%02d:%02d.\n",
+-			rtc_tm.tm_mday, rtc_tm.tm_mon + 1, rtc_tm.tm_year + 1900,
+-			rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec);
+-#endif
+-
+-		/* Enable alarm interrupts */
+-		retval = ioctl (rtcfd, RTC_AIE_ON, 0);
+-		if (retval == -1) {
+-			perror ("ioctl");
+-			exit (errno);
+-		}
+-	}
+-
+-#ifdef DEBUG
+-	printf ("Waiting for alarm...");
+-	fflush (stdout);
+-#endif
+-	/* This blocks until the alarm ring causes an interrupt */
+-	FD_ZERO (&afds);
+-	if (t)
+-		FD_SET (rtcfd, &afds);
+-	FD_SET (tfd, &afds);
+-	nfds = rtcfd+1;
+-	if (tfd > rtcfd)
+-		nfds = tfd + 1;
+-	/* Wait up to ten minutes. */
+-	tv.tv_sec = 10 * 60;
+-	tv.tv_usec = 0;
+-	then = now;
+-	if (select (nfds, &afds, (fd_set *) 0, (fd_set *) 0, &tv) < 0) {
+-		if (errno != EINTR)
+-			perror ("select");
+-		exit (errno);
+-	}
+-	now = time (NULL);
+-#ifdef DEBUG
+-	printf ("While we were sleeping, %d seconds elapsed, but %d alarms passed\n",
+-		(int)(now - then), (int)(tv.tv_sec));
+-#endif
+-	if (FD_ISSET (rtcfd, &afds)) {
+-		retval = read (rtcfd, &data, sizeof (unsigned long));
+-		if (retval == -1) {
+-			perror ("read");
+-			exit (errno);
+-		}
+-	}
+-	if (FD_ISSET(tfd, &afds)) {
+-		retval = read (tfd, &data, 1);
+-		if (retval == -1) {
+-			perror ("read");
+-			exit (errno);
+-		}
+-	}
+-#ifdef DEBUG
+-	printf ("Something happened!\n");
+-#endif
+-
+-	/* Disable alarm interrupts */
+-	retval = ioctl (rtcfd, RTC_AIE_OFF, 0);
+-	if (retval == -1) {
+-		perror ("ioctl");
+-		exit (errno);
+-	}
+-
+ 	close (rtcfd);
+-	close (tfd);
+ }
+ 
+ 
+@@ -345,11 +242,223 @@
+ }
+ 
+ 
++G_DEFINE_TYPE(AtdAlarm, atd_alarm, G_TYPE_OBJECT);
++
++
++static void atd_alarm_finalize (GObject* self) {
++	g_object_unref(((AtdAlarm*) self)->alarm_proxy);
++	G_OBJECT_CLASS (atd_alarm_parent_class)->finalize (self);
++}
++
++
++static void atd_alarm_class_init(AtdAlarmClass *cls)
++{
++	G_OBJECT_CLASS (cls)->finalize = atd_alarm_finalize;
++}
++
++
++static void atd_alarm_init(AtdAlarm *self)
++{
++}
++
++
++AtdAlarm* atd_alarm_new (char *spooldir)
++{
++AtdAlarm *self;
++
++	self = g_object_new(ATD_TYPE_ALARM, NULL);
++	if (self) {
++		self->bus = NULL;
++		self->alarm_proxy = NULL;
++		self->trigger = NULL;
++	}
++	return self;
++}
++
++
++gboolean input_on_trigger(GIOChannel *source, GIOCondition condition,
++		   AtdAlarm *obj)
++{
++char data;
++
++	if (read (g_io_channel_unix_get_fd(source), &data, 1) == -1) {
++		perror ("read");
++		exit (errno);
++	}
++	atd_alarm_alarm(obj);
++
++	return TRUE;
++}
++
++
++void display_free_g_error(GError **error)
++{
++	if ((*error)->domain == DBUS_GERROR &&
++	    (*error)->code == DBUS_GERROR_REMOTE_EXCEPTION)
++		g_printerr("Remote exception: %s: %s\n",
++			   dbus_g_error_get_name(*error),
++			   (*error)->message);
++	else
++		g_printerr("Error: %s\n", (*error)->message);
++	g_error_free(*error);
++	*error = NULL;
++}
++
++
++static void otimed_destroy(DBusGProxy *alarm_proxy, AtdAlarm *obj)
++{
++#ifdef DEBUG
++	printf("proxy for " OTIMED " destroyed\n");
++#endif
++	g_object_unref(obj->alarm_proxy);
++	obj->alarm_proxy = NULL;
++}
++
++
++void atd_alarm_connect_otimed(AtdAlarm *self)
++{
++GError *error;
++int tfd;
++
++	error = NULL;
++	self->alarm_proxy = dbus_g_proxy_new_for_name_owner
++		(self->bus, OTIMED, "/org/freesmartphone/Time/Alarm",
++		 "org.freesmartphone.Time.Alarm", &error);
++	if (error != NULL) {
++		display_free_g_error(&error);
++		return;
++	}
++	g_signal_connect(self->alarm_proxy, "destroy",
++			 G_CALLBACK(otimed_destroy), self);
++
++	/* if we are connected to otimed (so we know it is up and
++	 * running) we can open the trigger
++	 */
++	if (self->trigger)
++		return;
++	if (mkfifo ("trigger.new", 0777) < 0)
++		die ("cannot mkfifo trigger.new");
++	if (rename ("trigger.new","trigger"))
++		die ("cannot rename trigger.new");
++	chmod ("trigger", S_IWUSR | S_IWGRP | S_IWOTH);
++	tfd = open ("trigger", O_RDWR);
++	if (tfd ==  -1) {
++		perror("trigger");
++		exit(errno);
++	}
++	self->trigger = g_io_channel_unix_new(tfd);
++	g_io_add_watch(self->trigger, G_IO_IN,
++		       (GIOFunc) input_on_trigger, self);
++}
++	
++
++void atd_alarm_waitfor(AtdAlarm *self, time_t t)
++{
++GError *error;
++
++	if (!t)
++		return;
++
++	rtc_set_time();
++	error = NULL;
++	if (self->alarm_proxy == NULL) {
++		g_printerr(OTIMED " not running, could not call SetAlarm\n");
++	} else if (!dbus_g_proxy_call(self->alarm_proxy, "SetAlarm", &error,
++				      G_TYPE_STRING, DBUS_NAME,
++				      G_TYPE_INT, t, G_TYPE_INVALID,
++				      G_TYPE_INVALID)) {
++		display_free_g_error(&error);
++	}
++#ifdef DEBUG
++	printf("DBus waitfor: %d\n", (int) t);
++#endif
++}
++
++
++void name_owner_changed(DBusGProxy *proxy, const char *name,
++			const char *prev_name, const char *new_name,
++			AtdAlarm *obj)
++{
++	if (!strcmp(name, OTIMED) && *new_name) {
++#ifdef DEBUG
++		printf("DBus NameOwnerChanged: " OTIMED "\n");
++#endif
++		atd_alarm_connect_otimed(obj);
++		atd_alarm_alarm(obj);
++	}
++}
++
++
++static void dbus_disconnected(DBusGProxy *obj, GMainLoop *ml)
++{
++	g_printerr("DBus disconnected\n");
++	g_main_loop_quit(ml);
++}
++
++
++void atd_alarm_start(AtdAlarm *self)
++//int start_atd_alarm(GIOChannel *trigger, int exit_on_error)
++{
++GMainLoop *ml;
++GError *error;
++DBusError dbus_error;
++DBusGProxy *proxy;
++int code;
++
++	error = NULL;
++	self->bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
++	if (!self->bus) {
++		g_printerr("failed to connect to DBUS: %s\n",
++			   error->message);
++		g_error_free(error);
++		return;
++	}
++	dbus_error_init(&dbus_error);
++	code = dbus_bus_request_name
++		(dbus_g_connection_get_connection(self->bus),
++		 DBUS_NAME, DBUS_NAME_FLAG_DO_NOT_QUEUE, &dbus_error);
++	if (code != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
++		if (code == -1)
++			g_printerr("Error: %s\n", dbus_error.message);
++		else
++			g_printerr("could not register name (%d): %s\n",
++				   code, DBUS_NAME);
++		exit(1);
++	}
++	dbus_g_connection_register_g_object(self->bus, "/", G_OBJECT(self));
++	proxy = dbus_g_proxy_new_for_name(self->bus, "org.freedesktop.DBus",
++					  "/org/freedesktop/DBus",
++					  "org.freedesktop.DBus");
++	dbus_g_proxy_add_signal(proxy, "NameOwnerChanged", G_TYPE_STRING,
++				G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
++	dbus_g_proxy_connect_signal(proxy, "NameOwnerChanged",
++				    G_CALLBACK(name_owner_changed), self, NULL);
++	atd_alarm_connect_otimed(self);
++	atd_alarm_alarm(self);
++
++	ml = g_main_loop_new(NULL, FALSE);
++	g_signal_connect(proxy, "destroy", G_CALLBACK(dbus_disconnected), ml);
++	dbus_connection_set_exit_on_disconnect
++		(dbus_g_connection_get_connection(self->bus), FALSE);
++
++	g_main_loop_run(ml);
++
++	g_object_unref(proxy);
++	if (self->alarm_proxy)
++		g_object_unref(self->alarm_proxy);
++	self->alarm_proxy = NULL;
++	dbus_g_connection_unref(self->bus);
++	self->bus = NULL;
++	g_main_loop_unref(ml);
++
++	return;
++}
++
++
+ int main (int argc, char *argv[])
+ {
+-struct dirent *dirent;
+-unsigned long this, next, now;
+ char *argv0;
++AtdAlarm *obj;
+ 
+ 	argv0 = strrchr(argv[0], '/');
+ 	if (!argv0)
+@@ -362,17 +471,36 @@
+ 		die("cannot chdir");
+ 	if (!strcmp (argv0, "atq"))
+ 		exit_atq();
+-	if (mkfifo ("trigger.new", 0777) < 0)
+-		die ("cannot mkfifo trigger.new");
+-	if (rename ("trigger.new","trigger"))
+-		die ("cannot rename trigger.new");
+-	chmod ("trigger", S_IWUSR | S_IWGRP | S_IWOTH);
+ 
+ 	/* ignore some signals we get from spawned processes */
+ 	signal (SIGCHLD, SIG_IGN);
+ 	signal (SIGPIPE, SIG_IGN);
+ 
++
++	g_type_init();
++	dbus_g_object_type_install_info(ATD_TYPE_ALARM,
++					&dbus_glib_atd_alarm_object_info);
++	obj = atd_alarm_new(argv[1]);
++	if (!obj) {
++		g_printerr("Failed to create AtdAlarm object");
++		exit(1);
++	}
+ 	while (1) {
++		atd_alarm_start(obj);
++		sleep(DBUS_RECONNECT_TIMEOUT);
++	}
++}
++
++
++gboolean atd_alarm_alarm(AtdAlarm *self)
++{
++struct dirent *dirent;
++unsigned long this, next, now;
++
++#ifdef DEBUG
++		printf("atd_alarm_alarm() run at: %d\n", (int) time(NULL));
++#endif
++
+ 		/* run all the jobs in the past */
+ 		now = time (NULL);
+ 		scan_from_top ();
+@@ -402,8 +530,7 @@
+ #endif
+ 		if (next == ULONG_MAX)
+ 			next = 0;
+-		waitfor (next);
+-	}
++		atd_alarm_waitfor (self, next);
+ 
+-return 0;
++		return TRUE;
+ } 
+--- /dev/null	2009-09-15 19:51:58.514753360 +0200
++++ src/atd-alarm.h	2009-09-15 22:45:59.000000000 +0200
+@@ -0,0 +1,26 @@
++#ifndef ATD_ALARM_H
++#define ATD_ALARM_H
++
++#include <glib-object.h>
++#include <dbus/dbus-glib.h>
++
++#define ATD_TYPE_ALARM (atd_alarm_get_type())
++
++typedef struct _AtdAlarm
++{
++	GObject parent;
++	DBusGConnection *bus;
++	DBusGProxy *alarm_proxy;
++	GIOChannel *trigger;
++} AtdAlarm;
++
++typedef struct _AtdAlarmClass
++{
++	GObjectClass parent_class;
++} AtdAlarmClass;
++
++static gboolean atd_alarm_alarm(AtdAlarm *self);
++
++static void atd_alarm_waitfor(AtdAlarm *self, time_t t);
++
++#endif
+--- /dev/null	2009-09-15 19:51:58.514753360 +0200
++++ src/atd-alarm.xml	2009-03-16 17:55:48.000000000 +0100
+@@ -0,0 +1,8 @@
++<?xml version="1.0" encoding="UTF-8" ?>
++
++<node name="/">
++  <interface name="org.freesmartphone.Notification">
++    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="atd_alarm" />
++      <method name="Alarm" />
++  </interface>
++</node>
diff --git a/recipes/ffalarms/atd-over-fso_0.70.bb b/recipes/ffalarms/atd-over-fso_0.70.bb
new file mode 100644
index 0000000000..951e10c66d
--- /dev/null
+++ b/recipes/ffalarms/atd-over-fso_0.70.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "Lightweight At Daemon working on top of org.freesmartphone.otimed"
+SECTION = "base"
+LICENSE = "GPLV2"
+RCONFLICTS = "at atd"
+RREPLACES = "at atd"
+RPROVIDES = "atd"
+DEPENDS = "dbus-glib pkgconfig"
+RDEPENDS += "dbus dbus-glib frameworkd"
+
+PR = "r2"
+
+SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \
+			file://atd-startup.patch;patch=1;pnum=0 \
+			file://atd-startup-restart.patch;patch=2;pnum=0 \
+			file://atd-alarm-glue.patch;patch=3;pnum=0 \
+			file://atd-over-fso.conf.patch;patch=4;pnum=0 \
+			file://run-over-fso.patch;patch=5;pnum=1"
+S = "${WORKDIR}/atd"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "atd"
+INITSCRIPT_PARAMS = "defaults 97"
+
+do_compile() {
+	export CFLAGS="$CFLAGS `${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-glib-1`"
+	export LDFLAGS="$LDFLAGS `${STAGING_BINDIR_NATIVE}/pkg-config --libs dbus-glib-1`"
+	oe_runmake
+}
+
+do_install() {
+	install -d ${D}${sbindir}
+	install atd ${D}${sbindir}/atd
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/dbus-1/system.d
+	install dist/etc/init.d/atd ${D}${sysconfdir}/init.d/atd
+	install dist/etc/dbus-1/system.d/atd-over-fso.conf ${D}${sysconfdir}/dbus-1/system.d/atd-over-fso.conf
+}
+
+updatercd_postinst_prepend() {
+/etc/init.d/dbus-1 reload
+}
+
+updatercd_postrm_append() {
+/etc/init.d/dbus-1 reload
+}
diff --git a/recipes/ffalarms/ffalarms/shr.patch b/recipes/ffalarms/ffalarms/shr.patch
new file mode 100644
index 0000000000..77a66d6583
--- /dev/null
+++ b/recipes/ffalarms/ffalarms/shr.patch
@@ -0,0 +1,11 @@
+--- ffalarms-0.2.4/ffalarms.vala	2009-09-21 14:05:09.000000000 +0200
++++ ffalarms-0.2.4/ffalarms.vala	2009-09-21 14:05:09.000000000 +0200
+@@ -27,7 +27,7 @@
+     "Could not contact atd daemon, the alarm may not work";
+ public const string COMMANDS = "alsactl amixer";
+ public const string ALSASTATE =
+-    "/usr/share/openmoko/scenarios/stereoout.state";
++    "/usr/share/shr/scenarii/stereoout.state";
+ 
+ 
+ public errordomain MyError {
diff --git a/recipes/ffalarms/ffalarms_0.2.2.bb b/recipes/ffalarms/ffalarms_0.2.2.bb
new file mode 100644
index 0000000000..a280779d52
--- /dev/null
+++ b/recipes/ffalarms/ffalarms_0.2.2.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Finger friendly alarms"
+HOMEPAGE = "http://ffalarms.projects.openmoko.org/"
+LICENSE = "GPLv3"
+AUTHOR = "Lukasz Pankowski <lukpank@o2.pl>"
+MAINTAINER = "Lukasz Pankowski <lukpank@o2.pl>"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+DEPENDS = "edje-native python-native"
+
+# Pure Python plus Edje interface
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://projects.openmoko.org/frs/download.php/832/ffalarms-0.2.2.tar.gz"
+
+inherit distutils
+
+FILES_${PN} += "${datadir}/${PN} ${datadir}/applications/ffalarms.desktop ${datadir}/pixmaps"
+
+RDEPENDS += "python-re python-datetime python-edje python-ecore \
+             atd-over-fso alsa-utils-amixer alsa-utils-alsactl \
+             ttf-dejavu-sans"
+
+RSUGGESTS += "mplayer alsa-utils-aplay openmoko-alsa-scenarios"
diff --git a/recipes/ffalarms/ffalarms_svn.bb b/recipes/ffalarms/ffalarms_svn.bb
new file mode 100644
index 0000000000..2293748925
--- /dev/null
+++ b/recipes/ffalarms/ffalarms_svn.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "Finger friendly alarms"
+HOMEPAGE = "http://ffalarms.projects.openmoko.org/"
+LICENSE = "GPLv3"
+AUTHOR = "?ukasz Pankowski <lukpank@o2.pl>"
+MAINTAINER = "?ukasz Pankowski <lukpank@o2.pl>"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+DEPENDS = "elementary libeflvala"
+
+PV = "0.2.4+svnr${SRCREV}"
+PR = "r0"
+
+inherit vala
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ffalarms;module=trunk;proto=https"
+SRC_URI_append_shr += "file://shr.patch;patch=1"
+
+S = "${WORKDIR}/trunk"
+
+FILES_${PN} += "${datadir}/${PN} ${datadir}/applications ${datadir}/pixmaps"
+
+RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl openmoko-alsa-scenarios ttf-dejavu-sans"
+
+RSUGGESTS = "mplayer alsa-utils-aplay frameworkd"
+
+do_compile() {
+	oe_runmake VAPIDIR=${STAGING_DATADIR}/vala/vapi
+}
+
+do_install() {
+	oe_runmake install DESTDIR=${D}
+}
diff --git a/recipes/gpe-icons/gpe-icons.inc b/recipes/gpe-icons/gpe-icons.inc
new file mode 100644
index 0000000000..5e5289493b
--- /dev/null
+++ b/recipes/gpe-icons/gpe-icons.inc
@@ -0,0 +1,20 @@
+SECTION = "gpe"
+RDEPENDS += "gdk-pixbuf-loader-png"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "gpe-pixmaps"
+ALTERNATIVE_LINK = "${datadir}/gpe/pixmaps"
+ALTERNATIVE_PATH = "${datadir}/gpe/pixmaps.${PN}"
+ALTERNATIVE_PRIORITY ?= 1
+
+pkg_postinst() {
+        if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+                echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+                echo "warn: It will be replaced with link managed by update-alternatives"
+                echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+                echo "warn: It should be empty but probably isn't!"
+                echo "warn: Check what's left there and remove it manually."
+                mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
+        fi
+}
diff --git a/recipes/gpe-icons/gpe-theme-neo_git.bb b/recipes/gpe-icons/gpe-theme-neo_git.bb
new file mode 100644
index 0000000000..b158a311d5
--- /dev/null
+++ b/recipes/gpe-icons/gpe-theme-neo_git.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "nEo GPE theme - a very fast, high contrast GPE theme"
+SECTION = "gpe"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS = "gdk-pixbuf-loader-png gpe-filemanager gpe-sketchbook"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}-gitr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/gpe/theme-neo/pixmaps"
+
+require gpe-icons.inc
+
+do_install() {
+        install -d ${D}${datadir}/gpe/
+        install -d ${D}${datadir}/gpe/pixmaps.${PN}/
+        cp -r ${S}/* "${D}${datadir}/gpe/pixmaps.${PN}/"
+}
+
+FILES_${PN} = "${datadir}/gpe/pixmaps.${PN}/"
+
diff --git a/recipes/images/shr-image.bb b/recipes/images/shr-image.bb
new file mode 100644
index 0000000000..e889f2dfb9
--- /dev/null
+++ b/recipes/images/shr-image.bb
@@ -0,0 +1,30 @@
+require shr-image.inc
+
+IMAGE_BASENAME = "full"
+
+DEPENDS += "task-shr"
+RDEPENDS += "\
+    task-shr-apps \
+    task-shr-games \
+    task-shr-gtk \
+"
+
+IMAGE_INSTALL += "\
+  task-shr-apps \
+  task-shr-games \
+  task-shr-gtk \
+"
+
+# perform some SHR convenience tweaks to the rootfs
+shr_rootfs_postprocess_append() {
+    curdir=$PWD
+    cd ${IMAGE_ROOTFS}
+
+
+    #Replace desktop files
+    echo "Icon=pidgin.png" >> ./usr/share/applications/pidgin.desktop
+    sed -i "s/^X-Icon-path.*$//g" ./usr/share/applications/vagalume.desktop
+
+    cd $curdir
+}
+
diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc
new file mode 100644
index 0000000000..1a5a224e83
--- /dev/null
+++ b/recipes/images/shr-image.inc
@@ -0,0 +1,157 @@
+#------------------------------------------------------
+# SHR Image Recipe
+#------------------------------------------------------
+
+PV = "2.0"
+PR = "r4"
+
+
+DEPENDS += "task-shr-minimal"
+
+RDEPENDS += "\
+  ${MACHINE_TASK_PROVIDER} \
+  task-base \
+  task-shr-minimal-base \
+  task-shr-minimal-cli \
+  task-shr-minimal-apps \
+  task-shr-minimal-audio \
+  task-shr-minimal-gtk \
+  task-shr-minimal-x \
+  task-x11-illume \
+  task-fso-compliance \
+  task-fonts-truetype-core \
+"
+
+IMAGE_INSTALL += "\
+  ${MACHINE_TASK_PROVIDER} \
+  task-base \
+  task-shr-minimal-base \
+  task-shr-minimal-cli \
+  task-shr-minimal-apps \
+  task-shr-minimal-audio \
+  task-shr-minimal-gtk \
+  task-shr-minimal-x \
+  task-x11-illume \
+  task-fso-compliance \
+  task-fonts-truetype-core \
+"
+
+inherit image
+
+# perform some SHR convenience tweaks to the rootfs
+shr_rootfs_postprocess() {
+    dirs=`find ${FILESDIR} -type d -printf "%P\n" | grep -v "^.$" | grep -v ".git"`
+    for dir in $dirs; do
+        mkdir -p ${IMAGE_ROOTFS}/$dir
+    done
+    files=`find ${FILESDIR} -type f -printf "%P\n" | grep -v ".git"`
+    for file in $files; do
+        cp -f ${FILESDIR}/$file ${IMAGE_ROOTFS}/$file
+    done
+
+    curdir=$PWD
+    cd ${IMAGE_ROOTFS}
+    # date/time
+    date "+%m%d%H%M%Y" >./etc/timestamp
+    # alias foo
+    echo "alias pico=nano" >>./etc/profile
+    echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
+    echo "alias ipkg='opkg'" >>./etc/profile
+    # dns
+    echo "nameserver 208.67.222.222" >./etc/resolv.conf
+    echo "nameserver 208.67.220.220" >>./etc/resolv.conf
+    # nfs
+    mkdir -p ./local/pkg
+    echo >>./etc/fstab
+    echo "# NFS Host" >>./etc/fstab
+    echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab
+    # fix .desktop files for illume
+    #desktop=`find ./usr/share/applications -name "*.desktop"`
+    #for file in $desktop; do
+    #    echo "Categories=Office;" >>$file
+    #done
+
+    echo "Exec=vala-terminal -e htop" >> ./usr/share/applications/htop.desktop
+
+    # minimal gtk theme foo
+    mkdir -p ./etc/gtk-2.0/
+    echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc.default
+    echo 'gtk-theme-name = "shr-theme-gtk-e17lookalike"' >> ./etc/gtk-2.0/gtkrc.default
+    echo 'gtk-icon-theme-name = "openmoko-standard"' >> ./etc/gtk-2.0/gtkrc.default
+    #echo 'style "treeview"' >> ./etc/gtk-2.0/gtkrc.default
+    #echo '{   ' >> ./etc/gtk-2.0/gtkrc.default
+    #echo '    GtkTreeView::expander-size = 40' >> ./etc/gtk-2.0/gtkrc.default
+    #echo '}' >> ./etc/gtk-2.0/gtkrc.default
+    #echo 'widget_class "*TreeView*" style "treeview"' >> ./etc/gtk-2.0/gtkrc.default
+    update-alternatives --install /etc/gtk-2.0/gtkrc gtk-theme /etc/gtk-2.0/gtkrc.default 1
+
+    echo '' >> ./etc/ld.so.conf
+    # fix strange iconv/gconf bug
+    ln -s libc.so.6 ./lib/libc.so
+
+    #font cache optimization, persistent cache
+    sed -i "s/<cachedir>.*\/var\/cache\/\(.*\)<\/cachedir>/<cachedir>\/var\/local\/\1<\/cachedir>/g" ./etc/fonts/fonts.conf
+
+    #set up a nice gentoo-like PS1
+    echo "export PS1=\"\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] \"">> ./etc/profile
+
+    #load modules on boot
+    [ -d ./etc/modutils ] || mkdir ./etc/modutils
+    echo "g_ether" > ./etc/modutils/g_ether
+    echo "ppp_generic" > ./etc/modutils/ppp_generic
+
+    #set up some variables to improve default settings
+    echo "if [ \"\$DISPLAY\" = \"\" ]" >> ./etc/profile
+    echo "then" >> ./etc/profile
+    echo "    export DISPLAY=localhost:0" >> ./etc/profile
+    echo "fi" >> ./etc/profile
+    echo "export HISTFILESIZE=1000" >> ./etc/profile
+    echo "export HISTSIZE=1000" >> ./etc/profile
+    echo "alias rm='rm -i'; alias cp='cp -i'; alias mv='mv -i'" >> ./etc/profile
+    echo "alias la='ls $LS_OPTIONS -ltrA'; alias lh='ls $LS_OPTIONS -ltrh'; alias lr='ls $LS_OPTIONS -ltr';" >> ./etc/profile
+    echo "alias lR='ls $LS_OPTIONS -ltrR'" >> ./etc/profile
+    echo "# set your locale here:" >> ./etc/profile
+    echo "export LANG=en_US.UTF-8" >> ./etc/profile
+
+    #fix sound in elementary-alarm
+    /bin/sh -c "cd ./usr/share; ln -s elementary-alarm elementary_alarm"
+
+    # Add some missing entries to the passwd and group file; but do so carefully
+    # since this will be fixed upstream at some point.
+    grep -q '^tss:' ./etc/passwd || echo 'tss:x:93:93:Linux TSS User:/bin:/bin/sh' >>./etc/passwd
+    grep -q '^scanner:' ./etc/group || echo 'scanner:*:91:' >>./etc/group
+    grep -q '^nvram:'   ./etc/group || echo 'nvram:*:92:'   >>./etc/group
+    grep -q '^tss:'     ./etc/group || echo 'tss:*:93:'     >>./etc/group
+    grep -q '^fuse:'    ./etc/group || echo 'fuse:*:94:'    >>./etc/group
+    grep -q '^kvm:'     ./etc/group || echo 'kvm:*:95:'     >>./etc/group
+    grep -q '^rdma:'    ./etc/group || echo 'rdma:*:96:'    >>./etc/group
+
+    cd $curdir
+}
+
+shr_rootfs_gta02_postprocess() {
+    curdir=$PWD
+    cd ${IMAGE_ROOTFS}
+    cd ${IMAGE_ROOTFS}/boot
+    ln -s uImage uImage-GTA02.bin
+    cd $curdir
+    sed -i 's/#SCORouting=PCM/SCORouting=PCM/' ${IMAGE_ROOTFS}/etc/bluetooth/audio.conf
+}
+
+shr_rootfs_gta01_postprocess() {
+    curdir=$PWD
+    cd ${IMAGE_ROOTFS}
+    cd ${IMAGE_ROOTFS}/boot
+    ln -s uImage uImage-GTA01.bin
+    cd $curdir
+    sed -i 's/#SCORouting=PCM/SCORouting=PCM/' ${IMAGE_ROOTFS}/etc/bluetooth/audio.conf
+}
+
+ROOTFS_POSTPROCESS_COMMAND += " shr_rootfs_postprocess"
+
+ROOTFS_POSTPROCESS_COMMAND_append_om-gta02 = ";shr_rootfs_gta02_postprocess"
+ROOTFS_POSTPROCESS_COMMAND_append_om-gta01 = ";shr_rootfs_gta01_postprocess"
+
+#do_testlab() {
+#	:
+#}
diff --git a/recipes/images/shr-image/boot/append-GTA02 b/recipes/images/shr-image/boot/append-GTA02
new file mode 100644
index 0000000000..4901a091e7
--- /dev/null
+++ b/recipes/images/shr-image/boot/append-GTA02
@@ -0,0 +1,2 @@
+loglevel=1 quiet splash 
+
diff --git a/recipes/images/shr-image/etc/htoprc b/recipes/images/shr-image/etc/htoprc
new file mode 100644
index 0000000000..e7bb5b7879
--- /dev/null
+++ b/recipes/images/shr-image/etc/htoprc
@@ -0,0 +1,21 @@
+# Beware! This file is rewritten every time htop exits.
+# The parser is also very primitive, and not human-friendly.
+# (I know, it's in the todo list).
+fields=39 46 47 49 1 
+sort_key=46
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=0
+shadow_other_users=0
+highlight_base_name=0
+highlight_megabytes=1
+tree_view=0
+header_margin=0
+detailed_cpu_time=1
+color_scheme=0
+delay=15
+left_meters=AllCPUs Memory 
+left_meter_modes=1 1 
+right_meters=Tasks LoadAverage Uptime 
+right_meter_modes=2 2 2
diff --git a/recipes/images/shr-image/etc/logrotate.d/50freesmartphone b/recipes/images/shr-image/etc/logrotate.d/50freesmartphone
new file mode 100644
index 0000000000..2d3fb8196f
--- /dev/null
+++ b/recipes/images/shr-image/etc/logrotate.d/50freesmartphone
@@ -0,0 +1,11 @@
+/var/log/frameworkd.log { 
+    rotate 5 
+    weekly 
+    compress 
+} 
+
+/var/log/ophonekitd.log { 
+    rotate 5 
+    weekly 
+    compress 
+} 
diff --git a/recipes/images/shr-image/etc/profile.d/elementary.sh b/recipes/images/shr-image/etc/profile.d/elementary.sh
new file mode 100755
index 0000000000..da435964a7
--- /dev/null
+++ b/recipes/images/shr-image/etc/profile.d/elementary.sh
@@ -0,0 +1,4 @@
+export ELM_ENGINE=x11
+export ELM_THEME=default
+export ELM_SCALE=2
+export ELM_FINGER_SIZE=70
diff --git a/recipes/images/shr-lite-image.bb b/recipes/images/shr-lite-image.bb
new file mode 100644
index 0000000000..fa1a7ac71a
--- /dev/null
+++ b/recipes/images/shr-lite-image.bb
@@ -0,0 +1,5 @@
+require shr-image.inc
+
+IMAGE_BASENAME = "lite"
+
+IMAGES_LINGUAS="en-us"
diff --git a/recipes/images/shr-lite-image/boot/append-GTA02 b/recipes/images/shr-lite-image/boot/append-GTA02
new file mode 100644
index 0000000000..4901a091e7
--- /dev/null
+++ b/recipes/images/shr-lite-image/boot/append-GTA02
@@ -0,0 +1,2 @@
+loglevel=1 quiet splash 
+
diff --git a/recipes/images/shr-lite-image/etc/htoprc b/recipes/images/shr-lite-image/etc/htoprc
new file mode 100644
index 0000000000..e7bb5b7879
--- /dev/null
+++ b/recipes/images/shr-lite-image/etc/htoprc
@@ -0,0 +1,21 @@
+# Beware! This file is rewritten every time htop exits.
+# The parser is also very primitive, and not human-friendly.
+# (I know, it's in the todo list).
+fields=39 46 47 49 1 
+sort_key=46
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=0
+shadow_other_users=0
+highlight_base_name=0
+highlight_megabytes=1
+tree_view=0
+header_margin=0
+detailed_cpu_time=1
+color_scheme=0
+delay=15
+left_meters=AllCPUs Memory 
+left_meter_modes=1 1 
+right_meters=Tasks LoadAverage Uptime 
+right_meter_modes=2 2 2
diff --git a/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone b/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone
new file mode 100644
index 0000000000..2d3fb8196f
--- /dev/null
+++ b/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone
@@ -0,0 +1,11 @@
+/var/log/frameworkd.log { 
+    rotate 5 
+    weekly 
+    compress 
+} 
+
+/var/log/ophonekitd.log { 
+    rotate 5 
+    weekly 
+    compress 
+} 
diff --git a/recipes/images/shr-lite-image/etc/profile.d/elementary.sh b/recipes/images/shr-lite-image/etc/profile.d/elementary.sh
new file mode 100755
index 0000000000..da435964a7
--- /dev/null
+++ b/recipes/images/shr-lite-image/etc/profile.d/elementary.sh
@@ -0,0 +1,4 @@
+export ELM_ENGINE=x11
+export ELM_THEME=default
+export ELM_SCALE=2
+export ELM_FINGER_SIZE=70
diff --git a/recipes/intone-video/intone-video_svn.bb b/recipes/intone-video/intone-video_svn.bb
new file mode 100644
index 0000000000..2b9b109012
--- /dev/null
+++ b/recipes/intone-video/intone-video_svn.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "intone-video is a mplayer video frontend for openmoko phones"
+HOMEPAGE = "http://code.google.com/p/intone-video/"
+AUTHOR = "cchandel"
+LICENSE = "GPLv2"
+SECTION = "e/apps"
+DEPENDS = "elementary eina sqlite3 edbus"
+RDEPENDS = "mplayer lame libxv libsdl-x11"
+
+PV = "0.13+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://intone-video.googlecode.com/svn/trunk;module=.;proto=http"
+S = "${WORKDIR}"
+
+inherit autotools
+
+do_configure_prepend() {
+	rm -f "${S}/INSTALL"
+	touch "${S}/INSTALL"
+	sed -i 's/intone/intone-video/g' ${S}/configure.ac
+	sed -i 's/\/doc\/intone$/\/share\/doc\/intone-video/g' ${S}/Makefile.am
+	sed -i '/^EXTRA_DIST = $(glade_DATA)/d' ${S}/src/Makefile.am
+	sed -i '/^gladedir = $(datadir)\/intone\/glade/d' ${S}/src/Makefile.am
+	sed -i '/^glade_DATA = intone.glade/d' ${S}/src/Makefile.am
+}
+
+do_install_append() {
+	mv ${D}/${bindir}/intone ${D}/${bindir}/intone-video
+	mkdir -p "${D}/${datadir}/pixmaps"
+	install -m 0644 "${S}/resources/intone-video.png" "${D}/${datadir}/pixmaps"
+	mkdir -p "${D}/${datadir}/applications"
+	install -m 0644 "${S}/resources/intone-video.desktop" "${D}/${datadir}/applications"
+}
+
+
+FILES_${PN} += "/usr/share/pixmaps/* /usr/share/applications/*"
+
diff --git a/recipes/intone/intone/vorbis-include-id3tag.patch b/recipes/intone/intone/vorbis-include-id3tag.patch
new file mode 100644
index 0000000000..71bd5e7dc8
--- /dev/null
+++ b/recipes/intone/intone/vorbis-include-id3tag.patch
@@ -0,0 +1,23 @@
+diff -uri intone/src/db_sqlite.c intone.mok/src/db_sqlite.c
+--- intone/src/db_sqlite.c	2009-06-30 22:41:23.000000000 +0200
++++ intone.mok/src/db_sqlite.c	2009-07-05 23:10:01.000000000 +0200
+@@ -17,7 +17,7 @@
+ #include "db_sqlite.h"
+ #include <id3.h>
+ #include <vorbis/codec.h>
+-#include <vorbisfile.h>
++#include <vorbis/vorbisfile.h>
+ #include <string.h>
+ 
+ int check_file_exists(char *path) 
+diff -uri intone/src/Makefile.am intone.mok/src/Makefile.am
+--- intone/src/Makefile.am	2009-05-15 16:29:18.000000000 +0200
++++ intone.mok/src/Makefile.am	2009-07-05 23:54:20.000000000 +0200
+@@ -31,6 +31,6 @@
+ intone_LDFLAGS = \
+ 	-Wl,--export-dynamic
+ 
+-intone_LDADD = $(INTONE_LIBS)
++intone_LDADD = $(INTONE_LIBS) -lid3
+ 
+ EXTRA_DIST = $(glade_DATA)
diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb
new file mode 100644
index 0000000000..d8bd63484c
--- /dev/null
+++ b/recipes/intone/intone_svn.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "intone is a mplayer frontend for openmoko phones"
+HOMEPAGE = "http://code.google.com/p/intone/"
+AUTHOR = "cchandel"
+LICENSE = "GPLv2"
+SECTION = "e/apps"
+DEPENDS = "elementary eina sqlite3 edbus libvorbis id3lib"
+RDEPENDS = "mplayer lame libxv libsdl-x11"
+
+PV = "0.66+svnr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "svn://intone.googlecode.com/svn/trunk;module=.;proto=http \
+file://vorbis-include-id3tag.patch;pnum=1;patch=1;maxrev=18"
+S = "${WORKDIR}"
+
+inherit autotools
+
+do_configure_prepend() {
+	rm -f "${S}/INSTALL"
+	touch "${S}/INSTALL"
+	sed -i 's/{prefix}\/doc\/intone$/{prefix}\/share\/doc\/intone/g' ${S}/Makefile.am
+}
+
+do_install_append() {
+	mkdir -p "${D}/${datadir}/pixmaps"
+	install -m 0644 "${S}/resources/intone.png" "${D}/${datadir}/pixmaps"
+	mkdir -p "${D}/${datadir}/applications"
+	install -m 0644 "${S}/resources/intone.desktop" "${D}/${datadir}/applications"
+	mkdir -p "${D}/${datadir}/intone"
+	for ico in "${S}/resources/"*.png; do
+		if [ "$(basename $ico)" != "intone.png" ]; then
+			install -m 0644 $ico "${D}/${datadir}/intone"
+		fi
+	done
+}
+
+
+FILES_${PN} += "/usr/share/intone/* /usr/share/applications/* /usr/share/pixmaps/*"
+
diff --git a/recipes/linphone/linphone-3.1.0/preferences-segv.patch b/recipes/linphone/linphone-3.1.0/preferences-segv.patch
new file mode 100644
index 0000000000..529688b68f
--- /dev/null
+++ b/recipes/linphone/linphone-3.1.0/preferences-segv.patch
@@ -0,0 +1,11 @@
+--- linphone-3.1.0/coreapi/linphonecore.c	2009/03/24 22:24:49	366
++++ linphone-3.1.0/coreapi/linphonecore.c	2009/03/24 22:43:14	367
+@@ -2108,7 +2108,7 @@
+ 	if (olddev!=NULL && olddev!=lc->video_conf.device){
+ 		toggle_video_preview(lc,FALSE);/*restart the video local preview*/
+ 	}
+-	if (lc->ready){
++	if (lc->ready && lc->video_conf.device){
+ 		vd=ms_web_cam_get_string_id(lc->video_conf.device);
+ 		if (vd && strstr(vd,"Static picture")!=NULL){
+ 			vd=NULL;
diff --git a/recipes/linphone/linphone_3.1.0.bb b/recipes/linphone/linphone_3.1.0.bb
new file mode 100644
index 0000000000..bebaa169e2
--- /dev/null
+++ b/recipes/linphone/linphone_3.1.0.bb
@@ -0,0 +1,82 @@
+DESCRIPTION = "SIP-based IP phone (console edition)"
+HOMEPAGE = "http://www.linphone.org/?lang=us"
+SECTION = "x11/utils"
+LICENSE = "GPLv2"
+
+PR = "r1"
+
+DEPENDS = "intltool libosip2 speex libogg alsa-lib readline libexosip2"
+DEPENDS_${PN} = "liblinphone"
+DEPENDS_${PN}c = "liblinphone readline"
+DEPENDS_liblinphone = "libmediastreamer libortp libosip2"
+#DEPENDS_libquickstream = "speex libmediastreamer alsa-lib"
+DEPENDS_libmediastreamer = "speex libogg alsa-lib libortp"
+
+RDEPENDS_${PN} = "liblinphone"
+RDEPENDS_${PN}c = "liblinphone readline"
+RDEPENDS_liblinphone = "libmediastreamer libortp libosip2"
+#RDEPENDS_libquickstream = "speex libmediastreamer libasound"
+RDEPENDS_libmediastreamer = "speex libogg libasound libortp"
+
+PROVIDES += "linphone linphonec liblinphone"
+
+SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/3.1.x/sources/linphone-${PV}.tar.gz \
+	file://b64_assert.patch;patch=1 \
+	file://preferences-segv.patch;patch=1 \
+	"
+
+S = "${WORKDIR}/linphone-${PV}"
+
+inherit autotools pkgconfig
+
+export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config
+
+EXTRA_OECONF = "--disable-gtk-doc \
+                --without-ffmpeg --disable-video \
+                --enable-alsa \
+                --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \
+                --disable-truespeech --disable-manual \
+		--enable-console_ui=yes --enable-gtk_ui=yes \
+		--with-realprefix=/usr \
+		"
+
+PARALLEL_MAKE = ""
+
+do_stage () {
+        install -d ${STAGING_DATADIR}/aclocal
+        oe_libinstall -a -so liblinphone ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/linphone
+        install -m 0644 ${S}/coreapi/linphonecore.h ${STAGING_INCDIR}/linphone
+        install -m 0644 ${S}/coreapi/lpconfig.h ${STAGING_INCDIR}/linphone
+        oe_libinstall -a -so libmediastreamer ${STAGING_LIBDIR}
+#        oe_libinstall -a -so libquickstream ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/mediastreamer2
+        install -m 0644 ${S}/mediastreamer2/include/mediastreamer2/*.h ${STAGING_INCDIR}/mediastreamer2
+        install -d ${STAGING_INCDIR}/ortp
+        oe_libinstall -a -so libortp ${STAGING_LIBDIR}/
+        install -m 0644 ${S}/oRTP/include/ortp/*.h ${STAGING_INCDIR}/ortp/
+        autotools_stage_all
+}
+
+PACKAGES += "linphonec linphone-rings liblinphone libmediastreamer libortp"
+
+FILES_${PN} = "${bindir}/linphone-3 \ 
+	    ${bindir}/linphone \
+            ${datadir}/linphone \
+ 	    ${datadir}/pixmaps \
+	    ${datadir}/applications \
+	    ${datadir}/gnome/apps \
+	    ${datadir}/sounds/linphone/hello8000.wav \
+	    ${datadir}/sounds/linphone/hello16000.wav \
+	    ${datadir}/images/nowebcamCIF.jpg \
+	    "
+FILES_${PN}c = "${bindir}/linphonec ${bindir}/linphonecsh ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav"
+FILES_${PN}-rings = "${datadir}/sounds/linphone/rings"
+FILES_liblinphone = "${libdir}/liblinphone.so.*"
+#FILES_libquickstream = "${libdir}/libquickstream.so.*"
+FILES_libmediastreamer = "${libdir}/libmediastreamer.so.* /usr/libexec/mediastream"
+FILES_libortp = "${libdir}/libortp.so.*"
+FILES_${PN}-dev += "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}"
+
diff --git a/recipes/mokomaze/mokomaze-0.2.3/adapt_ttf_fontdir.patch b/recipes/mokomaze/mokomaze-0.2.3/adapt_ttf_fontdir.patch
new file mode 100644
index 0000000000..c899529df8
--- /dev/null
+++ b/recipes/mokomaze/mokomaze-0.2.3/adapt_ttf_fontdir.patch
@@ -0,0 +1,11 @@
+diff -r fd8e721228a3 src/Makefile.am
+--- a/src/Makefile.am	Mon May 04 10:29:40 2009 +0200
++++ b/src/Makefile.am	Mon May 04 10:31:38 2009 +0200
+@@ -3,7 +3,7 @@
+ AM_CPPFLAGS = \
+   -DDATADIR=\""$(datadir)"\" -D_GNU_SOURCE \
+   -DPIXMAPDIR=\""$(datadir)/pixmaps"\" \
+-  -DFONTDIR=\""/usr/share/fonts/truetype/ttf-liberation"\"
++  -DFONTDIR=\""/usr/share/fonts/truetype"\"
+ 
+ AM_CFLAGS = -Wall -pedantic -std=c99 @SDL_CFLAGS@
diff --git a/recipes/mokomaze/mokomaze-0.2.3/avoid_dim_suspend.patch b/recipes/mokomaze/mokomaze-0.2.3/avoid_dim_suspend.patch
new file mode 100644
index 0000000000..58c5b642dd
--- /dev/null
+++ b/recipes/mokomaze/mokomaze-0.2.3/avoid_dim_suspend.patch
@@ -0,0 +1,14 @@
+diff -r fd8e721228a3 data/config.json
+--- a/data/config.json	Mon May 04 10:29:40 2009 +0200
++++ b/data/config.json	Mon May 04 11:28:27 2009 +0200
+@@ -20,8 +20,8 @@
+     },
+ 
+     "exec": {
+-        "init": "",
+-        "final": ""
++        "init": "dbus-send --system --type=method_call --dest=org.shr.ophonekitd.Usage /org/shr/ophonekitd/Usage org.shr.ophonekitd.Usage.RequestResource string:Display",
++        "final": "dbus-send --system --type=method_call --dest=org.shr.ophonekitd.Usage /org/shr/ophonekitd/Usage org.shr.ophonekitd.Usage.ReleaseResource string:Display"
+     }
+ 
+ }
diff --git a/recipes/mokomaze/mokomaze-0.2.3/fix_desktop_file.patch b/recipes/mokomaze/mokomaze-0.2.3/fix_desktop_file.patch
new file mode 100644
index 0000000000..7f45f0c982
--- /dev/null
+++ b/recipes/mokomaze/mokomaze-0.2.3/fix_desktop_file.patch
@@ -0,0 +1,16 @@
+diff -r fd8e721228a3 data/mokomaze.desktop
+--- a/data/mokomaze.desktop	Mon May 04 10:29:40 2009 +0200
++++ b/data/mokomaze.desktop	Mon May 04 10:33:02 2009 +0200
+@@ -1,12 +1,10 @@
+ [Desktop Entry]
+ Name=Mokomaze
+ Comment=Labyrinth game
+-Encoding=UTF-8
+-Version=0.2.3
+ Type=Application
+ Exec=mokomaze
+ Terminal=false
+-Categories=Application;Game;SDL;
++Categories=Game;SDL;
+ X-MB-SingleInstance=true
+ Icon=mokomaze
diff --git a/recipes/mokomaze/mokomaze-0.5.1/avoid_dim_suspend.patch b/recipes/mokomaze/mokomaze-0.5.1/avoid_dim_suspend.patch
new file mode 100644
index 0000000000..58c5b642dd
--- /dev/null
+++ b/recipes/mokomaze/mokomaze-0.5.1/avoid_dim_suspend.patch
@@ -0,0 +1,14 @@
+diff -r fd8e721228a3 data/config.json
+--- a/data/config.json	Mon May 04 10:29:40 2009 +0200
++++ b/data/config.json	Mon May 04 11:28:27 2009 +0200
+@@ -20,8 +20,8 @@
+     },
+ 
+     "exec": {
+-        "init": "",
+-        "final": ""
++        "init": "dbus-send --system --type=method_call --dest=org.shr.ophonekitd.Usage /org/shr/ophonekitd/Usage org.shr.ophonekitd.Usage.RequestResource string:Display",
++        "final": "dbus-send --system --type=method_call --dest=org.shr.ophonekitd.Usage /org/shr/ophonekitd/Usage org.shr.ophonekitd.Usage.ReleaseResource string:Display"
+     }
+ 
+ }
diff --git a/recipes/mokomaze/mokomaze-0.5.5+git8/fsoraw.patch b/recipes/mokomaze/mokomaze-0.5.5+git8/fsoraw.patch
new file mode 100644
index 0000000000..e59f0cf6a7
--- /dev/null
+++ b/recipes/mokomaze/mokomaze-0.5.5+git8/fsoraw.patch
@@ -0,0 +1,11 @@
+--- mokomaze-0.5.5+git8/data/mokomaze.desktop	2009-08-22 12:14:31.000000000 +0200
++++ mokomaze-0.5.5+git8/data/mokomaze.desktop	2009-08-22 12:50:30.000000000 +0200
+@@ -4,7 +4,7 @@
+ Encoding=UTF-8
+ Version=0.5
+ Type=Application
+-Exec=mokomaze
++Exec=fsoraw -r Display mokomaze
+ Terminal=false
+ Categories=Game;
+ X-MB-SingleInstance=true
diff --git a/recipes/mokomaze/mokomaze_0.2.3.bb b/recipes/mokomaze/mokomaze_0.2.3.bb
new file mode 100644
index 0000000000..e2292c11a2
--- /dev/null
+++ b/recipes/mokomaze/mokomaze_0.2.3.bb
@@ -0,0 +1,22 @@
+DESCRIPTION="Classic game where you control a steel ball by tilting a wooden labyrinth"
+HOMEPAGE="http://mokomaze.projects.openmoko.org/"
+SECTION="x11/games"
+PRIORITY="optional"
+LICENSE="GPLv3"
+DEPENDS="libsdl-ttf libsdl-image"
+RDEPENDS="ttf-liberation-mono"
+
+
+PR="r4"
+SRC_URI="http://projects.openmoko.org/frs/download.php/764/${P}.tar.gz \
+         file://adapt_ttf_fontdir.patch;patch=1 \
+         file://fix_desktop_file.patch;patch=1 \
+         file://avoid_dim_suspend.patch;patch=1"
+
+inherit autotools
+
+# FIXME: This should suffice to specify the fontdir, but it does not work
+# Therefore we simply patch the makefile now to use the correct fontdir
+#EXTRA_OEMAKE="FONTDIR=${datadir}/fonts/truetype"
+
+
diff --git a/recipes/mokomaze/mokomaze_0.5.1.bb b/recipes/mokomaze/mokomaze_0.5.1.bb
new file mode 100644
index 0000000000..56ffc356e4
--- /dev/null
+++ b/recipes/mokomaze/mokomaze_0.5.1.bb
@@ -0,0 +1,21 @@
+DESCRIPTION="Classic game where you control a steel ball by tilting a wooden labyrinth"
+HOMEPAGE="http://mokomaze.projects.openmoko.org/"
+SECTION="x11/games"
+PRIORITY="optional"
+LICENSE="GPLv3"
+DEPENDS="libsdl-ttf libsdl-image ode"
+RDEPENDS="ttf-liberation-mono libpng"
+
+PR="r7"
+SRC_URI="http://projects.openmoko.org/frs/download.php/813/${PN}-${PV}.tar.gz \
+         file://avoid_dim_suspend.patch;patch=1"
+
+S=${WORKDIR}/${PN}-${PV}
+
+inherit autotools
+
+EXTRA_OECONF="FONTDIR=${datadir}/fonts/truetype"
+
+# needed for ode
+LDFLAGS += "-lstdc++"
+
diff --git a/recipes/mokomaze/mokomaze_0.5.5.bb b/recipes/mokomaze/mokomaze_0.5.5.bb
new file mode 100644
index 0000000000..e579564faa
--- /dev/null
+++ b/recipes/mokomaze/mokomaze_0.5.5.bb
@@ -0,0 +1,23 @@
+DESCRIPTION="Classic game where you control a steel ball by tilting a wooden labyrinth"
+HOMEPAGE="http://mokomaze.projects.openmoko.org/"
+SECTION="x11/games"
+PRIORITY="optional"
+LICENSE="GPLv3"
+DEPENDS="libsdl-ttf libsdl-image ode"
+RDEPENDS="ttf-liberation-mono libpng fsoraw"
+
+PR="r1"
+PV="0.5.5+git8"
+
+SRC_URI="http://mokomaze.projects.openmoko.org/files/${PN}-${PV}.tar.gz \
+	file://fsoraw.patch;patch=1"
+
+#S=${WORKDIR}/${PN}-${PV}+git8
+
+inherit autotools
+
+EXTRA_OECONF="FONTDIR=${datadir}/fonts/truetype --enable-rgb-swap"
+
+# needed for ode
+LDFLAGS += "-lstdc++"
+
diff --git a/recipes/notifier/notifier_0.2.bb b/recipes/notifier/notifier_0.2.bb
new file mode 100644
index 0000000000..2cd999f878
--- /dev/null
+++ b/recipes/notifier/notifier_0.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "A notifier for new calls and messages"
+HOMEPAGE = "http://www.telefoninux.org"
+AUTHOR = "Pietro Montorfano"
+LICENSE = "GPLv3"
+RDEPENDS = "python-elementary python python-edbus"
+SECTION = "x11/application"
+PR = "r2"
+
+SRC_URI = "http://monto.homelinux.org/notifier \
+http://monto.homelinux.org/89notifier"
+
+S = "${WORKDIR}"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 ${S}/notifier ${D}${bindir}/
+	install -d ${D}${sysconfdir}/X11/Xsession.d
+	install -m 0755 ${S}/89notifier ${D}${sysconfdir}/X11/Xsession.d/
+}
+
+
diff --git a/recipes/omgps/omgps_svn.bb b/recipes/omgps/omgps_svn.bb
new file mode 100644
index 0000000000..5e19fad035
--- /dev/null
+++ b/recipes/omgps/omgps_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "GPS application for openmoko freerunner"
+HOMEPAGE = "http://omgps.googlecode.com"
+SECTION = "openmoko/applications"
+LICENSE = "GPLv2"
+DEPENDS = "gtk+ python-pygobject dbus-glib"
+#PACKAGES = "${PN}-dbg ${PN}"
+PV = "0.1-svnr${SRCREV}"
+PR = "r0"
+S = "${WORKDIR}/${PN}"
+SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;proto=http"
+
+inherit autotools
diff --git a/recipes/omnewrotate/files/correct-sysfs-bl-path.patch b/recipes/omnewrotate/files/correct-sysfs-bl-path.patch
new file mode 100644
index 0000000000..6d381649a8
--- /dev/null
+++ b/recipes/omnewrotate/files/correct-sysfs-bl-path.patch
@@ -0,0 +1,53 @@
+diff -uri omnewrotate.org/src/omnewrotate.c omnewrotate/src/omnewrotate.c
+--- omnewrotate.org/src/omnewrotate.c	2009-05-03 20:23:56.000000000 +0200
++++ omnewrotate/src/omnewrotate.c	2009-05-07 17:46:07.000000000 +0200
+@@ -95,8 +95,8 @@
+ #define LONG_TIME 0
+ 
+ #define EVENT_PATH "/dev/input/event3"
+-#define GET_BRIGHTNESS_PATH "/sys/class/backlight/pcf50633-bl/actual_brightness"
+-#define SET_BRIGHTNESS_PATH "/sys/class/backlight/pcf50633-bl/brightness"
++#define GET_BRIGHTNESS_PATH "/sys/class/backlight/gta02-bl/actual_brightness"
++#define SET_BRIGHTNESS_PATH "/sys/class/backlight/gta02-bl/brightness"
+ 
+ #define NUM_THREADS 1
+ 
+@@ -197,8 +197,8 @@
+ #endif
+ 
+ 	if (change_brightness && !use_dbus) {
+-		set_brightness_file = open(SET_BRIGHTNESS_PATH, O_RDWR);
+-		get_brightness_file = open(GET_BRIGHTNESS_PATH, O_RDWR);
++		set_brightness_file = open(SET_BRIGHTNESS_PATH, O_WRONLY);
++		get_brightness_file = open(GET_BRIGHTNESS_PATH, O_RDONLY);
+ 
+ 		if (set_brightness_file < 0 || get_brightness_file < 0)
+ 		{
+@@ -273,7 +273,7 @@
+ 	rootWindow = RootWindow(display, screen);
+ 	XRRRotations(display, screen, &r);
+ 
+-	char current_brightness[3] = "63\n";
++	char current_brightness[4] = "255\n";
+ 	char brightness_off[2] = "0\n";
+ 
+ 
+@@ -317,7 +317,7 @@
+ 		else
+ 		{
+ 			lseek(get_brightness_file, 0, SEEK_SET);
+-			read(get_brightness_file, &current_brightness, 2);
++			read(get_brightness_file, &current_brightness, 3);
+ 			lseek(set_brightness_file, 0, SEEK_SET);
+ 			write(set_brightness_file, &brightness_off, 2);
+ 		}
+@@ -333,7 +333,7 @@
+ 		if(debug) printf("Recovering screen brightness for nifty effect\n");
+ 		usleep(500000);
+ 		lseek(set_brightness_file, 0, SEEK_SET);
+-		write(set_brightness_file, &current_brightness, 3);
++		write(set_brightness_file, &current_brightness, 4);
+ 	}
+ 
+ }
+Nur in omnewrotate.org/src: .omnewrotate.c.swp.
diff --git a/recipes/omnewrotate/omnewrotate_0.5.4.bb b/recipes/omnewrotate/omnewrotate_0.5.4.bb
new file mode 100644
index 0000000000..c712efaba0
--- /dev/null
+++ b/recipes/omnewrotate/omnewrotate_0.5.4.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "OpenMoko New Rotate is a screen rotation program"
+HOMEPAGE = "http://code.google.com/p/omnewrotate/"
+AUTHOR = "Rui Seabra"
+LICENSE = "GPLv3"
+SECTION = "console/network"
+DEPENDS = "libframeworkd-glib xrandr"
+PV = "0.5.4"
+PR = "r4"
+
+SRC_URI = "svn://omnewrotate.googlecode.com/svn/trunk;module=.;proto=http;rev=HEAD \
+file://correct-sysfs-bl-path.patch;patch=1 \
+"
+S = "${WORKDIR}"
+
+inherit autotools
diff --git a/recipes/omoney/omoney_svn.bb b/recipes/omoney/omoney_svn.bb
new file mode 100644
index 0000000000..706a5d0493
--- /dev/null
+++ b/recipes/omoney/omoney_svn.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "OMoney is a bookkeeping application for Openmoko"
+HOMEPAGE = "http://omoney.googlecode.com"
+AUTHOR = "Bumbl"
+LICENSE = "GPLv2"
+SECTION = "openmoko/money"
+PV = "milestone1-svnr${SRCREV}"
+PR = "r0"
+SRC_URI = "svn://omoney.googlecode.com/svn/trunk;module=.;proto=http;rev=29"
+S = "${WORKDIR}"
+
+inherit distutils
+
+RDEPENDS_${PN} = "\
+  python \
+  python-datetime \
+  python-evas \
+  python-edje \
+  python-ecore \
+  python-etk \
+  python-sqlite3 \
+  python-textutils"
+
+FILES_${PN} = "\
+  /usr/bin/omoney \
+  /usr/share/omoney/omgui.edj \
+  /usr/share/pixmaps/omoney.png \
+  /usr/share/applications/omoney.desktop"
+
diff --git a/recipes/omview/omview_svn.bb b/recipes/omview/omview_svn.bb
new file mode 100644
index 0000000000..8b743072c1
--- /dev/null
+++ b/recipes/omview/omview_svn.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "OMView"
+SECTION = "x11/graphics"
+PKG_TAGS_${PN} = "group::communication"
+DEPENDS += " evas ewl epsilon"
+RDEPENDS += " epsilon-thumbd"
+PV = "0.0.1-svnr${SRCREV}"
+PR = "r2"
+
+inherit autotools
+
+SRC_URI += "svn://svn.projects.openmoko.org/svnroot;proto=svn;module=omview"
+
+S = "${WORKDIR}/${PN}"
+
diff --git a/recipes/openmoko-3rdparty/advancedcaching_git.bb b/recipes/openmoko-3rdparty/advancedcaching_git.bb
new file mode 100644
index 0000000000..01d247f123
--- /dev/null
+++ b/recipes/openmoko-3rdparty/advancedcaching_git.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Advanced Geocaching Tool for Linux - Towards paperless geocaching!"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.opkg.org/package_268.html"
+RDEPENDS = "python-pygtk python-html python-image python-netclient python-misc python-sqlite3 python-mime python-json"
+PV=0.1.2+gitr${SRCREV}
+
+SRC_URI = "git://github.com/webhamster/advancedcaching.git;protocol=git;branch=master"
+
+inherit setuptools
+
+S = "${WORKDIR}/git/files"
+
+do_install_append() {
+        mkdir -p "${D}/${datadir}/pixmaps"
+        install -m 0644 "${S}/advancedcaching.png" "${D}/${datadir}/pixmaps"
+        mkdir -p "${D}/${datadir}/applications"
+        install -m 0644 "${S}/advancedcaching.desktop" "${D}/${datadir}/applications"
+}
+
+FILES_${PN} += "/usr/share/applications/* /usr/share/pixmaps/*"
diff --git a/recipes/openmoko-3rdparty/om-neon_svn.bb b/recipes/openmoko-3rdparty/om-neon_svn.bb
new file mode 100644
index 0000000000..48aa0ab6db
--- /dev/null
+++ b/recipes/openmoko-3rdparty/om-neon_svn.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Simple image viewer"
+HOMEPAGE = "http://neon.projects.openmoko.org/"
+LICENSE = "GPLv3"
+AUTHOR = "Valéry Febvre <vfebvre@easter-eggs.com>"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+DEPENDS = "edje-native python-native"
+
+SRCREV = ${AUTOREV}
+PV = "1.0.0+svn${SRCREV}"
+PR = "r2"
+
+S = "${WORKDIR}/trunk"
+
+# Pure Python plus Edje interface
+PACKAGE_ARCH = "all"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/neon;module=trunk"
+
+inherit distutils
+
+FILES_${PN} += "${datadir}/neon ${datadir}/applications/neon.desktop ${datadir}/pixmaps"
+
+RDEPENDS += "python-textutils python-evas python-ecore python-edje"
+
+do_compile_prepend() {
+	sed -i "s/\/opt\/bin\/edje_cc -v/${@"${STAGING_BINDIR_NATIVE}".replace('/', '\/')}\/edje_cc/g" ${S}/build_edje.py
+	sed -i "s/#THEMES_DIR = '\/usr\/share\/neon\/themes'/THEMES_DIR = '\/usr\/share\/neon\/themes'/g" ${S}/neon/neon.py
+	sed -i "s/THEMES_DIR = '..\/data\/themes'/#THEMES_DIR = '..\/data\/themes'/g" ${S}/neon/neon.py
+}
diff --git a/recipes/openmoko-3rdparty/pisi_0.4.7.bb b/recipes/openmoko-3rdparty/pisi_0.4.7.bb
new file mode 100644
index 0000000000..b3425d2c2e
--- /dev/null
+++ b/recipes/openmoko-3rdparty/pisi_0.4.7.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "PISI is synchronizing information"
+AUTHOR = "Michael Pilgermann"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://projects.openmoko.org/projects/pisi/"
+SRCNAME = "pisi"
+DEPENDS = "python-native python"
+RDEPENDS = "python-vobject python python-pygtk python-pygobject python-pycairo\
+           python-gdata python-webdav python-ldap python-epydoc python-core\
+           python-dateutil python-sqlite3 python-netserver python-netclient\
+           python-misc"
+
+PACKAGE_ARCH = "all"
+
+PR = "r0"
+
+SRC_URI = "http://projects.openmoko.org/frs/download.php/907/pisi-src-${PV}.tar.gz"
+
+FILES_${PN} += "/opt/pisi \
+                ${datadir}/pixmaps \
+                ${datadir}/applications \
+                /home"
+CONFFILES_${PN} += "/home/root/.${PN}/conf.default"
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/python ${S}/setup.py build ${D}
+}
+
+do_install() {
+	${STAGING_BINDIR_NATIVE}/python ${S}/setup.py install ${D}
+	rm -rf ${D}/opt/pisi/build/
+	rm -rf ${D}/opt/pisi/patches/
+}
diff --git a/recipes/openmoocow/openmoocow/openmoocow.desktop b/recipes/openmoocow/openmoocow/openmoocow.desktop
new file mode 100644
index 0000000000..e819c48ba4
--- /dev/null
+++ b/recipes/openmoocow/openmoocow/openmoocow.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=MooCow
+Comment=Moobox simulator
+Type=Application
+Exec=openmoocow
+Terminal=false
+Categories=Games;
+Icon=openmoocow/icon.png
+X-MB-SingleInstance=true
+
diff --git a/recipes/openmoocow/openmoocow_git.bb b/recipes/openmoocow/openmoocow_git.bb
new file mode 100644
index 0000000000..58fcd9b246
--- /dev/null
+++ b/recipes/openmoocow/openmoocow_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "OpenMooCow makes your phone (nearly) become a cow!"
+HOMEPAGE = "http://www.srcf.ucam.org/~taw27/openmoko/openmoocow/"
+AUTHOR = "Thomas White"
+LICENSE = "GPLv3"
+SECTION = "applications/games"
+PV = "0.0.3+r${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://git.bitwiz.org.uk/openmoocow.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+inherit autotools
+
+
diff --git a/recipes/opensync/libsyncml_0.5.4.bb b/recipes/opensync/libsyncml_0.5.4.bb
new file mode 100644
index 0000000000..cf5c5b9135
--- /dev/null
+++ b/recipes/opensync/libsyncml_0.5.4.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Libsyncml is an implementation of the SyncML protocol."
+HOMEPAGE = "https://libsyncml.opensync.org/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "libxml2 glib-2.0"
+RRECOMMENDS = "wbxml2 openobex libsoup"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/libsyncml-${PV}.tar.gz \
+           "
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE += " . -B${WORKDIR}/build "
+
+PACKAGES += "${PN}-tools"
+
+FILES_${PN}-tools = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
+
+do_build_prepend() {
+	cd ${WORKDIR}/build
+}
+
+do_install_prepend() {
+	cd ${WORKDIR}/build
+}
\ No newline at end of file
diff --git a/recipes/opensync/wbxml2_0.10.7.bb b/recipes/opensync/wbxml2_0.10.7.bb
new file mode 100644
index 0000000000..77d819a423
--- /dev/null
+++ b/recipes/opensync/wbxml2_0.10.7.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "WBXML parsing and encoding library."
+HOMEPAGE = "http://libwbxml.opensync.org/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libwbxml/libwbxml-${PV}.tar.gz \
+           "
+
+S = "${WORKDIR}/libwbxml-${PV}"
+
+inherit cmake pkgconfig
+
+EXTRA_OECMAKE += " . -B${WORKDIR}/build "
+
+PACKAGES += "${PN}-tools"
+
+FILES_${PN}-tools = "${bindir}"
+FILES_${PN} = "${libdir}/*.so.*"
+
+do_build_prepend() {
+	cd ${WORKDIR}/build
+}
+
+do_install_prepend() {
+	cd ${WORKDIR}/build
+}
diff --git a/recipes/orrery/orrery/Makefile.am.patch b/recipes/orrery/orrery/Makefile.am.patch
new file mode 100644
index 0000000000..23e7798139
--- /dev/null
+++ b/recipes/orrery/orrery/Makefile.am.patch
@@ -0,0 +1,67 @@
+Nur in files: aclocal.m4.
+Nur in files.fixed: autogen.sh.
+Nur in files: autom4te.cache.
+Nur in files: configure.
+diff -uri files/configure.in files.fixed/configure.in
+--- files/configure.in	2008-08-17 05:32:06.000000000 +0200
++++ files.fixed/configure.in	2009-02-18 16:01:30.102497178 +0100
+@@ -2,4 +2,13 @@
+ AM_INIT_AUTOMAKE(orrery,1.1)
+ AC_PROG_CC
+ AC_PROG_INSTALL
++
++PKG_CHECK_MODULES(GTK, gtk+-x11-2.0 gthread-2.0)
++PKG_CHECK_MODULES(X11, x11 xext xau xcursor xfixes xdmcp xrender)
++
++AC_SUBST(GTK_CFLAGS)
++AC_SUBST(GTK_LIBS)
++AC_SUBST(X11_CFLAGS)
++AC_SUBST(X11_LIBS)
++
+ AC_OUTPUT(Makefile)
+Nur in files: depcomp.
+Nur in files: install-sh.
+diff -uri files/Makefile.am files.fixed/Makefile.am
+--- files/Makefile.am	2008-09-03 08:54:55.000000000 +0200
++++ files.fixed/Makefile.am	2009-02-18 16:14:19.574262603 +0100
+@@ -1,36 +1,4 @@
+-CFLAGS = -g -O3 -Wall
+-CC = $(OM)/build/tmp/cross/arm-angstrom-linux-gnueabi/bin/gcc
+-INCLUDES = -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/gtk-2.0/    \
+-           -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/cairo/      \
+-           -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/glib-2.0/   \
+-           -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/pango-1.0/  \
+-           -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/gtk-2.0/include \
+-           -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/atk-1.0/
+-LDADD = $(OM)/build/tmp/rootfs/usr/lib/libgobject-2.0.so.0                            \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpangocairo-1.0.so.0 \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpango-1.0.so.0      \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libcairo.so.2          \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgmodule-2.0.so.0    \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libglib-2.0.so.0       \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libfontconfig.so.1     \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXext.so.6           \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXrender.so.1        \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpopt.so.0           \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgthread-2.0.so.0    \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libX11.so.6            \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXcursor.so.1        \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXfixes.so.3         \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgdk_pixbuf-2.0.so.0 \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpangoft2-1.0.so.0   \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libz.so.1              \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpng12.so.0          \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libfreetype.so.6       \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libexpat.so.1          \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXau.so.6            \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXdmcp.so.6          \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgtk-x11-2.0.so.0    \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libatk-1.0.so.0        \
+-	$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgcrypt.so.11.2.2    \
+-        $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgpg-error.so.0.3.0
+ bin_PROGRAMS = orrery
+ orrery_SOURCES = planetInfo.c orrery.c
++orrery_CFLAGS = -g -O3 -Wall @GTK_CFLAGS@ @X11_CFLAGS@
++orrery_LDADD = @GTK_LIBS@ @X11_LIBS@ -lpopt -lz -lexpat -lgcrypt -lgpg-error
+Nur in files: Makefile.in.
+Nur in files: missing.
diff --git a/recipes/orrery/orrery/datadir.patch b/recipes/orrery/orrery/datadir.patch
new file mode 100644
index 0000000000..7a3c204ad9
--- /dev/null
+++ b/recipes/orrery/orrery/datadir.patch
@@ -0,0 +1,12 @@
+diff -uri files/orrery.c files.datadir/orrery.c
+--- files/orrery.c	2009-01-07 11:28:32.000000000 +0100
++++ files.datadir/orrery.c	2009-02-18 19:08:44.887262837 +0100
+@@ -70,7 +70,7 @@
+ 
+ #define FULL_CIRCLE (23040) /* Full circle in calls to draw_arc */
+ 
+-#define DATA_DIR    "/media/card/orrery"
++#define DATA_DIR    "/usr/share/orrery"
+ #define N_PLANETS (9)
+ #define N_SOLAR_SYSTEM_OBJECTS (10)
+ 
diff --git a/recipes/orrery/orrery_2.4.bb b/recipes/orrery/orrery_2.4.bb
new file mode 100644
index 0000000000..dc5622946e
--- /dev/null
+++ b/recipes/orrery/orrery_2.4.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "orrery"
+SECTION = "x11/scientific"
+PV = "2.4"
+
+inherit autotools
+
+SRC_URI = "http://projects.openmoko.org/frs/download.php/581/orrery_2.4_clean.tar.gz \
+           file://datadir.patch;patch=1 \
+           file://Makefile.am.patch;patch=1"
+S = "${WORKDIR}/files"
+
+do_install_append() {
+		    install -d ${D}${datadir}/applications
+		    install -m 0644 ${S}/orrery.desktop ${D}${datadir}/applications
+		    install -d ${D}${datadir}/orrery
+		    cp -a ${S}/data/* ${D}${datadir}/orrery
+		    rm ${D}${datadir}/orrery/icons/orrery.png
+		    install -d ${D}${datadir}/icons
+		    install ${S}/data/icons/orrery.png ${D}${datadir}/icons
+}
+
+FILES_${PN} += "\
+	    ${datadir}/applications/orrery.desktop \
+	    ${datadir}/orrery \
+	    ${datadir}/icons"
+
diff --git a/recipes/pidgin/msn-pecan_git.bb b/recipes/pidgin/msn-pecan_git.bb
new file mode 100644
index 0000000000..c9b1bf5a58
--- /dev/null
+++ b/recipes/pidgin/msn-pecan_git.bb
@@ -0,0 +1,23 @@
+DESCRIPTION="Alternative MSN protocol plug-in for pidgin"
+HOMEPAGE="http://code.google.com/p/msn-pecan/"
+SECTION = "x11/network"
+LICENSE="GPL-2"
+RDEPENDS="pidgin"
+DEPENDS="pidgin"
+PV="0.0.1-gitr${SRCREV}"
+PR="r0"
+
+inherit pkgconfig
+
+SRC_URI="git://github.com/felipec/msn-pecan.git;protocol=http"
+S="${WORKDIR}/git"
+
+do_compile() {
+        oe_runmake "DESTDIR=${D}"
+}
+do_install() {
+	oe_runmake "DESTDIR=${D}" install
+}
+
+FILES_${PN} = "${libdir}/purple-2/*.so"
+FILES_${PN}-dbg = "${libdir}/purple-2/.debug/"
diff --git a/recipes/pyphonelog/pyphonelog_git.bb b/recipes/pyphonelog/pyphonelog_git.bb
new file mode 100644
index 0000000000..a92578f044
--- /dev/null
+++ b/recipes/pyphonelog/pyphonelog_git.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "PyPhonelog is a phonelog gui that connects to the shr daemon/a custom daemon"
+HOMEPAGE = "http://wiki.openmoko.org/wiki/PyPhonelog"
+SECTION = "x11/applications"
+LICENSE = "GPLv2"
+SRCNAME = "pyphonelog"
+RDEPENDS += "python python-pygtk python-sqlite3 python-phoneutils"
+
+inherit distutils
+
+S = "${WORKDIR}/git"
+PV = "0.17.0-gitr${SRCREV}"
+PR = "r0"
+SRC_URI = "git://shr.bearstech.com/repo/pyphonelog.git;protocol=http"
+FILES_${PN} += "${datadir}/applications/phonelog.desktop \
+		${datadir}/phonelog/ \
+		${datadir}/pixmaps/phonelog.png"
diff --git a/recipes/pythm/pythm/mplayer-escape-filenames.patch b/recipes/pythm/pythm/mplayer-escape-filenames.patch
new file mode 100644
index 0000000000..329f4ef7f4
--- /dev/null
+++ b/recipes/pythm/pythm/mplayer-escape-filenames.patch
@@ -0,0 +1,19 @@
+diff -ur pythm-org/pythm/mplayer/mplayerbackend.py pythm/pythm/mplayer/mplayerbackend.py
+--- pythm-org/pythm/mplayer/mplayerbackend.py	2008-11-22 14:18:13.227163500 +0100
++++ pythm/pythm/mplayer/mplayerbackend.py	2009-01-15 23:54:50.582429054 +0100
+@@ -96,7 +96,7 @@
+                 entry = self.current[1]
+                 self.emit(Signals.SONG_CHANGED,entry)
+                 self.songend = time.time()
+-                fn = entry.id
++                fn = re.escape(entry.id)
+                 array = self.mplayer.innercmd("loadfile '" + fn + "'\n","======",True)
+                 #array = self.mplayer.arraycmd("loadfile","======",fn)
+                 self.fill_entry(array, entry)
+@@ -404,4 +404,4 @@
+         self.browse()
+ 
+         
+-        
+\ Kein Zeilenumbruch am Dateiende.
++
diff --git a/recipes/pythm/pythm/pythm.conf b/recipes/pythm/pythm/pythm.conf
new file mode 100644
index 0000000000..2fbe3c4997
--- /dev/null
+++ b/recipes/pythm/pythm/pythm.conf
@@ -0,0 +1,32 @@
+# global pythm settings
+# place this file in ~/.pythm/, name it pythm.conf
+
+[pythm]
+# backends to show in backend list
+backends=mpd,mplayer
+# the default backend to use, can be either
+# mpd or mplayer, or omitted
+backend=mplayer
+
+# mpd specific settings
+[mpd]
+# mpd host
+host=localhost
+# mpd port
+port=6600
+# mpd password, comment out for no password
+#password=verysecret
+
+# mplayer settings
+[mplayer]
+# renice val for mplayer process
+renice=-15
+
+# directory containing music (the start folder for the browser)
+musicdir=~
+# allowed file endings in browse mode, comma separated
+endings=ogg,mp3
+# filters to exclude in file browser. applied to files and directories
+# using regular expressions. use filtersN for more entries
+# default is to ignore all elements that start with a ".".
+filters0=\..*
diff --git a/recipes/pythm/pythm/pythm.desktop b/recipes/pythm/pythm/pythm.desktop
new file mode 100644
index 0000000000..89f74d50bb
--- /dev/null
+++ b/recipes/pythm/pythm/pythm.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=0.5
+Type=Application
+Encoding=UTF-8
+Name=pythm
+Comment=pyGTK+ Frontend for MPD and mplayer
+TryExec=pythm-bin
+Exec=pythm-bin
+Icon=bass.png
+Categories=Application;AudioVideo;Audio;Player;
+Categories=Office;
+Terminal=false
diff --git a/recipes/pythm/pythm_svn.bb b/recipes/pythm/pythm_svn.bb
new file mode 100644
index 0000000000..da01f5cf63
--- /dev/null
+++ b/recipes/pythm/pythm_svn.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Pythm is a media player gui designed to work with mplayer or mpd as "slave" players.\
+use mplayer to hear music on the road or mpd control if your are at home."
+HOMEPAGE = "http://projects.openmoko.org/projects/pythm/"
+SECTION = "application/multimedia"
+LICENSE = "GPLv2"
+SRCNAME = "pythm"
+PV = "0.5.1+svnr${SRCREV}"
+PR = "r3"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=pythm \
+           file://mplayer-escape-filenames.patch;patch=0 \
+           file://pythm.desktop \
+	   file://pythm.conf"
+S = "${WORKDIR}/pythm"
+
+inherit setuptools
+
+RDEPENDS_${PN} = "\
+  python-pygtk \
+  mplayer \
+"
+DISTUTILS_INSTALL_ARGS = "--root=${D} \
+    --prefix=${prefix} \
+    --install-data=${datadir}"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}
+	install -d ${D}/${datadir}/applications
+	install -m 0644 ../pythm.conf ${D}${sysconfdir}
+	install -m 0644 ../pythm.desktop ${D}/${datadir}/applications
+}
+
+
+FILES_${PN} += "\
+  ${sysconfdir}/pythm.conf \
+  ${datadir}/applications/pythm.desktop"
+
diff --git a/recipes/python/pydes_1.3.1.bb b/recipes/python/pydes_1.3.1.bb
new file mode 100644
index 0000000000..b266538b42
--- /dev/null
+++ b/recipes/python/pydes_1.3.1.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Python DES implementation"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python"
+
+PR = "r1"
+ARCH_pydes = "all"
+
+SRC_URI = "http://twhiteman.netfirms.com/pyDES/pyDes-1.3.1.tar.gz"
+
+inherit distutils
+
+S = ${WORKDIR}/pyDes-1.3.1
+
+
+
diff --git a/recipes/python/pyring_1.1.10.bb b/recipes/python/pyring_1.1.10.bb
new file mode 100644
index 0000000000..211801debf
--- /dev/null
+++ b/recipes/python/pyring_1.1.10.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Python keyring"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+RDEPENDS = "python python-pygtk python-xml python-netclient python-numeric pydes"
+
+ARCH_pyring = "all"
+
+SRC_URI = "http://handheldshell.com/software/pyring_${PV}.tgz "
+
+inherit distutils
+
+S = ${WORKDIR}/pyring-${PV}
+
+do_configure_prepend() {
+	cp ${S}/setup_freerunner.py ${S}/setup.py
+        exit 0
+}
+
+FILES_${PN} += "${datadir}"
+
diff --git a/recipes/python/python-dateutil_1.4.1.bb b/recipes/python/python-dateutil_1.4.1.bb
new file mode 100644
index 0000000000..204c48d190
--- /dev/null
+++ b/recipes/python/python-dateutil_1.4.1.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Extensions to the standard Python date/time support"
+HOMEPAGE = "http://labix.org/python-dateutil"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "PSF"
+SRCNAME = "${PN}"
+PR = "r1"
+
+SRC_URI = "http://labix.org/download/python-dateutil/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+PACKAGES =+ "${PN}-zoneinfo"
+FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo"
+
+RDEPENDS_${PN} = "\
+  python-core \
+  python-datetime \
+"
diff --git a/recipes/python/python-epydoc_3.0.1.bb b/recipes/python/python-epydoc_3.0.1.bb
new file mode 100644
index 0000000000..36d22ad5a0
--- /dev/null
+++ b/recipes/python/python-epydoc_3.0.1.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Epydoc is a tool for generating API documentation for Python modules, based on their docstrings" 
+SECTION = "devel/python" 
+PRIORITY = "optional" 
+LICENSE = "MIT" 
+HOMEPAGE = "http://epydoc.sourceforge.net/" 
+SRCNAME = "epydoc" 
+DEPENDS = "python" 
+ 
+SRC_URI = "http://downloads.sourceforge.net/project/${SRCNAME}/${SRCNAME}/${PV}/${SRCNAME}-${PV}.tar.gz" 
+S = "${WORKDIR}/${SRCNAME}-${PV}" 
+ 
+inherit distutils 
diff --git a/recipes/python/python-ldap/setup.cfg.patch b/recipes/python/python-ldap/setup.cfg.patch
new file mode 100644
index 0000000000..a703d342e9
--- /dev/null
+++ b/recipes/python/python-ldap/setup.cfg.patch
@@ -0,0 +1,14 @@
+--- python-ldap-2.3.9/setup.cfg.orig    2009-08-13 11:07:23.000000000 +0200
++++ python-ldap-2.3.9/setup.cfg 2009-08-13 11:07:37.000000000 +0200
+@@ -1,9 +1,9 @@
+ [_ldap]
+ extra_objects = 
+ extra_compile_args = 
+-libs = ldap_r lber sasl2 ssl crypto
++libs = ldap_r lber ssl crypto
+ library_dirs = /opt/openldap-RE24/lib
+-include_dirs = /opt/openldap-RE24/include /usr/include/sasl
++include_dirs = /opt/openldap-RE24/include
+
+ [egg_info]
+ tag_build =  
diff --git a/recipes/python/python-ldap_2.3.9.bb b/recipes/python/python-ldap_2.3.9.bb
new file mode 100644
index 0000000000..8a605e49e4
--- /dev/null
+++ b/recipes/python/python-ldap_2.3.9.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "LDAP client API for Python, C wrapper module around OpenLDAP 2.x with an object-oriented API" 
+SECTION = "devel/python" 
+PRIORITY = "optional" 
+LICENSE = "Python-style" 
+HOMEPAGE = "http://www.python-ldap.org/" 
+DEPENDS = "python openldap" 
+ 
+SRC_URI = "http://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz \ 
+           file://setup.cfg.patch;patch=1"  
+ 
+inherit setuptools  
diff --git a/recipes/python/python-phoneutils_git.bb b/recipes/python/python-phoneutils_git.bb
index 1e962d36ad..c1e1dbe16e 100644
--- a/recipes/python/python-phoneutils_git.bb
+++ b/recipes/python/python-phoneutils_git.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Python Bindings for libphone-utils"
 SECTION = "devel/python"
 DEPENDS = "libphone-utils"
-PV = "0.0.2+gitr${SRCPV}"
+PV = "0.0.2+gitr${SRCREV}"
 PR = "r1"
 
 SRC_URI = "git://git.shr-project.org/repo/libphone-utils.git;protocol=http;branch=master"
diff --git a/recipes/python/python-pybluez_0.16.bb b/recipes/python/python-pybluez_0.16.bb
new file mode 100644
index 0000000000..44554d6ff1
--- /dev/null
+++ b/recipes/python/python-pybluez_0.16.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Python bindings for the Linux Bluetooth stack"
+SECTION = "devel/python"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "ml0"
+
+SRC_URI = "http://pybluez.googlecode.com/files/PyBluez-${PV}.tar.gz"
+S = "${WORKDIR}/PyBluez-${PV}"
+
+inherit distutils
diff --git a/recipes/python/python-pygobject-native_2.20.0.bb b/recipes/python/python-pygobject-native_2.20.0.bb
new file mode 100644
index 0000000000..ddc71d4418
--- /dev/null
+++ b/recipes/python/python-pygobject-native_2.20.0.bb
@@ -0,0 +1,18 @@
+require python-pygobject_${PV}.bb
+
+DEPENDS = "python-native glib-2.0-native"
+PR = "r0"
+
+PARALLEL_MAKE = ""
+
+inherit native
+
+SRC_URI = "\
+  ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
+#  file://python-path.patch;patch=1 \
+"
+
+do_stage_append() {
+	install -d ${STAGING_BINDIR}
+	install -m 0755 gobject/generate-constants ${STAGING_BINDIR}/gobject-generate-constants
+}
diff --git a/recipes/python/python-pygobject_2.20.0.bb b/recipes/python/python-pygobject_2.20.0.bb
new file mode 100644
index 0000000000..140ba3b2f3
--- /dev/null
+++ b/recipes/python/python-pygobject_2.20.0.bb
@@ -0,0 +1,38 @@
+DESCRIPTION = "Python GObject bindings"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+DEPENDS = "python-pygobject-native-${PV}"
+PR = "ml0"
+
+DEFAULT_PREFERENCE = "-1"
+
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "\
+  ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/${MAJ_VER}/pygobject-${PV}.tar.bz2 \
+  file://generate-constants.patch;patch=1 \
+"
+S = "${WORKDIR}/pygobject-${PV}"
+
+FILESPATH = "${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files"
+
+inherit autotools distutils-base pkgconfig
+
+# necessary to let the call for python-config succeed
+export BUILD_SYS
+export HOST_SYS
+
+do_stage() {
+	autotools_stage_all
+	install -d ${STAGING_LIBDIR}/../share/pygobject/
+	cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
+	install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+	cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+}
+
+PACKAGES += "${PN}-lib"
+
+FILES_${PN} = "${libdir}/python*"
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir} ${datadir}"
+FILES_${PN}-dbg += "${libdir}/.debug"
diff --git a/recipes/python/python-pygtk_2.16.0.bb b/recipes/python/python-pygtk_2.16.0.bb
new file mode 100644
index 0000000000..939d9bef33
--- /dev/null
+++ b/recipes/python/python-pygtk_2.16.0.bb
@@ -0,0 +1,64 @@
+DESCRIPTION = "Python GTK+ 2.10.x Bindings"
+SECTION = "devel/python"
+# needs gtk+ 2.10.x
+DEPENDS = "gtk+ libglade python-pycairo python-pygobject"
+RDEPENDS = "python-shell python-pycairo python-pygobject"
+PROVIDES = "python-pygtk2"
+SRCNAME = "pygtk"
+LICENSE = "LGPL"
+PR = "ml0"
+
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \
+           file://fix-gtkunixprint.patch;patch=1 \
+           file://prevent_to_get_display_during_import.patch;patch=1 \
+           file://nodocs-2.16.0.patch;patch=1 \
+           file://acinclude.m4"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+EXTRA_OECONF = "\
+  --disable-docs \
+  --with-python-includes=${STAGING_INCDIR}/../ \
+"
+
+inherit autotools pkgconfig distutils-base
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+# dirty fix #1: remove dependency on python-pygobject-dev
+do_install_append() {
+	find ${D} -name "*.la"|xargs rm -f
+	rm -f ${D}/${bindir}/pygtk-codegen-2.0
+	rm -rf ${D}/${libdir}/pkgconfig
+}
+
+# dirty fix #2: fix build system paths leaking in
+require fix-path.inc
+
+PACKAGES =+ "${PN}-demo"
+FILES_${PN}-demo = "\
+  ${bindir}/pygtk-demo \
+  ${libdir}/pygtk \
+"
+RDEPENDS_${PN}-demo = "python-pygtk python-stringold python-lang"
+
+# todo: revamp packaging, package demo seperatly
+FILES_${PN}-dev += "\
+  ${libdir}/pygtk/2.0 \
+  ${bindir}/pygtk-* \
+  ${datadir}/pygtk/2.0"
+
+do_stage() {
+	autotools_stage_includes
+#	sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0
+#	install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/
+	# until we have a newer pygobject version, we resue pygtk's codegen
+#	ln -sf ./pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/pygobject-codegen-2.0
+	install -d ${STAGING_DATADIR}/pygtk/2.0/codegen
+	install -d ${STAGING_DATADIR}/pygtk/2.0/defs/
+#	cp -pPr codegen/*.py* ${STAGING_DATADIR}/pygtk/2.0/codegen/
+	cp -pPr *.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
+	cp -pPr gtk/*.defs ${STAGING_DATADIR}/pygtk/2.0/defs/
+}
diff --git a/recipes/python/python-vobject_0.8.1c.bb b/recipes/python/python-vobject_0.8.1c.bb
new file mode 100644
index 0000000000..87ff6b7fdd
--- /dev/null
+++ b/recipes/python/python-vobject_0.8.1c.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Python package for parsing and generating vCard and vCalendar files" 
+SECTION = "devel/python" 
+PRIORITY = "optional" 
+LICENSE = "Apache License V2.0" 
+HOMEPAGE = "http://vobject.skyhouseconsulting.com/" 
+SRCNAME = "vobject" 
+RDEPENDS = "python python-dateutil"
+PR = "r1"
+
+SRC_URI = "http://vobject.skyhouseconsulting.com/${SRCNAME}-${PV}.tar.gz" 
+S = "${WORKDIR}/${SRCNAME}-${PV}" 
+
+inherit setuptools  
diff --git a/recipes/python/python-webdav_0.1.2.bb b/recipes/python/python-webdav_0.1.2.bb
new file mode 100644
index 0000000000..efc74f9183
--- /dev/null
+++ b/recipes/python/python-webdav_0.1.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "This project aims to provide an object-oriented Python WebDAV client-side library\
+	       based on Python`s standard httplib and Greg Stein`s davlib.\
+               The client shall fully support RFCs 4918 (basic specification),\
+               3744 (access control), and 3253 (versioning)."
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "Apache License V2.0"
+HOMEPAGE = "http://sourceforge.net/projects/pythonwebdavlib/"
+SRCNAME = "Python_WebDAV_Library"
+DEPENDS = "python"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pythonwebdavlib/Python%20WebDAV%20Library%20-%20${PV}/${SRCNAME}-${PV}.zip"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/recipes/python/python-wifi_0.3.1.bb b/recipes/python/python-wifi_0.3.1.bb
new file mode 100644
index 0000000000..7461a6941e
--- /dev/null
+++ b/recipes/python/python-wifi_0.3.1.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Fusil is a Python library used to write fuzzing programs."
+HOMEPAGE = "http://fusil.hachoir.org/"
+SECTION = "devel/python"
+LICENSE = "GPLv2"
+SRCNAME = "python-wifi"
+
+SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+RDEPENDS_${PN} = "\
+  python-ctypes \
+  python-datetime \
+"
+
+
+
diff --git a/recipes/shr/e-wm-theme-illume-neo_git.bb b/recipes/shr/e-wm-theme-illume-neo_git.bb
new file mode 100644
index 0000000000..5af40cafc0
--- /dev/null
+++ b/recipes/shr/e-wm-theme-illume-neo_git.bb
@@ -0,0 +1,32 @@
+DESCRIPTION = "nEo illume theme - a very fast, high contrast illume theme"
+SECTION = "e/utils"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+DEPENDS = "edje-native"
+RDEPENDS = "e-wm"
+RRECOMMENDS = "elementary-theme-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+LICENCE = "unknown"
+
+PV = "0.1-${EFL_SRCREV}-gitr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/e-wm/${PN}"
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/neo.edc -o ${S}/neo.edj
+}
+
+do_install() {
+        install -d ${D}${datadir}/enlightenment/data/themes/
+        install -m 0644 ${S}/neo.edj ${D}${datadir}/enlightenment/data/themes/
+}
+
+FILES_${PN} = "${datadir}/enlightenment/data/themes/"
+
+pkg_postinst() {
+        echo "To activate this theme make sure to set your enlightenment rendering engine to SOFTWARE or enlightenment will segfault."
+        echo "This theme also ships with an enlightenment bootscreen which can be activated by selecting it under STARTUP in the LOOK tab of enlightenment settings"
+        echo "After activating this theme be sure to switch to SOFTWARE_16 engine in enlightenment advanced settings to unleash the theme's full power ;-)"
+}
diff --git a/recipes/shr/elementary-theme-neo_git.bb b/recipes/shr/elementary-theme-neo_git.bb
new file mode 100644
index 0000000000..8c72a6080d
--- /dev/null
+++ b/recipes/shr/elementary-theme-neo_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "nEo elementary theme - a very fast, high contrast etk theme"
+SECTION = "e/utils"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+DEPENDS = "edje-native"
+RRECOMMENDS = "e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2.1-${EFL_SRCREV}-gitr${SRCREV}"
+PR = "r3"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \
+          "
+
+S = "${WORKDIR}/git/elementary/${PN}"
+
+do_compile() {
+	${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/neo.edc -o ${S}/neo.edj
+}
+
+do_install() {
+        install -d ${D}${datadir}/elementary/themes/
+        install -m 0644 ${S}/neo.edj ${D}${datadir}/elementary/themes/
+}
+
+FILES_${PN} = "${datadir}/elementary/themes/"
diff --git a/recipes/shr/etk-theme-neo_git.bb b/recipes/shr/etk-theme-neo_git.bb
new file mode 100644
index 0000000000..f93776000b
--- /dev/null
+++ b/recipes/shr/etk-theme-neo_git.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "nEo etk theme - a very fast, high contrast etk theme"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}-gitr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+require etk-theme.inc
diff --git a/recipes/shr/etk-theme.inc b/recipes/shr/etk-theme.inc
new file mode 100644
index 0000000000..6e8b33db27
--- /dev/null
+++ b/recipes/shr/etk-theme.inc
@@ -0,0 +1,34 @@
+SECTION = "e/utils"
+DEPENDS = "edje-native"
+RDEPENDS = "etk"
+
+S = "${WORKDIR}/git/etk/${PN}/"
+
+do_compile() {
+        ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/default.edc -o ${S}/default.edj
+}
+
+do_install() {
+        install -d ${D}${datadir}/etk/themes.${PN}/
+        install -m 0644 ${S}/default.edj ${D}${datadir}/etk/themes.${PN}/
+}
+
+FILES_${PN} = "${datadir}/etk/themes.${PN}"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "etk-theme"
+ALTERNATIVE_LINK = "${datadir}/etk/themes"
+ALTERNATIVE_PATH = "${datadir}/etk/themes.${PN}"
+ALTERNATIVE_PRIORITY ?= 1
+
+pkg_postinst() {
+        if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+                echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+                echo "warn: It will be replaced with link managed by update-alternatives"
+                echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+                echo "warn: It should be empty but probably isn't!"
+                echo "warn: Check what's left there and remove it manually."
+                mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
+        fi
+}
diff --git a/recipes/shr/gtk-theme-neo_git.bb b/recipes/shr/gtk-theme-neo_git.bb
new file mode 100644
index 0000000000..be41e4ba89
--- /dev/null
+++ b/recipes/shr/gtk-theme-neo_git.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "nEo GTK theme - a very fast, high contrast GTK theme"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS += "icon-theme-neo"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}-gitr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/gtk/${PN}/"
+
+require gtk-theme.inc
diff --git a/recipes/shr/gtk-theme.inc b/recipes/shr/gtk-theme.inc
new file mode 100644
index 0000000000..863cf43019
--- /dev/null
+++ b/recipes/shr/gtk-theme.inc
@@ -0,0 +1,33 @@
+RPROVIDES_${PN} += "virtual/theme-gtk"
+RDEPENDS = "gtk+"
+SECTION = "gtk"
+
+inherit update-alternatives
+
+SRC_URI += "file://gtk-theme/gtkrc.${PN}"
+
+do_install() {
+	install -d "${D}${datadir}/themes/${PN}/gtk-2.0"
+	cp -r "${S}/" "${D}${datadir}/themes/${PN}/gtk-2.0"
+        install -d ${D}${sysconfdir}/gtk-2.0/
+        install -m 0644 ${WORKDIR}/gtk-theme/gtkrc.${PN} ${D}${sysconfdir}/gtk-2.0/gtkrc.${PN}
+}
+
+FILES_${PN} = "${datadir}/themes/${PN}/ \
+               ${sysconfdir}/gtk-2.0/gtkrc.${PN} \
+              "
+
+ALTERNATIVE_NAME = "gtk-theme"
+ALTERNATIVE_LINK = "${sysconfdir}/gtk-2.0/gtkrc"
+ALTERNATIVE_PATH = "${sysconfdir}/gtk-2.0/gtkrc.${PN}"
+
+pkg_postinst() {
+        if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+                echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+                echo "warn: It will be replaced with link managed by update-alternatives"
+                echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+                echo "warn: It should be empty but probably isn't!"
+                echo "warn: Check what's left there and remove it manually."
+                mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
+        fi
+}
diff --git a/recipes/shr/gtk-theme/gtkrc.gtk-theme-neo b/recipes/shr/gtk-theme/gtkrc.gtk-theme-neo
new file mode 100644
index 0000000000..c27c4c44a2
--- /dev/null
+++ b/recipes/shr/gtk-theme/gtkrc.gtk-theme-neo
@@ -0,0 +1,3 @@
+gtk-font-name = "Sans 5"
+gtk-theme-name = "gtk-theme-neo"
+gtk-icon-theme-name = "nEo"
diff --git a/recipes/shr/gtk-theme/gtkrc.shr-theme-gtk-e17lookalike b/recipes/shr/gtk-theme/gtkrc.shr-theme-gtk-e17lookalike
new file mode 100644
index 0000000000..1602654b0a
--- /dev/null
+++ b/recipes/shr/gtk-theme/gtkrc.shr-theme-gtk-e17lookalike
@@ -0,0 +1,3 @@
+gtk-font-name = "Sans 5"
+gtk-theme-name = "theme-qad-neo"
+gtk-icon-theme-name = "nEo"
diff --git a/recipes/shr/icon-theme-neo_git.bb b/recipes/shr/icon-theme-neo_git.bb
new file mode 100644
index 0000000000..7cffb10d29
--- /dev/null
+++ b/recipes/shr/icon-theme-neo_git.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "nEo icon theme - a high contrast icon theme which looks especially well when using all the other nEo themes"
+SECTION = "e/utils"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS = "e-wm"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}-gitr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/icons/icon-theme-neo"
+
+do_install() {
+        install -d ${D}${datadir}/icons/
+        install -d ${D}${datadir}/icons/nEo/
+        cp -r ${S}/* "${D}${datadir}/icons/nEo/"
+}
+
+FILES_${PN} = "${datadir}/icons/nEo/"
+
+pkg_postinst() {
+        echo "To activate this theme select it under ICON THEME in the LOOK tab of enlightenment settings"
+        echo "Restart enlightenment for the changes to take affect"
+}
diff --git a/recipes/shr/illume-keyboard-arabic_git.bb b/recipes/shr/illume-keyboard-arabic_git.bb
new file mode 100644
index 0000000000..41ea9e1cd4
--- /dev/null
+++ b/recipes/shr/illume-keyboard-arabic_git.bb
@@ -0,0 +1,11 @@
+AUTHOR = "Mohammad Fahmi / Tom Hacohen"
+DESCRIPTION = "Illume keyboard with arabic layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "arabic"
+INSTFILES = "Arabic.kbd Arabic.png"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-browse_git.bb b/recipes/shr/illume-keyboard-browse_git.bb
new file mode 100644
index 0000000000..268140c75a
--- /dev/null
+++ b/recipes/shr/illume-keyboard-browse_git.bb
@@ -0,0 +1,19 @@
+AUTHOR = "Pander"
+DESCRIPTION = "Illume keyboard with a layout optimized for browsing"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "browse"
+INSTFILES = "\
+Browse.kbd \
+end-browse.png \
+pagedown-browse.png \
+browse.png \
+home-browse.png \
+pageup-browse.png \
+space-browse.png \
+"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-danish_git.bb b/recipes/shr/illume-keyboard-danish_git.bb
new file mode 100644
index 0000000000..21f8ff954a
--- /dev/null
+++ b/recipes/shr/illume-keyboard-danish_git.bb
@@ -0,0 +1,11 @@
+AUTHOR = "Esben Damgaard"
+DESCRIPTION = "Illume keyboard with danish layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "danish"
+INSTFILES = "Danish.kbd danish.png"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-default-alt_git.bb b/recipes/shr/illume-keyboard-default-alt_git.bb
new file mode 100644
index 0000000000..34c3c299bb
--- /dev/null
+++ b/recipes/shr/illume-keyboard-default-alt_git.bb
@@ -0,0 +1,11 @@
+AUTHOR = "Pander"
+DESCRIPTION = "Illume keyboard with an alternative default layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "default-alt"
+INSTFILES = "Default-alt.kbd"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-dutch_git.bb b/recipes/shr/illume-keyboard-dutch_git.bb
new file mode 100644
index 0000000000..2300ac7101
--- /dev/null
+++ b/recipes/shr/illume-keyboard-dutch_git.bb
@@ -0,0 +1,21 @@
+AUTHOR = "Pander"
+DESCRIPTION = "Illume keyboard with dutch layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "dutch"
+INSTFILES = "\
+capslock-negative.png \
+end.png \
+pagedown.png \
+qwerty-dutch-nl.png \
+Terminal-dutch-nl.kbd \
+capslock.png \
+home.png \
+pageup.png \
+space.png \
+"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-dvorak_git.bb b/recipes/shr/illume-keyboard-dvorak_git.bb
new file mode 100644
index 0000000000..795d78dcc7
--- /dev/null
+++ b/recipes/shr/illume-keyboard-dvorak_git.bb
@@ -0,0 +1,11 @@
+AUTHOR = "Gabor Adam TOTH"
+DESCRIPTION = "Illume keyboard with dvorak layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "dvorak"
+INSTFILES = "Dvorak.kbd dvorak.png"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-french_git.bb b/recipes/shr/illume-keyboard-french_git.bb
new file mode 100644
index 0000000000..205a6ad991
--- /dev/null
+++ b/recipes/shr/illume-keyboard-french_git.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Illume keyboard with french layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "french"
+INSTFILES = "Azerty.kbd Azerty.png"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-german_git.bb b/recipes/shr/illume-keyboard-german_git.bb
new file mode 100644
index 0000000000..0252932116
--- /dev/null
+++ b/recipes/shr/illume-keyboard-german_git.bb
@@ -0,0 +1,11 @@
+AUTHOR = "Florian Hackenberger"
+DESCRIPTION = "Illume keyboard with german layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "german"
+INSTFILES = "German.kbd German.png"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-hebrew_git.bb b/recipes/shr/illume-keyboard-hebrew_git.bb
new file mode 100644
index 0000000000..8d408b4a91
--- /dev/null
+++ b/recipes/shr/illume-keyboard-hebrew_git.bb
@@ -0,0 +1,11 @@
+AUTHOR = "Tom Hacohen"
+DESCRIPTION = "Illume keyboard with hebrew layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "hebrew"
+INSTFILES = "Hebrew.kbd Alpha-hebrew-il.png"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-numeric-alt_git.bb b/recipes/shr/illume-keyboard-numeric-alt_git.bb
new file mode 100644
index 0000000000..f2d2487386
--- /dev/null
+++ b/recipes/shr/illume-keyboard-numeric-alt_git.bb
@@ -0,0 +1,18 @@
+AUTHOR = "Pander"
+DESCRIPTION = "Illume keyboard with an alternative numeric layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "numeric-alt"
+INSTFILES = "\
+end-alt.png \
+home-alt.png \
+Numbers-alt.kbd \
+numeric-alt.png \
+pagedown-alt.png \
+pageup-alt.png \
+"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard-russian-terminal_git.bb b/recipes/shr/illume-keyboard-russian-terminal_git.bb
new file mode 100644
index 0000000000..f0a4508d98
--- /dev/null
+++ b/recipes/shr/illume-keyboard-russian-terminal_git.bb
@@ -0,0 +1,9 @@
+AUTHOR = "lucky"
+DESCRIPTION = "Illume keyboard with russian layout for the Terminal"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "russian-terminal"
+INSTFILES = "Terminal_Russian.kbd Terminal-russian-ru.png"
+
+require illume-keyboard.inc
diff --git a/recipes/shr/illume-keyboard-russian_git.bb b/recipes/shr/illume-keyboard-russian_git.bb
new file mode 100644
index 0000000000..517956bb2b
--- /dev/null
+++ b/recipes/shr/illume-keyboard-russian_git.bb
@@ -0,0 +1,11 @@
+AUTHOR = "lucky"
+DESCRIPTION = "Illume keyboard with russian layout"
+PV = "0.0-gitr${SRCREV}"
+PR = "r0"
+
+BASEDIR = "russian"
+INSTFILES = "X8_Russian.kbd X8-russian-ru.png"
+
+require illume-keyboard.inc
+
+
diff --git a/recipes/shr/illume-keyboard.inc b/recipes/shr/illume-keyboard.inc
new file mode 100644
index 0000000000..4003352cc1
--- /dev/null
+++ b/recipes/shr/illume-keyboard.inc
@@ -0,0 +1,14 @@
+SECTION = "x11/data"
+
+SRC_URI = "git://git.shr-project.org/repo/illume-keyboards.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+FILES_${PN} = "${libdir}/enlightenment/modules/illume/keyboards/*"
+PACKAGE_ARCH = "all"
+
+do_install() {
+	install -d ${D}${libdir}/enlightenment/modules/illume/keyboards
+	for f in ${INSTFILES}; do
+		install -m 0644 ${S}/${BASEDIR}/${f} ${D}${libdir}/enlightenment/modules/illume/keyboards/
+	done
+}
diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb
new file mode 100644
index 0000000000..87d564f61a
--- /dev/null
+++ b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "nEo libframeworkd-phonegui-efl - a very fast, high contrast etk theme"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS = "libframeworkd-phonegui-efl"
+RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2-${EFL_SRCREV}-gitr${SRCREV}"
+PR = "r2"
+
+require libframeworkd-phonegui-efl-theme.inc
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/libframeworkd-phonegui-efl/theme-neo"
+
+do_compile() {
+        for edc in call contacts dialer dialog elm-resizing-label incoming-message keypad messages sim-auth ussd ; do
+                ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/${edc}/. -fd ${S}/${edc}. ${S}/${edc}/${edc}.edc -o ${S}/${edc}.edj
+        done
+}
+
+do_install() {
+        install -d ${D}${datadir}/libframeworkd-phonegui-efl.${PN}/
+        install -m 0644 ${S}/*.edj ${D}${datadir}/libframeworkd-phonegui-efl.${PN}/
+}
diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme.inc b/recipes/shr/libframeworkd-phonegui-efl-theme.inc
new file mode 100644
index 0000000000..eab118f322
--- /dev/null
+++ b/recipes/shr/libframeworkd-phonegui-efl-theme.inc
@@ -0,0 +1,22 @@
+SECTION = "e/utils"
+DEPENDS += "edje-native"
+
+FILES_${PN} += "${datadir}/libframeworkd-phonegui-efl.${PN}"
+
+inherit update-alternatives
+
+ALTERNATIVE_NAME = "libframeworkd-phonegui-efl-theme"
+ALTERNATIVE_LINK = "${datadir}/libframeworkd-phonegui-efl"
+ALTERNATIVE_PATH = "${datadir}/libframeworkd-phonegui-efl.${PN}"
+ALTERNATIVE_PRIORITY ?= 1
+
+pkg_postinst() {
+        if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then
+                echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!"
+                echo "warn: It will be replaced with link managed by update-alternatives"
+                echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old."
+                echo "warn: It should be empty but probably isn't!"
+                echo "warn: Check what's left there and remove it manually."
+                mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old
+        fi
+}
diff --git a/recipes/shr/shr-config_git.bb b/recipes/shr/shr-config_git.bb
new file mode 100644
index 0000000000..382f4af930
--- /dev/null
+++ b/recipes/shr/shr-config_git.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "Central settings app for FSO/SHR distros"
+HOMEPAGE = "http://git.freesmartphone.org"
+AUTHOR = "Sebastian Spaeth (see AUTHORS)"
+LICENSE  = "GPLv2"
+DEPENDS = "vala-native elementary libeflvala"
+SECTION = "x11/application"
+PV = "0.0.2+r${SRCREV}"
+PR = "r4"
+
+EXTRA_OECONF="--enable-vapidir=${STAGING_DATADIR}/vala/vapi"
+inherit autotools
+
+SRC_URI = "git://github.com/spaetz/shr-config.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb
new file mode 100644
index 0000000000..5f6c31c2b1
--- /dev/null
+++ b/recipes/shr/shr-launcher_svn.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "shr-launcher is a home app/launcher for openmoko phones"
+HOMEPAGE = "http://code.google.com/p/shr-launcher/"
+AUTHOR = "cchandel"
+LICENSE = "GPLv2"
+SECTION = "e/apps"
+DEPENDS = "elementary eina edbus"
+
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "svn://shr-launcher.googlecode.com/svn/trunk;module=.;proto=http"
+
+do_configure_prepend() {
+  rm -f ${S}/config.log
+  rm -f ${S}/config.status
+}
+
+S = "${WORKDIR}"
+
+inherit autotools
+
diff --git a/recipes/shr/shr-settings_git.bb b/recipes/shr/shr-settings_git.bb
new file mode 100644
index 0000000000..bb4f20a71a
--- /dev/null
+++ b/recipes/shr/shr-settings_git.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Modular settings application for SHR based on python-elementary"
+HOMEPAGE = "http://shr-project.org"
+SHR_RELEASE ?= "shr"
+LICENSE ?= "GPL"
+RDEPENDS = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 ophonekitd frameworkd python-phoneutils"
+SECTION = "x11/application"
+PV = "0.1.1+r${SRCREV}"
+PR = "r7"
+
+inherit setuptools
+
+PACKAGES =+ "\
+  ${PN}-addons-illume \
+  ${PN}-backup-configuration \
+"
+
+RRECOMMENDS_${PN} = "\
+  ${PN}-addons-illume \
+  ${PN}-backup-configuration \
+"
+
+PACKAGE_ARCH_${PN}-addons-illume = "all"
+PACKAGE_ARCH_${PN}-backup-configuration = "all"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-settings.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+FILES_${PN} += "${prefix}/share/pixmaps"
+FILES_${PN} += "${prefix}/share/applications"
+FILES_${PN}-addons-illume = "${prefix}/share/applications/shr-settings-addons-illume"
+FILES_${PN}-backup-configuration = "${sysconfdir}/shr-settings/"
+CONFFILES_${PN}-backup-configuration = "${sysconfdir}/shr-settings/*"
diff --git a/recipes/shr/shr-theme-gtk-e17lookalike_git.bb b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb
new file mode 100644
index 0000000000..5abd55caad
--- /dev/null
+++ b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "A gtk theme that looks like e17"
+LICENSE = "MIT BSD"
+PV = "0.1.1-gitr${SRCREV}"
+PR = "r3"
+
+SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master"
+
+S = "${WORKDIR}/git/gtk/${PN}"
+
+require gtk-theme.inc
diff --git a/recipes/shr/shr-theme-neo.bb b/recipes/shr/shr-theme-neo.bb
new file mode 100644
index 0000000000..20186ffe31
--- /dev/null
+++ b/recipes/shr/shr-theme-neo.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "nEo shr theme - a very fast, high contrast shr theme"
+SECTION = "x11/data"
+HOMEPAGE = "http://jmccloud.jm.funpic.de"
+AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com"
+RDEPENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo gpe-theme-neo icon-theme-neo"
+LICENSE = "unknown"
+
+PV = "0.2"
+PR = "r1"
+
+ALLOW_EMPTY = "1"
diff --git a/recipes/sms-sentry/sms-sentry.bb b/recipes/sms-sentry/sms-sentry.bb
new file mode 100644
index 0000000000..be6c22c831
--- /dev/null
+++ b/recipes/sms-sentry/sms-sentry.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "An SMS monitor to locate a Neo Freerunner"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "python"
+
+PR = "r1"
+
+SRC_URI = "http://www.handheldshell.com/software/fso/sms-sentry_1.01.tgz"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "sms-sentry.sh"
+INITSCRIPT_PARAMS = "defaults 35"
+
+S = ${WORKDIR}/sms-sentry_1.01
+
+do_install() {
+        install -d ${D}/${sysconfdir}/init.d
+        install -d ${D}/${sysconfdir}/default
+        install -d ${D}/usr/bin
+        install -m 0755 ${S}/sms-sentry.sh ${D}/${sysconfdir}/init.d/
+        install -m 0755 ${S}/sms-sentry ${D}/usr/bin/
+        install -m 0644 ${S}/sms-sentry.default ${D}/${sysconfdir}/default/sms-sentry.default
+}
+
+do_configure() {
+        exit 0
+}
+
+do_compile() {
+        exit 0
+}
+
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
new file mode 100644
index 0000000000..8ea9fdc71e
--- /dev/null
+++ b/recipes/tasks/task-shr-feed.bb
@@ -0,0 +1,240 @@
+DESCRIPTION = "SHR Feed"
+PR = "r24"
+PV = "1.0"
+LICENSE = "GPL"
+
+inherit task
+
+RDEPENDS_${PN} += "\
+		python-elementary \
+		openmoko-agpsui \
+		mc \
+		mplayer \
+		x11vnc \
+		omview \
+		openvpn \
+		navit \
+		pythm \
+		fbreader \
+		omoney \
+		enotes \
+		epdfview \
+		pyphonelog \
+		pingus \
+		mokomaze \
+		openmoocow \
+		dosbox \
+		vagalume \
+		python-pygame \
+		mokoko \
+		bluez-utils-alsa \
+#		devmem2 \
+		exhibit \
+		edje-viewer \
+		obexpush \
+		obexftp \
+		mtpaint \
+		telepathy-python \
+		intone-video \
+		ipkg-link \
+		ipkg-utils \
+		mysql \
+		gpe-calendar \
+		gpe-todo \
+		gpe-scap \
+		gpe-sketchbook \
+		gpe-filemanager \
+		gpe-gallery \
+		gpe-timesheet \
+		gpe-contacts \
+		fltk-chess \
+		remoko \
+		shr-config \
+		shr-today \
+                shr-theme-neo \
+		shr-splash \
+		shr-splash-theme-simple \
+		shr-splash-theme-dontpanic \
+		shr-splash-theme-handy \
+		shr-splash-theme-niebiee \
+		openbmap-logger \
+		pisi \
+		ffalarms \
+		libnotify \
+		accelges \
+		ebrainy \
+		sms-sentry \
+		cellhunter \
+		dillo2 \
+		usbmode \
+		pyefl-sudoku \
+		tasks \
+		dates \
+		omnewrotate \
+		xchat \
+		python-pyid3lib \
+		libframeworkd-phonegui-efl2 \
+		intone \
+		vim \
+		vpnc \
+		emacs \
+		mcabber \
+		gdb \
+		oh-puzzles \
+		links-x11 \
+		e-wm-illume-dict-pl \
+		callrec \
+		dictator \
+		midori \
+		numptyphysics \
+		pidgin \
+		libpurple-protocol-msn \
+		libpurple-protocol-icq \
+		vagalume \
+		ppp \
+		bluez-hcidump \
+		kbdd \
+		kexec-tools \
+		claws-mail \
+		claws-plugin-mailmbox \
+#		claws-plugin-gtkhtml2-viewer \
+		claws-plugin-rssyl \
+		mc \
+		iotop \
+		xprop \
+		xev \
+		xwininfo \
+		tcpdump \
+		lsof \
+		zsh \
+		gzip \
+		zip \
+		microcom \
+		minicom \
+		leafpad \
+		abiword \
+		aspell \
+		enchant \
+		joe \
+		nano \
+		ntpclient \
+		ntp \
+		tor \
+		vnc \
+#		gpsdrive \
+		wxwidgets \
+		x11vnc \
+#		libswt3.4-gtk-java \
+		cacao \
+#		jamvm \
+		dbus-x11 \
+		bluez-utils-alsa \
+		python-pybluez \
+		xournal \
+		evince \
+#		asterisk \
+		git \
+		ruby \
+		orrery \
+		synergy \
+		irssi \
+		zhone \
+		paroli \
+		cu \
+		net-tools \
+		iproute2 \
+		iputils \
+		i2c-tools \
+		psmisc \
+		debianutils \
+		tcptraceroute \
+		task-proper-tools \
+		wmiconfig \
+		netkit-telnet \
+		bind-utils \
+		bubble-keyboard \
+		intuition \
+		gridpad \
+		essential-dialer \
+		font-adobe-100dpi \
+		font-adobe-75dpi \
+		font-adobe-utopia-100dpi \
+		font-adobe-utopia-75dpi \
+#		font-adobe-utopia-type1 \
+		font-arabic-misc \
+		font-bh-100dpi \
+		font-bh-75dpi \
+		font-bh-lucidatypewriter-100dpi \
+		font-bh-lucidatypewriter-75dpi \
+#		font-bh-ttf \
+#		font-bh-type1 \
+		font-bitstream-100dpi \
+		font-bitstream-75dpi \
+		font-bitstream-speedo \
+#		font-bitstream-type1 \
+		font-cronyx-cyrillic \
+		font-cursor-misc \
+		font-daewoo-misc \
+		font-dec-misc \
+#		font-ibm-type1 \
+		font-isas-misc \
+		font-jis-misc \
+		font-micro-misc \
+		font-misc-cyrillic \
+#		font-misc-ethiopic \
+#		font-misc-meltho \
+		font-misc-misc \
+		font-mutt-misc \
+		font-schumacher-misc \
+		font-screen-cyrillic \
+		font-sony-misc \
+		font-sun-misc \
+		font-winitzki-cyrillic \
+#		font-xfree86-type1 \
+		msn-pecan \
+		erminig \
+		qwo \
+		fso-apm \
+		fso-abyss \
+		fsousaged \
+		fsodeviced \
+		fsonetworkd \
+		fsotimed \
+		opimd-utils \
+		omgps \
+		shr-launcher \
+		e-tasks \
+		elementary-theme-sixteen \
+		e-wm-theme-illume-sixteen \
+		e-wm-theme-illume-niebiee \
+		elementary-theme-niebiee \
+		elmdentica \
+		shr-installer \
+		eject \
+		illume-keyboard-german \
+		illume-keyboard-arabic \
+		illume-keyboard-browse \
+		illume-keyboard-danish \
+		illume-keyboard-default-alt \
+		illume-keyboard-dutch \
+		illume-keyboard-dvorak \
+		illume-keyboard-french \
+		illume-keyboard-hebrew \
+		illume-keyboard-numeric-alt \
+		illume-keyboard-russian-terminal \
+		illume-keyboard-russian \
+		python-xlib \
+		xcompmgr \
+		man \
+		man-pages \
+		aceofpenguins-launcher \
+		om-neon \
+		ipython \
+		phoneme-advanced-foundation \
+		eve \
+		python-pybluez \
+		x11perf \
+		pyring \
+		bt-configure \
+		bt-gps \
+"
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
new file mode 100644
index 0000000000..bafdef0eb4
--- /dev/null
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -0,0 +1,146 @@
+DESCRIPTION = "SHR Lite Image Feed"
+PR = "r10"
+PV = "2.0"
+LICENSE = "GPL"
+
+inherit task
+
+def get_rdepends(bb, d):
+    enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
+
+    # If locale is disabled, bail out
+    if not enabled:
+        return
+
+    locales = bb.data.getVar("GLIBC_GENERATE_LOCALES", d, 1)
+    if not locales or locales == "all":
+        locales = bb.data.getVar("IMAGE_LINGUAS", d, 1);
+
+
+    import re
+
+    rdepends = ""
+    if not locales or locales == "all":
+        # if locales aren't specified, or user has written "all"
+        import os
+        ipkdir = bb.data.getVar('DEPLOY_DIR_IPK', d, 1)
+
+        regexp1 = re.compile("glibc-binary-localedata-.*") # search pattern
+        regexp2 = re.compile("_.*") # we want to remove all version info and file extension
+
+        for root, subFolders, files in os.walk(ipkdir):
+            for file in files:
+                if regexp1.search(file):
+                    file = regexp2.sub("", file)
+                    rdepends = "%s %s" % (rdepends, file)
+
+    else:
+        # if locales are specified
+        regexp1 = re.compile("\\..*") # We want to turn en_US.UTF-8 into en_US
+        regexp2 = re.compile("_")     # We want to turn en_US into en-US
+
+
+        for locale in locales.split(" "):
+            locale = regexp1.sub("", locale)
+            locale = regexp2.sub("-", locale)
+            locale = str.lower(locale)
+            rdepends = "%s glibc-binary-localedata-%s" % (rdepends, locale)
+    return rdepends
+
+
+
+
+PACKAGES += "\
+	${PN}-base \
+	${PN}-cli \
+	${PN}-fso \
+	${PN}-audio \
+	${PN}-x \
+	${PN}-apps \
+	${PN}-gtk \
+"
+
+
+
+RDEPENDS_${PN}-base = "\
+  netbase \
+  sysfsutils \
+  modutils-initscripts \
+  module-init-tools-depmod \
+  rsync \
+  screen \
+  fbset \
+  fbset-modes \
+  openssh-sftp-server \
+  cron \
+  logrotate\
+  util-linux-fdisk \
+  shr-splash \
+"
+
+RDEPENDS_${PN}-cli = "\
+  screen \
+  nano \
+  iptables \
+  mtd-utils \
+  s3c24xx-gpio \
+  mickeydbus \
+  mickeyterm \
+"
+
+RDEPENDS_${PN}-fso = "\
+  fsoraw \
+  opimd-utils-cli \
+  python-codecs \
+  python-gst \
+"
+
+
+RDEPENDS_${PN}-audio = "\
+  alsa-utils-aplay \
+  alsa-utils-amixer \
+"
+
+RDEPENDS_${PN}-audio_append_om-gta01 = "\
+  alsa-scenarii-shr \
+"
+
+RDEPENDS_${PN}-audio_append_om-gta02 =  "\
+  alsa-scenarii-shr \
+"
+
+RDEPENDS_${PN}-x = "\
+  glibc-utils \
+  glibc-charmap-utf-8 \
+  e-wm-config-illume-shr \
+  e-wm-theme-illume-shr \
+  etk-theme-shr \
+  ${@get_rdepends(bb, d)} \
+  libx11-locale \
+  libmokoui2 \
+  xcursor-transparent-theme \
+"
+
+RDEPENDS_${PN}-apps = "\
+  shr-dialer \
+  shr-messages \
+  shr-contacts \
+  notifier \
+  ophonekitd \ 
+  libframeworkd-phonegui-efl \
+  ffalarms \
+  shr-settings \
+  shr-theme \
+  calc \
+"
+
+
+RDEPENDS_${PN}-gtk = "\
+  openmoko-icon-theme-standard2 \
+  shr-theme-gtk-e17lookalike \
+  vala-terminal \
+  tangogps \
+  pyphonelog \
+  matchbox-keyboard-im \
+"
+
diff --git a/recipes/tasks/task-shr.bb b/recipes/tasks/task-shr.bb
new file mode 100644
index 0000000000..d867a48cd1
--- /dev/null
+++ b/recipes/tasks/task-shr.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "SHR Fat Image Feed"
+PR = "r3"
+PV = "2.0"
+LICENSE = "GPL"
+
+inherit task
+
+PACKAGES = "\
+  ${PN}-gtk \
+  ${PN}-apps \
+  ${PN}-games \
+"
+
+RDEPENDS_${PN}-gtk = "\
+  gpe-scap \
+  pidgin \
+  libpurple-protocol-msn \
+  libpurple-protocol-icq \
+  vagalume \
+  gpe-sketchbook \ 
+"
+
+RDEPENDS_${PN}-apps += "\
+   task-shr-minimal-apps \
+	opimd-utils-notes \
+	mokonnect \
+	midori \
+	intone \
+"
+
+RDEPENDS_${PN}-games += "\
+  numptyphysics \
+"
+
diff --git a/recipes/usbmode/usbmode.bb b/recipes/usbmode/usbmode.bb
new file mode 100644
index 0000000000..f68fc759b3
--- /dev/null
+++ b/recipes/usbmode/usbmode.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Freerunner USB Mode Control Program"
+RDEPENDS += "python python-pygtk"
+LICENSE = "GPL"
+HOMEPAGE = http://techiem2.net/index.php?/archives/10-Freerunner-USB-Mode-Control-Program.html"
+SECTION = "x11/games"
+PV = "1.0"
+
+SRC_URI = "\
+	http://www.techiem2.net/files/usbmode.tar.gz \
+"
+
+S = "${WORKDIR}"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -d ${D}${datadir}/applications
+	install -m 0644 ${WORKDIR}/usbmode.desktop ${D}${datadir}/applications
+	install -m 0755 ${S}/usbmode.py ${D}${bindir}/usbmode.py
+}
+
+FILES_${PN} = "${bindir}/usbmode.py ${datadir}/applications/usbmode.desktop"
+
diff --git a/recipes/webkit/webkit-efl_git.bb b/recipes/webkit/webkit-efl_git.bb
new file mode 100644
index 0000000000..15506e5c5f
--- /dev/null
+++ b/recipes/webkit/webkit-efl_git.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = " Webkit browser engine, EFL edition"
+LICENSE = "GPL"
+PV="0.1+gitr${SRCREV}"
+PR="r0"
+
+DEPENDS = "icu flex gst-plugins-base gstreamer jpeg libpng libxml2 pango libsoup-2.4 eina ecore evas edje cairo fontconfig freetype curl sqlite libxslt gperf-native libxt"
+
+SRC_URI = "git://gitorious.org/webkit-efl/webkit-efl.git;protocol=git;branch=master"
+
+S= "${WORKDIR}/git"
+
+inherit autotools lib_package pkgconfig
+
+EXTRA_OECONF = "--disable-video --host=${TARGET_SYS} --with-port=efl --enable-web-workers=no"
+
+do_stage() {
+    autotools_stage_all
+}
+
+PACKAGES =+ "${PN}-webinspector"
+FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/"