Git December 2010

git@phpmyadmin.net

5 participants
175 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1138-g4bfc006

by Michal Čihař

The branch, master has been updated via 4bfc006bb5be6c1aaf0afafc9af7052b984729f0 (commit) from 3913ebbd0c24fe576d3c77fc6f99c12a2a87afc7 (commit) - Log ----------------------------------------------------------------- commit 4bfc006bb5be6c1aaf0afafc9af7052b984729f0 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Dec 26 15:51:35 2010 +0100 Czech translation update ----------------------------------------------------------------------- Summary of changes: po/cs.po | 58 +++++++++++++++++++++++++++------------------------------- 1 files changed, 27 insertions(+), 31 deletions(-) diff --git a/po/cs.po b/po/cs.po index 6694aa9..3dac65a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-15 09:21+0100\n" +"PO-Revision-Date: 2010-12-26 15:51+0100\n" "Last-Translator: Michal Čihař <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -617,8 +617,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:372 libraries/display_tbl.lib.php:1942 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -840,8 +840,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1090,16 +1090,14 @@ msgid "Inline Edit" msgstr "Upravit zde" #: js/messages.php:89 -#, fuzzy #| msgid "Hide query chart" msgid "Hide search criteria" -msgstr "Skrýt graf dotazu" +msgstr "Skrýt parametry vyhledávání" #: js/messages.php:90 -#, fuzzy #| msgid "Show query chart" msgid "Show search criteria" -msgstr "Zobrazit graf dotazu" +msgstr "Zobrazit parametry vyhledávání" #: js/messages.php:93 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 @@ -1610,8 +1608,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -4535,8 +4533,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -6464,8 +6462,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6506,8 +6504,8 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -7126,8 +7124,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7575,8 +7573,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -9047,8 +9045,8 @@ msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." msgstr "" -"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie%" -"s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " +"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie" +"%s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " "hodnotu než je tato." #: setup/lib/index.lib.php:266 @@ -9059,8 +9057,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." @@ -9578,24 +9576,22 @@ msgid "Browse distinct values" msgstr "Procházet odlišné hodnoty" #: tbl_structure.php:165 tbl_structure.php:166 -#, fuzzy #| msgid "Adding Primary Key" msgid "Add primary key" -msgstr "Přidávám primární klíč" +msgstr "Přidávt primární klíč" #: tbl_structure.php:167 tbl_structure.php:168 -#, fuzzy #| msgid "Apply index(s)" msgid "Add index" -msgstr "Applikovat indexy" +msgstr "Přidat index" #: tbl_structure.php:169 tbl_structure.php:170 msgid "Add unique index" -msgstr "" +msgstr "Přidat unikátní index" #: tbl_structure.php:171 tbl_structure.php:172 msgid "Add FULLTEXT index" -msgstr "" +msgstr "Přidat fulltextový index" #: tbl_structure.php:384 msgctxt "None for default" hooks/post-receive -- phpMyAdmin

13 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1137-g3913ebb

by Marc Delisle

