diff --git a/.travis.yml b/.travis.yml index 0d8d1b7051..7ce0bf3eda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,6 @@ before_script: script: - ./scripts/generate-mo --quiet - ant phpunit lint + - if [[ $TRAVIS_PULL_REQUEST != "false" ]] ; then ./scripts/check-dco origin/master..FETCH_HEAD ; fi after_script: - php vendor/bin/coveralls -v diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 62c9798053..fdd200c5dd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,9 +10,13 @@ Please report [bugs on SourceForge.net][1]. ## Patches submission -Patches are welcome either as [pull requests on GitHub][2]. +Patches are welcome as [pull requests on GitHub][2]. Please include a +Signed-off-by tag. Note that by submitting patches with the Signed-off-by +tag, you are giving permission to license the patch as GPLv2-or-later. See +[the DCO file][3] for details. [2]: https://github.com/phpmyadmin/phpmyadmin/pulls +[3]: https://github.com/phpmyadmin/phpmyadmin/blob/master/DCO ## More information diff --git a/ChangeLog b/ChangeLog index 9d9809f270..aee3826ecf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,8 +66,9 @@ phpMyAdmin - ChangeLog - bug #4159 bug with navigation between database and table filter - bug #4119 Huge session data with $cfg['Error_Handler']['gather'] - bug #4169 Table list jumps to table on click +- bug #4168 Rename multiple columns is not working -4.0.10.0 (not yet released) +4.0.10.0 (2013-12-04) - bug #4150 Clicking database name in query window opens a new tab - bug #4141 Wrong page is shown after editing; also, do not show a modal dialog for multi-row edit diff --git a/DCO b/DCO new file mode 100644 index 0000000000..26fdfbfe94 --- /dev/null +++ b/DCO @@ -0,0 +1,44 @@ +If you would like to make a contribution to the phpMyAdmin Project, please +certify to the following: +*** +phpMyAdmin Developer's Certificate of Origin. Version 1.0 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I have the + right to submit it under the license of "GNU General Public License or + any later version" ("GPLv2-or-later"); or + +(b) The contribution is based upon previous work that, to the best of my + knowledge, is covered under an appropriate open source license and I have + the right under that license to submit that work with modifications, + whether created in whole or in part by me, under GPLv2-or-later; or + +(c) The contribution was provided directly to me by some other person who + certified (a) or (b) and I have not modified it. + +(d) I understand and agree that this project and the contribution are public + and that a record of the contribution (including all metadata and + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + phpMyAdmin's policies and the requirements of the GPLv2-or-later where + they are relevant. + +(e) I am granting this work to this project under the terms of the + GPLv2-or-later. + + http://www.gnu.org/licenses/gpl-2.0.html + +*** +*** +And please confirm your certification to the above by adding the following +line to your patch: + + Signed-off-by: Jane Developer + +using your real name (sorry, no pseudonyms or anonymous contributions). + +If you are a developer who is authorized to contribute to phpMyAdmin on +behalf of your employer, then please use your corporate email address in the +Signed-off-by tag. If not, then please use a personal email address. + diff --git a/README b/README index 5bffd45651..117d6e8370 100644 --- a/README +++ b/README @@ -39,6 +39,13 @@ details. You should have received a copy of the GNU General Public License along with this program. If not, see . +Licensing of current contributions +---------------------------------- + +Beginning on 2013-12-01, new contributions to this codebase are all licensed +under terms compatible with GPLv2-or-later. phpMyAdmin is currently +transitioning older code to GPLv2-or-later, but work is not yet complete. + Third party licenses -------------------- diff --git a/libraries/Util.class.php b/libraries/Util.class.php index e5221d24d4..33a43fa7c1 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -442,8 +442,6 @@ class PMA_Util */ public static function getMySQLDocuURL($link, $anchor = '') { - global $cfg; - // Fixup for newly used names: $link = str_replace('_', '-', strtolower($link)); diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index 65839910a4..ae10c960c8 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -272,7 +272,7 @@ function get_tab_pos() * Prepares XML output for js/pmd/ajax.js to display a message * */ -function PMD_return_upd($b, $ret) +function PMD_Return_upd($b, $ret) { // not sure where this was defined... global $K; diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index a50195403c..5c6f04d30f 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1451,7 +1451,6 @@ function PMA_getHtmlDivForMoveColumnsDialog() */ function PMA_getHtmlForEditView($url_params) { - $retval = array(); $query = "SELECT `VIEW_DEFINITION`, `CHECK_OPTION`, `DEFINER`, `SECURITY_TYPE`" . " FROM `INFORMATION_SCHEMA`.`VIEWS`" . " WHERE TABLE_SCHEMA='" . PMA_Util::sqlAddSlashes($GLOBALS['db']) . "'" diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php index d2d2093503..60170677b6 100644 --- a/libraries/tbl_columns_definition_form.inc.php +++ b/libraries/tbl_columns_definition_form.inc.php @@ -126,7 +126,7 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) { // old column attributes if ($is_backup) { $_form_params = PMA_getFormParamsForOldColumn( - $columnMeta, $length, $_form_params + $columnMeta, $length, $_form_params, $columnNumber ); } diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index bd8f14f5f6..aec1c8f03a 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -1265,14 +1265,16 @@ function PMA_getHtmlForColumnAttributes($columnNumber, $columnMeta, $type_upper, /** * Function to get form parameters for old column * - * @param array $columnMeta column meta - * @param int $length length - * @param array $form_params form parameters + * @param array $columnMeta column meta + * @param int $length length + * @param array $form_params form parameters + * @param int $columnNumber column/field number * * @return array */ -function PMA_getFormParamsForOldColumn($columnMeta, $length, $form_params) -{ +function PMA_getFormParamsForOldColumn( + $columnMeta, $length, $form_params, $columnNumber +) { if (isset($columnMeta['Field'])) { $form_params['field_orig[' . $columnNumber . ']'] = $columnMeta['Field']; diff --git a/pmd_relation_new.php b/pmd_relation_new.php index 2d0657bd21..9c780e21bb 100644 --- a/pmd_relation_new.php +++ b/pmd_relation_new.php @@ -33,7 +33,7 @@ if (PMA_Util::isForeignKeySupported($type_T1) if (isset($existrel_foreign[$F2]) && isset($existrel_foreign[$F2]['constraint']) ) { - PMD_return_new(0, __('Error: relation already exists.')); + PMD_Return_new(0, __('Error: relation already exists.')); } // note: in InnoDB, the index does not requires to be on a PRIMARY // or UNIQUE key @@ -76,12 +76,12 @@ if (PMA_Util::isForeignKeySupported($type_T1) $upd_query .= ' ON UPDATE ' . $on_update; } $upd_query .= ';'; - $GLOBALS['dbi']->tryQuery($upd_query) or PMD_return_new(0, __('Error: Relation not added.')); - PMD_return_new(1, __('FOREIGN KEY relation added')); + $GLOBALS['dbi']->tryQuery($upd_query) or PMD_Return_new(0, __('Error: Relation not added.')); + PMD_Return_new(1, __('FOREIGN KEY relation added')); } } else { // internal (pmadb) relation if ($GLOBALS['cfgRelation']['relwork'] == false) { - PMD_return_new(0, __('Error: Relational features are disabled!')); + PMD_Return_new(0, __('Error: Relational features are disabled!')); } else { // no need to recheck if the keys are primary or unique at this point, // this was checked on the interface part @@ -97,9 +97,9 @@ if (PMA_Util::isForeignKeySupported($type_T1) . '\'' . PMA_Util::sqlAddSlashes($F1) . '\')'; if (PMA_queryAsControlUser($q, false, PMA_DatabaseInterface::QUERY_STORE)) { - PMD_return_new(1, __('Internal relation added')); + PMD_Return_new(1, __('Internal relation added')); } else { - PMD_return_new(0, __('Error: Relation not added.')); + PMD_Return_new(0, __('Error: Relation not added.')); } } } @@ -110,7 +110,7 @@ if (PMA_Util::isForeignKeySupported($type_T1) * @param string $b Value of attribute "b" * @param string $ret Value of attribute "return" */ -function PMD_return_new($b,$ret) +function PMD_Return_new($b,$ret) { global $db,$T1,$F1,$T2,$F2; header("Content-Type: text/xml; charset=utf-8"); diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php index 9dff0579b8..b500d7c26e 100644 --- a/pmd_relation_upd.php +++ b/pmd_relation_upd.php @@ -64,6 +64,6 @@ if ($try_to_delete_internal_relation) { PMA_DatabaseInterface::QUERY_STORE ); } -PMD_return_upd(1, __('Relation deleted')); +PMD_Return_upd(1, __('Relation deleted')); ?> diff --git a/po/el.po b/po/el.po index 04c779459c..520cad0f10 100644 --- a/po/el.po +++ b/po/el.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-11-26 09:40+0200\n" +"PO-Revision-Date: 2013-12-04 07:43+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.9-dev\n" @@ -8829,6 +8829,8 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" +"Μετατρέπει Δυαδικές τιμές σε κείμενο (Προεπιλογή «T» και «F»). Η πρώτη " +"επιλογή είναι για το ΑΛΗΘΕΣ, η δεύτερη για το ΨΕΥΔΕΣ. Nonzero=true." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" @@ -12863,7 +12865,7 @@ msgstr "Εμφάνισης σκαριφήματος (σχήματος) βάσε #: server_privileges.php:142 msgid "Username and hostname didn't change." -msgstr "" +msgstr "Το όνομα χρήστη και το όνομα φιλοξενητή δεν άλλαξαν." #: server_status.php:32 #, php-format diff --git a/po/en_GB.po b/po/en_GB.po index b55f931e15..e93cb5c779 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-09-24 03:42+0200\n" -"Last-Translator: Robert Readman \n" -"Language-Team: English (United Kingdom) \n" +"PO-Revision-Date: 2013-12-03 20:33+0200\n" +"Last-Translator: Gabriela Solis \n" +"Language-Team: English (United Kingdom) " +"\n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.7-dev\n" +"X-Generator: Weblate 1.9-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -410,21 +410,27 @@ msgid "Database Log" msgstr "Database Log" #: error_report.php:33 +#, fuzzy msgid "" "An error has been detected and an error report has been automatically " "submitted based on your settings." msgstr "" +"An error has been detected and an error report has been automatically " +"submitted based on your settings." #: error_report.php:37 error_report.php:54 error_report.php:65 #: error_report.php:81 msgid "You may want to refresh the page." -msgstr "" +msgstr "You may want to refresh the page." #: error_report.php:45 +#, fuzzy msgid "" "An error has been detected and an error report has been generated but failed " "to be sent." msgstr "" +"An error has been detected and an error report has been generated but failed " +"to be sent." #: error_report.php:50 error_report.php:77 msgid "If you experience any problems please submit a bug report manually." diff --git a/po/es.po b/po/es.po index b10b42ddcc..c78e7c6d70 100644 --- a/po/es.po +++ b/po/es.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-12-03 20:40+0200\n" -"Last-Translator: Gabriela Solis \n" +"PO-Revision-Date: 2013-12-03 21:42+0200\n" +"Last-Translator: Matías Bellone \n" "Language-Team: Spanish " "\n" "Language: es\n" @@ -8875,8 +8875,9 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" -"Convierte los valores de Boolean a texto(por defecto 'T' y 'F'). La primera " -"opcion es Verdadero(T), y la segunda es por Falso(F). No cero= verdad" +"Convierte los valores booleanos a texto («T» y «F» de forma predeterminada). " +"La primera opcion es para «TRUE» (verdadero), y la segunda por «FALSE» " +"(falso). Distinto a cero = verdadero." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" @@ -8891,12 +8892,12 @@ msgid "" msgstr "" "Muestra una columna TIME, TIMESTAMP, DATETIME o marca temporal numérica unix " "como una fecha con formato. La primera opción es la diferencia (en horas) " -"que se añadirá a la marca temporal (Valor predeterminado: 0). La segunda " +"que se añadirá a la marca temporal (valor predeterminado: 0). La segunda " "opción es para especificar un formato de fecha/hora diferente. La tercera " -"opción determina si usted quiere ver la fecha local o la UTC (use las " -"cadenas \"local\" o \"utc\"). Según eso, el formato de la fecha tendrá un " -"valor diferente - para \"local\" mire la documentación de la función strftime" -"() de PHP y para \"utc\" se hace usando la función gmdate()." +"opción determina si desea ver la fecha local o UTC (utilice las cadenas " +"«local» o «utc»). Según esta configuración, el formato de la fecha tendrá un " +"valor diferente - para «local» mire la documentación de la función " +"strftime() de PHP y para «utc» la de la función gmdate()." #: libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php:31 msgid "" @@ -12905,7 +12906,7 @@ msgstr "Ver el volcado (schema) de la base de datos" #: server_privileges.php:142 msgid "Username and hostname didn't change." -msgstr "Nombre del usuario y el nombre del sistema central no cambiaron." +msgstr "El nombre del usuario y el nombre del sistema central no cambiaron." #: server_status.php:32 #, php-format diff --git a/po/et.po b/po/et.po index 59972c01a4..4b1cc8fd22 100644 --- a/po/et.po +++ b/po/et.po @@ -6,14 +6,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-12-02 09:30+0200\n" +"PO-Revision-Date: 2013-12-04 09:18+0200\n" "Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian \n" +"Language-Team: Estonian " +"\n" +"Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: et\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.9-dev\n" @@ -8682,6 +8682,9 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" +"Teisendab tõeväärtuse tekstiks (vikimisi 'T' ja 'F'). Esimene vastab " +"väärtusele TÕENE, teine väärtusele VÄÄR. Nullist erinev väärtus tähendab " +"tõest väärtust." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" diff --git a/po/fr.po b/po/fr.po index 6cbc4be0cb..2768f6c695 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,14 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-11-25 22:30+0200\n" +"PO-Revision-Date: 2013-12-04 11:59+0200\n" "Last-Translator: Marc Delisle \n" -"Language-Team: French \n" +"Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Weblate 1.9-dev\n" @@ -8817,6 +8816,9 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" +"Convertit des valeurs booléennes en texte (par défaut « T » et « F »). La " +"première option remplace une valeur vraie et la seconde remplace une valeur " +"fausse. Une valeur différente de zéro signifie vrai." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" diff --git a/po/ia.po b/po/ia.po index d6c74e9d4e..a4d4576e4e 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-11-25 23:01+0200\n" +"PO-Revision-Date: 2013-12-04 14:16+0200\n" "Last-Translator: Giovanni Sora \n" -"Language-Team: Interlingua \n" +"Language-Team: Interlingua " +"\n" +"Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ia\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.9-dev\n" @@ -435,6 +435,8 @@ msgstr "" #: error_report.php:50 error_report.php:77 msgid "If you experience any problems please submit a bug report manually." msgstr "" +"Si tu ha experientia de ulle problema, pro favor tu submitte un reporto de " +"error (bug) manualmente." #: error_report.php:63 error_report.php:72 msgid "Thank you for submitting this report." @@ -442,7 +444,7 @@ msgstr "Gratias pro submitter iste reporto." #: error_report.php:74 msgid "Unfortunately the submission failed." -msgstr "" +msgstr "Infortunatemente on falleva a submitter." #: export.php:160 msgid "Bad type!" @@ -4651,10 +4653,12 @@ msgid "" "Disable the table maintenance mass operations, like optimizing or repairing " "the selected tables of a database." msgstr "" +"Dishabilita le operationes massive de mantenentia de tabella, como optimisar " +"o reparar le tabellas seligite de un base de datos." #: libraries/config/messages.inc.php:63 msgid "Disable multi table maintenance" -msgstr "" +msgstr "Dishabilita le mantenentia multiple de tabella" #: libraries/config/messages.inc.php:64 msgid "Edit SQL queries in popup window" @@ -4912,142 +4916,144 @@ msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value" msgstr "" +"Ordina elementos in le menu a rolar del claves externe, [kbd]content[/kbd] " +"es le datos de referentia,[kbd]id[/kbd] es le valor del clave" #: libraries/config/messages.inc.php:152 msgid "Foreign key dropdown order" -msgstr "" +msgstr "Ordine del clave externe del menu a rolar" #: libraries/config/messages.inc.php:153 msgid "A dropdown will be used if fewer items are present" -msgstr "" +msgstr "Un menu a rolar essera usate si on ha minus elementos presente" #: libraries/config/messages.inc.php:154 msgid "Foreign key limit" -msgstr "" +msgstr "Limite de clave externe" #: libraries/config/messages.inc.php:155 msgid "Browse mode" -msgstr "" +msgstr "Modo de navigation" #: libraries/config/messages.inc.php:156 msgid "Customize browse mode" -msgstr "" +msgstr "Personalisa modo de navigation" #: libraries/config/messages.inc.php:158 libraries/config/messages.inc.php:160 #: libraries/config/messages.inc.php:177 libraries/config/messages.inc.php:188 #: libraries/config/messages.inc.php:190 libraries/config/messages.inc.php:218 #: libraries/config/messages.inc.php:234 msgid "Customize default options" -msgstr "" +msgstr "Personalisa optiones predefinite" #: libraries/config/messages.inc.php:159 libraries/config/setup.forms.php:249 #: libraries/config/setup.forms.php:323 #: libraries/config/user_preferences.forms.php:146 #: libraries/config/user_preferences.forms.php:218 msgid "CSV" -msgstr "" +msgstr "CSV" #: libraries/config/messages.inc.php:161 msgid "Developer" -msgstr "" +msgstr "Disveloppator" #: libraries/config/messages.inc.php:162 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "Preferentias pro disveloppatores de phpMyAdmin" #: libraries/config/messages.inc.php:163 msgid "Edit mode" -msgstr "" +msgstr "Modo de modificar" #: libraries/config/messages.inc.php:164 msgid "Customize edit mode" -msgstr "" +msgstr "Personalisa le modo de modificar" #: libraries/config/messages.inc.php:166 msgid "Export defaults" -msgstr "" +msgstr "Exporta le valores predefinite" #: libraries/config/messages.inc.php:167 msgid "Customize default export options" -msgstr "" +msgstr "Personalisa le optiones de exportar predefinite" #: libraries/config/messages.inc.php:168 libraries/config/messages.inc.php:210 #: setup/frames/menu.inc.php:17 msgid "Features" -msgstr "" +msgstr "Characteristicas" #: libraries/config/messages.inc.php:169 msgid "General" -msgstr "" +msgstr "General" #: libraries/config/messages.inc.php:170 msgid "Set some commonly used options" -msgstr "" +msgstr "Fixa alcun optiones usate communemente" #: libraries/config/messages.inc.php:172 msgid "Import defaults" -msgstr "" +msgstr "Importa valores predefinite" #: libraries/config/messages.inc.php:173 msgid "Customize default common import options" -msgstr "" +msgstr "Personalisa le optiones de importar commun predefinite" #: libraries/config/messages.inc.php:174 msgid "Import / export" -msgstr "" +msgstr "Importa / exporta" #: libraries/config/messages.inc.php:175 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "Fixa le optiones de compression e le dossiers de importar e exportar" #: libraries/config/messages.inc.php:176 msgid "LaTeX" -msgstr "" +msgstr "LaTeX" #: libraries/config/messages.inc.php:179 msgid "Databases display options" -msgstr "" +msgstr "Optiones pro monstrar base de datos" #: libraries/config/messages.inc.php:180 setup/frames/menu.inc.php:21 msgid "Navigation panel" -msgstr "" +msgstr "Pannello de navigation" #: libraries/config/messages.inc.php:181 msgid "Customize appearance of the navigation panel" -msgstr "" +msgstr "Personalisa apparentia del pannello de navigation" #: libraries/config/messages.inc.php:182 libraries/select_server.lib.php:44 #: setup/frames/index.inc.php:141 msgid "Servers" -msgstr "" +msgstr "Servitores" #: libraries/config/messages.inc.php:183 msgid "Servers display options" -msgstr "" +msgstr "Optiones pro monstrar servitores" #: libraries/config/messages.inc.php:185 msgid "Tables display options" -msgstr "" +msgstr "Optiones pro monstrar tabellas" #: libraries/config/messages.inc.php:186 setup/frames/menu.inc.php:23 msgid "Main panel" -msgstr "" +msgstr "Pannello principal" #: libraries/config/messages.inc.php:187 msgid "Microsoft Office" -msgstr "" +msgstr "Microsoft Office" #: libraries/config/messages.inc.php:191 msgid "Other core settings" -msgstr "" +msgstr "Altere preferentias principal" #: libraries/config/messages.inc.php:192 msgid "Settings that didn't fit anywhere else" -msgstr "" +msgstr "Altere preferentias que on non pote poner in altere loco" #: libraries/config/messages.inc.php:193 msgid "Page titles" -msgstr "" +msgstr "Titulos de pagina" #: libraries/config/messages.inc.php:194 msgid "" @@ -5058,37 +5064,39 @@ msgstr "" #: libraries/config/messages.inc.php:195 #: libraries/navigation/NavigationHeader.class.php:216 msgid "Query window" -msgstr "" +msgstr "Fenestra de query" #: libraries/config/messages.inc.php:196 msgid "Customize query window options" -msgstr "" +msgstr "Personalisa le optiones de fenestra de query" #: libraries/config/messages.inc.php:197 msgid "Security" -msgstr "" +msgstr "Securitate" #: libraries/config/messages.inc.php:198 msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" msgstr "" +"Pro favor tu nota que phpMyAdmin es solo un interfacie e su characteristicas " +"non limita MySQL" #: libraries/config/messages.inc.php:199 msgid "Basic settings" -msgstr "" +msgstr "Preferentias basic" #: libraries/config/messages.inc.php:200 msgid "Authentication" -msgstr "" +msgstr "Authentication" #: libraries/config/messages.inc.php:201 msgid "Authentication settings" -msgstr "" +msgstr "Preferentias de authentication" #: libraries/config/messages.inc.php:202 msgid "Server configuration" -msgstr "" +msgstr "Configuration del servitor" #: libraries/config/messages.inc.php:203 msgid "" @@ -5098,11 +5106,11 @@ msgstr "" #: libraries/config/messages.inc.php:204 msgid "Enter server connection parameters" -msgstr "" +msgstr "Inserta parametros de connexion del servitor" #: libraries/config/messages.inc.php:205 msgid "Configuration storage" -msgstr "" +msgstr "Immagazinage de configuration" #: libraries/config/messages.inc.php:206 msgid "" @@ -5113,7 +5121,7 @@ msgstr "" #: libraries/config/messages.inc.php:207 msgid "Changes tracking" -msgstr "" +msgstr "Traciamento de modificationes" #: libraries/config/messages.inc.php:208 msgid "" @@ -5123,40 +5131,40 @@ msgstr "" #: libraries/config/messages.inc.php:209 msgid "Customize export options" -msgstr "" +msgstr "Personalisa optiones de exportar" #: libraries/config/messages.inc.php:211 msgid "Customize import defaults" -msgstr "" +msgstr "Personalisa optiones predefinite de importar" #: libraries/config/messages.inc.php:212 msgid "Customize navigation panel" -msgstr "" +msgstr "Personalisa pannello de navigation" #: libraries/config/messages.inc.php:213 msgid "Customize main panel" -msgstr "" +msgstr "Personalisa pannello principal" #: libraries/config/messages.inc.php:214 libraries/config/messages.inc.php:219 #: setup/frames/menu.inc.php:19 msgid "SQL queries" -msgstr "" +msgstr "Queries de SQL" #: libraries/config/messages.inc.php:216 msgid "SQL Query box" -msgstr "" +msgstr "Quadro de Query de SQL" #: libraries/config/messages.inc.php:217 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "Personalisa ligamines monstrate in le quadros de Query de SQL" #: libraries/config/messages.inc.php:220 msgid "SQL queries settings" -msgstr "" +msgstr "Preferentias de queries de SQL" #: libraries/config/messages.inc.php:221 msgid "SQL Validator" -msgstr "" +msgstr "Validator de SQL" #: libraries/config/messages.inc.php:222 msgid "" @@ -5168,55 +5176,57 @@ msgstr "" #: libraries/config/messages.inc.php:223 msgid "Startup" -msgstr "" +msgstr "Initiar" #: libraries/config/messages.inc.php:224 msgid "Customize startup page" -msgstr "" +msgstr "Personalisa le pagina de initiar" #: libraries/config/messages.inc.php:225 msgid "Database structure" -msgstr "" +msgstr "Structura de base de datos" #: libraries/config/messages.inc.php:226 msgid "Choose which details to show in the database structure (list of tables)" msgstr "" +"Selige qual detalios monstrar in le structura de base de datos (lista de " +"tabellas)" #: libraries/config/messages.inc.php:227 msgid "Table structure" -msgstr "" +msgstr "Structura de tabella" #: libraries/config/messages.inc.php:228 msgid "Settings for the table structure (list of columns)" -msgstr "" +msgstr "Preferentias del structura de tabella (lista de columnas)" #: libraries/config/messages.inc.php:229 msgid "Tabs" -msgstr "" +msgstr "Schedas" #: libraries/config/messages.inc.php:230 msgid "Choose how you want tabs to work" -msgstr "" +msgstr "Selige como tu vole que le schedas functiona" #: libraries/config/messages.inc.php:231 msgid "Text fields" -msgstr "" +msgstr "Campos de texto" #: libraries/config/messages.inc.php:232 msgid "Customize text input fields" -msgstr "" +msgstr "Personalisa le campos de ingresso de texto" #: libraries/config/messages.inc.php:233 msgid "Texy! text" -msgstr "" +msgstr "Texy! texto" #: libraries/config/messages.inc.php:235 msgid "Warnings" -msgstr "" +msgstr "Avisos" #: libraries/config/messages.inc.php:236 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "Dishabilita alcun avisos monstrate per phpMyAdmin" #: libraries/config/messages.inc.php:237 msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index b7e36a917c..d331f2b6e2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-11-28 14:02+0200\n" +"PO-Revision-Date: 2013-12-04 12:03+0200\n" "Last-Translator: Helder Santana \n" -"Language-Team: Portuguese (Brazil) \n" +"Language-Team: Portuguese (Brazil) " +"\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 1.9-dev\n" @@ -8810,6 +8810,8 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" +"Converte valores booleanos em texto (default 'T' e 'F'). Primeira opção é " +"TRUE, segunda FALSE. Não nulo = true." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" @@ -12786,7 +12788,7 @@ msgstr "Ver dump (esquema) dos bancos de dados" #: server_privileges.php:142 msgid "Username and hostname didn't change." -msgstr "" +msgstr "Username e hostname sem alterações." #: server_status.php:32 #, php-format diff --git a/po/sl.po b/po/sl.po index 219ff3b4b3..9db77a642e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-11-25 23:08+0200\n" +"PO-Revision-Date: 2013-12-04 15:56+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian " +"\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%" -"100==4 ? 2 : 3;\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3;\n" "X-Generator: Weblate 1.9-dev\n" #: changelog.php:36 license.php:28 @@ -8753,6 +8753,8 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" +"Pretvori Boolove vrednosti v besedilo (privzeto 'T' in 'F'). Prva možnost je " +"za TRUE, druga za FALSE. Neničelno = true." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" @@ -12715,7 +12717,7 @@ msgstr "Pokaži povzetek stanja zbirk podatkov" #: server_privileges.php:142 msgid "Username and hostname didn't change." -msgstr "" +msgstr "Uporabniško ime in ime gostitelja ni spremenjeno." #: server_status.php:32 #, php-format diff --git a/po/tr.po b/po/tr.po index 5d8ea08126..47dbab5b52 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-03 12:52-0500\n" -"PO-Revision-Date: 2013-12-01 18:16+0200\n" +"PO-Revision-Date: 2013-12-04 06:58+0200\n" "Last-Translator: Burak Yavuz \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish " +"\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Weblate 1.9-dev\n" @@ -8766,6 +8766,8 @@ msgid "" "Converts Boolean values to text (default 'T' and 'F'). First option is for " "TRUE, second for FALSE. Nonzero=true." msgstr "" +"Boolean değerlerini metne dönüştürür (varsayılan 'T' ve 'F'). Birinci " +"seçenek TRUE içindir, ikincisi FALSE içindir. Nonzero=true." #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" diff --git a/scripts/check-dco b/scripts/check-dco new file mode 100755 index 0000000000..15c36bef0d --- /dev/null +++ b/scripts/check-dco @@ -0,0 +1,21 @@ +#!/bin/sh +# Checks whether all commits in given range have Signed-Off-By + +if [ -z "$1" ] ; then + echo "Usage: check-dco COMMITRANGE" + exit 1 +fi + +RESULT=0 + +for rev in `git rev-list --no-merges $1` ; do + if ! git log -1 $rev | grep -iq '^ Signed-Off-By:' ; then + echo '------------------------------------------' + echo "Missing Signed-Off-By in following commit:" + git --no-pager log -1 $rev + echo + RESULT=1 + fi +done + +exit $RESULT