[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_8-24652-gc7b138e

Michal Čihař nijel at users.sourceforge.net
Mon Dec 12 09:31:26 CET 2011


The branch, master has been updated
       via  c7b138eeddb2ad7319d9547d1383db5ebb74114c (commit)
       via  faa5b3996ced44d21fa4707b7762fba7b79b896a (commit)
       via  e3a83035fb7d23350ad1f424db3bf9c3501a94eb (commit)
       via  8ab58a868f85336407f0ec86019bb5239be43d9a (commit)
       via  74ae425bdbc57b2053462f4f07835aad88f6a91e (commit)
       via  6418fa9b4c2c92ccb31a61dd2fe7b7d2193eb223 (commit)
       via  5d82d7ece3df362d5a324306533f0f229a8f294f (commit)
       via  735a2df429ab5dc06c8bfbc49de7de847bf587ad (commit)
       via  cb589e95b601adcbd32e6322e69686b13ea841ec (commit)
       via  1a0874d98466f3bb23933830adde2cb60c9b8d4c (commit)
       via  7e0fa1e58da387356b2156f4514bbf6c2fafbdc9 (commit)
       via  c86882f71c19793f7d6c7d2a30ad1ad39b563f41 (commit)
       via  163efe222b2965f37e7025a9d3b516a25bdbeeb1 (commit)
       via  51d5d06fd87f99d152ac58a4d04d2a23e8eb2fdf (commit)
       via  0c0b20d5f5ceea35627d2d3ef0f076ad869ba121 (commit)
       via  53e540f086768a0321840eeac174a0fa8d7ced21 (commit)
       via  73091ec815080ce5fbae44b62f3d87a900fe10aa (commit)
       via  99c5b55b8bda1cffa3e109c46b19c3e6b6807f11 (commit)
       via  b41806d24703104a71f74c506aedd523cf3b6432 (commit)
       via  9d402afa000c13888baed372db34ce51631de5fd (commit)
       via  690acb114da645942a8c11a0a160d893c89e29a8 (commit)
       via  1b48be018e16adc2cef949c205f608d80ae845a1 (commit)
       via  6ef208bb08dbdd1ca9da8ac237612352acfe8310 (commit)
       via  248cbda80742a254863380fd3850638330049984 (commit)
       via  ca461af372167cebbc9a50987d02f5e716570245 (commit)
       via  32c1ede52ce5d7b07de851680676a57b166d2486 (commit)
       via  fc7776e84eec8c63fd3530aae8eaa8e8b5f0b9f6 (commit)
       via  bb16ede19a9bc66b9905af2942eb2ba291142f85 (commit)
       via  478555ac29aecb65a4b33506a35a4df363ccb83a (commit)
       via  75ae8a50fae298e7aa5d66b30d5a1622ce7554a8 (commit)
       via  fa2d23b92476169bd425cc486126aa1be608e897 (commit)
       via  9222f1da0091d638d7bcbab7ce07c2a8e8ca112c (commit)
       via  1ccf6671b33eb34788cc2a6c6834d40af147e1b7 (commit)
       via  9c3116b3791193863813ba8d94df50398459e588 (commit)
       via  bef282ce355375d311efbedf2ac94dac721edf18 (commit)
       via  67981bce37c9ca7f166c5180c471b4ba53cbfa38 (commit)
       via  277f8de89aac7718613b3459319653e1be96fb61 (commit)
       via  1c999472afb01e53920762acbdc232f4f90e4af8 (commit)
       via  4a2d24b4d26a1bfac4403405fee1763a7db3ed5d (commit)
       via  7f17bfd1cb84dffe4d4401d6719b593661649c92 (commit)
       via  b83cfc9ea1f8a8c4188588ca57160e62dc68ee10 (commit)
       via  4f2b2eeb79d983ea8692f83504754f5e14eef205 (commit)
       via  2299785a8c5f529a4123090090ac14bbe33328b0 (commit)
       via  708dc5ae0f514a665e95de88758082fb2c8bff7b (commit)
       via  00c8562adf2a30abf1817efe5c8447a31b45329d (commit)
       via  82f673d5dc5cb9751a22a34ba39eb9c63e1ad029 (commit)
       via  28b0ac9177a3be7f541cabeca8ac0805eee6d52f (commit)
       via  36dd1e1eca6ad3d26ebc1c1afcfbab93b7c34838 (commit)
       via  7c67855040a1a5271fd978be355cb80c859da981 (commit)
       via  9b36edeac0ad3d3d95b39b5709d3939d45ed3e22 (commit)
       via  0cc18634ed8bbd6188f0c24ec905afada1c7ecbe (commit)
       via  ece6e167d42258b87b82dd60b76d44f0f55de8d6 (commit)
       via  8adbb058a366374352a2b80e30b6a9b082d13071 (commit)
       via  f07302cb13b1eb51c8e83f287a168a345e1e315a (commit)
       via  0e39b650d3c635a18b126fd95e7679b2c6ce2c6a (commit)
       via  8c79a38d3701652f5d191e7992cfc10893eb09c4 (commit)
       via  b5b026501dad8bb90b177f7e5e6af2ec862435ec (commit)
       via  22c5e888f69418eebaeefa2bc0c0c966460e75d3 (commit)
       via  0997aec5012dcc28b09d430a395096f8e9eb0553 (commit)
       via  bd9a882e64ffe76f589cedd0e4fa6ee73ab037a8 (commit)
       via  8bc39449af4bb2e45b27a16feabf2c7ca48750b9 (commit)
       via  6dd9670e32ceb30b7b5b2f56490d230c04791b5f (commit)
       via  36fa65c205deba0d095f0bea1c9274145dbde09e (commit)
       via  0f9ce127192fb16fdc6bcd0933d8280311248b2b (commit)
       via  293bfeb22153b52549f5eae6648df9eb3df623ab (commit)
       via  d4bd98f64eebad15330607d3bd442c2c67ad035c (commit)
       via  ef683b169692cde987017be3c04f16dd72a89267 (commit)
       via  a58815d4e088e6361fbef0cec3ac3071a140b9e9 (commit)
       via  95aace1b68c8f1124162659ad03088d4fd427637 (commit)
       via  0588976244a0e780b053541df00ee4b5d0873c05 (commit)
       via  75e35f7389faa6661a237bccbd0547c16c111485 (commit)
       via  eb45ead063a4da37665d26953064493c0b5f4eb7 (commit)
       via  4534c4b0918db7b475310d16a3a3f4feca715570 (commit)
       via  8c526ff77384c2c44853274bbfd0199a391182dc (commit)
       via  dbc57dab791ef65857a0f73a28bea874e0d3fe6f (commit)
       via  d8cf646354966282c484094e895c5f0b61343207 (commit)
       via  40bb4d42d0815b3f25368a5485d47c2bb0198df0 (commit)
       via  e44f2714e67a1d797c6cacb0ce1f460473fbe995 (commit)
       via  928c27a48180e9012984b5b585a9ea9a805c0c3d (commit)
       via  dd6f950c50a4332b826a6a90e69d640e8705c1b1 (commit)
       via  2547e79ad17eb6766966885002459de4512f74cf (commit)
       via  39c73c7aeaacb043abcf72012418d403e2706c12 (commit)
       via  21510a8cead104a237b4cb231cd7846e6001b109 (commit)
       via  335bf340c30dd6001ae3fa3395b7c55caaeb664d (commit)
       via  64bce9106dfaa94d6d54b18510eaf4bf0ad11a3b (commit)
       via  88ee62aae14cf6578cb4dd9d49d929479835acff (commit)
       via  21ebcc2998320e3c59a2618e23dba410c2e2eee4 (commit)
       via  68d6c40d3763f1793acc0fc03f4160aabb47b8f3 (commit)
       via  c5d1464b111ad6d9653de49e07b4457bc231bd59 (commit)
       via  327f35d65e9f0060fd6fbbb440b7e6ae6aa3e60e (commit)
       via  84820b571b1ca787024b8a430f6ebeab0bbe39d4 (commit)
       via  70d11160c44990ba2a9fddf1ef240334624e4e51 (commit)
       via  92e25342019a2998e635602f8a9c27c6879f2be0 (commit)
       via  3570126009c40e0102f6706db5628f8e0174c201 (commit)
       via  0a49308133b8cdd1063750c8e72c046e1e56892b (commit)
       via  fe8097d8cecc69a83299f472ef32c3b8a5f5234e (commit)
       via  225c351cd9fccc2face35d47ff6767fc630ff3bb (commit)
       via  4b73fc2e160226790e8e47368edff225656e4aac (commit)
       via  f49a818c50a0137cc370a8923e6bfa3f5a747049 (commit)
       via  8d7fc42153cc185408066f15d2b26111769dcd87 (commit)
       via  08eb856145cf148ddbd33efb782a3469c7dd21c6 (commit)
       via  561428b481dcfddfb53b70a898b5f3c12b367e8c (commit)
       via  8da64def266d3283ff6d189317a982dd6d28e223 (commit)
       via  a91ea66fa7323fe498bba7e15da43a6f61ef64b0 (commit)
       via  543b842d553b13889c9a77f7bbd96e82c1de1113 (commit)
       via  3e51e69a5014c10ad481d8c17964af63ab31e485 (commit)
       via  89caa5a5fb7a8bc4e60678068e9266bb92b382dc (commit)
       via  a77629a786c9d924b4cbcd337ee891a291ea7a7f (commit)
       via  b9374bb54a85caad173ac7cb3e30f701486f25f6 (commit)
       via  78fff3f49af93e7202995ec37f0d6e0bf6252e32 (commit)
       via  a016ddcb84888d4a1ba81977f4c60483478aae7d (commit)
       via  fbe251ad7e3617190413e7fe2d9bd262d54a055a (commit)
       via  afcfd9b371b1b30e51a6a6ebeefe673187190423 (commit)
       via  37fe83d2a3a437880386faeb77f33593179aeeb3 (commit)
       via  5e02558348487f997afed6d01cf7a52cbaa2feb4 (commit)
       via  3736de40a6b3e85f4c1bc2223dd7d99d099c8ecf (commit)
       via  197a07486e6e511eceb55a6a4834639be034cb9e (commit)
       via  f1914f7590a367f3cbba7327d2d0e2706e9fa1cb (commit)
       via  dcba91c350323afbcb01ab082113cdb4926ca515 (commit)
       via  dcfe157554611fb504b82409213b41fbded526c0 (commit)
       via  e5e5198cc6ce42be0d64797b6db1de7aa9ff21cf (commit)
       via  1b7b27eeb2cba00891f54ce10ba2e1eb575f2662 (commit)
       via  a5a66d8fb148e7472b291e10cc9f0591b55c3c7e (commit)
       via  496aba91930adb459a9307a984949c4ebd976f50 (commit)
       via  349c1b4e7f1f2e9ee3cd265041067bd28b393c2c (commit)
       via  7d6e7699e6aadbfc1933fc1d62f8bb939a4730dd (commit)
       via  9a1a6940ba99182c5a96f0cfe724eaa3ed8b34e9 (commit)
       via  6274c1c1d2b9797147cd78f5b8af0f9f3390ed9e (commit)
       via  d1ca86114a1305aab3cef12f92b27ff58c8dcac6 (commit)
       via  5e1db59494218d2b4d249028200dbc314ce65fae (commit)
       via  972fbdcf56656fdaa5f493c858937ae055633036 (commit)
       via  afbfbfa2734886cfb4ae50c24cbb1c9c2c3a1ce3 (commit)
       via  f9da2f5b264d4ff65a48c429e526e424c6679855 (commit)
       via  24aecc8fdd6830ea1f1b83dc2190a42d33db0897 (commit)
       via  ef3dda936118d4713962bf8b1b282a3702636043 (commit)
       via  c9d9081ede981cfd6a708142e060e5d96d4f662f (commit)
       via  7dd7db4cac9cc2365472d4c90579a1cc95073bf7 (commit)
       via  fac4982e2b0dea688e1b42b46dfb148e39b6a28e (commit)
       via  95042f018321d279ae85a4c14291c5f7e6638537 (commit)
       via  cbeb6e50ba3b58499929635e87962bcb4e9f78e3 (commit)
       via  b97eb786ca8ef24801f8d721043f518bf4f19efb (commit)
       via  9c188c21dfab00ab781f3061cdd6dae07b244586 (commit)
       via  4a8b62ab3068b3bec96f33ae777421df84fd2a30 (commit)
       via  b8c2b3660f3459b2345b22e54e53fa64ef35ee85 (commit)
      from  628a0c646920787933c7e7231e8e5c3574625a12 (commit)


- Log -----------------------------------------------------------------
commit c7b138eeddb2ad7319d9547d1383db5ebb74114c
Merge: 628a0c6 faa5b39
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Dec 12 09:30:26 2011 +0100

    Merge remote-tracking branch 'pootle/master'
    
    Conflicts:
    	po/de.po
    	po/fr.po
    	po/ja.po
    	po/ru.po
    	po/uk.po

commit faa5b3996ced44d21fa4707b7762fba7b79b896a
Author: Pootle server <noreply at l10n.cihar.com>
Date:   Mon Dec 12 10:26:28 2011 +0200

    Translation update done using Pootle.

commit e3a83035fb7d23350ad1f424db3bf9c3501a94eb
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:18:54 2011 +0200

    Translation update done using Pootle.

commit 8ab58a868f85336407f0ec86019bb5239be43d9a
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:17:35 2011 +0200

    Translation update done using Pootle.

commit 74ae425bdbc57b2053462f4f07835aad88f6a91e
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:17:02 2011 +0200

    Translation update done using Pootle.

commit 6418fa9b4c2c92ccb31a61dd2fe7b7d2193eb223
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:16:21 2011 +0200

    Translation update done using Pootle.

commit 5d82d7ece3df362d5a324306533f0f229a8f294f
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:15:49 2011 +0200

    Translation update done using Pootle.

commit 735a2df429ab5dc06c8bfbc49de7de847bf587ad
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:14:12 2011 +0200

    Translation update done using Pootle.

commit cb589e95b601adcbd32e6322e69686b13ea841ec
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:13:09 2011 +0200

    Translation update done using Pootle.

commit 1a0874d98466f3bb23933830adde2cb60c9b8d4c
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:11:49 2011 +0200

    Translation update done using Pootle.

commit 7e0fa1e58da387356b2156f4514bbf6c2fafbdc9
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:11:43 2011 +0200

    Translation update done using Pootle.

commit c86882f71c19793f7d6c7d2a30ad1ad39b563f41
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:11:30 2011 +0200

    Translation update done using Pootle.

commit 163efe222b2965f37e7025a9d3b516a25bdbeeb1
Author: typim <duke3d at ukr.net>
Date:   Mon Dec 12 09:10:39 2011 +0200

    Translation update done using Pootle.

commit 51d5d06fd87f99d152ac58a4d04d2a23e8eb2fdf
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:15:04 2011 +0200

    Translation update done using Pootle.

commit 0c0b20d5f5ceea35627d2d3ef0f076ad869ba121
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:13:53 2011 +0200

    Translation update done using Pootle.

commit 53e540f086768a0321840eeac174a0fa8d7ced21
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:12:51 2011 +0200

    Translation update done using Pootle.

commit 73091ec815080ce5fbae44b62f3d87a900fe10aa
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:12:42 2011 +0200

    Translation update done using Pootle.

commit 99c5b55b8bda1cffa3e109c46b19c3e6b6807f11
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:11:55 2011 +0200

    Translation update done using Pootle.

commit b41806d24703104a71f74c506aedd523cf3b6432
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:11:35 2011 +0200

    Translation update done using Pootle.

commit 9d402afa000c13888baed372db34ce51631de5fd
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:11:13 2011 +0200

    Translation update done using Pootle.

commit 690acb114da645942a8c11a0a160d893c89e29a8
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:09:51 2011 +0200

    Translation update done using Pootle.

commit 1b48be018e16adc2cef949c205f608d80ae845a1
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:08:10 2011 +0200

    Translation update done using Pootle.

commit 6ef208bb08dbdd1ca9da8ac237612352acfe8310
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:07:59 2011 +0200

    Translation update done using Pootle.

commit 248cbda80742a254863380fd3850638330049984
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:07:30 2011 +0200

    Translation update done using Pootle.

commit ca461af372167cebbc9a50987d02f5e716570245
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:04:34 2011 +0200

    Translation update done using Pootle.

commit 32c1ede52ce5d7b07de851680676a57b166d2486
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:03:37 2011 +0200

    Translation update done using Pootle.

commit fc7776e84eec8c63fd3530aae8eaa8e8b5f0b9f6
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:03:26 2011 +0200

    Translation update done using Pootle.

commit bb16ede19a9bc66b9905af2942eb2ba291142f85
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:02:57 2011 +0200

    Translation update done using Pootle.

commit 478555ac29aecb65a4b33506a35a4df363ccb83a
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:02:26 2011 +0200

    Translation update done using Pootle.

commit 75ae8a50fae298e7aa5d66b30d5a1622ce7554a8
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 06:02:06 2011 +0200

    Translation update done using Pootle.

commit fa2d23b92476169bd425cc486126aa1be608e897
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:59:54 2011 +0200

    Translation update done using Pootle.

commit 9222f1da0091d638d7bcbab7ce07c2a8e8ca112c
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:58:13 2011 +0200

    Translation update done using Pootle.

commit 1ccf6671b33eb34788cc2a6c6834d40af147e1b7
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:56:00 2011 +0200

    Translation update done using Pootle.

commit 9c3116b3791193863813ba8d94df50398459e588
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:51:59 2011 +0200

    Translation update done using Pootle.

commit bef282ce355375d311efbedf2ac94dac721edf18
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:50:06 2011 +0200

    Translation update done using Pootle.

commit 67981bce37c9ca7f166c5180c471b4ba53cbfa38
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:48:03 2011 +0200

    Translation update done using Pootle.

commit 277f8de89aac7718613b3459319653e1be96fb61
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:46:51 2011 +0200

    Translation update done using Pootle.

commit 1c999472afb01e53920762acbdc232f4f90e4af8
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:43:07 2011 +0200

    Translation update done using Pootle.

commit 4a2d24b4d26a1bfac4403405fee1763a7db3ed5d
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:40:47 2011 +0200

    Translation update done using Pootle.

commit 7f17bfd1cb84dffe4d4401d6719b593661649c92
Author: Pootle server <noreply at l10n.cihar.com>
Date:   Mon Dec 12 05:36:38 2011 +0200

    Translation update done using Pootle.

commit b83cfc9ea1f8a8c4188588ca57160e62dc68ee10
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:33:14 2011 +0200

    Translation update done using Pootle.

commit 4f2b2eeb79d983ea8692f83504754f5e14eef205
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:30:40 2011 +0200

    Translation update done using Pootle.

commit 2299785a8c5f529a4123090090ac14bbe33328b0
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:26:58 2011 +0200

    Translation update done using Pootle.

commit 708dc5ae0f514a665e95de88758082fb2c8bff7b
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:26:13 2011 +0200

    Translation update done using Pootle.

commit 00c8562adf2a30abf1817efe5c8447a31b45329d
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:25:24 2011 +0200

    Translation update done using Pootle.

commit 82f673d5dc5cb9751a22a34ba39eb9c63e1ad029
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:25:11 2011 +0200

    Translation update done using Pootle.

commit 28b0ac9177a3be7f541cabeca8ac0805eee6d52f
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:24:58 2011 +0200

    Translation update done using Pootle.

commit 36dd1e1eca6ad3d26ebc1c1afcfbab93b7c34838
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:24:45 2011 +0200

    Translation update done using Pootle.

commit 7c67855040a1a5271fd978be355cb80c859da981
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:24:21 2011 +0200

    Translation update done using Pootle.

commit 9b36edeac0ad3d3d95b39b5709d3939d45ed3e22
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:23:48 2011 +0200

    Translation update done using Pootle.

commit 0cc18634ed8bbd6188f0c24ec905afada1c7ecbe
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:19:39 2011 +0200

    Translation update done using Pootle.

commit ece6e167d42258b87b82dd60b76d44f0f55de8d6
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:19:31 2011 +0200

    Translation update done using Pootle.

commit 8adbb058a366374352a2b80e30b6a9b082d13071
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:18:55 2011 +0200

    Translation update done using Pootle.

commit f07302cb13b1eb51c8e83f287a168a345e1e315a
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:18:41 2011 +0200

    Translation update done using Pootle.

commit 0e39b650d3c635a18b126fd95e7679b2c6ce2c6a
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:18:24 2011 +0200

    Translation update done using Pootle.

commit 8c79a38d3701652f5d191e7992cfc10893eb09c4
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:18:16 2011 +0200

    Translation update done using Pootle.

commit b5b026501dad8bb90b177f7e5e6af2ec862435ec
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:18:07 2011 +0200

    Translation update done using Pootle.

commit 22c5e888f69418eebaeefa2bc0c0c966460e75d3
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:17:57 2011 +0200

    Translation update done using Pootle.

commit 0997aec5012dcc28b09d430a395096f8e9eb0553
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:17:48 2011 +0200

    Translation update done using Pootle.

commit bd9a882e64ffe76f589cedd0e4fa6ee73ab037a8
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:17:39 2011 +0200

    Translation update done using Pootle.

commit 8bc39449af4bb2e45b27a16feabf2c7ca48750b9
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:14:58 2011 +0200

    Translation update done using Pootle.

commit 6dd9670e32ceb30b7b5b2f56490d230c04791b5f
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:12:10 2011 +0200

    Translation update done using Pootle.

commit 36fa65c205deba0d095f0bea1c9274145dbde09e
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:10:18 2011 +0200

    Translation update done using Pootle.

commit 0f9ce127192fb16fdc6bcd0933d8280311248b2b
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:08:41 2011 +0200

    Translation update done using Pootle.

commit 293bfeb22153b52549f5eae6648df9eb3df623ab
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:05:15 2011 +0200

    Translation update done using Pootle.

commit d4bd98f64eebad15330607d3bd442c2c67ad035c
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:04:31 2011 +0200

    Translation update done using Pootle.

commit ef683b169692cde987017be3c04f16dd72a89267
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:01:06 2011 +0200

    Translation update done using Pootle.

commit a58815d4e088e6361fbef0cec3ac3071a140b9e9
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 05:00:36 2011 +0200

    Translation update done using Pootle.

commit 95aace1b68c8f1124162659ad03088d4fd427637
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:58:55 2011 +0200

    Translation update done using Pootle.

commit 0588976244a0e780b053541df00ee4b5d0873c05
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:58:51 2011 +0200

    Translation update done using Pootle.

commit 75e35f7389faa6661a237bccbd0547c16c111485
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:58:47 2011 +0200

    Translation update done using Pootle.

commit eb45ead063a4da37665d26953064493c0b5f4eb7
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:58:41 2011 +0200

    Translation update done using Pootle.

commit 4534c4b0918db7b475310d16a3a3f4feca715570
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:58:32 2011 +0200

    Translation update done using Pootle.

commit 8c526ff77384c2c44853274bbfd0199a391182dc
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:57:36 2011 +0200

    Translation update done using Pootle.

commit dbc57dab791ef65857a0f73a28bea874e0d3fe6f
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:53:15 2011 +0200

    Translation update done using Pootle.

commit d8cf646354966282c484094e895c5f0b61343207
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:52:28 2011 +0200

    Translation update done using Pootle.

commit 40bb4d42d0815b3f25368a5485d47c2bb0198df0
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:50:57 2011 +0200

    Translation update done using Pootle.

commit e44f2714e67a1d797c6cacb0ce1f460473fbe995
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:50:32 2011 +0200

    Translation update done using Pootle.

commit 928c27a48180e9012984b5b585a9ea9a805c0c3d
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:50:19 2011 +0200

    Translation update done using Pootle.

commit dd6f950c50a4332b826a6a90e69d640e8705c1b1
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:50:04 2011 +0200

    Translation update done using Pootle.

commit 2547e79ad17eb6766966885002459de4512f74cf
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:49:31 2011 +0200

    Translation update done using Pootle.

commit 39c73c7aeaacb043abcf72012418d403e2706c12
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:48:58 2011 +0200

    Translation update done using Pootle.

commit 21510a8cead104a237b4cb231cd7846e6001b109
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:47:42 2011 +0200

    Translation update done using Pootle.

commit 335bf340c30dd6001ae3fa3395b7c55caaeb664d
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:44:59 2011 +0200

    Translation update done using Pootle.

commit 64bce9106dfaa94d6d54b18510eaf4bf0ad11a3b
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:43:42 2011 +0200

    Translation update done using Pootle.

commit 88ee62aae14cf6578cb4dd9d49d929479835acff
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:42:08 2011 +0200

    Translation update done using Pootle.

commit 21ebcc2998320e3c59a2618e23dba410c2e2eee4
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:39:17 2011 +0200

    Translation update done using Pootle.

commit 68d6c40d3763f1793acc0fc03f4160aabb47b8f3
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:38:45 2011 +0200

    Translation update done using Pootle.

commit c5d1464b111ad6d9653de49e07b4457bc231bd59
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:38:01 2011 +0200

    Translation update done using Pootle.

commit 327f35d65e9f0060fd6fbbb440b7e6ae6aa3e60e
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:37:18 2011 +0200

    Translation update done using Pootle.

commit 84820b571b1ca787024b8a430f6ebeab0bbe39d4
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:35:24 2011 +0200

    Translation update done using Pootle.

commit 70d11160c44990ba2a9fddf1ef240334624e4e51
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:35:01 2011 +0200

    Translation update done using Pootle.

commit 92e25342019a2998e635602f8a9c27c6879f2be0
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:34:29 2011 +0200

    Translation update done using Pootle.

commit 3570126009c40e0102f6706db5628f8e0174c201
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:33:54 2011 +0200

    Translation update done using Pootle.

commit 0a49308133b8cdd1063750c8e72c046e1e56892b
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:33:38 2011 +0200

    Translation update done using Pootle.

commit fe8097d8cecc69a83299f472ef32c3b8a5f5234e
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:30:09 2011 +0200

    Translation update done using Pootle.

commit 225c351cd9fccc2face35d47ff6767fc630ff3bb
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:28:56 2011 +0200

    Translation update done using Pootle.

commit 4b73fc2e160226790e8e47368edff225656e4aac
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:27:56 2011 +0200

    Translation update done using Pootle.

commit f49a818c50a0137cc370a8923e6bfa3f5a747049
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:27:44 2011 +0200

    Translation update done using Pootle.

commit 8d7fc42153cc185408066f15d2b26111769dcd87
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:23:29 2011 +0200

    Translation update done using Pootle.

commit 08eb856145cf148ddbd33efb782a3469c7dd21c6
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:23:15 2011 +0200

    Translation update done using Pootle.

commit 561428b481dcfddfb53b70a898b5f3c12b367e8c
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:21:29 2011 +0200

    Translation update done using Pootle.

commit 8da64def266d3283ff6d189317a982dd6d28e223
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:21:05 2011 +0200

    Translation update done using Pootle.

commit a91ea66fa7323fe498bba7e15da43a6f61ef64b0
Author: any anonymous user <>
Date:   Mon Dec 12 04:20:11 2011 +0200

    Translation update done using Pootle.

commit 543b842d553b13889c9a77f7bbd96e82c1de1113
Author: minichip <holger at ronecker.com>
Date:   Mon Dec 12 04:18:51 2011 +0200

    Translation update done using Pootle.

commit 3e51e69a5014c10ad481d8c17964af63ab31e485
Author: Knox_x <fabianhagen at gmx.de>
Date:   Mon Dec 12 04:18:17 2011 +0200

    Translation update done using Pootle.

commit 89caa5a5fb7a8bc4e60678068e9266bb92b382dc
Author: typim <duke3d at ukr.net>
Date:   Sun Dec 11 21:45:29 2011 +0200

    Translation update done using Pootle.

commit a77629a786c9d924b4cbcd337ee891a291ea7a7f
Author: typim <duke3d at ukr.net>
Date:   Sun Dec 11 21:45:04 2011 +0200

    Translation update done using Pootle.

commit b9374bb54a85caad173ac7cb3e30f701486f25f6
Author: typim <duke3d at ukr.net>
Date:   Sun Dec 11 21:43:27 2011 +0200

    Translation update done using Pootle.

commit 78fff3f49af93e7202995ec37f0d6e0bf6252e32
Author: typim <duke3d at ukr.net>
Date:   Sun Dec 11 21:42:47 2011 +0200

    Translation update done using Pootle.

commit a016ddcb84888d4a1ba81977f4c60483478aae7d
Author: typim <duke3d at ukr.net>
Date:   Sun Dec 11 21:42:22 2011 +0200

    Translation update done using Pootle.

commit fbe251ad7e3617190413e7fe2d9bd262d54a055a
Author: typim <duke3d at ukr.net>
Date:   Sun Dec 11 21:37:05 2011 +0200

    Translation update done using Pootle.

commit afcfd9b371b1b30e51a6a6ebeefe673187190423
Author: typim <duke3d at ukr.net>
Date:   Sun Dec 11 21:36:42 2011 +0200

    Translation update done using Pootle.

commit 37fe83d2a3a437880386faeb77f33593179aeeb3
Author: typim <duke3d at ukr.net>
Date:   Sun Dec 11 21:36:35 2011 +0200

    Translation update done using Pootle.

commit 5e02558348487f997afed6d01cf7a52cbaa2feb4
Author: Pootle server <noreply at l10n.cihar.com>
Date:   Sun Dec 11 16:42:01 2011 +0200

    Translation update done using Pootle.

commit 3736de40a6b3e85f4c1bc2223dd7d99d099c8ecf
Author: Pootle server <noreply at l10n.cihar.com>
Date:   Sun Dec 11 16:40:06 2011 +0200

    Translation update done using Pootle.

commit 197a07486e6e511eceb55a6a4834639be034cb9e
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:31:23 2011 +0200

    Translation update done using Pootle.

commit f1914f7590a367f3cbba7327d2d0e2706e9fa1cb
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:23:02 2011 +0200

    Translation update done using Pootle.

commit dcba91c350323afbcb01ab082113cdb4926ca515
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:11:52 2011 +0200

    Translation update done using Pootle.

commit dcfe157554611fb504b82409213b41fbded526c0
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:09:06 2011 +0200

    Translation update done using Pootle.

commit e5e5198cc6ce42be0d64797b6db1de7aa9ff21cf
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:08:12 2011 +0200

    Translation update done using Pootle.

commit 1b7b27eeb2cba00891f54ce10ba2e1eb575f2662
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:07:31 2011 +0200

    Translation update done using Pootle.

commit a5a66d8fb148e7472b291e10cc9f0591b55c3c7e
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:06:38 2011 +0200

    Translation update done using Pootle.

commit 496aba91930adb459a9307a984949c4ebd976f50
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:05:55 2011 +0200

    Translation update done using Pootle.

commit 349c1b4e7f1f2e9ee3cd265041067bd28b393c2c
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:01:03 2011 +0200

    Translation update done using Pootle.

commit 7d6e7699e6aadbfc1933fc1d62f8bb939a4730dd
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 10:00:41 2011 +0200

    Translation update done using Pootle.

commit 9a1a6940ba99182c5a96f0cfe724eaa3ed8b34e9
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:57:26 2011 +0200

    Translation update done using Pootle.

commit 6274c1c1d2b9797147cd78f5b8af0f9f3390ed9e
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:57:01 2011 +0200

    Translation update done using Pootle.

commit d1ca86114a1305aab3cef12f92b27ff58c8dcac6
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:55:35 2011 +0200

    Translation update done using Pootle.

commit 5e1db59494218d2b4d249028200dbc314ce65fae
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:54:26 2011 +0200

    Translation update done using Pootle.

commit 972fbdcf56656fdaa5f493c858937ae055633036
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:52:11 2011 +0200

    Translation update done using Pootle.

commit afbfbfa2734886cfb4ae50c24cbb1c9c2c3a1ce3
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:51:16 2011 +0200

    Translation update done using Pootle.

commit f9da2f5b264d4ff65a48c429e526e424c6679855
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:48:43 2011 +0200

    Translation update done using Pootle.

commit 24aecc8fdd6830ea1f1b83dc2190a42d33db0897
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:48:34 2011 +0200

    Translation update done using Pootle.

commit ef3dda936118d4713962bf8b1b282a3702636043
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:47:37 2011 +0200

    Translation update done using Pootle.

commit c9d9081ede981cfd6a708142e060e5d96d4f662f
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:46:24 2011 +0200

    Translation update done using Pootle.

commit 7dd7db4cac9cc2365472d4c90579a1cc95073bf7
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:36:35 2011 +0200

    Translation update done using Pootle.

commit fac4982e2b0dea688e1b42b46dfb148e39b6a28e
Author: typim <duke3d at ukr.net>
Date:   Sat Dec 10 09:35:12 2011 +0200

    Translation update done using Pootle.

commit 95042f018321d279ae85a4c14291c5f7e6638537
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Sat Dec 10 08:22:08 2011 +0200

    Translation update done using Pootle.

commit cbeb6e50ba3b58499929635e87962bcb4e9f78e3
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Sat Dec 10 08:21:55 2011 +0200

    Translation update done using Pootle.

commit b97eb786ca8ef24801f8d721043f518bf4f19efb
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Sat Dec 10 08:21:10 2011 +0200

    Translation update done using Pootle.

commit 9c188c21dfab00ab781f3061cdd6dae07b244586
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Sat Dec 10 08:20:44 2011 +0200

    Translation update done using Pootle.

commit 4a8b62ab3068b3bec96f33ae777421df84fd2a30
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Sat Dec 10 08:19:44 2011 +0200

    Translation update done using Pootle.

commit b8c2b3660f3459b2345b22e54e53fa64ef35ee85
Author: Yuichiro <yuichiro at pop07.odn.ne.jp>
Date:   Sat Dec 10 08:17:21 2011 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 po/de.po |  290 ++++++++++++++++++++++++++++++++++++--------------------------
 po/fr.po |    9 +--
 po/ja.po |   47 +++++------
 po/ru.po |    7 +--
 po/uk.po |  108 ++++++++++++-----------
 5 files changed, 249 insertions(+), 212 deletions(-)

diff --git a/po/de.po b/po/de.po
index 249ab36..c8d43dd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-10 07:53-0500\n"
-"PO-Revision-Date: 2011-11-10 17:41+0200\n"
-"Last-Translator: Anonymous Pootle User\n"
+"PO-Revision-Date: 2011-12-12 06:13+0200\n"
+"Last-Translator: minichip <holger at ronecker.com>\n"
 "Language-Team: german <de at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -783,8 +783,9 @@ msgid "Versions"
 msgstr "Versionen"
 
 #: db_tracking.php:135 tbl_tracking.php:400 tbl_tracking.php:668
+#, fuzzy
 msgid "Tracking report"
-msgstr "Tracking Report"
+msgstr "Verfolgungs-Report"
 
 #: db_tracking.php:136 tbl_tracking.php:235 tbl_tracking.php:670
 msgid "Structure snapshot"
@@ -805,31 +806,33 @@ msgstr "Datenbank-Log"
 #: enum_editor.php:23 js/messages.php:255
 #: libraries/rte/rte_routines.lib.php:690
 msgid "ENUM/SET editor"
-msgstr ""
+msgstr "ENUM/SET Editor"
 
 #: enum_editor.php:28 js/messages.php:257
-#, fuzzy
 #| msgid "Values for the column \"%s\""
 msgid "Values for a new column"
-msgstr "Werte für die Spalte \"%s\""
+msgstr "Werte für eine neue Spalte"
 
 #: enum_editor.php:30 js/messages.php:256
-#, fuzzy, php-format
+#, php-format
 #| msgid "Values for the column \"%s\""
 msgid "Values for column %s"
-msgstr "Werte für die Spalte \"%s\""
+msgstr "Werte für die Spalte %s"
 
 #: enum_editor.php:34 js/messages.php:258
-#, fuzzy
 #| msgid "Enter each value in a separate field."
 msgid "Enter each value in a separate field"
-msgstr "Jeden Wert in einem eigenen Feld eingeben."
+msgstr "Jeden Wert in einem eigenen Feld eingeben"
 
+<<<<<<< HEAD
 #: enum_editor.php:123
 #, fuzzy
+=======
+#: enum_editor.php:121
+>>>>>>> pootle/master
 #| msgid "+ Add a value"
 msgid "Add a value"
-msgstr "+ Wert hinzufügen"
+msgstr "Wert hinzufügen"
 
 #: enum_editor.php:129 gis_data_editor.php:317
 msgid "Output"
@@ -924,32 +927,31 @@ msgid "Add a point"
 msgstr "Punkt hinzufügen"
 
 #: gis_data_editor.php:220 js/messages.php:310
-#, fuzzy
 #| msgid "Lines terminated by"
 msgid "Linestring"
-msgstr "Linestring"
+msgstr "LineString"
 
 #: gis_data_editor.php:223 gis_data_editor.php:279 js/messages.php:314
+#, fuzzy
 msgid "Outer Ring"
-msgstr "Aussenring"
+msgstr "Ankreis"
 
 # Ist hiermit der Inkreis gemeint? http://de.wikipedia.org/wiki/Inkreis
 #: gis_data_editor.php:225 gis_data_editor.php:281 js/messages.php:313
 #, fuzzy
 msgid "Inner Ring"
-msgstr "Innenring:"
+msgstr "Inkreis"
 
 #: gis_data_editor.php:252
-#, fuzzy
 #| msgid "Add a new User"
 msgid "Add a linestring"
-msgstr "Linestring hinzufügen"
+msgstr "LineString hinzufügen"
 
 #: gis_data_editor.php:252 gis_data_editor.php:304 js/messages.php:316
 #, fuzzy
 #| msgid "Add a new User"
 msgid "Add an inner ring"
-msgstr "Innenring hinzufügen"
+msgstr "Inkreis hinzufügen"
 
 #: gis_data_editor.php:266 js/messages.php:311
 msgid "Polygon"
@@ -960,7 +962,6 @@ msgid "Add a polygon"
 msgstr "Polygon hinzufügen"
 
 #: gis_data_editor.php:310
-#, fuzzy
 #| msgid "Geometry"
 msgid "Add geometry"
 msgstr "Geometrie hinzufügen"
@@ -1093,7 +1094,7 @@ msgstr "Sie sind dabei eine komplette Tabelle zu LÖSCHEN!"
 
 #: js/messages.php:33
 msgid "You are about to TRUNCATE a complete table!"
-msgstr "Sie sind dabei die Daten einer kompletten Tabelle zu ZERSTÖREN!"
+msgstr "Sie sind dabei die Daten einer kompletten Tabelle zu LEEREN!"
 
 #: js/messages.php:35
 msgid "Deleting tracking data"
@@ -1126,22 +1127,20 @@ msgid "This is not a number!"
 msgstr "Das ist keine Zahl!"
 
 #: js/messages.php:46
-#, fuzzy
 #| msgid "Add index"
 msgid "Add Index"
 msgstr "Index hinzufügen"
 
 #: js/messages.php:47
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit Index"
-msgstr "Bearbeitungsmodus"
+msgstr "Index bearbeiten"
 
 #: js/messages.php:48 tbl_indexes.php:293
-#, fuzzy, php-format
+#, php-format
 #| msgid "Add %s column(s)"
 msgid "Add %d column(s) to index"
-msgstr "%s Spalte(n) einfügen"
+msgstr "%d Spalte(n) zum Index hinzufügen"
 
 #. l10n: Default description for the y-Axis of Charts
 #: js/messages.php:52
@@ -1251,7 +1250,7 @@ msgstr "Prozesse"
 
 #: js/messages.php:85
 msgid "Connections / Processes"
-msgstr "Verbindungen/Prozesse"
+msgstr "Verbindungen / Prozesse"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
@@ -1269,15 +1268,21 @@ msgstr "Abfrage-Statistiken"
 
 #: js/messages.php:94
 msgid "Local monitor configuration incompatible"
-msgstr "Die lokale Bildschirmkonfiguration ist nicht kompatibel."
+msgstr "Die lokale Bildschirmkonfiguration ist nicht kompatibel"
 
 #: js/messages.php:95
+#, fuzzy
 msgid ""
 "The chart arrangement configuration in your browsers local storage is not "
 "compatible anymore to the newer version of the monitor dialog. It is very "
 "likely that your current configuration will not work anymore. Please reset "
 "your configuration to default in the <i>Settings</i> menu."
 msgstr ""
+"Die Diagram Anordnung in Ihrem lokalen Browser Speicher ist nicht mehr "
+"kompatibel zur neuen Version des Monitor Dialogs. Es ist sehr Wahrscheinlich "
+"das Ihre aktuellen Einstellungen nicht mehr funktionieren. Bitte setzen Sie "
+"die Konfiguration im <i>Einstellungen</i> Menü auf die Standardwerte "
+"zurück."
 
 #: js/messages.php:97
 msgid "Query cache efficiency"
@@ -1393,11 +1398,11 @@ msgid "EiB"
 msgstr "EiB"
 
 #: js/messages.php:132
-#, fuzzy, php-format
+#, php-format
 #| msgid "%s table"
 #| msgid_plural "%s tables"
 msgid "%d table(s)"
-msgstr "%s Tabelle"
+msgstr "%d Tabelle(n)"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:135
@@ -1615,7 +1620,7 @@ msgstr "Gruppiere die Abfragen und ignoriere Werte in WHERE-Abfragen"
 
 #: js/messages.php:189
 msgid "Sum of grouped rows:"
-msgstr "Anzahl der gruppierten Datensätze"
+msgstr "Anzahl der gruppierten Datensätze:"
 
 #: js/messages.php:190
 msgid "Total:"
@@ -1645,15 +1650,15 @@ msgstr "Neuladen"
 
 #: js/messages.php:197
 msgid "Affected rows:"
-msgstr "Betroffene Zeilen: "
+msgstr "Betroffene Zeilen:"
 
 #: js/messages.php:199
 #, fuzzy
 #| msgid "Failed parsing config file. It doesn't seem to be valid JSON code"
 msgid "Failed parsing config file. It doesn't seem to be valid JSON code."
 msgstr ""
-"Das Parsen/Einlesen der Konfigutationsdatei ist fehlgeschlagen. Es scheint "
-"sich nicht um eine gültige JSON-Kodierung zu handeln."
+"Das Einlesen der Konfigutationsdatei ist fehlgeschlagen. Es scheint sich "
+"nicht um eine gültige JSON-Kodierung zu handeln."
 
 #: js/messages.php:200
 msgid ""
@@ -1740,7 +1745,7 @@ msgstr "OK"
 
 #: js/messages.php:228
 msgid "Click to dismiss this notification"
-msgstr ""
+msgstr "Hier klicken um diese Meldung zu schließen"
 
 #: js/messages.php:231
 msgid "Renaming Databases"
@@ -1801,10 +1806,10 @@ msgstr ""
 "beinhalten!"
 
 #: js/messages.php:259
-#, fuzzy, php-format
+#, php-format
 #| msgid "+ Add a value"
 msgid "Add %d value(s)"
-msgstr "+ Wert hinzufügen"
+msgstr "%d Wert(e) hinzufügen"
 
 #: js/messages.php:262
 msgid ""
@@ -1852,26 +1857,27 @@ msgid "Show search criteria"
 msgstr "Suchkriterien anzeigen"
 
 #: js/messages.php:280 libraries/tbl_select.lib.php:110
-#, fuzzy
 #| msgid "Search"
 msgid "Zoom Search"
 msgstr "Suche"
 
 #: js/messages.php:282
 msgid "Each point represents a data row."
-msgstr "Jeder Punkt stellt eine Datenreihe dar"
+msgstr "Jeder Punkt stellt eine Datenreihe dar."
 
 #: js/messages.php:284
 msgid "Hovering over a point will show its label."
 msgstr "Das Überfliegen eines Punktes zeigt seine Bezeichnung."
 
 #: js/messages.php:286
+#, fuzzy
 msgid "Use mousewheel to zoom in or out of the plot."
-msgstr ""
+msgstr "Verwenden Sie das Mausrad um die Grafik zu vergrößern oder verkleinern."
 
 #: js/messages.php:288
+#, fuzzy
 msgid "Click and drag the mouse to navigate the plot."
-msgstr ""
+msgstr "Klicken und ziehen Sie die Maus, um in der Grafik zu navigieren."
 
 #: js/messages.php:290
 msgid "Click reset zoom link to come back to original state."
@@ -1891,7 +1897,7 @@ msgstr ""
 
 #: js/messages.php:296
 msgid "Strings are converted into integer for plotting"
-msgstr "Zeichenketten werden für die Zeichnung in Integerwerte umgewandelt."
+msgstr "Zeichenketten werden für die Zeichnung in Integerwerte umgewandelt"
 
 #: js/messages.php:298
 msgid "Select two columns"
@@ -1905,13 +1911,13 @@ msgstr "2 unterschiedliche Spalten auswählen"
 #, fuzzy
 #| msgid "Query results operations"
 msgid "Query results"
-msgstr "Operationen für das Abfrageergebnis"
+msgstr "Abfrageergebnis"
 
 #: js/messages.php:301
 #, fuzzy
 #| msgid "Data pointer size"
 msgid "Data point content"
-msgstr "Größe des Datenzeigers"
+msgstr "Datenpunkt Inhalt"
 
 #: js/messages.php:304 tbl_change.php:312 tbl_indexes.php:228
 #: tbl_indexes.php:255
@@ -1985,16 +1991,20 @@ msgstr ""
 "umzustellen"
 
 #: js/messages.php:340
+#, fuzzy
 msgid ""
 "This table does not contain a unique column. Features related to the grid "
 "edit, checkbox, Edit, Copy and Delete links may not work after saving."
 msgstr ""
+"Diese Tabelle enthält keine eindeutige Spalte. Merkmale in Bezug auf Gitter "
+"bearbeiten, Kontrollkästchen, Bearbeiten, Kopieren und Löschen von Links "
+"können nach dem Speichern eventuell nicht funktionieren."
 
 #: js/messages.php:341
 msgid ""
 "You can also edit most columns<br />by clicking directly on their content."
 msgstr ""
-"Sie können die meisten Spalten bearbeiten<br/>indem Sie auf den Inhalt "
+"Sie können die meisten Spalten bearbeiten<br />indem Sie auf den Inhalt "
 "klicken."
 
 #: js/messages.php:342
@@ -2288,6 +2298,7 @@ msgstr "Sekunde"
 #, php-format
 msgid "Failed formatting string for rule '%s'. PHP threw following error: %s"
 msgstr ""
+"Formatieren des Texts für Regel '%s' fehlgeschlagen. PHP Fehlermeldung: %s"
 
 #: libraries/Config.class.php:703
 msgid "Remove \"./config\" directory before using phpMyAdmin!"
@@ -2516,6 +2527,8 @@ msgid ""
 "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]"
 "['MaxTableUiprefs'] %s)"
 msgstr ""
+"Bereinigen der Tabellen UI Einstellungen fehlgeschlagen (siehe "
+"$cfg['Servers'][$i]['MaxTableUiprefs'] %s)"
 
 #: libraries/Table.class.php:1529
 #, php-format
@@ -2524,6 +2537,9 @@ msgid ""
 "after you refresh this page. Please check if the table structure has been "
 "changed."
 msgstr ""
+"Die UI Eigenschaft \"%s\" konnte nicht gespeichert werden. Die vorgenommenen "
+"Änderungen werden nicht dauerhaft sein wenn Sie diese Seite aktualisieren. "
+"Bitte überprüfen Sie, ob die Struktur der Tabelle geändert wurde."
 
 #: libraries/Theme.class.php:145
 #, php-format
@@ -2555,7 +2571,7 @@ msgstr "Pfad für das Oberflächendesign %s nicht gefunden!"
 
 #: libraries/Theme_Manager.class.php:296 themes.php:20 themes.php:27
 msgid "Theme"
-msgstr "Theme"
+msgstr "Oberflächendesign"
 
 #: libraries/auth/config.auth.lib.php:71
 msgid "Cannot connect: invalid settings."
@@ -2594,7 +2610,7 @@ msgstr ""
 
 #: libraries/auth/cookie.auth.lib.php:35
 msgid "Failed to use Blowfish from mcrypt!"
-msgstr "Benutzung von Blowfish des mcrypt-Pakets fehlgeschlagen."
+msgstr "Benutzung von Blowfish des mcrypt-Pakets fehlgeschlagen!"
 
 #: libraries/auth/cookie.auth.lib.php:197
 msgid "Log in"
@@ -2831,7 +2847,7 @@ msgstr "Sie sollten auf %s %s oder neuer aktualisieren."
 #: libraries/common.lib.php:188
 #, php-format
 msgid "Max: %s%s"
-msgstr "Maximale Dateigröße: %s%s"
+msgstr "Maximal: %s%s"
 
 #. l10n: Please check that translation actually exists.
 #: libraries/common.lib.php:443
@@ -2950,7 +2966,6 @@ msgstr "Fehlende(r) Parameter:"
 
 #: libraries/common.lib.php:2447 libraries/common.lib.php:2450
 #: libraries/display_tbl.lib.php:306
-#, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
@@ -2959,7 +2974,6 @@ msgstr "Anfang"
 #: libraries/common.lib.php:2448 libraries/common.lib.php:2451
 #: libraries/display_tbl.lib.php:307 server_binlog.php:135
 #: server_binlog.php:137
-#, fuzzy
 #| msgid "Previous"
 msgctxt "Previous page"
 msgid "Previous"
@@ -2968,7 +2982,6 @@ msgstr "Vorherige"
 #: libraries/common.lib.php:2478 libraries/common.lib.php:2481
 #: libraries/display_tbl.lib.php:372 server_binlog.php:170
 #: server_binlog.php:172
-#, fuzzy
 #| msgid "Next"
 msgctxt "Next page"
 msgid "Next"
@@ -2976,7 +2989,6 @@ msgstr "Nächste"
 
 #: libraries/common.lib.php:2479 libraries/common.lib.php:2482
 #: libraries/display_tbl.lib.php:389
-#, fuzzy
 #| msgid "End"
 msgctxt "Last page"
 msgid "End"
@@ -3293,7 +3305,7 @@ msgstr "Zeile unter Mauscursor hervorheben"
 msgid "Highlight pointer"
 msgstr "Cursor hervorheben"
 
-# Maybe the wikipedia link should point to the german version of the article
+# Maybe the wikipedia link should point to the german version of the article

 # (http://de.wikipedia.org/wiki/Bzip2 )
 #: libraries/config/messages.inc.php:30
 msgid ""
@@ -3326,24 +3338,26 @@ msgid ""
 "Defines the minimum size for input fields generated for CHAR and VARCHAR "
 "columns"
 msgstr ""
+"Lege die Mindestgröße der Eingabefelder für CHAR und VARCHAR-Spalten fest"
 
 #: libraries/config/messages.inc.php:35
 #, fuzzy
 #| msgid "Customize text input fields"
 msgid "Minimum size for input field"
-msgstr "Texteingabefelder anpassen"
+msgstr "Mindestgröße für Eingabefeld"
 
 #: libraries/config/messages.inc.php:36
 msgid ""
 "Defines the maximum size for input fields generated for CHAR and VARCHAR "
 "columns"
 msgstr ""
+"Lege die maximale Größe der Eingabefelder für CHAR und VARCHAR-Spalten fest"
 
 #: libraries/config/messages.inc.php:37
 #, fuzzy
 #| msgid "Maximum size for temporary sort files"
 msgid "Maximum size for input field"
-msgstr "Maximale Größe temporärer Dateien beim Sortieren"
+msgstr "Maximale Größe für Eingabefeld"
 
 #: libraries/config/messages.inc.php:38
 msgid "Number of columns for CHAR/VARCHAR textareas"
@@ -3764,7 +3778,7 @@ msgstr "Standard-Exporteinstellungen anpassen"
 #: libraries/config/messages.inc.php:169 libraries/config/messages.inc.php:211
 #: setup/frames/menu.inc.php:16
 msgid "Features"
-msgstr "Features"
+msgstr "Funktionen"
 
 #: libraries/config/messages.inc.php:170
 msgid "General"
@@ -4234,8 +4248,9 @@ msgid "Use less graphically intense tabs"
 msgstr "Benutze graphisch weniger anspruchsvolle Tabs"
 
 #: libraries/config/messages.inc.php:293
+#, fuzzy
 msgid "Light tabs"
-msgstr "Light Tabs"
+msgstr "Einfache Tabs"
 
 #: libraries/config/messages.inc.php:294
 msgid ""
@@ -4609,24 +4624,25 @@ msgid ""
 "Leave blank for no [a at http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] "
 "support, suggested: [kbd]pma_bookmark[/kbd]"
 msgstr ""
-"Leer lassen für keine [a at http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/"
-"a] Unterstützung, Vorschlag: [kbd]pma_bookmark[/kbd]"
+"Leer lassen für keine "
+"[a at http://wiki.phpmyadmin.net/pma/bookmark]Lesezeichen[/a] Unterstützung, "
+"Vorschlag: [kbd]pma_bookmark[/kbd]"
 
 #: libraries/config/messages.inc.php:375
 msgid "Bookmark table"
-msgstr "Bookmark Table"
+msgstr "Lesezeichen Tabelle"
 
 #: libraries/config/messages.inc.php:376
 msgid ""
 "Leave blank for no column comments/mime types, suggested: [kbd]"
 "pma_column_info[/kbd]"
 msgstr ""
-"Leer lassen für keine Spalten Kommentare/mime types,Vorschlag: [kbd]"
-"pma_column_info[/kbd]"
+"Leer lassen für keine Spalten Kommentare/mime types, Vorschlag: "
+"[kbd]pma_column_info[/kbd]"
 
 #: libraries/config/messages.inc.php:377
 msgid "Column information table"
-msgstr "Column Info Table"
+msgstr "Spalten Informationen Tabelle"
 
 #: libraries/config/messages.inc.php:378
 msgid "Compress connection to MySQL server"
@@ -4647,7 +4663,7 @@ msgstr "Art der Verbindung"
 
 #: libraries/config/messages.inc.php:382
 msgid "Control user password"
-msgstr "Control-user Passwort"
+msgstr "pmadb Benutzer Passwort"
 
 #: libraries/config/messages.inc.php:383
 msgid ""
@@ -4659,19 +4675,20 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:384
 msgid "Control user"
-msgstr "Control-user"
+msgstr "pmadb Benutzer"
 
 #: libraries/config/messages.inc.php:385
 msgid ""
 "An alternate host to hold the configuration storage; leave blank to use the "
 "already defined host"
 msgstr ""
+"Eine alternative Host für den Konfiguration Speicher; leer lassen, um die "
+"bereits definierten Host zu verwenden"
 
 #: libraries/config/messages.inc.php:386
-#, fuzzy
 #| msgid "Control user"
 msgid "Control host"
-msgstr "Control-user"
+msgstr "pmadb Host"
 
 #: libraries/config/messages.inc.php:387
 msgid "Count tables when showing database list"
@@ -4745,13 +4762,15 @@ msgstr "Hostname"
 
 #: libraries/config/messages.inc.php:401
 msgid "Logout URL"
-msgstr "Logout URL"
+msgstr "Abmelde URL"
 
 #: libraries/config/messages.inc.php:402
 msgid ""
 "Limits number of table preferences which are stored in database, the oldest "
 "records are automatically removed"
 msgstr ""
+"Begrenzt die Anzahl der Tabelle Einstellungen die in der Datenbank "
+"gespeichert werden, die ältesten Einträge werden automatisch gelöscht"
 
 #: libraries/config/messages.inc.php:403
 #, fuzzy
@@ -4843,12 +4862,12 @@ msgid ""
 "Leave blank for no [a at http://wiki.phpmyadmin.net/pma/relation]relation-links"
 "[/a] support, suggested: [kbd]pma_relation[/kbd]"
 msgstr ""
-"Leer lassenfür keine [a at http://wiki.phpmyadmin.net/pma/relation]relation-"
-"links[/a] Unterstützung, Vorschlag: [kbd]pma_relation[/kbd]"
+"Leer lassen für keine [a at http://wiki.phpmyadmin.net/pma/relation]relation-"
+"link[/a] Unterstützung, Vorschlag: [kbd]pma_relation[/kbd]"
 
 #: libraries/config/messages.inc.php:419
 msgid "Relation table"
-msgstr "Relation Table"
+msgstr "Relation Tabelle"
 
 #: libraries/config/messages.inc.php:420
 msgid "SQL command to fetch available databases"
@@ -4863,8 +4882,8 @@ msgid ""
 "See [a at http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types"
 "[/a] for an example"
 msgstr ""
-"Siehe [a at http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication "
-"types[/a] für ein Beispiel"
+"Siehe [a at http://wiki.phpmyadmin.net/pma/auth_types#signon]Authentifizierungs"
+"arten[/a] für ein Beispiel"
 
 #: libraries/config/messages.inc.php:423
 msgid "Signon session name"
@@ -4881,7 +4900,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:426
 msgid "Server socket"
-msgstr "Sockel"
+msgstr "Server Socket"
 
 #: libraries/config/messages.inc.php:427
 msgid "Enable SSL for connection to MySQL server"
@@ -5364,7 +5383,7 @@ msgstr "Aktiviere die Prüfung auf Aktualisierungen auf der Hauptseite"
 msgid "Version check"
 msgstr "Versionsüberprüfung"
 
-# Maybe wikipedia links should point to $lang.wikipedia.org, eg
+# Maybe wikipedia links should point to $lang.wikipedia.org, eg

 # http://de.wikipedia.org/wiki/ZIP-Dateiformat
 #: libraries/config/messages.inc.php:522
 msgid ""
@@ -5440,7 +5459,7 @@ msgstr "Open Document Text"
 
 #: libraries/config/validate.lib.php:198
 msgid "Could not initialize Drizzle connection library"
-msgstr "Konnte Drizzle-Verbindungsbibliothek nicht initialisieren."
+msgstr "Konnte Drizzle-Verbindungsbibliothek nicht initialisieren"
 
 #: libraries/config/validate.lib.php:205 libraries/config/validate.lib.php:212
 msgid "Could not connect to Drizzle server"
@@ -5491,21 +5510,29 @@ msgstr "Die Erweiterung %s fehlt. Bitte die PHP Konfiguration überprüfen."
 msgid "possible deep recursion attack"
 msgstr ""
 
+<<<<<<< HEAD
 #: libraries/database_interface.lib.php:1771
 #, fuzzy
+=======
+#: libraries/database_interface.lib.php:1765
+>>>>>>> pootle/master
 #| msgid " the local MySQL server's socket is not correctly configured)"
 msgid ""
 "The server is not responding (or the local server's socket is not correctly "
 "configured)."
 msgstr ""
-"(evtl. ist auch der Socket des lokalen MySQL-Servers nicht korrekt "
-"konfiguriert)"
+"Der Server antwortet nicht (evtl. ist der Socket des lokalen MySQL-Servers "
+"nicht korrekt konfiguriert)."
 
+<<<<<<< HEAD
 #: libraries/database_interface.lib.php:1774
 #, fuzzy
+=======
+#: libraries/database_interface.lib.php:1768
+>>>>>>> pootle/master
 #| msgid "The server is not responding"
 msgid "The server is not responding."
-msgstr "Der Server antwortet nicht"
+msgstr "Der Server antwortet nicht."
 
 #: libraries/database_interface.lib.php:1778
 msgid "Please check privileges of directory containing database."
@@ -6625,8 +6652,8 @@ msgstr ""
 #: libraries/export/sql.php:45
 msgid "Additional custom header comment (\\n splits lines):"
 msgstr ""
-"Individuelle Kommentare für den Kopfbereich (\n"
-" erzeugt einen Zeilenumbruch):"
+"Individuelle Kommentare für den Kopfbereich (\\n erzeugt einen "
+"Zeilenumbruch):"
 
 #: libraries/export/sql.php:50
 msgid ""
@@ -6706,9 +6733,9 @@ msgid ""
 "both of the above<br />       Example: <code>INSERT INTO "
 "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>"
 msgstr ""
-"beide obigen Optionen verwenden <br />       Beispiel: "
-"<code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</"
-"code>"
+"beide obigen Optionen verwenden<br />       Beispiel: "
+"<code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), "
+"(7,8,9)</code>"
 
 #: libraries/export/sql.php:277
 msgid ""
@@ -7824,7 +7851,7 @@ msgstr ""
 #: libraries/rte/rte_words.lib.php:47
 #, php-format
 msgid "No event with name %1$s found in database %2$s"
-msgstr "Es wurde kein Ereignis mit dem Namen %s in Datenbank %s gefunden"
+msgstr "Es wurde kein Ereignis mit dem Namen %1$s in Datenbank %2$s gefunden"
 
 #: libraries/rte/rte_words.lib.php:48
 msgid "There are no events to display."
@@ -8091,7 +8118,7 @@ msgstr "Begrenzer"
 
 #: libraries/sql_query_form.lib.php:344
 msgid "Show this query here again"
-msgstr "Diese Abfrage hier wieder anzeigen "
+msgstr "Diese Abfrage hier wieder anzeigen"
 
 #: libraries/sql_query_form.lib.php:399
 msgid "View only"
@@ -8192,10 +8219,10 @@ msgid ""
 "a single quote (\"'\") amongst those values, precede it with a backslash "
 "(for example '\\\\xyz' or 'a\\'b')."
 msgstr ""
-"Wenn das Feld vom Typ \"ENUM\" oder \"SET\" ist, benutzen Sie bitte das "
-"Format: 'a','b','c',... <br />Wann immer Sie ein Backslash (\"\\\") oder ein "
-"einfaches Anführungszeichen (\"'\") verwenden, setzen Sie bitte ein "
-"Backslash vor das Zeichen. (z. B.: '\\\\xyz' oder 'a\\'b')."
+"Wenn das Feld vom Typ \"ENUM\" oder \"SET\" ist, benutzen Sie bitte das Format: "
+"'a','b','c'...<br />Wann immer Sie ein Backslash (\"\\\") oder ein einfaches "
+"Anführungszeichen (\"'\") verwenden, setzen Sie bitte ein Backslash vor das "
+"Zeichen. (z.B.: '\\\\xyz' oder 'a\\'b')."
 
 #: libraries/tbl_properties.inc.php:99
 msgid ""
@@ -8232,9 +8259,9 @@ msgid ""
 "'\\\\xyz' or 'a\\'b')."
 msgstr ""
 "Bitte die Werte für die Umwandlungsoptionen in folgendem Format angeben: "
-"'a', 100, b,'c',...<br />Wann immer Sie ein Backslash (\"\\\") oder ein "
-"einfaches Anführungszeichen (\"'\") verwenden, setzen Sie bitte ein "
-"Backslash vor das Zeichen. (z. B.: '\\\\xyz' oder 'a\\'b')."
+"'a', 100, b,'c'...<br />Wann immer Sie ein Backslash (\"\\\") oder ein "
+"einfaches Anführungszeichen (\"'\") verwenden, setzen Sie bitte ein Backslash "
+"vor das Zeichen. (z.B.: '\\\\xyz' oder 'a\\'b')."
 
 #: libraries/tbl_properties.inc.php:321
 msgid "ENUM or SET data too long?"
@@ -8931,8 +8958,8 @@ msgstr "Alle"
 #, php-format
 msgid "<b>%s</b> table not found or not set in %s"
 msgstr ""
-"Die Tabelle <b>%s</b> wurde entweder nicht gefunden oder in der "
-"Kofigurationsdatei %s nicht gesetzt"
+"Die Tabelle <b>%s</b> wurde nicht gefunden oder in der Kofigurationsdatei %s "
+"nicht gesetzt"
 
 #: schema_export.php:39
 msgid "File doesn't exist"
@@ -9265,7 +9292,7 @@ msgstr "Tabellenspezifische Rechte"
 #: server_privileges.php:535 server_privileges.php:687
 #: server_privileges.php:1700
 msgid "Note: MySQL privilege names are expressed in English"
-msgstr "Hinweis: MySQL-Rechte werden auf Englisch angegeben "
+msgstr "Hinweis: MySQL-Rechte werden auf Englisch angegeben"
 
 #: server_privileges.php:612
 msgid "Administration"
@@ -9391,11 +9418,11 @@ msgid ""
 "server uses, if they have been changed manually. In this case, you should %"
 "sreload the privileges%s before you continue."
 msgstr ""
-"phpMyAdmin liest die Benutzerprofile direkt aus den entsprechenden MySQL-"
-"Tabellen aus. Der Inhalt dieser Tabellen kann sich von den Benutzerprofilen, "
-"die MySQL z.Zt. verwendet, unterscheiden, wenn manuelle Änderungen "
-"vorgenommen wurden. In diesem Fall sollten Sie %sdie Benutzerprofile neu "
-"laden%s bevor Sie fortfahren."
+"Hinweis: phpMyAdmin liest die Benutzerprofile direkt aus den entsprechenden "
+"MySQL-Tabellen aus. Der Inhalt dieser Tabellen kann sich von den "
+"Benutzerprofilen, die MySQL z.Zt. verwendet, unterscheiden, wenn manuelle "
+"Änderungen vorgenommen wurden. In diesem Fall sollten Sie %sdie "
+"Benutzerprofile neu laden%s bevor Sie fortfahren."
 
 #: server_privileges.php:1854
 msgid "The selected user was not found in the privilege table."
@@ -10687,6 +10714,7 @@ msgid "Monitor Instructions"
 msgstr "Einführung zur Überwachung"
 
 #: server_status.php:1593
+#, fuzzy
 msgid ""
 "The phpMyAdmin Monitor can assist you in optimizing the server configuration "
 "and track down time intensive queries. For the latter you will need to set "
@@ -10714,7 +10742,6 @@ msgid "Using the monitor:"
 msgstr "Verwendung der Überwachung:"
 
 #: server_status.php:1613
-#, fuzzy
 #| msgid ""
 #| "Ok, you are good to go! Once you click 'Start monitor' your browser will "
 #| "refresh all displayed charts in a regular interval. You may add charts "
@@ -10725,11 +10752,10 @@ msgid ""
 "may add charts and change the refresh rate under 'Settings', or remove any "
 "chart using the cog icon on each respective chart."
 msgstr ""
-"OK, Sie sind bereit zum Starten! Sobald Sie 'Überwachung starten' angeklickt "
-"haben, wird Ihr Browser in regelmäßigen Intervallen alle angezeigten "
-"Diagramme aktualisieren. Unter 'Einstellungen' können Sie Diagramme "
-"hinzufügen und das Aktualisierungsintervall ändern oder beliebige Diagramme "
-"entfernen, wenn Sie das Zahnrad-Icon des entsprechenden Schaubilds verwenden."
+"Ihr Browser wird in regelmäßigen Intervallen alle angezeigten Diagramme "
+"aktualisieren. Unter 'Einstellungen' können Sie Diagramme hinzufügen und das "
+"Aktualisierungsintervall ändern oder beliebige Diagramme entfernen, wenn "
+"Sie das Zahnrad-Icon des entsprechenden Schaubilds verwenden."
 
 #: server_status.php:1615
 msgid ""
@@ -11359,7 +11385,7 @@ msgstr "Die Tabelle %1$s wurde erfolgreich geändert"
 
 #: tbl_change.php:699
 msgid "Because of its length,<br /> this column might not be editable"
-msgstr "Wegen seiner Länge ist dieses<br />Feld vielleicht nicht editierbar "
+msgstr "Wegen seiner Länge ist dieses<br />Feld vielleicht nicht editierbar"
 
 #: tbl_change.php:817
 msgid "Remove BLOB Repository Reference"
@@ -11566,11 +11592,12 @@ msgid "Index name:"
 msgstr "Indexname:"
 
 #: tbl_indexes.php:188
+#, fuzzy
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
-"Der Name des Primärschlüssels (und <b>nur dessen</b>) darf <b>nur</b> "
-"\"PRIMARY\" lauten."
+"(Nur der Name des Primärschlüssels <b>darf</b> und <b>muß</b> \"PRIMARY\" "
+"lauten!)"
 
 #: tbl_indexes.php:199
 msgid "Index type:"
@@ -11579,7 +11606,7 @@ msgstr "Indextyp:"
 #: tbl_indexes.php:285
 #, php-format
 msgid "Add to index  %s column(s)"
-msgstr "%s Spalten zum Index hinzufügen"
+msgstr "%s Spalte(n) zum Index hinzufügen"
 
 #: tbl_move_copy.php:44
 msgid "Can't move table to same one!"
@@ -11734,7 +11761,7 @@ msgstr "Zeilenlänge"
 
 #: tbl_printview.php:373 tbl_structure.php:898
 msgid "Row size"
-msgstr "Zeilengröße "
+msgstr "Zeilengröße"
 
 #: tbl_printview.php:383 tbl_structure.php:906
 msgid "Next autoindex"
@@ -12092,8 +12119,8 @@ msgstr "Betriebszeit unter einem Tag"
 #: po/advisory_rules.php:12
 msgid "Uptime is less than 1 day, performance tuning may not be accurate."
 msgstr ""
-"Die Betriebszeit beträgt weniger als ein Tag, Performanz-Optimierungen "
-"könnten ungenau sein."
+"Die Betriebszeit beträgt weniger als ein Tag, Leistung-Optimierungen könnten "
+"ungenau sein."
 
 #: po/advisory_rules.php:15
 msgid ""
@@ -12495,11 +12522,15 @@ msgstr ""
 msgid "query_cache_limit is set to 1 MiB"
 msgstr ""
 
+<<<<<<< HEAD
 #: po/advisory_rules.php:324
 #, fuzzy
+=======
+#: po/advisory_rules.php:110
+>>>>>>> pootle/master
 #| msgid "Allows creating temporary tables."
 msgid "Percentage of sorts that cause temporary tables"
-msgstr "Erlaubt das Erstellen temporärer Tabellen."
+msgstr "Erlaubt das Erstellen temporärer Tabellen"
 
 #: po/advisory_rules.php:327 po/advisory_rules.php:342
 #, fuzzy
@@ -12524,7 +12555,7 @@ msgstr ""
 #, fuzzy
 #| msgid "Allows creating temporary tables."
 msgid "Rate of sorts that cause temporary tables"
-msgstr "Erlaubt das Erstellen temporärer Tabellen."
+msgstr "Erlaubt das Erstellen temporärer Tabellen"
 
 #: po/advisory_rules.php:350
 #, php-format
@@ -12557,7 +12588,7 @@ msgstr ""
 #, fuzzy
 #| msgid "There are no routines to display."
 msgid "Rate of joins without indexes"
-msgstr "Es sind keine Prozeduren zum Anzeigen vorhanden."
+msgstr "Es sind keine Prozeduren zum Anzeigen vorhanden"
 
 #: po/advisory_rules.php:372
 msgid "There are too many joins without indexes."
@@ -12629,7 +12660,7 @@ msgstr "Wo die Datensatz-Links angezeigt werden sollen"
 #, fuzzy
 #| msgid "Where to show the table row links"
 msgid "The rate of reading the next table row is high."
-msgstr "Wo die Datensatz-Links angezeigt werden sollen"
+msgstr "Wo die Datensatz-Links angezeigt werden sollen."
 
 #: po/advisory_rules.php:420
 msgid ""
@@ -12745,8 +12776,13 @@ msgstr "key_buffer_size ist 0"
 msgid "Max %% MyISAM key buffer ever used"
 msgstr "Größe des Sortierungspuffers"
 
+<<<<<<< HEAD
 #: po/advisory_rules.php:492 po/advisory_rules.php:507
 #, fuzzy, php-format
+=======
+#: po/advisory_rules.php:166 po/advisory_rules.php:171
+#, php-format
+>>>>>>> pootle/master
 #| msgid "Sort buffer size"
 msgid "MyISAM key buffer (index cache) %% used is low."
 msgstr "Größe des Sortierungspuffers"
@@ -12906,8 +12942,13 @@ msgstr ""
 msgid "The thread cache is set to 0"
 msgstr ""
 
+<<<<<<< HEAD
 #: po/advisory_rules.php:624
 #, fuzzy, php-format
+=======
+#: po/advisory_rules.php:210
+#, php-format
+>>>>>>> pootle/master
 #| msgid "Tracking is not active."
 msgid "Thread cache hit rate %%"
 msgstr "Tracking ist nicht aktiviert."
@@ -12962,11 +13003,16 @@ msgid ""
 "launch"
 msgstr ""
 
+<<<<<<< HEAD
 #: po/advisory_rules.php:665
 #, fuzzy, php-format
+=======
+#: po/advisory_rules.php:223
+#, php-format
+>>>>>>> pootle/master
 #| msgid "long_query_time is set to %d second(s)."
 msgid "slow_launch_time is set to %s"
-msgstr "long_query_time ist auf %d Sekunde(n) eingestellt."
+msgstr "slow_launch_time ist auf %s eingestellt"
 
 #: po/advisory_rules.php:669
 #, fuzzy
@@ -13066,11 +13112,15 @@ msgstr ""
 msgid "Is InnoDB disabled?"
 msgstr ""
 
+<<<<<<< HEAD
 #: po/advisory_rules.php:747
 #, fuzzy
+=======
+#: po/advisory_rules.php:251
+>>>>>>> pootle/master
 #| msgid "Could not save recent table"
 msgid "You do not have InnoDB enabled."
-msgstr "Konnte die aktuelle Tabelle nicht speichern"
+msgstr "InnoDB ist nicht aktiviert."
 
 #: po/advisory_rules.php:750
 msgid "InnoDB is usually the better choice for table engines."
@@ -13180,7 +13230,7 @@ msgstr ""
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "MyISAM concurrent inserts"
-msgstr "max. gleichzeitige Verbindungen"
+msgstr "MyISAM gleichzeitige Einfügeoperationen"
 
 #: po/advisory_rules.php:807
 msgid "Enable concurrent_insert by setting it to 1"
diff --git a/po/fr.po b/po/fr.po
index 5f792b3..c9aee33 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-10 07:53-0500\n"
-"PO-Revision-Date: 2011-12-04 13:26+0200\n"
-"Last-Translator: Marc Delisle <marc at infomarc.info>\n"
+"PO-Revision-Date: 2011-12-12 10:26+0200\n"
+"Last-Translator: Michal Čihař <michal at cihar.com>\n"
 "Language-Team: french <fr at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -11317,35 +11317,30 @@ msgid "Continue insertion with %s rows"
 msgstr "Continuer l'insertion avec %s lignes"
 
 #: tbl_chart.php:88
-#, fuzzy
 #| msgid "Bar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Barre"
 
 #: tbl_chart.php:89
-#, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Colonne"
 
 #: tbl_chart.php:90
-#, fuzzy
 #| msgid "Line"
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Ligne"
 
 #: tbl_chart.php:91
-#, fuzzy
 #| msgid "Spline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spline"
 
 #: tbl_chart.php:92
-#, fuzzy
 #| msgid "Pie"
 msgctxt "Chart type"
 msgid "Pie"
diff --git a/po/ja.po b/po/ja.po
index 4026284..4884d53 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-10 07:53-0500\n"
-"PO-Revision-Date: 2011-12-08 11:45+0200\n"
+"PO-Revision-Date: 2011-12-10 08:21+0200\n"
 "Last-Translator: Yuichiro <yuichiro at pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1527,7 +1527,7 @@ msgstr ""
 
 #: js/messages.php:175
 msgid "Analysing & loading logs. This may take a while."
-msgstr "ログの解析および読み込み中。すこし時間がかかることがあります。"
+msgstr "ログの解析および読み込みを行っています。少し時間がかかることがあります。"
 
 #: js/messages.php:176
 msgid ""
@@ -1680,7 +1680,7 @@ msgstr "キャンセル"
 
 #: js/messages.php:222
 msgid "Loading"
-msgstr "読み込み中"
+msgstr "読み込んでいます"
 
 #: js/messages.php:223
 msgid "Processing Request"
@@ -1795,10 +1795,9 @@ msgid "Change"
 msgstr "変更"
 
 #: js/messages.php:270
-#, fuzzy
 #| msgid "Maximum execution time"
 msgid "Query execution time"
-msgstr "最大実行時間"
+msgstr "クエリの実行時間"
 
 #: js/messages.php:273 libraries/config/FormDisplay.tpl.php:355
 #: libraries/schema/User_Schema.class.php:352
@@ -2866,7 +2865,7 @@ msgstr "SQL の検証"
 
 #: libraries/common.lib.php:1295
 msgid "Inline edit of this query"
-msgstr "このクエリをインライン編集する"
+msgstr "このクエリをインラインで編集します"
 
 #: libraries/common.lib.php:1297
 msgctxt "Inline edit query"
@@ -12972,16 +12971,14 @@ msgid ""
 "fine. See also <a href=\"http://mysqldatabaseadministration.blogspot."
 "com/2007/01/increase-innodblogfilesize-proper-way.html\">this blog entry</a>"
 msgstr ""
-"特に、InnoDB のテーブルへの書き込みが多いシステムの場合には、"
-"innodb_log_file_size は {innodb_buffer_pool_size} の 25%% に設定するといいで"
-"しょう。しかしながら、この値が大きくなると、データベースが壊れたときのリカバ"
-"リに時間がかかるようになります。そのため、この値は 256 MiB を超えないほうがい"
-"いと言われています。なお、この変数は簡単には変更できないので注意してくださ"
-"い。サーバを停止させ、InnoDB ログファイルを削除し、my.cnf に新しい値を設定し"
-"て、そうした後にサーバは起動し直す必要があります。そして、全ての設定が正しく"
-"設定できているのかを、エラーログで確認しなければなりません。<a href=\"http://"
-"mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-"
-"proper-way.html\">こちらのブログ記事 (英語)</a> もご覧になってください。"
+"特に、InnoDB のテーブルへの書き込みが多いシステムの場合には、innodb_log_file_size は "
+"{innodb_buffer_pool_size} の 25%% "
+"に設定するといいでしょう。しかしながら、この値が大きくなると、データベースが壊れたときの修復に時間がかかるようになります。そのため、この値は 256 "
+"MiB を超えないほうがいいと言われています。なお、この変数は簡単には変更できないので注意してください。サーバを停止させ、InnoDB "
+"ログファイルを削除し、my.cnf に新しい値を設定して、そうした後にサーバは起動し直す必要があります。そして、全ての設定が正しく設定できているのかを、"
+"エラーログで確認しなければなりません。<a "
+"href=\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-"
+"innodblogfilesize-proper-way.html\">こちらのブログ記事 (英語)</a> もご覧になってください。"
 
 #: po/advisory_rules.php:770
 #, php-format
@@ -13014,17 +13011,15 @@ msgid ""
 "mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-"
 "proper-way.html\">this blog entry</a>"
 msgstr ""
-"一般的には、innodb_log_file_size に {innodb_buffer_pool_size} の 25%% の値を"
-"設定すれば十分です。innodb_log_file_size の値が非常に大きい場合、データベース"
-"が多量に破損した後の復帰に時間がかかるようになります。<a href=\"http://www."
-"mysqlperformanceblog.com/2006/07/03/choosing-proper-innodb_log_file_size/\">"
-"こちらの記事 (英語)</a> も参照してください。なお、この変数を変更するには、"
-"サーバを停止させ、InnoDB ログファイルを削除し、my.cnf に新しい値を設定してか"
-"ら、サーバを起動し直す必要があります。それから、全ての設定が正しく行えたかを"
-"確認するために、エラーログを確認しなければなりません。設定に関しては、<a "
+"一般的には、innodb_log_file_size に {innodb_buffer_pool_size} の 25%% "
+"の値を設定すれば十分です。innodb_log_file_size "
+"の値が非常に大きい場合、データベースが多量に破損した後の修復に時間がかかるようになります。<a "
+"href=\"http://www.mysqlperformanceblog.com/2006/07/03/choosing-proper-"
+"innodb_log_file_size/\">こちらの記事 (英語)</a> "
+"も参照してください。なお、この変数を変更するには、サーバを停止させ、InnoDB ログファイルを削除し、my.cnf に新しい値を設定してから、サーバを"
+"起動し直す必要があります。それから、全ての設定が正しく行えたかを確認するために、エラーログを確認しなければなりません。設定に関しては、<a "
 "href=\"http://mysqldatabaseadministration.blogspot.com/2007/01/increase-"
-"innodblogfilesize-proper-way.html\">こちらのブログ記事 (英語)</a> もご覧くだ"
-"さい。"
+"innodblogfilesize-proper-way.html\">こちらのブログ記事 (英語)</a> もご覧ください。"
 
 #: po/advisory_rules.php:785
 #, php-format
diff --git a/po/ru.po b/po/ru.po
index 3461f20..7283636 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-10 07:53-0500\n"
-"PO-Revision-Date: 2011-12-05 00:15+0200\n"
+"PO-Revision-Date: 2011-12-09 17:22+0200\n"
 "Last-Translator: Victor Volkov <hanut at php-myadmin.ru>\n"
 "Language-Team: russian <ru at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1106,7 +1106,6 @@ msgid "This is not a number!"
 msgstr "Введите число!"
 
 #: js/messages.php:46
-#, fuzzy
 #| msgid "Add index"
 msgid "Add Index"
 msgstr "Добавить индекс"
@@ -1628,7 +1627,6 @@ msgid "Affected rows:"
 msgstr "Затронуто строк:"
 
 #: js/messages.php:199
-#, fuzzy
 #| msgid "Failed parsing config file. It doesn't seem to be valid JSON code"
 msgid "Failed parsing config file. It doesn't seem to be valid JSON code."
 msgstr "Ошибка при разборе конфигурационного файла. Не корректный код JSON."
@@ -11338,21 +11336,18 @@ msgid "Column"
 msgstr "Столбец"
 
 #: tbl_chart.php:90
-#, fuzzy
 #| msgid "Line"
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Линия"
 
 #: tbl_chart.php:91
-#, fuzzy
 #| msgid "Spline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Сплайн"
 
 #: tbl_chart.php:92
-#, fuzzy
 #| msgid "Pie"
 msgctxt "Chart type"
 msgid "Pie"
diff --git a/po/uk.po b/po/uk.po
index e72d71e..6209923 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-12-10 07:53-0500\n"
-"PO-Revision-Date: 2011-12-08 14:18+0200\n"
-"Last-Translator: oleg-ilnytskyi <ukraine.oleg at gmail.com>\n"
+"PO-Revision-Date: 2011-12-12 09:17+0200\n"
+"Last-Translator: typim <duke3d at ukr.net>\n"
 "Language-Team: ukrainian <uk at li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -580,7 +580,6 @@ msgid "Words are separated by a space character (\" \")."
 msgstr "Слова розділені пробілом (\" \")."
 
 #: db_search.php:300
-#, fuzzy
 #| msgid "Inside table(s):"
 msgid "Inside tables:"
 msgstr "Всередині таблиць:"
@@ -1156,7 +1155,7 @@ msgstr "Перезавантаження прав"
 
 #: js/messages.php:61
 msgid "Removing Selected Users"
-msgstr "Видалити відмічених користувачів"
+msgstr "Видалення відмічених користувачів"
 
 #: js/messages.php:62 js/messages.php:141 tbl_tracking.php:235
 #: tbl_tracking.php:400
@@ -1177,7 +1176,7 @@ msgstr "Графік трафіку в реальному часі"
 
 #: js/messages.php:67 server_status.php:797
 msgid "Live conn./process chart"
-msgstr ""
+msgstr "Графік підкл./процесів в реальному часі"
 
 #: js/messages.php:68 server_status.php:815
 msgid "Live query chart"
@@ -1261,8 +1260,8 @@ msgid ""
 msgstr ""
 "Конфігурація графіку розташування в локальному сховищі вашого браузеру "
 "більше не сумісна з новою версією монітора діалогового вікна. Цілком "
-"імовірно, що ваша поточна конфігурація не буде працювати. Будь ласка, "
-"встановіть конфігурації за замовчанням в меню <i> Установки </ I>."
+"імовірно, що ваша поточна конфігурація більше не буде працювати. Будь ласка, "
+"встановіть вашу конфігурацію за замовчанням в меню <i>Установки</ I>."
 
 #: js/messages.php:97
 msgid "Query cache efficiency"
@@ -1298,7 +1297,7 @@ msgstr "МБ"
 #: js/messages.php:105 js/messages.php:126 libraries/common.lib.php:1390
 #: server_status.php:1668
 msgid "KiB"
-msgstr "кБ"
+msgstr "КБ"
 
 #: js/messages.php:107
 msgid "Average load"
@@ -1402,11 +1401,11 @@ msgstr "Вилучити діаграму"
 
 #: js/messages.php:139
 msgid "Edit title and labels"
-msgstr "Редагувати назви та позначки"
+msgstr "Редагувати назву та позначки"
 
 #: js/messages.php:140
 msgid "Add chart to grid"
-msgstr "Додати діаграму до сітки"
+msgstr "Додати графік до сітки"
 
 #: js/messages.php:142
 msgid "Please add at least one variable to the series"
@@ -1430,19 +1429,19 @@ msgstr "Призупинити монітор"
 
 #: js/messages.php:147
 msgid "general_log and slow_query_log are enabled."
-msgstr "general_log та slow_query_log вімкнені"
+msgstr "general_log та slow_query_log ввімкнені"
 
 #: js/messages.php:148
 msgid "general_log is enabled."
-msgstr "general_log вімкнений."
+msgstr "general_log ввімкнений."
 
 #: js/messages.php:149
 msgid "slow_query_log is enabled."
-msgstr "slow_query_log вімкнений."
+msgstr "slow_query_log ввімкнений."
 
 #: js/messages.php:150
 msgid "slow_query_log and general_log are disabled."
-msgstr "general_log та slow_query_log вимкнені"
+msgstr "general_log та slow_query_log вимкнені."
 
 #: js/messages.php:151
 msgid "log_output is not set to TABLE."
@@ -1459,14 +1458,14 @@ msgid ""
 "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
 "depending on your system."
 msgstr ""
-"slow_query_log вімкнений, але сервер журналює тільки запити що не довші за %"
-"d секунди. Рекомендовано встановлювати long_query_time 0-2 секунди, в "
-"залежності від Вашої системи"
+"slow_query_log ввімкнений, але сервер журналює тільки запити що є довші за %"
+"d секунди. Рекомендовано встановити long_query_time 0-2 секунди, в "
+"залежності від вашої системи."
 
 #: js/messages.php:154
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr "long_query_time встановлено на %d секунди."
+msgstr "long_query_time встановлено на %d секунди(секунд)."
 
 #: js/messages.php:155
 msgid ""
@@ -1498,7 +1497,7 @@ msgstr "Вимкнено %s"
 #: js/messages.php:163
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr "Встановити long_query_time в %d"
+msgstr "Встановити long_query_time у %d секунд"
 
 #: js/messages.php:164
 msgid ""
@@ -1506,7 +1505,7 @@ msgid ""
 "database administrator."
 msgstr ""
 "Ви не можете змінити ці змінні. Будь ласка увійдіть як root або зв'яжіться з "
-"Вашим адміністратором БД."
+"вашим адміністратором БД."
 
 #: js/messages.php:165
 msgid "Change settings"
@@ -1523,20 +1522,22 @@ msgstr "Заголовок діаграми"
 #. l10n: As in differential values
 #: js/messages.php:170
 msgid "Differential"
-msgstr "Differential"
+msgstr "Диференціальний"
 
 #: js/messages.php:171
 #, php-format
 msgid "Divided by %s:"
-msgstr "Розділено через %s:"
+msgstr "Розділено по %s:"
 
 #: js/messages.php:173
+#, fuzzy
 msgid "From slow log"
 msgstr "Із повільного журналу (slow log)"
 
 #: js/messages.php:174
+#, fuzzy
 msgid "From general log"
-msgstr "Із загального жкрналу (general log)"
+msgstr "Із загального журналу (general log)"
 
 #: js/messages.php:175
 msgid "Analysing & loading logs. This may take a while."
@@ -1563,7 +1564,7 @@ msgstr ""
 
 #: js/messages.php:178
 msgid "Log data loaded. Queries executed in this time span:"
-msgstr "Журнальні дані завантажені. Запити виконані в це проміжок часу:"
+msgstr "Журнальні дані завантажені. Запити виконані в цей проміжок часу:"
 
 #: js/messages.php:180
 msgid "Jump to Log table"
@@ -1622,6 +1623,7 @@ msgid "Reload page"
 msgstr "Перезавантажити сторінку"
 
 #: js/messages.php:197
+#, fuzzy
 msgid "Affected rows:"
 msgstr "Рядки що зазнали змін:"
 
@@ -1735,7 +1737,7 @@ msgstr "Зміна Кодування"
 
 #: js/messages.php:235
 msgid "Table must have at least one column"
-msgstr "Таблиця повинна мати принаймі один Стовпчик"
+msgstr "Таблиця повинна мати принаймі один стовпчик"
 
 #: js/messages.php:240
 msgid "Insert Table"
@@ -1831,6 +1833,7 @@ msgid "Each point represents a data row."
 msgstr "Кожна точка являє собою рядок даних."
 
 #: js/messages.php:284
+#, fuzzy
 msgid "Hovering over a point will show its label."
 msgstr "При наведенні на точку буде показано її лейбл."
 
@@ -1841,7 +1844,7 @@ msgstr ""
 
 #: js/messages.php:288
 msgid "Click and drag the mouse to navigate the plot."
-msgstr "Перетягніть мишу для навігації по графіку."
+msgstr "Натисніть і перетягніть мишу для навігації по графіку."
 
 #: js/messages.php:290
 msgid "Click reset zoom link to come back to original state."
@@ -2161,16 +2164,15 @@ msgstr "Субота"
 
 #. l10n: Short week day name
 #: js/messages.php:440
-#, fuzzy
 #| msgctxt "Short week day name"
 #| msgid "Sun"
 msgid "Sun"
-msgstr "Нд"
+msgstr "Нед"
 
 #. l10n: Short week day name
 #: js/messages.php:442 libraries/common.lib.php:1626
 msgid "Mon"
-msgstr "Пн"
+msgstr "Пон"
 
 #. l10n: Short week day name
 #: js/messages.php:444 libraries/common.lib.php:1628
@@ -2180,7 +2182,7 @@ msgstr "Вт"
 #. l10n: Short week day name
 #: js/messages.php:446 libraries/common.lib.php:1630
 msgid "Wed"
-msgstr "Ср"
+msgstr "Сер"
 
 #. l10n: Short week day name
 #: js/messages.php:448 libraries/common.lib.php:1632
@@ -2290,15 +2292,15 @@ msgstr "Невідома помилка при завантаженні."
 
 #: libraries/File.class.php:278
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr "Завантажуваний файл перевищує директиву upload_max_filesize в php.ini."
+msgstr "Завантажений файл перевищує директиву upload_max_filesize в php.ini."
 
 #: libraries/File.class.php:281
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
-"Завантажуваний файл перевищує MAX_FILE_SIZE директиву, яка була вказана в "
-"HTML формі."
+"Завантажений файл перевищує MAX_FILE_SIZE директиву, яка була вказана в HTML "
+"формі."
 
 #: libraries/File.class.php:284
 msgid "The uploaded file was only partially uploaded."
@@ -2306,7 +2308,7 @@ msgstr "Завантажуваний файл був завантажений л
 
 #: libraries/File.class.php:287
 msgid "Missing a temporary folder."
-msgstr "Відсутня тимчасова дирикторія."
+msgstr "Відсутня тимчасова директорія."
 
 #: libraries/File.class.php:290
 msgid "Failed to write file to disk."
@@ -2325,12 +2327,12 @@ msgid ""
 "Error moving the uploaded file, see [a at ./Documentation."
 "html#faq1_11 at Documentation]FAQ 1.11[/a]"
 msgstr ""
-"Помилка прі переммщенні файлу, a at ./Documentation.html#faq1_11 at Documentation]"
-"FAQ 1.11[/a]"
+"Помилка прі переміщенні файлу, дивись "
+"[a at ./Documentation.html#faq1_11 at Documentation]FAQ 1.11[/a]"
 
 #: libraries/File.class.php:508
 msgid "Error while moving uploaded file."
-msgstr "Помилка при переммщенні файлу."
+msgstr "Помилка при переміщенні файлу."
 
 #: libraries/File.class.php:516
 msgid "Cannot read (moved) upload file."
@@ -2380,7 +2382,7 @@ msgid ""
 "The indexes %1$s and %2$s seem to be equal and one of them could possibly be "
 "removed."
 msgstr ""
-"Схоже що індекси %1$s та %2$s ідентичні, тому напевне один із них може бути "
+"Схоже що індекси %1$s та %2$s ідентичні, тому один із них може бути "
 "вилученим."
 
 #: libraries/List_Database.class.php:379 libraries/config/messages.inc.php:179
@@ -2400,25 +2402,25 @@ msgstr "Помилка"
 #, php-format
 msgid "%1$d row affected."
 msgid_plural "%1$d rows affected."
-msgstr[0] "%1$d рядок змінено"
-msgstr[1] "%1$d рядків змінено"
-msgstr[2] "%1$d рядків змінено"
+msgstr[0] "%1$d рядок змінено."
+msgstr[1] "%1$d рядків змінено."
+msgstr[2] "%1$d рядків змінено."
 
 #: libraries/Message.class.php:257
 #, php-format
 msgid "%1$d row deleted."
 msgid_plural "%1$d rows deleted."
-msgstr[0] "%1$d рядок видалено"
-msgstr[1] "%1$d рядків видалено"
-msgstr[2] "%1$d рядків видалено"
+msgstr[0] "%1$d рядок видалено."
+msgstr[1] "%1$d рядків видалено."
+msgstr[2] "%1$d рядків видалено."
 
 #: libraries/Message.class.php:273
 #, php-format
 msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
-msgstr[0] "%1$d рядок додано"
-msgstr[1] "%1$d рядків додано"
-msgstr[2] "%1$d рядків додано"
+msgstr[0] "%1$d рядок додано."
+msgstr[1] "%1$d рядків додано."
+msgstr[2] "%1$d рядків додано."
 
 #: libraries/PDF.class.php:81
 msgid "Error while creating PDF:"
@@ -2434,12 +2436,12 @@ msgstr "Нещодавні таблиці"
 
 #: libraries/RecentTable.class.php:149
 msgid "There are no recent tables"
-msgstr "Нещодавніх таблиць немає."
+msgstr "Нещодавніх таблиць немає"
 
 #: libraries/StorageEngine.class.php:198
 msgid ""
 "There is no detailed status information available for this storage engine."
-msgstr "Для цього механізму зберігання нама дельної інформації про статус."
+msgstr "Для цього механізму зберігання немає дельної інформації про статус."
 
 #: libraries/StorageEngine.class.php:334
 #, php-format
@@ -2458,11 +2460,11 @@ msgstr "Цей MySQL сервер не підтримує %s кодування.
 
 #: libraries/Table.class.php:329
 msgid "unknown table status: "
-msgstr "невідомий статус таблиці:"
+msgstr "невідомий статус таблиці: "
 
 #: libraries/Table.class.php:1116
 msgid "Invalid database"
-msgstr "Поламана БД"
+msgstr "Неправильна база даних"
 
 #: libraries/Table.class.php:1130 tbl_get_field.php:25
 msgid "Invalid table name"
@@ -2471,7 +2473,7 @@ msgstr "Неправильна назва таблиці"
 #: libraries/Table.class.php:1161
 #, php-format
 msgid "Error renaming table %1$s to %2$s"
-msgstr "Помилка зміни назви %1$s на %2$s"
+msgstr "Помилка зміни назви таблиці %1$s на %2$s"
 
 #: libraries/Table.class.php:1248
 #, php-format
@@ -2480,7 +2482,7 @@ msgstr "Таблицю %s було перейменовано в %s"
 
 #: libraries/Table.class.php:1380
 msgid "Could not save table UI preferences"
-msgstr "Неможливо зберегти таблиичні налаштування UI"
+msgstr "Неможливо зберегти табличні налаштування UI"
 
 #: libraries/Table.class.php:1403
 #, php-format


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list