The branch, master has been updated via 3913ebbd0c24fe576d3c77fc6f99c12a2a87afc7 (commit) from 6fc5270d7c9f37e06439e77d11b8838baff464bd (commit) - Log ----------------------------------------------------------------- commit 3913ebbd0c24fe576d3c77fc6f99c12a2a87afc7 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Dec 26 08:53:59 2010 -0500 Optimize DOM querying ----------------------------------------------------------------------- Summary of changes: js/functions.js | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/js/functions.js b/js/functions.js index 409de9b..ee6d60e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2149,11 +2149,13 @@ $(document).ready(function() { // Position the dropdown $(".structure_actions_dropdown").each(function() { + // Optimize DOM querying + var $this_dropdown = $(this); // The top offset must be set for IE even if it didn't change - var cell_right_edge_offset = $(this).parent().offset().left + $(this).parent().innerWidth(); - var left_offset = cell_right_edge_offset - $(this).innerWidth(); - var top_offset = $(this).parent().offset().top + $(this).parent().innerHeight(); - $(this).offset({ top: top_offset, left: left_offset }); + var cell_right_edge_offset = $this_dropdown.parent().offset().left + $this_dropdown.parent().innerWidth(); + var left_offset = cell_right_edge_offset - $this_dropdown.innerWidth(); + var top_offset = $this_dropdown.parent().offset().top + $this_dropdown.parent().innerHeight(); + $this_dropdown.offset({ top: top_offset, left: left_offset }); }); // A hack for IE6 to prevent the after_field select element from being displayed on top of the dropdown by hooks/post-receive -- phpMyAdmin

13 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1132-ga874856

by Piotr Przybylski

The branch, master has been updated via a874856d01ea9e352a91746806b8dfbfefcba004 (commit) from 3289d84a03d72e34f451134524c5e337a8621ada (commit) - Log ----------------------------------------------------------------- commit a874856d01ea9e352a91746806b8dfbfefcba004 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sun Dec 26 14:00:09 2010 +0100 Fixes to "More" dropdown on Structure page: * hide using mouseleave for owning table cell instead of mouseleave on menu * links as blocks, so that they are as wide as possible ----------------------------------------------------------------------- Summary of changes: js/functions.js | 94 +++++++++++++---------- themes/darkblue_orange/css/theme_right.css.php | 4 + themes/original/css/theme_right.css.php | 4 + 3 files changed, 61 insertions(+), 41 deletions(-) diff --git a/js/functions.js b/js/functions.js index cba0853..409de9b 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2135,40 +2135,50 @@ $(document).ready(function() { */ // Remove the actions from the table cells (they are available by default for JavaScript-disabled browsers) // if the table is not a view or information_schema (otherwise there is only one action to hide and there's no point) - if($("input[type='hidden'][name='table_type']").attr("value") == "table") { - $("table[id='tablestructure'] td[class='browse']").remove(); - $("table[id='tablestructure'] td[class='primary']").remove(); - $("table[id='tablestructure'] td[class='unique']").remove(); - $("table[id='tablestructure'] td[class='index']").remove(); - $("table[id='tablestructure'] td[class='fulltext']").remove(); - $("table[id='tablestructure'] th[class='action']").attr("colspan", 3); - - // Display the "more" text - $("table[id='tablestructure'] td[class='more_opts']").show() - - // Position the dropdown - $.each($(".structure_actions_dropdown"), function() { - // The top offset must be set for IE even if it didn't change - var cell_right_edge_offset = $(this).parent().offset().left + $(this).parent().innerWidth(); - var left_offset = cell_right_edge_offset - $(this).innerWidth(); - var top_offset = $(this).parent().offset().top + $(this).parent().innerHeight(); - $(this).offset({ top: top_offset, left: left_offset }); - }); - - // A hack for IE6 to prevent the after_field select element from being displayed on top of the dropdown by - // positioning an iframe directly on top of it - $("iframe[class='IE_hack']").width($("select[name='after_field']").width()); - $("iframe[class='IE_hack']").height($("select[name='after_field']").height()); - $("iframe[class='IE_hack']").offset({ top: $("select[name='after_field']").offset().top, left: $("select[name='after_field']").offset().left }); - - // When "more" is hovered over, show the hidden actions - $("table[id='tablestructure'] td[class='more_opts']").mouseenter( - function() { + if($("input[type='hidden'][name='table_type']").val() == "table") { + var $table = $("table[id='tablestructure']"); + $table.find("td[class='browse']").remove(); + $table.find("td[class='primary']").remove(); + $table.find("td[class='unique']").remove(); + $table.find("td[class='index']").remove(); + $table.find("td[class='fulltext']").remove(); + $table.find("th[class='action']").attr("colspan", 3); + + // Display the "more" text + $table.find("td[class='more_opts']").show(); + + // Position the dropdown + $(".structure_actions_dropdown").each(function() { + // The top offset must be set for IE even if it didn't change + var cell_right_edge_offset = $(this).parent().offset().left + $(this).parent().innerWidth(); + var left_offset = cell_right_edge_offset - $(this).innerWidth(); + var top_offset = $(this).parent().offset().top + $(this).parent().innerHeight(); + $(this).offset({ top: top_offset, left: left_offset }); + }); + + // A hack for IE6 to prevent the after_field select element from being displayed on top of the dropdown by + // positioning an iframe directly on top of it + var $after_field = $("select[name='after_field']"); + $("iframe[class='IE_hack']") + .width($after_field.width()) + .height($after_field.height()) + .offset({ + top: $after_field.offset().top, + left: $after_field.offset().left + }); + + // When "more" is hovered over, show the hidden actions + $table.find("td[class='more_opts']") + .mouseenter(function() { if($.browser.msie && $.browser.version == "6.0") { - $("iframe[class='IE_hack']").show(); - $("iframe[class='IE_hack']").width($("select[name='after_field']").width()+4); - $("iframe[class='IE_hack']").height($("select[name='after_field']").height()+4); - $("iframe[class='IE_hack']").offset({ top: $("select[name='after_field']").offset().top, left: $("select[name='after_field']").offset().left}); + $("iframe[class='IE_hack']") + .show() + .width($after_field.width()+4) + .height($after_field.height()+4) + .offset({ + top: $after_field.offset().top, + left: $after_field.offset().left + }); } $(".structure_actions_dropdown").hide(); // Hide all the other ones that may be open $(this).children(".structure_actions_dropdown").show(); @@ -2176,15 +2186,17 @@ $(document).ready(function() { if($.browser.msie) { var left_offset_IE = $(this).offset().left + $(this).innerWidth() - $(this).children(".structure_actions_dropdown").innerWidth(); var top_offset_IE = $(this).offset().top + $(this).innerHeight(); - $(this).children(".structure_actions_dropdown").offset({ top: top_offset_IE, left: left_offset_IE }); + $(this).children(".structure_actions_dropdown").offset({ + top: top_offset_IE, + left: left_offset_IE }); } - }); - $(".structure_actions_dropdown").mouseleave(function() { - $(this).hide(); - if($.browser.msie && $.browser.version == "6.0") { - $("iframe[class='IE_hack']").hide(); - } - }); + }) + .mouseleave(function() { + $(this).children(".structure_actions_dropdown").hide(); + if($.browser.msie && $.browser.version == "6.0") { + $("iframe[class='IE_hack']").hide(); + } + }); } }); diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index 438e04d..f5ac595 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -1610,6 +1610,10 @@ a.close_enum_editor { display: none; } +.structure_actions_dropdown a { + display: block; +} + td.more_opts { display: none; white-space: nowrap; diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 450c91d..2e5d6f6 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1551,6 +1551,10 @@ a.close_enum_editor { z-index: 100; } +.structure_actions_dropdown a { + display: block; +} + td.more_opts { display: none; white-space: nowrap; hooks/post-receive -- phpMyAdmin

13 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 7468f132438a52a510e85ab194ebc76c5ef479a5

by Michal Čihař

The branch, master has been updated via 7468f132438a52a510e85ab194ebc76c5ef479a5 (commit) via 400f5e37e0c197120c88fd9aa058e3e1a3c53b6a (commit) via 448f5a5bb029bd4f73ef02b9b3c6e35a4cb9ac99 (commit) via 09aa91f79415ccce1739bf2a8d7d827b5da71e4d (commit) from 744d022b6d981283d4b75a4729f939be9a609287 (commit) - Log ----------------------------------------------------------------- commit 7468f132438a52a510e85ab194ebc76c5ef479a5 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sun Dec 26 00:07:04 2010 +0200 Translation update done using Pootle. commit 400f5e37e0c197120c88fd9aa058e3e1a3c53b6a Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Dec 25 20:53:14 2010 +0200 Translation update done using Pootle. commit 448f5a5bb029bd4f73ef02b9b3c6e35a4cb9ac99 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Sat Dec 25 13:53:27 2010 +0200 Translation update done using Pootle. commit 09aa91f79415ccce1739bf2a8d7d827b5da71e4d Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Fri Dec 24 13:12:26 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/tr.po | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/po/tr.po b/po/tr.po index 35b5d44..62f3e79 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-19 11:54+0100\n" -"PO-Revision-Date: 2010-12-19 17:31+0200\n" +"PO-Revision-Date: 2010-12-26 00:07+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: none\n" "Language: tr\n" @@ -548,6 +548,11 @@ msgid "" "contain all languages and all character sets. We'll assume you chose a kit " "whose name looks like <tt>phpMyAdmin-x.x.x-all-languages.tar.gz</tt>." msgstr "" +"Phpmyadmin.net İndirme sayfasından uygun dağıtım aracını seçin. Bazı araçlar " +"sadece İngilizce mesajları içerir, diğerleri UTF-8 biçiminde (bu pek çok " +"durumda daha iyi olmalıdır) tüm dilleri içerir, diğerleri tüm dilleri ve tüm " +"karakter grubunu içerir. Biz adı <tt>phpMyAdmin-x.x.x-all-" +"languages.tar.gz</tt> gibi görüneni seçeceğinizi sanıyoruz." #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:200 @@ -558,6 +563,11 @@ msgid "" "the files in a directory on your local machine, and, after step 4, transfer " "the directory on your web server using, for example, ftp." msgstr "" +"Dağıtımı untar veya unzip ile çıkartın (altdizinleri çıkarttığınızdan emin " +"olun): web sunucunuzun belge kök dizini içinde <tt>tar -xzvf " +"phpMyAdmin_x.x.x-all-languages.tar.gz</tt>. Eğer belge kök dizininize " +"doğrudan erişiminiz yoksa, dosyaları yerel makinanızdaki dizine koyun ve " +"sonra adım 4'te, örneğin ftp kullanarak dizini web sunucunuza aktarın." #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:205 @@ -569,6 +579,12 @@ msgid "" "\"#faq1_26\"><abbr title=\"Frequently Asked Questions\">FAQ</abbr> 1.26</a> " "for suggestions." msgstr "" +"Ensure that all the scripts have the appropriate owner (eğer PHP güvenli " +"kipte çalışıyorsa, is running in safe mode, having some scripts with an " +"owner different from the owner of other scripts will be a problem). Öneriler " +"için <a href=\"#faq4_2\"> <abbr title=\"Sıkça Sorulan Sorular\">SSS</abbr> " +"4.2</a> ve <a href=\"#faq1_26\"><abbr title=\"Sıkça Sorulan Sorular\">SSS</abbr> " +"1.26</a>'ya bakın." #. type: Content of: <html><body><div><ol><li> #: ../phpmyadmin/Documentation.html:212 hooks/post-receive -- phpMyAdmin localized documentation

13 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1131-g3289d84

by Michal Čihař

The branch, master has been updated via 3289d84a03d72e34f451134524c5e337a8621ada (commit) via 7a5fdd00b5b310c712b716f8523640e0212eb444 (commit) via 9baae0809def1e2650d2d003a0e07f65ca0b8ff5 (commit) via 6caf489f5563f28aec5e9844e3b912b9069302e8 (commit) via 826cad671d7726ad4cd68ef2e92e9f06f05d1fe6 (commit) via 6a11d82c8457dbfb8a8053603d1cd67c321ba4f8 (commit) via 31e1b69a0575e1bb8b53335c5c375a118023e7e6 (commit) via e7179b85babd3d30445861a7604f358f7ae017cc (commit) via e81c8b5cf628c3ffc0f0d4592d6e33a325c6002c (commit) via 101f9d94c1c2ff67e50ac68f56b86e0f560a3eb8 (commit) via 1d5c0cbcf98db092f1405e09292eca2fed022763 (commit) via 595a63c089b7d037da5e5bb8da285ebdfe4747a4 (commit) via 80a6c00a0866fd62402a2427fd4fe45483a5b8a7 (commit) via c3f965cdabd6d97be3bd49cc51e4fca31dfe50c1 (commit) via ff5321b3563e59d7e7a3cae906a47c3a4d176a40 (commit) via 9c3eebb9dd8e39aea01f872971a799fadda649a1 (commit) via 049c5f599de3abd587254c059fa1f7b0f448e2a2 (commit) via 85979d1937b6f82bfbc4e33c9c07a46f1222346c (commit) via 2aac0da6c258219921cee82b15024abd72a21ea0 (commit) via bd9b2ea9af8ba8be522837bcc6cc6e05d660abd3 (commit) via 86c28f397cd7c795b1f49bcee40c6f9dd358c4cd (commit) via 10ee3cfc97df97acd0548700ea3a06bb66718261 (commit) via 483626678b399bd9faa77734b37c0c372282cf5c (commit) via e4a6811883e2a29009abe43ff3090ef1869ac3a9 (commit) via 073e5b972ad9f354b499df80f8bf5543c0045f34 (commit) via f3f9464e7cc51c16820c2ef98ed18a4cf7c1fbf7 (commit) via 8e9807398b265735b5d109a4601ed3b3f4406e88 (commit) via 9d7fa2b73233afd156e5093a92041ed7454837c1 (commit) via b8a619aa5cfd0ccf02654f63ed08c6c8dad3b584 (commit) via c38d3be341b5dbdd81906065f4433fd82ddc6630 (commit) via 158432766ee7f900092cf4afdedb45f9153217e8 (commit) via ba95355232d4eb003fa770850737b72d141aa46e (commit) via 4aa9974fe851e6ad0ea4739b3d641593eea53754 (commit) via 842172ce90bd28f721340fca59c55e98f6434b80 (commit) via a5f6e3d2ccbd312c16698ceb378d16c71b20b701 (commit) via 0f1cf192760cebe640daf4623e64600e0fdb1318 (commit) via 3bdbace7b4e9d5d7b56677a757521ba3ea495da2 (commit) via fe179344a0f42cbd1c12aba0ca1ee93f3dc84cc5 (commit) via aa1094876dd832089c14431925cff1037c896d39 (commit) via f0476546450540093e7a1a2d8151985afafb4aec (commit) via a29cfa03776b1014170af3e6f68bdb2c8acab9d8 (commit) via 20112637073d2798b9625f7e8231cef135b57dbf (commit) via 2833ca8785f3e8ded2698309976e20a943dce74a (commit) via 5bf54351b4a67da56a1536dfd854fc67efaf3410 (commit) via a1f91c6fff0c68fe9fbc72f9f8b5cc3c1e5eb816 (commit) via 40cffcac5842dc96a210ef61fc77377bd688a719 (commit) via f396382504ef375027e2a1d41160942d39c9344d (commit) via 893edebe6772fbd0054aad93dc3f4436105e4c88 (commit) via 0735ceefc9c7d32fa33bef955d27483994de0eb5 (commit) via 2a70157736142b3c6613e7f4ae20da847a8c0b60 (commit) via 73681bfcc5495c1cf4246e85a1841cefae05fa9d (commit) via 4f42d9f3f32681c4ea06753d9a7e6bce453e69d1 (commit) via 8dc6159ae8faeda6103cca83fc5b4319d22920b4 (commit) via 79003b0cadda0b710a0fcaf3633ea37786fa6907 (commit) via 050086e9ee2141a4350807843087bfe3604d114e (commit) via 1e75343319765ef70e55a7ad929898dfd59b9693 (commit) via bec72dfd58a1c847d20997becc968490c34f9f74 (commit) via 2647b438872f663fe0fbfef7e56e351ee41ab7a1 (commit) via de1f8b032996ffe9be507b6978fea144bd5c6fb6 (commit) via afe844b5e7e961a2113a9d56dbb4869e229595c5 (commit) via 89eb4c3461e4f88a9e4f06ae67b4e695ed5abdd3 (commit) via 7141b37bbef3b9aa80b2f5a775bfc44ce2d94620 (commit) via ed6ce7f1522933785b8b00c0d393fa4d17f94e2b (commit) via aa5d2c3e19998303c1f1c6b9d9683c2d30c7d769 (commit) via 43df1a3aed70a39fcf77c9beec74e38489abd2b7 (commit) via 5351b9966bb824420736aaa165ddc2951053f9fb (commit) via 7e03e86a940f5a96eab658170f445bc2bcf49734 (commit) via 3f8520766549ae31479ae75f731583b489413bfc (commit) via 2339cdb05752b9d962ea493f3bbf9d184410fdc2 (commit) via f1cc40c63bde810b971cfe4c3fc93c6b3abd9ecc (commit) via f0228acac59bc4a5e06c7ab9de3d79a8506633b1 (commit) via 559de270a0f197bd6f0f4bf4df4be144ecee6c64 (commit) via f5e9b1b4564c846bbb1836a1055db28d7f51a32c (commit) via e9a235ba2f9ae51df5f343a1e041e338589093d0 (commit) via adcfe834d0ba95b10f6875dd873925042707db87 (commit) via f07d6631c991d997c3bd2dc85e6f05181b9858b6 (commit) via 1e5ddae5f81d505671a3a72a27a33d064c77f74c (commit) via 8a6f16dac870e4edeba3de52586c53364f7927d1 (commit) via b1911dad15acfec5be7c70fdeffff2d9d71360d7 (commit) via 7f6610cdb3f4e9bc4a165b84fec3bcf717dc06b1 (commit) via 043a94d835e9e4557062f7b9a03ae00129598649 (commit) via ddc92e928545c5e0de6ee18e3ceeff7a3bfbb18b (commit) via 5f1a91a6a48dc6b5a44c9b9412f4c9ae36491d69 (commit) via 8b79adb55a028a06a486cb4a50ac54761ce1000f (commit) via e22efb62804a4ca5f1dbf7a1d4d7c16c25dab4bb (commit) via 3655c27f764fb0388191d0b6111492f228bb787b (commit) via 2db4e0d833c531033fc7056e985934808f14b140 (commit) via d24f2a0e1460bfac67dab099131b14aecadc75b3 (commit) via c40caea803b0471b17dc2c83974cc2f576741d28 (commit) via a1d6d442ef2b730ecee4a6babd644d64f0f02112 (commit) via 6913c044c2b6907ea0b379a5c9cb426c917bb2b8 (commit) from 7d9313245b878bfde8fe4a1ac0d10ba35ac0de79 (commit) - Log ----------------------------------------------------------------- commit 3289d84a03d72e34f451134524c5e337a8621ada Merge: 7d9313245b878bfde8fe4a1ac0d10ba35ac0de79 7a5fdd00b5b310c712b716f8523640e0212eb444 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Dec 26 09:34:42 2010 +0100 Merge remote branch 'pootle/master' Conflicts: po/nl.po po/tr.po commit 7a5fdd00b5b310c712b716f8523640e0212eb444 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:12:00 2010 +0200 Translation update done using Pootle. commit 9baae0809def1e2650d2d003a0e07f65ca0b8ff5 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:10:59 2010 +0200 Translation update done using Pootle. commit 6caf489f5563f28aec5e9844e3b912b9069302e8 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:10:40 2010 +0200 Translation update done using Pootle. commit 826cad671d7726ad4cd68ef2e92e9f06f05d1fe6 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:09:29 2010 +0200 Translation update done using Pootle. commit 6a11d82c8457dbfb8a8053603d1cd67c321ba4f8 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:08:35 2010 +0200 Translation update done using Pootle. commit 31e1b69a0575e1bb8b53335c5c375a118023e7e6 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:08:22 2010 +0200 Translation update done using Pootle. commit e7179b85babd3d30445861a7604f358f7ae017cc Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:08:15 2010 +0200 Translation update done using Pootle. commit e81c8b5cf628c3ffc0f0d4592d6e33a325c6002c Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:08:12 2010 +0200 Translation update done using Pootle. commit 101f9d94c1c2ff67e50ac68f56b86e0f560a3eb8 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:07:58 2010 +0200 Translation update done using Pootle. commit 1d5c0cbcf98db092f1405e09292eca2fed022763 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:07:46 2010 +0200 Translation update done using Pootle. commit 595a63c089b7d037da5e5bb8da285ebdfe4747a4 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:07:39 2010 +0200 Translation update done using Pootle. commit 80a6c00a0866fd62402a2427fd4fe45483a5b8a7 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:07:20 2010 +0200 Translation update done using Pootle. commit c3f965cdabd6d97be3bd49cc51e4fca31dfe50c1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:07:10 2010 +0200 Translation update done using Pootle. commit ff5321b3563e59d7e7a3cae906a47c3a4d176a40 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:06:42 2010 +0200 Translation update done using Pootle. commit 9c3eebb9dd8e39aea01f872971a799fadda649a1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:06:29 2010 +0200 Translation update done using Pootle. commit 049c5f599de3abd587254c059fa1f7b0f448e2a2 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:06:09 2010 +0200 Translation update done using Pootle. commit 85979d1937b6f82bfbc4e33c9c07a46f1222346c Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:06:04 2010 +0200 Translation update done using Pootle. commit 2aac0da6c258219921cee82b15024abd72a21ea0 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:05:47 2010 +0200 Translation update done using Pootle. commit bd9b2ea9af8ba8be522837bcc6cc6e05d660abd3 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:05:39 2010 +0200 Translation update done using Pootle. commit 86c28f397cd7c795b1f49bcee40c6f9dd358c4cd Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:05:08 2010 +0200 Translation update done using Pootle. commit 10ee3cfc97df97acd0548700ea3a06bb66718261 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:04:28 2010 +0200 Translation update done using Pootle. commit 483626678b399bd9faa77734b37c0c372282cf5c Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:03:56 2010 +0200 Translation update done using Pootle. commit e4a6811883e2a29009abe43ff3090ef1869ac3a9 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:03:49 2010 +0200 Translation update done using Pootle. commit 073e5b972ad9f354b499df80f8bf5543c0045f34 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:03:43 2010 +0200 Translation update done using Pootle. commit f3f9464e7cc51c16820c2ef98ed18a4cf7c1fbf7 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:03:39 2010 +0200 Translation update done using Pootle. commit 8e9807398b265735b5d109a4601ed3b3f4406e88 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:00:45 2010 +0200 Translation update done using Pootle. commit 9d7fa2b73233afd156e5093a92041ed7454837c1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 22:00:23 2010 +0200 Translation update done using Pootle. commit b8a619aa5cfd0ccf02654f63ed08c6c8dad3b584 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:59:43 2010 +0200 Translation update done using Pootle. commit c38d3be341b5dbdd81906065f4433fd82ddc6630 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:59:37 2010 +0200 Translation update done using Pootle. commit 158432766ee7f900092cf4afdedb45f9153217e8 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:59:27 2010 +0200 Translation update done using Pootle. commit ba95355232d4eb003fa770850737b72d141aa46e Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:59:21 2010 +0200 Translation update done using Pootle. commit 4aa9974fe851e6ad0ea4739b3d641593eea53754 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:59:01 2010 +0200 Translation update done using Pootle. commit 842172ce90bd28f721340fca59c55e98f6434b80 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:58:51 2010 +0200 Translation update done using Pootle. commit a5f6e3d2ccbd312c16698ceb378d16c71b20b701 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:58:07 2010 +0200 Translation update done using Pootle. commit 0f1cf192760cebe640daf4623e64600e0fdb1318 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:57:55 2010 +0200 Translation update done using Pootle. commit 3bdbace7b4e9d5d7b56677a757521ba3ea495da2 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:57:34 2010 +0200 Translation update done using Pootle. commit fe179344a0f42cbd1c12aba0ca1ee93f3dc84cc5 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:57:18 2010 +0200 Translation update done using Pootle. commit aa1094876dd832089c14431925cff1037c896d39 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:57:09 2010 +0200 Translation update done using Pootle. commit f0476546450540093e7a1a2d8151985afafb4aec Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:56:43 2010 +0200 Translation update done using Pootle. commit a29cfa03776b1014170af3e6f68bdb2c8acab9d8 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:56:35 2010 +0200 Translation update done using Pootle. commit 20112637073d2798b9625f7e8231cef135b57dbf Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:56:15 2010 +0200 Translation update done using Pootle. commit 2833ca8785f3e8ded2698309976e20a943dce74a Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:56:08 2010 +0200 Translation update done using Pootle. commit 5bf54351b4a67da56a1536dfd854fc67efaf3410 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:40:13 2010 +0200 Translation update done using Pootle. commit a1f91c6fff0c68fe9fbc72f9f8b5cc3c1e5eb816 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:39:40 2010 +0200 Translation update done using Pootle. commit 40cffcac5842dc96a210ef61fc77377bd688a719 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:39:21 2010 +0200 Translation update done using Pootle. commit f396382504ef375027e2a1d41160942d39c9344d Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:39:00 2010 +0200 Translation update done using Pootle. commit 893edebe6772fbd0054aad93dc3f4436105e4c88 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:38:50 2010 +0200 Translation update done using Pootle. commit 0735ceefc9c7d32fa33bef955d27483994de0eb5 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:38:24 2010 +0200 Translation update done using Pootle. commit 2a70157736142b3c6613e7f4ae20da847a8c0b60 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:38:15 2010 +0200 Translation update done using Pootle. commit 73681bfcc5495c1cf4246e85a1841cefae05fa9d Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:38:09 2010 +0200 Translation update done using Pootle. commit 4f42d9f3f32681c4ea06753d9a7e6bce453e69d1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:38:05 2010 +0200 Translation update done using Pootle. commit 8dc6159ae8faeda6103cca83fc5b4319d22920b4 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:37:54 2010 +0200 Translation update done using Pootle. commit 79003b0cadda0b710a0fcaf3633ea37786fa6907 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:36:22 2010 +0200 Translation update done using Pootle. commit 050086e9ee2141a4350807843087bfe3604d114e Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:36:16 2010 +0200 Translation update done using Pootle. commit 1e75343319765ef70e55a7ad929898dfd59b9693 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:36:06 2010 +0200 Translation update done using Pootle. commit bec72dfd58a1c847d20997becc968490c34f9f74 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:36:00 2010 +0200 Translation update done using Pootle. commit 2647b438872f663fe0fbfef7e56e351ee41ab7a1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:35:43 2010 +0200 Translation update done using Pootle. commit de1f8b032996ffe9be507b6978fea144bd5c6fb6 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:35:11 2010 +0200 Translation update done using Pootle. commit afe844b5e7e961a2113a9d56dbb4869e229595c5 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:33:04 2010 +0200 Translation update done using Pootle. commit 89eb4c3461e4f88a9e4f06ae67b4e695ed5abdd3 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:32:09 2010 +0200 Translation update done using Pootle. commit 7141b37bbef3b9aa80b2f5a775bfc44ce2d94620 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:32:03 2010 +0200 Translation update done using Pootle. commit ed6ce7f1522933785b8b00c0d393fa4d17f94e2b Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:31:57 2010 +0200 Translation update done using Pootle. commit aa5d2c3e19998303c1f1c6b9d9683c2d30c7d769 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:31:48 2010 +0200 Translation update done using Pootle. commit 43df1a3aed70a39fcf77c9beec74e38489abd2b7 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:31:35 2010 +0200 Translation update done using Pootle. commit 5351b9966bb824420736aaa165ddc2951053f9fb Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:31:10 2010 +0200 Translation update done using Pootle. commit 7e03e86a940f5a96eab658170f445bc2bcf49734 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:30:46 2010 +0200 Translation update done using Pootle. commit 3f8520766549ae31479ae75f731583b489413bfc Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:29:46 2010 +0200 Translation update done using Pootle. commit 2339cdb05752b9d962ea493f3bbf9d184410fdc2 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:29:28 2010 +0200 Translation update done using Pootle. commit f1cc40c63bde810b971cfe4c3fc93c6b3abd9ecc Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:29:00 2010 +0200 Translation update done using Pootle. commit f0228acac59bc4a5e06c7ab9de3d79a8506633b1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:27:18 2010 +0200 Translation update done using Pootle. commit 559de270a0f197bd6f0f4bf4df4be144ecee6c64 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:26:36 2010 +0200 Translation update done using Pootle. commit f5e9b1b4564c846bbb1836a1055db28d7f51a32c Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:26:28 2010 +0200 Translation update done using Pootle. commit e9a235ba2f9ae51df5f343a1e041e338589093d0 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:25:51 2010 +0200 Translation update done using Pootle. commit adcfe834d0ba95b10f6875dd873925042707db87 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:25:37 2010 +0200 Translation update done using Pootle. commit f07d6631c991d997c3bd2dc85e6f05181b9858b6 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:25:16 2010 +0200 Translation update done using Pootle. commit 1e5ddae5f81d505671a3a72a27a33d064c77f74c Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:25:07 2010 +0200 Translation update done using Pootle. commit 8a6f16dac870e4edeba3de52586c53364f7927d1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:24:58 2010 +0200 Translation update done using Pootle. commit b1911dad15acfec5be7c70fdeffff2d9d71360d7 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:24:46 2010 +0200 Translation update done using Pootle. commit 7f6610cdb3f4e9bc4a165b84fec3bcf717dc06b1 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:24:36 2010 +0200 Translation update done using Pootle. commit 043a94d835e9e4557062f7b9a03ae00129598649 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:24:33 2010 +0200 Translation update done using Pootle. commit ddc92e928545c5e0de6ee18e3ceeff7a3bfbb18b Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:24:22 2010 +0200 Translation update done using Pootle. commit 5f1a91a6a48dc6b5a44c9b9412f4c9ae36491d69 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:24:14 2010 +0200 Translation update done using Pootle. commit 8b79adb55a028a06a486cb4a50ac54761ce1000f Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:24:09 2010 +0200 Translation update done using Pootle. commit e22efb62804a4ca5f1dbf7a1d4d7c16c25dab4bb Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:24:00 2010 +0200 Translation update done using Pootle. commit 3655c27f764fb0388191d0b6111492f228bb787b Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:23:49 2010 +0200 Translation update done using Pootle. commit 2db4e0d833c531033fc7056e985934808f14b140 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:23:22 2010 +0200 Translation update done using Pootle. commit d24f2a0e1460bfac67dab099131b14aecadc75b3 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:22:17 2010 +0200 Translation update done using Pootle. commit c40caea803b0471b17dc2c83974cc2f576741d28 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:19:40 2010 +0200 Translation update done using Pootle. commit a1d6d442ef2b730ecee4a6babd644d64f0f02112 Author: Herman van Rink <rink(a)initfour.nl> Date: Sat Dec 25 21:19:27 2010 +0200 Translation update done using Pootle. commit 6913c044c2b6907ea0b379a5c9cb426c917bb2b8 Author: Burak Yavuz <hitowerdigit(a)hotmail.com> Date: Thu Dec 23 23:46:38 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/nl.po | 230 ++++++++++++++++++++++---------------------------------------- po/tr.po | 4 +- 2 files changed, 84 insertions(+), 150 deletions(-) diff --git a/po/nl.po b/po/nl.po index 33a2327..da73466 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-24 07:55-0500\n" -"PO-Revision-Date: 2010-12-10 22:54+0200\n" +"PO-Revision-Date: 2010-12-25 22:12+0200\n" "Last-Translator: Herman van Rink <rink(a)initfour.nl>\n" "Language-Team: dutch <nl(a)li.org>\n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -3821,7 +3821,6 @@ msgstr "" "suggestie: [kbd]pma_table_info[/kbd]" #: libraries/config/messages.inc.php:414 -#, fuzzy #| msgid "Display fields table" msgid "Display columns table" msgstr "Toon velden tabel" @@ -4271,10 +4270,9 @@ msgstr "" #: libraries/config/setup.forms.php:264 #: libraries/config/user_preferences.forms.php:167 -#, fuzzy #| msgid "Customization" msgid "Custom" -msgstr "Aanpassingen" +msgstr "Aangepast" #: libraries/config/setup.forms.php:285 #: libraries/config/user_preferences.forms.php:187 @@ -4465,74 +4463,65 @@ msgstr "" "installatie!" #: libraries/display_export.lib.php:87 -#, fuzzy #| msgid "Allows locking tables for the current thread." msgid "Exporting databases from the current server" -msgstr "Maakt het mogelijk tabellen op slot te zetten voor de huidige thread." +msgstr "Exporteer meerdere databases vanuit de huidige server" #: libraries/display_export.lib.php:89 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Exporting tables from \"%s\" database" -msgstr "Nieuwe tabel aanmaken in database %s" +msgstr "Tabellen exporteren uit de \"%s\" database" #: libraries/display_export.lib.php:91 -#, fuzzy, php-format +#, php-format #| msgid "Create table on database %s" msgid "Exporting rows from \"%s\" table" -msgstr "Nieuwe tabel aanmaken in database %s" +msgstr "Rijen exporteren uit de \"%s\" tabel" #: libraries/display_export.lib.php:97 -#, fuzzy #| msgid "Export type" msgid "Export Method:" -msgstr "Export type" +msgstr "Export methode:" #: libraries/display_export.lib.php:113 -#, fuzzy #| msgid "Quick - display only the minimal options to configure" msgid "Quick - display only the minimal options" msgstr "Snel - toon enkel de belangrijkste opties" #: libraries/display_export.lib.php:129 -#, fuzzy #| msgid "Custom - display all possible options to configure" msgid "Custom - display all possible options" msgstr "Uitgebreid - toon alle mogelijke opties" #: libraries/display_export.lib.php:137 -#, fuzzy #| msgid "Databases" msgid "Database(s):" msgstr "Databases" #: libraries/display_export.lib.php:139 -#, fuzzy #| msgid "Tables" msgid "Table(s):" msgstr "Tabellen" #: libraries/display_export.lib.php:149 -#, fuzzy #| msgid "Rows" msgid "Rows:" -msgstr "Rijen" +msgstr "Rijen:" #: libraries/display_export.lib.php:157 -#, fuzzy #| msgid "Dump all rows" msgid "Dump some row(s)" msgstr "Dump alle rijen" #: libraries/display_export.lib.php:159 -#, fuzzy #| msgid "Number of fields" msgid "Number of rows:" -msgstr "Aantal velden" +msgstr "Aantal rijen:" #: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Te beginnen op rij:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" @@ -4540,40 +4529,38 @@ msgstr "Dump alle rijen" #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202 msgid "Output:" -msgstr "" +msgstr "Uitvoer:" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 -#, fuzzy, php-format +#, php-format #| msgid "Save on server in %s directory" msgid "Save on server in the directory <b>%s</b>" -msgstr "Bewaar op de server in %s directory" +msgstr "Bewaar op de server in <b>%s</b> directory" #: libraries/display_export.lib.php:206 -#, fuzzy #| msgid "Save as file" msgid "Save output to a file" msgstr "Opslaan als bestand" #: libraries/display_export.lib.php:227 -#, fuzzy #| msgid "File name template" msgid "File name template:" -msgstr "Bestandsnaam template" +msgstr "Bestandsnaam template:" #: libraries/display_export.lib.php:229 msgid "@SERVER@ will become the server name" -msgstr "" +msgstr "@SERVER@ wordt vervangen door de servernaam" #: libraries/display_export.lib.php:231 msgid ", @DATABASE@ will become the database name" -msgstr "" +msgstr ", @DATABASE@ wordt vervangen door de databasenaam" #: libraries/display_export.lib.php:233 msgid ", @TABLE@ will become the table name" -msgstr "" +msgstr ", @TABLE@ wordt vervangen door de tabel naam" #: libraries/display_export.lib.php:237 -#, fuzzy, php-format +#, php-format #| msgid "" #| "This value is interpreted using %1$sstrftime%2$s, so you can use time " #| "formatting strings. Additionally the following transformations will " @@ -4585,11 +4572,12 @@ msgid "" msgstr "" "Deze waarde wordt geïnterpreteerd met behulp van %1$sstrftime%2$s, het " "gebruik van opmaakcodes is dan ook toegestaan. Daarnaast worden de volgende " -"vertalingen toegepast: %3$s. Overige tekst zal gelijk blijven." +"vertalingen toegepast: %3$s. Overige tekst zal gelijk blijven. Zie %4$sFAQ%" +"5$s voor meer details." #: libraries/display_export.lib.php:275 msgid "use this for future exports" -msgstr "" +msgstr "gebruik dit voor toekomstige exports" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:512 @@ -4597,10 +4585,9 @@ msgid "Character set of the file:" msgstr "Karakter set van het bestand:" #: libraries/display_export.lib.php:309 -#, fuzzy #| msgid "Compression" msgid "Compression:" -msgstr "Compressie" +msgstr "Compressie:" #: libraries/display_export.lib.php:311 libraries/display_tbl.lib.php:528 #: libraries/export/sql.php:933 libraries/tbl_properties.inc.php:578 @@ -4609,35 +4596,30 @@ msgid "None" msgstr "Geen" #: libraries/display_export.lib.php:313 -#, fuzzy #| msgid "\"zipped\"" msgid "zipped" -msgstr "\"Gezipt\"" +msgstr "gezipt" #: libraries/display_export.lib.php:315 -#, fuzzy #| msgid "\"gzipped\"" msgid "gzipped" -msgstr "\"ge-gzipt\"" +msgstr "ge-gzipt" #: libraries/display_export.lib.php:317 -#, fuzzy #| msgid "\"bzipped\"" msgid "bzipped" -msgstr "\"ge-bzipt\"" +msgstr "ge-bzipt" #: libraries/display_export.lib.php:331 libraries/display_import.lib.php:244 #: libraries/export/codegen.php:37 -#, fuzzy #| msgid "Format" msgid "Format:" -msgstr "Opmaak" +msgstr "Opmaak:" #: libraries/display_export.lib.php:336 -#, fuzzy #| msgid "Transformation options" msgid "Format-specific options:" -msgstr "Transformatieopties" +msgstr "Opmaakspecifieke-opties:" # Is er een betere vertaling voor 'encoding' ? #: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260 @@ -4669,28 +4651,26 @@ msgstr "" "zijn niet beschikbaar." #: libraries/display_import.lib.php:129 -#, fuzzy #| msgid "Cannot log in to the MySQL server" msgid "Importing into the current server" -msgstr "Kan niet inloggen op de MySQL-server" +msgstr "Importeren naar de huidige MySQL-server" #: libraries/display_import.lib.php:131 -#, fuzzy, php-format +#, php-format #| msgid "Jump to database" msgid "Importing into the database \"%s\"" -msgstr "Ga naar database" +msgstr "Importeren in database \"%s\"" #: libraries/display_import.lib.php:133 -#, fuzzy, php-format +#, php-format #| msgid "Jump to database" msgid "Importing into the table \"%s\"" -msgstr "Ga naar database" +msgstr "Importeren in tabel \"%s\"" #: libraries/display_import.lib.php:139 -#, fuzzy #| msgid "File to import" msgid "File to Import:" -msgstr "Te importeren bestand" +msgstr "Te importeren bestand:" #: libraries/display_import.lib.php:156 #, php-format @@ -4708,10 +4688,9 @@ msgid "File uploads are not allowed on this server." msgstr "Het uploaden van bestanden is niet toegestaan op deze server." #: libraries/display_import.lib.php:208 -#, fuzzy #| msgid "Partial import" msgid "Partial Import:" -msgstr "Gedeeltelijke import" +msgstr "Gedeeltelijke import:" #: libraries/display_import.lib.php:214 #, php-format @@ -4722,7 +4701,6 @@ msgstr "" "hervat worden vanaf positie %d" #: libraries/display_import.lib.php:221 -#, fuzzy #| msgid "" #| "Allow the interruption of an import in case the script detects it is " #| "close to the PHP timeout limit. This might be good way to import large " @@ -4737,10 +4715,9 @@ msgstr "" "bestanden, maar kan transacties verstoren." #: libraries/display_import.lib.php:228 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of rows to skip, starting from the first row:" -msgstr "Aantal queries die moeten worden overgeslagen vanaf het begin" +msgstr "Aantal queries die moeten worden overgeslagen vanaf het begin:" #: libraries/display_import.lib.php:250 msgid "Format-Specific Options:" @@ -4800,13 +4777,11 @@ msgid "Options" msgstr "Opties" #: libraries/display_tbl.lib.php:558 libraries/display_tbl.lib.php:568 -#, fuzzy #| msgid "Partial Texts" msgid "Partial texts" msgstr "Gedeeltelijke teksten" #: libraries/display_tbl.lib.php:559 libraries/display_tbl.lib.php:572 -#, fuzzy #| msgid "Full Texts" msgid "Full texts" msgstr "Volledige teksten" @@ -4816,7 +4791,6 @@ msgid "Relational key" msgstr "Relationele sleutel" #: libraries/display_tbl.lib.php:586 -#, fuzzy #| msgid "Relational display field" msgid "Relational display column" msgstr "Relationele weergave veld" @@ -4880,10 +4854,9 @@ msgid "Print view (with full texts)" msgstr "Afdrukken (met volledige teksten)" #: libraries/display_tbl.lib.php:2232 tbl_chart.php:81 -#, fuzzy #| msgid "Display PDF schema" msgid "Display chart" -msgstr "Geef het PDF-schema weer" +msgstr "Grafiek weergeven" #: libraries/display_tbl.lib.php:2382 msgid "Link not found" @@ -5080,20 +5053,18 @@ msgstr "" "'ALTER TABLE'" #: libraries/engines/pbms.lib.php:30 -#, fuzzy #| msgid "Garbage threshold" msgid "Garbage Threshold" msgstr "Garbage drempelwaaarde" #: libraries/engines/pbms.lib.php:31 -#, fuzzy #| msgid "" #| "The percentage of garbage in a data log file before it is compacted. This " #| "is a value between 1 and 99. The default is 50." msgid "The percentage of garbage in a repository file before it is compacted." msgstr "" "Het percentage van garbage in een data logbestand voor dat deze wordt " -"geschoond. Dit is een waarde tussen 1 en 99. De standaard is 50." +"geschoond." #: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:69 #: server_synchronize.php:1161 @@ -5128,10 +5099,9 @@ msgid "" msgstr "" #: libraries/engines/pbms.lib.php:50 -#, fuzzy #| msgid "Log file threshold" msgid "Temp Log Threshold" -msgstr "Log file drempelwaarde" +msgstr "Tijdelijke log file drempelwaarde" #: libraries/engines/pbms.lib.php:51 msgid "" @@ -5310,57 +5280,49 @@ msgstr "" "hernoemd met een opgehoogd volgnummer" #: libraries/export/csv.php:21 libraries/import/csv.php:27 -#, fuzzy #| msgid "Lines terminated by" msgid "Columns separated with:" -msgstr "Regels beëindigd door" +msgstr "Velden beëindigd door:" #: libraries/export/csv.php:22 libraries/import/csv.php:28 -#, fuzzy #| msgid "Fields enclosed by" msgid "Columns enclosed with:" -msgstr "Velden ingesloten door" +msgstr "Velden ingesloten door:" #: libraries/export/csv.php:23 libraries/import/csv.php:29 -#, fuzzy #| msgid "Fields escaped by" msgid "Columns escaped with:" -msgstr "Velden ontweken door" +msgstr "Velden ontweken door:" #: libraries/export/csv.php:24 libraries/import/csv.php:30 -#, fuzzy #| msgid "Lines terminated by" msgid "Lines terminated with:" -msgstr "Regels beëindigd door" +msgstr "Regels beëindigd door:" #: libraries/export/csv.php:25 libraries/export/excel.php:22 #: libraries/export/htmlword.php:28 libraries/export/latex.php:79 #: libraries/export/ods.php:23 libraries/export/odt.php:59 #: libraries/export/xls.php:23 libraries/export/xlsx.php:23 -#, fuzzy #| msgid "Replace NULL by" msgid "Replace NULL with:" -msgstr "Vervang NULL door" +msgstr "Vervang NULL door:" #: libraries/export/csv.php:26 libraries/export/excel.php:23 -#, fuzzy #| msgid "Remove CRLF characters within fields" msgid "Remove carriage return/line feed characters within columns" msgstr "Verwijder CRLF tekens uit veld-waarden" #: libraries/export/excel.php:32 -#, fuzzy #| msgid "Excel edition" msgid "Excel edition:" -msgstr "Excel editie" +msgstr "Excel editie:" #: libraries/export/htmlword.php:27 libraries/export/latex.php:69 #: libraries/export/odt.php:55 libraries/export/sql.php:132 #: libraries/export/texytext.php:25 libraries/export/xml.php:45 -#, fuzzy #| msgid "Databases display options" msgid "Data dump options" -msgstr "Weergave opties voor databases" +msgstr "Data dump opties" #: libraries/export/htmlword.php:135 libraries/export/odt.php:175 #: libraries/export/sql.php:946 libraries/export/texytext.php:123 @@ -5373,53 +5335,46 @@ msgid "Table structure for table" msgstr "Tabelstructuur voor tabel" #: libraries/export/latex.php:13 -#, fuzzy #| msgid "Content of table __TABLE__" msgid "Content of table @TABLE@" -msgstr "Content van tabel __TABLE__" +msgstr "Inhoud van tabel @TABLE@" #: libraries/export/latex.php:14 msgid "(continued)" msgstr "(vervolgd)" #: libraries/export/latex.php:15 -#, fuzzy #| msgid "Structure of table __TABLE__" msgid "Structure of table @TABLE@" -msgstr "Structuur van de tabel __TABLE__" +msgstr "Structuur van de tabel @TABLE@" #: libraries/export/latex.php:47 libraries/export/odt.php:39 #: libraries/export/sql.php:87 -#, fuzzy #| msgid "Transformation options" msgid "Object creation options" -msgstr "Transformatieopties" +msgstr "Object-aanmaakopties" #: libraries/export/latex.php:51 libraries/export/latex.php:75 -#, fuzzy #| msgid "Table caption" msgid "Table caption (continued)" -msgstr "Tabeltitel" +msgstr "Tabeltitel (vervolgd)" #: libraries/export/latex.php:56 libraries/export/odt.php:42 #: libraries/export/sql.php:40 -#, fuzzy #| msgid "Disable foreign key checks" msgid "Display foreign key relationships" -msgstr "controle op vreemde sleutels uitschakelen" +msgstr "Toon vreemde sleutel relaties" #: libraries/export/latex.php:59 libraries/export/odt.php:45 -#, fuzzy #| msgid "Displaying Column Comments" msgid "Display comments" msgstr "Toon kolom commentaar" #: libraries/export/latex.php:62 libraries/export/odt.php:48 #: libraries/export/sql.php:44 -#, fuzzy #| msgid "Available MIME types" msgid "Display MIME types" -msgstr "Beschikbare MIME-types" +msgstr "Toon beschikbare MIME-types" #: libraries/export/latex.php:139 libraries/export/sql.php:281 #: libraries/export/xml.php:105 libraries/header_printview.inc.php:56 @@ -5460,10 +5415,9 @@ msgid "(Generates a report containing the data of a single table)" msgstr "(Genereert een rapport met de gegevens van een enkele tabel)" #: libraries/export/pdf.php:24 -#, fuzzy #| msgid "Report title" msgid "Report title:" -msgstr "Report titel" +msgstr "Report titel:" #: libraries/export/php_array.php:16 msgid "PHP array" @@ -5476,10 +5430,11 @@ msgid "" msgstr "" #: libraries/export/sql.php:35 -#, fuzzy #| msgid "Add custom comment into header (\\n splits lines)" msgid "Additional custom header comment (\\n splits lines):" -msgstr "Voeg een commentaar toe in de header (\\n om regels af te breken" +msgstr "" +"Voeg een commentaar toe in de header (\n" +" om regels af te breken):" #: libraries/export/sql.php:37 msgid "" @@ -5494,16 +5449,15 @@ msgstr "" #: libraries/export/sql.php:72 libraries/export/sql.php:105 #: libraries/export/sql.php:107 -#, fuzzy, php-format +#, php-format #| msgid "Statements" msgid "Add %s statement" -msgstr "Opdrachten" +msgstr "%s statement toevoegen" #: libraries/export/sql.php:91 -#, fuzzy #| msgid "Statements" msgid "Add statements:" -msgstr "Opdrachten" +msgstr "Statements toevoegen: " #: libraries/export/sql.php:111 msgid "<code>CREATE TABLE</code> options:" @@ -5619,10 +5573,9 @@ msgid "Object creation options (all are recommended)" msgstr "" #: libraries/export/xml.php:40 -#, fuzzy #| msgid "View" msgid "Views" -msgstr "View" +msgstr "Views" #: libraries/export/xml.php:47 msgid "Export contents" @@ -5695,10 +5648,9 @@ msgid "" msgstr "" #: libraries/import/csv.php:41 -#, fuzzy #| msgid "Column names" msgid "Column names: " -msgstr "Kolom namen" +msgstr "Kolom namen: " #: libraries/import/csv.php:60 libraries/import/csv.php:72 #: libraries/import/csv.php:76 libraries/import/csv.php:80 @@ -5719,7 +5671,7 @@ msgid "Invalid format of CSV input on line %d." msgstr "Ongeldig formaat van CSV invoer op regel %d." #: libraries/import/csv.php:314 -#, fuzzy, php-format +#, php-format #| msgid "Invalid field count in CSV input on line %d." msgid "Invalid column count in CSV input on line %d." msgstr "Verkeerd aantal velden in CSV invoer op regel %d." @@ -5743,28 +5695,24 @@ msgid "This plugin does not support compressed imports!" msgstr "Deze plugin heeft geen ondersteuning voor gecomprimeerde imports!" #: libraries/import/ods.php:28 -#, fuzzy #| msgid "Import percentages as proper decimals (12.00% to .12)" msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>" -msgstr "Percentages als decimalen importeren (12.00% naar .12)" +msgstr "Percentages als decimalen importeren <i>(12.00% naar ,12)</i>" #: libraries/import/ods.php:29 -#, fuzzy #| msgid "Import currencies ($5.00 to 5.00)" msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>" -msgstr "Valuta importeren ($5.00 naar 5.00)" +msgstr "Valuta importeren <i>($5.00 naar 5.00)</i>" #: libraries/import/sql.php:32 -#, fuzzy #| msgid "SQL compatibility mode" msgid "SQL compatibility mode:" -msgstr "SQL-compatibiliteits mode" +msgstr "SQL-compatibiliteits mode:" #: libraries/import/sql.php:42 -#, fuzzy #| msgid "Do not use AUTO_INCREMENT for zero values" msgid "Do not use <code>AUTO_INCREMENT</code> for zero values" -msgstr "Gebruik geen AUTO_INCREMENT voor 0-waarden" +msgstr "Gebruik geen <code>AUTO_INCREMENT</code> voor 0-waarden" #: libraries/import/xml.php:74 libraries/import/xml.php:130 msgid "" @@ -5775,7 +5723,6 @@ msgstr "" "probeer opnieuw. " #: libraries/kanji-encoding.lib.php:142 -#, fuzzy #| msgid "None" msgctxt "None encoding conversion" msgid "None" @@ -6021,7 +5968,6 @@ msgid "Reload navigation frame" msgstr "Navigatievenster herladen." #: libraries/plugin_interface.lib.php:336 -#, fuzzy #| msgid "This format has no options" msgid "This format has no options" msgstr "Dit format heeft geen opties" @@ -6224,16 +6170,15 @@ msgstr "Configureer de coördinaten voor de tabel %s" #: libraries/schema/Pdf_Relation_Schema.class.php:866 #: libraries/schema/Svg_Relation_Schema.class.php:737 #: libraries/schema/Visio_Relation_Schema.class.php:502 -#, fuzzy, php-format +#, php-format #| msgid "Schema of the \"%s\" database - Page %s" msgid "Schema of the %s database - Page %s" msgstr "Schema van de \"%s\" database - Pagina %s" #: libraries/schema/Export_Relation_Schema.class.php:174 -#, fuzzy #| msgid "File %s does not contain any key id" msgid "This page does not contain any tables!" -msgstr "Bestand %s bevat geen sleutel id" +msgstr "Deze pagina bevat geen tabellen!" #: libraries/schema/Export_Relation_Schema.class.php:207 msgid "SCHEMA ERROR: " @@ -6266,16 +6211,14 @@ msgid "Create a page" msgstr "Creëer een nieuwe pagina" #: libraries/schema/User_Schema.class.php:99 -#, fuzzy #| msgid "Page number:" msgid "Page name" -msgstr "Paginanummer:" +msgstr "Paginanaam" #: libraries/schema/User_Schema.class.php:103 -#, fuzzy #| msgid "Automatic layout" msgid "Automatic layout based on" -msgstr "Automatische lay-out" +msgstr "Automatische lay-out gebaseerd op" #: libraries/schema/User_Schema.class.php:106 msgid "Internal relations" @@ -6290,20 +6233,18 @@ msgid "Please choose a page to edit" msgstr "Kies een pagina om aan te passen" #: libraries/schema/User_Schema.class.php:153 -#, fuzzy #| msgid "Select Tables" msgid "Select page" -msgstr "Selecteer tabellen" +msgstr "Selecteer pagina" #: libraries/schema/User_Schema.class.php:211 msgid "Select Tables" msgstr "Selecteer tabellen" #: libraries/schema/User_Schema.class.php:346 -#, fuzzy #| msgid "Relational schema" msgid "Display relational schema" -msgstr "Relationeel schema" +msgstr "Toon relationeel schema" #: libraries/schema/User_Schema.class.php:356 msgid "Select Export Relational Type" @@ -6338,10 +6279,9 @@ msgid "Portrait" msgstr "Portret" #: libraries/schema/User_Schema.class.php:394 -#, fuzzy #| msgid "Creation" msgid "Orientation" -msgstr "Gecreëerd" +msgstr "Oriëntatie" #: libraries/schema/User_Schema.class.php:407 msgid "Paper size" @@ -6371,7 +6311,6 @@ msgid "Unknown language: %1$s." msgstr "Onbekende taal: %1$s." #: libraries/select_server.lib.php:38 libraries/select_server.lib.php:44 -#, fuzzy #| msgid "Current server" msgid "Current Server" msgstr "Huidige server" @@ -6404,10 +6343,9 @@ msgid "Synchronize" msgstr "Synchronizatie" #: libraries/server_links.inc.php:99 -#, fuzzy #| msgid "settings" msgid "Settings" -msgstr "instellingen" +msgstr "Instellingen" #: libraries/server_synchronize.lib.php:1337 server_synchronize.php:1108 msgid "Source database" @@ -6442,10 +6380,9 @@ msgid "Run SQL query/queries on database %s" msgstr "Draai SQL query/queries op database %s" #: libraries/sql_query_form.lib.php:297 -#, fuzzy #| msgid "Column names" msgid "Columns" -msgstr "Kolom namen" +msgstr "Kolommen" #: libraries/sql_query_form.lib.php:332 sql.php:850 sql.php:851 sql.php:868 msgid "Bookmark this SQL query" @@ -6573,7 +6510,6 @@ msgid "Length/Values" msgstr "Lengte/Waardes*" #: libraries/tbl_properties.inc.php:104 -#, fuzzy #| msgid "" #| "If field type is \"enum\" or \"set\", please enter the values using this " #| "format: 'a','b','c'...<br />If you ever need to put a backslash (\"\\\") " @@ -6586,7 +6522,7 @@ msgid "" "(for example '\\\\xyz' or 'a\\'b')." msgstr "" "Als het veld type \"enum\" of \"set\" is, voer dan de waardes in volgens dit " -"formaat: 'a','b','c'...<br />Als u een backslash moet plaatsen (\"\") of een " +"formaat: 'a','b','c'...<br />Als u een backslash moet plaatsen (\"\\\") of een " "enkel aanhalingsteken (\"'\") bij deze waardes, plaats er dan een backslash " "voor (voorbeeld '\\\\xyz' of 'a\\'b')." @@ -6660,23 +6596,21 @@ msgid "PARTITION definition" msgstr "PARTITION definitie" #: libraries/tbl_properties.inc.php:779 tbl_structure.php:633 -#, fuzzy, php-format +#, php-format #| msgid "Add column(s)" msgid "Add %s column(s)" -msgstr "Kolom(men) toevoegen" +msgstr "Voeg %s kolom(men) toe" #: libraries/tbl_properties.inc.php:783 tbl_structure.php:627 -#, fuzzy #| msgid "You have to add at least one field." msgid "You have to add at least one column." -msgstr "U moet minimaal een veld toevoegen." +msgstr "U moet minimaal een kolom toevoegen." #: libraries/tbl_triggers.lib.php:28 msgid "Event" msgstr "Gebeurtenis" #: libraries/transformations/application_octetstream__download.inc.php:9 -#, fuzzy #| msgid "" #| "Displays a link to download the binary data of the field. You can use the " #| "first option to specify the filename, or use the second option as the " @@ -6689,8 +6623,8 @@ msgid "" "need to set the first option to the empty string." msgstr "" "Toon een link om de binaire data van een veld te downloaden. De eerste optie " -"is de bestandsnaam van het binaire bestand, de tweede optie is een mogelijke " -"veldnaam van een rij van de tabel, welke de bestandsnaam bevat. Wanneer de " +"is de bestandsnaam van het binaire bestand, de tweede optie is een " +"mogelijke veldnaam uit de tabel, welke de bestandsnaam bevat. Wanneer de " "tweede optie wordt gekozen is het vereist dat de eerste optie leeg is." #: libraries/transformations/application_octetstream__hex.inc.php:9 diff --git a/po/tr.po b/po/tr.po index 36e11e6..938ba47 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-24 07:55-0500\n" -"PO-Revision-Date: 2010-12-22 22:53+0200\n" +"PO-Revision-Date: 2010-12-23 23:46+0200\n" "Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n" "Language-Team: turkish <tr(a)li.org>\n" "MIME-Version: 1.0\n" @@ -7241,7 +7241,7 @@ msgstr "Veritabanı seçilmedi." #: server_databases.php:75 #, php-format msgid "%s databases have been dropped successfully." -msgstr "%s veritabanları başarılı olarak kaldırıldı." +msgstr "%s veritabanı başarılı olarak kaldırıldı." #: server_databases.php:100 msgid "Databases statistics" hooks/post-receive -- phpMyAdmin

13 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 52a41610c7a33534b485fad57038caf731a7256c

by Michal Čihař

The branch, master has been updated via 52a41610c7a33534b485fad57038caf731a7256c (commit) via e93ddd67fa55870260bf2bfe1c45eb5f46b9b771 (commit) from d19571307fd6f20f1a9e908990050aa05d4cabdb (commit) - Log ----------------------------------------------------------------- commit 52a41610c7a33534b485fad57038caf731a7256c Author: Michal Čihař <michal(a)cihar.com> Date: Sun Dec 26 09:06:13 2010 +0100 Do no try to cache parsed XML It seems to fail for some reason, and parsing it is not really expensive. commit e93ddd67fa55870260bf2bfe1c45eb5f46b9b771 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Dec 26 09:05:11 2010 +0100 Catch another type of corrupt cache file. ----------------------------------------------------------------------- Summary of changes: helper/cache.py | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/helper/cache.py b/helper/cache.py index c7dc626..0aa9824 100644 --- a/helper/cache.py +++ b/helper/cache.py @@ -86,7 +86,7 @@ class Cache(object): self.dbg('Using cache for %s!' % name) try: return cPickle.load(open(filename, 'r')) - except TypeError: + except (TypeError, EOFError): # Cache can not be unpickled self.warn('Deleting cache for %s!' % name) os.unlink(filename) @@ -143,14 +143,8 @@ class XMLCache(URLCache): def load(self, name, url): self.dbg('Downloading and parsing %s feed...' % name) self.dbg('URL: %s' % url) - cache = 'feed-%s' % name - try: - result = self.get(cache) - except NoCache: - data = super(XMLCache, self).load(url) - result = minidom.parseString(data.strip()) - self.set(cache, result) - return result + data = super(XMLCache, self).load(url) + return minidom.parseString(data.strip()) class FeedCache(URLCache): ''' hooks/post-receive -- phpMyAdmin website

13 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1040-g7d93132

by Marc Delisle

The branch, master has been updated via 7d9313245b878bfde8fe4a1ac0d10ba35ac0de79 (commit) from 1059e281d16a3fee98aadded173a8f92b52e2e27 (commit) - Log ----------------------------------------------------------------- commit 7d9313245b878bfde8fe4a1ac0d10ba35ac0de79 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Dec 25 15:41:37 2010 -0500 rfe #3141330 [relation] When displaying results, show a link to the foreign table even when phpMyAdmin configuration storage is not active ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ libraries/display_tbl.lib.php | 32 ++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index a55a6b7..1e7c645 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,8 @@ thanks to garas - garas - bug #3123433 [interface] Avoid double escaping of MySQL errors. - [interface] Use less noisy message and remove disable link on server charts and database statistics. ++ rfe #3141330 [relation] When displaying results, show a link to the foreign + table even when phpMyAdmin configuration storage is not active 3.3.10.0 (not yet released) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 7bbd4d8..ca56955 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -2014,20 +2014,24 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) } $tabs = '(\'' . join('\',\'', $target) . '\')'; - if ($cfgRelation['displaywork']) { - if (! strlen($table)) { - $exist_rel = false; - } else { - $exist_rel = PMA_getForeigners($db, $table, '', 'both'); - if ($exist_rel) { - foreach ($exist_rel AS $master_field => $rel) { - $display_field = PMA_getDisplayField($rel['foreign_db'], $rel['foreign_table']); - $map[$master_field] = array($rel['foreign_table'], - $rel['foreign_field'], - $display_field, - $rel['foreign_db']); - } // end while - } // end if + if (! strlen($table)) { + $exist_rel = false; + } else { + // To be able to later display a link to the related table, + // we verify both types of relations: either those that are + // native foreign keys or those defined in the phpMyAdmin + // configuration storage. If no PMA storage, we won't be able + // to use the "column to display" notion (for example show + // the name related to a numeric id). + $exist_rel = PMA_getForeigners($db, $table, '', 'both'); + if ($exist_rel) { + foreach ($exist_rel AS $master_field => $rel) { + $display_field = PMA_getDisplayField($rel['foreign_db'], $rel['foreign_table']); + $map[$master_field] = array($rel['foreign_table'], + $rel['foreign_field'], + $display_field, + $rel['foreign_db']); + } // end while } // end if } // end if // end 2b hooks/post-receive -- phpMyAdmin

13 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1039-g1059e28

by Marc Delisle

The branch, master has been updated via 1059e281d16a3fee98aadded173a8f92b52e2e27 (commit) from 90978114cda65a8c9a628af6cbd337858329e4ed (commit) - Log ----------------------------------------------------------------- commit 1059e281d16a3fee98aadded173a8f92b52e2e27 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Dec 24 08:13:02 2010 -0500 Remove extra wrapping of jQuery objects ----------------------------------------------------------------------- Summary of changes: js/sql.js | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/js/sql.js b/js/sql.js index c65876b..5a359c5 100644 --- a/js/sql.js +++ b/js/sql.js @@ -653,24 +653,23 @@ $(document).ready(function() { $input_siblings.each(function() { // Inline edit post has been successful. - if($(this).is(':not(.relation, .enum)')) { + $this_sibling = $(this); + if($this_sibling.is(':not(.relation, .enum)')) { /** * @var new_html String containing value of the data field after edit */ - var new_html = $(this).find('textarea').val(); - - if($(this).is('.transformed')) { - var field_name = getFieldName($(this), disp_mode); - var this_field = $(this); + var new_html = $this_sibling.find('textarea').val(); + if($this_sibling.is('.transformed')) { + var field_name = getFieldName($this_sibling, disp_mode); $.each(data.transformations, function(key, value) { if(key == field_name) { - if($(this_field).is('.text_plain, .application_octetstream')) { + if($this_sibling.is('.text_plain, .application_octetstream')) { new_html = value; return false; } else { - var new_value = $(this_field).find('textarea').val(); + var new_value = $this_sibling.find('textarea').val(); new_html = $(value).append(new_value); return false; } @@ -681,21 +680,19 @@ $(document).ready(function() { else { var new_html = ''; var new_value = ''; - $test_element = $(this).find('select'); + $test_element = $this_sibling.find('select'); if ($test_element.length != 0) { new_value = $test_element.val(); } - $test_element = $(this).find('span.curr_value'); + $test_element = $this_sibling.find('span.curr_value'); if ($test_element.length != 0) { new_value = $test_element.text(); } - if($(this).is('.relation')) { - var field_name = getFieldName($(this), disp_mode); - var this_field = $(this); - + if($this_sibling.is('.relation')) { + var field_name = getFieldName($this_sibling, disp_mode); $.each(data.relations, function(key, value) { if(key == field_name) { new_html = $(value).append(new_value); @@ -703,11 +700,11 @@ $(document).ready(function() { } }) } - if($(this).is('.enum')) { + if($this_sibling.is('.enum')) { new_html = new_value; } } - $(this).html(new_html); + $this_sibling.html(new_html); }) } else { hooks/post-receive -- phpMyAdmin

13 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1036-gef8687b

by Marc Delisle

The branch, master has been updated via ef8687b5debc62bf62f2bb1421aa3bd0600be05c (commit) from fc37859b4206bb5721aae6f609b451df8e32b328 (commit) - Log ----------------------------------------------------------------- commit ef8687b5debc62bf62f2bb1421aa3bd0600be05c Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 23 13:07:32 2010 -0500 Missing question mark ----------------------------------------------------------------------- Summary of changes: libraries/navigation_header.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index e34adc5..2b4606e 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -101,7 +101,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { echo '</a>'; echo ' ' . PMA_showMySQLDocu('', '', TRUE) . "\n"; - echo '<a href="navigation.php' . PMA_generate_common_url($params) . '" target="frame_navigation">'; + echo '<a href="navigation.php?' . PMA_generate_common_url($params) . '" target="frame_navigation">'; if ($GLOBALS['cfg']['MainPageIconic']) { echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"' . ' title="' . __('Reload navigation frame') . '"' hooks/post-receive -- phpMyAdmin

13 years, 8 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA1-1035-gfc37859

by Marc Delisle

The branch, master has been updated via fc37859b4206bb5721aae6f609b451df8e32b328 (commit) from 8b609dfe353cffd476f4f033ac895e7f42ec9882 (commit) - Log ----------------------------------------------------------------- commit fc37859b4206bb5721aae6f609b451df8e32b328 Author: Marc Delisle <marc(a)infomarc.info> Date: Thu Dec 23 13:02:53 2010 -0500 RFE 3141334: Reload icon New icon by Michael Keck and move it with other navi frame icons ----------------------------------------------------------------------- Summary of changes: libraries/navigation_header.inc.php | 23 ++++++++++++++++++----- navigation.php | 12 ------------ themes/darkblue_orange/img/s_reload.png | Bin 245 -> 385 bytes themes/original/css/theme_left.css.php | 7 ------- themes/original/img/s_reload.png | Bin 245 -> 385 bytes 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/libraries/navigation_header.inc.php b/libraries/navigation_header.inc.php index 6c5b266..e34adc5 100644 --- a/libraries/navigation_header.inc.php +++ b/libraries/navigation_header.inc.php @@ -91,13 +91,26 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) { echo '>' . $query_frame_link_text . '</a>' . "\n"; } // end if ($server != 0) -if ($GLOBALS['cfg']['MainPageIconic']) { echo ' <a href="Documentation.html" target="documentation"' - .' title="' . __('phpMyAdmin documentation') . '" >' - .'<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"' - .' alt="' . __('phpMyAdmin documentation') . '" /></a>' . "\n"; + .' title="' . __('phpMyAdmin documentation') . '" >'; + + if ($GLOBALS['cfg']['MainPageIconic']) { + echo '<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"' + .' alt="' . __('phpMyAdmin documentation') . '" />'; + } + echo '</a>'; echo ' ' . PMA_showMySQLDocu('', '', TRUE) . "\n"; -} + + echo '<a href="navigation.php' . PMA_generate_common_url($params) . '" target="frame_navigation">'; + if ($GLOBALS['cfg']['MainPageIconic']) { + echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"' + . ' title="' . __('Reload navigation frame') . '"' + . ' alt="' . __('Reload navigation frame') . '" />'; + } else { + echo '<br />' . __('Reload navigation frame'); + } + echo '</a>'; + echo '</div>' . "\n"; /** diff --git a/navigation.php b/navigation.php index fdb6502..aa16e66 100644 --- a/navigation.php +++ b/navigation.php @@ -53,18 +53,6 @@ function PMA_exitNavigationFrame() if (!empty($GLOBALS['db'])) { $params['db'] = $GLOBALS['db']; } - echo '<div id="reloadlink">' . "\n"; - echo '<a href="navigation.php' . PMA_generate_common_url($params) . '" target="frame_navigation">'; - if ($GLOBALS['cfg']['NavigationBarIconic']) { - echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"' - . ' title="' . __('Reload navigation frame') . '"' - . ' alt="' . __('Reload navigation frame') . '" />'; - } - if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) { - echo __('Reload navigation frame'); - } - echo '</a>'; - echo '</div>' . "\n"; echo '</body></html>'; exit; } diff --git a/themes/darkblue_orange/img/s_reload.png b/themes/darkblue_orange/img/s_reload.png index 754361e..0113cbd 100644 Binary files a/themes/darkblue_orange/img/s_reload.png and b/themes/darkblue_orange/img/s_reload.png differ diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 9bb3c39..ef0f53c 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -134,7 +134,6 @@ div#leftframelinks .icon { margin: 0; } -div#reloadlink a img, div#leftframelinks a img.icon { margin: 0; padding: 0.2em; @@ -231,12 +230,6 @@ div#left_tableList ul ul { background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>; color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>; } -#reloadlink { - clear: both; - float: <?php echo $right; ?>; - display: block; - padding: 1em; -} #NavFilter { display: none; diff --git a/themes/original/img/s_reload.png b/themes/original/img/s_reload.png index 754361e..0113cbd 100644 Binary files a/themes/original/img/s_reload.png and b/themes/original/img/s_reload.png differ hooks/post-receive -- phpMyAdmin

13 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git December 2010