diff --git a/src/IDF/Form/UpdateUpload.php b/src/IDF/Form/UpdateUpload.php index 651eb52..5b9e19d 100644 --- a/src/IDF/Form/UpdateUpload.php +++ b/src/IDF/Form/UpdateUpload.php @@ -46,6 +46,16 @@ class IDF_Form_UpdateUpload extends Pluf_Form 'size' => 67, ), )); + $this->fields['changelog'] = new Pluf_Form_Field_Varchar( + array('required' => false, + 'label' => __('Description'), + 'initial' => $this->upload->changelog, + 'widget' => 'Pluf_Form_Widget_TextareaInput', + 'widget_attrs' => array( + 'cols' => 58, + 'rows' => 13, + ), + )); $tags = $this->upload->get_tags_list(); for ($i=1;$i<7;$i++) { $initial = ''; @@ -132,6 +142,7 @@ class IDF_Form_UpdateUpload extends Pluf_Form } // Create the upload $this->upload->summary = trim($this->cleaned_data['summary']); + $this->upload->changelog = trim($this->cleaned_data['changelog']); $this->upload->modif_dtime = gmdate('Y-m-d H:i:s'); $this->upload->update(); $this->upload->batchAssoc('IDF_Tag', $tags); diff --git a/src/IDF/Form/Upload.php b/src/IDF/Form/Upload.php index fee3631..91daa03 100644 --- a/src/IDF/Form/Upload.php +++ b/src/IDF/Form/Upload.php @@ -44,6 +44,16 @@ class IDF_Form_Upload extends Pluf_Form 'size' => 67, ), )); + $this->fields['changelog'] = new Pluf_Form_Field_Varchar( + array('required' => false, + 'label' => __('Description'), + 'initial' => '', + 'widget' => 'Pluf_Form_Widget_TextareaInput', + 'widget_attrs' => array( + 'cols' => 58, + 'rows' => 13, + ), + )); $this->fields['file'] = new Pluf_Form_Field_File( array('required' => true, 'label' => __('File'), @@ -155,6 +165,7 @@ class IDF_Form_Upload extends Pluf_Form $upload->project = $this->project; $upload->submitter = $this->user; $upload->summary = trim($this->cleaned_data['summary']); + $upload->changelog = trim($this->cleaned_data['changelog']); $upload->file = $this->cleaned_data['file']; $upload->filesize = filesize(Pluf::f('upload_path').'/'.$this->project->shortname.'/files/'.$this->cleaned_data['file']); $upload->downloads = 0; diff --git a/src/IDF/Migrations/12DownloadDesc.php b/src/IDF/Migrations/12DownloadDesc.php new file mode 100644 index 0000000..ffd5772 --- /dev/null +++ b/src/IDF/Migrations/12DownloadDesc.php @@ -0,0 +1,55 @@ +getSqlTable(); + $sql = array(); + $sql['PostgreSQL'] = 'ALTER TABLE '.$table.' ADD COLUMN "changelog" TEXT DEFAULT \'\''; + $sql['MySQL'] = 'ALTER TABLE '.$table.' ADD COLUMN `changelog` LONGTEXT DEFAULT \'\''; + $db = Pluf::db(); + $engine = Pluf::f('db_engine'); + if (!isset($sql[$engine])) { + throw new Exception('SQLite complex migration not supported.'); + } + $db->execute($sql[$engine]); +} + +function IDF_Migrations_12DownloadDesc_down($params=null) +{ + $table = Pluf::factory('IDF_Upload')->getSqlTable(); + $sql = array(); + $sql['PostgreSQL'] = 'ALTER TABLE '.$table.' DROP COLUMN "changelog"'; + $sql['MySQL'] = 'ALTER TABLE '.$table.' DROP COLUMN `changelog`'; + $db = Pluf::db(); + $engine = Pluf::f('db_engine'); + if (!isset($sql[$engine])) { + throw new Exception('SQLite complex migration not supported.'); + } + $db->execute($sql[$engine]); + +} \ No newline at end of file diff --git a/src/IDF/Upload.php b/src/IDF/Upload.php index 1d129a5..4f849be 100644 --- a/src/IDF/Upload.php +++ b/src/IDF/Upload.php @@ -56,6 +56,12 @@ class IDF_Upload extends Pluf_Model 'size' => 250, 'verbose' => __('summary'), ), + 'changelog' => + array( + 'type' => 'Pluf_DB_Field_Text', + 'blank' => true, + 'verbose' => __('changes'), + ), 'file' => array( 'type' => 'Pluf_DB_Field_File', diff --git a/src/IDF/locale/fr/idf.po b/src/IDF/locale/fr/idf.po index c73de33..73aa046 100644 --- a/src/IDF/locale/fr/idf.po +++ b/src/IDF/locale/fr/idf.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: InDefero\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-16 13:36+0200\n" -"PO-Revision-Date: 2009-04-16 13:39+0100\n" +"POT-Creation-Date: 2009-06-22 21:06+0200\n" +"PO-Revision-Date: 2009-06-22 21:07+0100\n" "Last-Translator: Loïc d'Anterroches \n" "Language-Team: Translation team \n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "projet" #: IDF/IssueFile.php:57 #: IDF/Issue.php:67 #: IDF/Review.php:71 -#: IDF/Upload.php:79 +#: IDF/Upload.php:85 #: IDF/WikiPage.php:78 #: IDF/WikiRevision.php:79 #: IDF/Review/Comment.php:69 @@ -59,7 +59,7 @@ msgstr "changements" #: IDF/IssueFile.php:96 #: IDF/Issue.php:105 #: IDF/Review.php:99 -#: IDF/Upload.php:100 +#: IDF/Upload.php:106 #: IDF/WikiPage.php:100 #: IDF/WikiRevision.php:92 #: IDF/Review/Patch.php:83 @@ -68,30 +68,23 @@ msgstr "changements" msgid "creation date" msgstr "date de création" -#: IDF/Commit.php:170 +#: IDF/Commit.php:172 #, php-format msgid "New Commit %s - %s (%s)" msgstr "Nouveau commit %s - %s (%s)" -#: IDF/Commit.php:205 -#: IDF/Commit.php:232 +#: IDF/Commit.php:239 +#, php-format +msgid "Commit %s, by %s" +msgstr "Commit %s, par %s" + +#: IDF/Commit.php:266 #: IDF/Form/ReviewCreate.php:74 #: IDF/gettexttemplates/idf/source/base.html.php:5 #: IDF/gettexttemplates/idf/source/changelog.html.php:5 msgid "Commit" msgstr "Commit" -#: IDF/Commit.php:205 -#: IDF/IssueComment.php:173 -#: IDF/Issue.php:196 -#: IDF/Upload.php:186 -#: IDF/WikiPage.php:199 -#: IDF/WikiRevision.php:189 -#: IDF/Review/Comment.php:177 -#: IDF/gettexttemplates/idf/source/changelog.html.php:6 -msgid "by" -msgstr "par" - #: IDF/Conf.php:61 msgid "key" msgstr "clef" @@ -113,6 +106,7 @@ msgid "comment" msgstr "commentaire" #: IDF/IssueComment.php:72 +#: IDF/Upload.php:63 #: IDF/WikiRevision.php:85 #: IDF/Review/Comment.php:76 msgid "changes" @@ -182,17 +176,16 @@ msgstr "Propriétaire :" #: IDF/gettexttemplates/idf/issues/view.html.php:13 #: IDF/gettexttemplates/idf/issues/view.html.php:24 #: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:9 -#: IDF/gettexttemplates/idf/downloads/view.html.php:15 +#: IDF/gettexttemplates/idf/downloads/view.html.php:16 #: IDF/gettexttemplates/idf/downloads/delete.html.php:11 #: IDF/gettexttemplates/idf/downloads/download-created-email.txt.php:7 msgid "Labels:" msgstr "Étiquettes :" #: IDF/IssueComment.php:173 -#: IDF/Review/Comment.php:177 #, php-format -msgid "Comment on issue %d" -msgstr "Commentaire sur le ticket %d" +msgid "Comment on issue %d, by %s" +msgstr "Commentaire sur le ticket %d, par %s" #: IDF/IssueComment.php:195 #: IDF/Review/Comment.php:199 @@ -227,7 +220,7 @@ msgstr "Autre" #: IDF/IssueFile.php:102 #: IDF/Issue.php:111 #: IDF/Review.php:105 -#: IDF/Upload.php:106 +#: IDF/Upload.php:112 #: IDF/WikiPage.php:106 msgid "modification date" msgstr "date de modification" @@ -247,7 +240,7 @@ msgstr "Les personnes intéressées reçoivent un email d'information quand le t #: IDF/Issue.php:92 #: IDF/Review.php:86 -#: IDF/Upload.php:87 +#: IDF/Upload.php:93 #: IDF/WikiPage.php:94 msgid "labels" msgstr "étiquettes" @@ -259,8 +252,8 @@ msgstr "statut" #: IDF/Issue.php:196 #, php-format -msgid "Creation of issue %d" -msgstr "Création du ticket %d" +msgid "Creation of issue %d, by %s" +msgstr "Création du ticket %d, par %s" #: IDF/Issue.php:215 #, php-format @@ -330,33 +323,33 @@ msgstr "lcname" msgid "Lower case version of the name for fast searching." msgstr "Version minuscule du nom pour chercher rapidement." -#: IDF/Upload.php:64 +#: IDF/Upload.php:70 msgid "file" msgstr "fichier" -#: IDF/Upload.php:65 +#: IDF/Upload.php:71 msgid "The path is relative to the upload path." msgstr "Le chemin est relatif au répertoire de mise en ligne." -#: IDF/Upload.php:72 +#: IDF/Upload.php:78 msgid "file size in bytes" msgstr "taille du fichier en octets" -#: IDF/Upload.php:94 +#: IDF/Upload.php:100 msgid "number of downloads" msgstr "nombre de téléchargements" -#: IDF/Upload.php:183 +#: IDF/Upload.php:189 #, php-format msgid "Download %2$d, %3$s" msgstr "Téléchargement %2$d, %3$s" -#: IDF/Upload.php:186 +#: IDF/Upload.php:192 #, php-format -msgid "Addition of download %d" -msgstr "Création du téléchargement %d" +msgid "Addition of download %d, by %s" +msgstr "Création du téléchargement %d, par %s" -#: IDF/Upload.php:204 +#: IDF/Upload.php:210 #, php-format msgid "%s: Download %d added - %s" msgstr "%s: Ajout du téléchargement %d - %s" @@ -423,8 +416,8 @@ msgstr "%2$s, %3$s" #: IDF/WikiPage.php:199 #, php-format -msgid "Creation of page %s" -msgstr "Création de la page %s" +msgid "Creation of page %s, by %s" +msgstr "Création de la page %s, par %s" #: IDF/WikiPage.php:218 #, php-format @@ -445,8 +438,8 @@ msgstr "contenu" #: IDF/WikiRevision.php:189 #, php-format -msgid "Change of %s" -msgstr "Changement de %s" +msgid "Change of %s, by %s" +msgstr "Changement de %s, par %s" #: IDF/WikiRevision.php:209 #, php-format @@ -490,6 +483,16 @@ msgstr "commit" msgid "patch" msgstr "patch" +#: IDF/Review/Comment.php:177 +#, php-format +msgid "Comment on issue %d" +msgstr "Commentaire sur le ticket %d" + +#: IDF/Review/Comment.php:177 +#: IDF/gettexttemplates/idf/source/changelog.html.php:6 +msgid "by" +msgstr "par" + #: IDF/Plugin/SyncSvn.php:75 #: IDF/Plugin/SyncMercurial.php:75 #, php-format @@ -523,9 +526,9 @@ msgstr "Titre" #: IDF/Views/User.php:83 #: IDF/Views/Issue.php:61 #: IDF/Views/Issue.php:137 -#: IDF/Views/Issue.php:249 -#: IDF/Views/Issue.php:442 -#: IDF/Views/Issue.php:500 +#: IDF/Views/Issue.php:247 +#: IDF/Views/Issue.php:436 +#: IDF/Views/Issue.php:494 #: IDF/Views/Download.php:65 #: IDF/Views/Download.php:272 #: IDF/Form/Upload.php:40 @@ -592,8 +595,8 @@ msgid "Delete Old Revision of %s" msgstr "Suppression de la vieille version de %s" #: IDF/Views/Wiki.php:316 -#: IDF/Views/Admin.php:90 -#: IDF/Views/Admin.php:242 +#: IDF/Views/Admin.php:93 +#: IDF/Views/Admin.php:245 #, php-format msgid "Update %s" msgstr "Mise à jour de %s" @@ -638,7 +641,7 @@ msgid "%s Project Summary" msgstr "Résumé du projet %s" #: IDF/Views/Project.php:221 -#: IDF/Views/Admin.php:98 +#: IDF/Views/Admin.php:101 msgid "The project has been updated." msgstr "Le projet a été mis à jour." @@ -724,9 +727,9 @@ msgstr "Ce tableau montre les dernières revues de code." #: IDF/Views/User.php:81 #: IDF/Views/Issue.php:60 #: IDF/Views/Issue.php:136 -#: IDF/Views/Issue.php:248 -#: IDF/Views/Issue.php:441 -#: IDF/Views/Issue.php:499 +#: IDF/Views/Issue.php:246 +#: IDF/Views/Issue.php:435 +#: IDF/Views/Issue.php:493 msgid "Id" msgstr "Id" @@ -734,9 +737,9 @@ msgstr "Id" #: IDF/Views/User.php:84 #: IDF/Views/Issue.php:62 #: IDF/Views/Issue.php:138 -#: IDF/Views/Issue.php:250 -#: IDF/Views/Issue.php:443 -#: IDF/Views/Issue.php:501 +#: IDF/Views/Issue.php:248 +#: IDF/Views/Issue.php:437 +#: IDF/Views/Issue.php:495 #: IDF/Form/IssueCreate.php:92 #: IDF/Form/IssueUpdate.php:88 #: IDF/Form/ReviewCreate.php:103 @@ -747,9 +750,9 @@ msgstr "Statut" #: IDF/Views/User.php:85 #: IDF/Views/Issue.php:63 #: IDF/Views/Issue.php:139 -#: IDF/Views/Issue.php:251 -#: IDF/Views/Issue.php:444 -#: IDF/Views/Issue.php:502 +#: IDF/Views/Issue.php:249 +#: IDF/Views/Issue.php:438 +#: IDF/Views/Issue.php:496 msgid "Last Updated" msgstr "Dernière mise à jour" @@ -835,19 +838,19 @@ msgstr "Confirmez le changement d'adresse" msgid "Your new email address \"%s\" has been validated. Thank you!" msgstr "Votre nouvelle adresse email \"%s\" a été validée. Merci !" -#: IDF/Views/Source.php:49 +#: IDF/Views/Source.php:50 #, php-format msgid "%s Source Help" msgstr "Aide des sources de %s" -#: IDF/Views/Source.php:64 +#: IDF/Views/Source.php:65 #, php-format msgid "%1$s %2$s Change Log" msgstr "Changements %2$s de %1$s" -#: IDF/Views/Source.php:105 -#: IDF/Views/Source.php:154 -#: IDF/Views/Source.php:316 +#: IDF/Views/Source.php:108 +#: IDF/Views/Source.php:152 +#: IDF/Views/Source.php:318 #, php-format msgid "%1$s %2$s Source Tree" msgstr "Arbre des sources %2$s de %1$s" @@ -869,9 +872,9 @@ msgstr "Tickets ouverts de %s" #: IDF/Views/Issue.php:67 #: IDF/Views/Issue.php:143 -#: IDF/Views/Issue.php:255 -#: IDF/Views/Issue.php:448 -#: IDF/Views/Issue.php:506 +#: IDF/Views/Issue.php:253 +#: IDF/Views/Issue.php:442 +#: IDF/Views/Issue.php:500 msgid "No issues were found." msgstr "Aucun ticket n'a été trouvé." @@ -899,78 +902,78 @@ msgstr "Mes tickets en cours pour %s" msgid "Submit a new issue" msgstr "Soumettre un nouveau ticket" -#: IDF/Views/Issue.php:178 -#, php-format -msgid "Issue %d has been created." -msgstr "Le ticket %d a été créé." - -#: IDF/Views/Issue.php:197 +#: IDF/Views/Issue.php:194 #, php-format msgid "Issue %s - %s (%s)" msgstr "Ticket %s - %s (%s)" -#: IDF/Views/Issue.php:232 +#: IDF/Views/Issue.php:201 +#, php-format +msgid "Issue %d has been created." +msgstr "Le ticket %d a été créé." + +#: IDF/Views/Issue.php:230 #, php-format msgid "Search Issues - %s" msgstr "Recherche de tickets - %s" -#: IDF/Views/Issue.php:244 +#: IDF/Views/Issue.php:242 msgid "This table shows the found issues." msgstr "Ce tableau montre les tickets trouvés." -#: IDF/Views/Issue.php:274 +#: IDF/Views/Issue.php:272 #, php-format msgid "Issue %d: %s" msgstr "Ticket %d : %s" -#: IDF/Views/Issue.php:298 -#, php-format -msgid "Issue %d has been updated." -msgstr "Le ticket %d a été mis à jour." - -#: IDF/Views/Issue.php:329 +#: IDF/Views/Issue.php:322 #, php-format msgid "Updated Issue %s - %s (%s)" msgstr "Mise à jour ticket %s - %s (%s)" -#: IDF/Views/Issue.php:402 +#: IDF/Views/Issue.php:330 +#, php-format +msgid "Issue %d has been updated." +msgstr "Le ticket %d a été mis à jour." + +#: IDF/Views/Issue.php:396 #, php-format msgid "View %s" msgstr "Voir %s" -#: IDF/Views/Issue.php:422 +#: IDF/Views/Issue.php:416 #, php-format msgid "%s Closed Issues" msgstr "Tickets fermés de %s" -#: IDF/Views/Issue.php:432 +#: IDF/Views/Issue.php:426 msgid "This table shows the closed issues." msgstr "Ce tableau montre les tickets fermés." -#: IDF/Views/Issue.php:474 +#: IDF/Views/Issue.php:468 #, php-format msgid "%1$s Issues with Label %2$s" msgstr "%1$s tickets avec l'étiquette %2$s" -#: IDF/Views/Issue.php:477 +#: IDF/Views/Issue.php:471 #, php-format msgid "%1$s Closed Issues with Label %2$s" msgstr "Tickets fermés de %1$s avec l'étiquette %2$s" -#: IDF/Views/Issue.php:490 +#: IDF/Views/Issue.php:484 #, php-format msgid "This table shows the issues with label %s." msgstr "Ce tableau montre les tickets avec l'étiquette %s." -#: IDF/Views/Issue.php:539 +#: IDF/Views/Issue.php:533 msgid "The issue has been removed from your watch list." msgstr "Le ticket a été supprimé de votre liste de surveillance." -#: IDF/Views/Issue.php:542 +#: IDF/Views/Issue.php:536 msgid "The issue has been added to your watch list." msgstr "Le ticket a été ajouté à votre liste de surveillance." -#: IDF/Views/Issue.php:620 +#: IDF/Views/Issue.php:614 msgid "On your watch list." msgstr "Dans votre liste de surveillance." @@ -985,7 +988,7 @@ msgstr "Ce tableau présente la liste des fichiers en téléchargement." #: IDF/Views/Download.php:64 #: IDF/Views/Download.php:271 -#: IDF/Form/Upload.php:49 +#: IDF/Form/Upload.php:59 #: IDF/gettexttemplates/idf/source/mercurial/tree.html.php:6 #: IDF/gettexttemplates/idf/source/svn/tree.html.php:6 #: IDF/gettexttemplates/idf/source/git/tree.html.php:6 @@ -1067,89 +1070,93 @@ msgid "Short Name" msgstr "Nom court" #: IDF/Views/Admin.php:66 -#: IDF/Views/Admin.php:203 +#: IDF/Views/Admin.php:206 #: IDF/Form/Admin/ProjectCreate.php:48 #: IDF/Form/Admin/ProjectUpdate.php:42 msgid "Name" msgstr "Nom" -#: IDF/Views/Admin.php:71 +#: IDF/Views/Admin.php:67 +msgid "Repository Size" +msgstr "Taille du dépôt" + +#: IDF/Views/Admin.php:73 msgid "No projects were found." msgstr "Aucun projet n'a été trouvé." -#: IDF/Views/Admin.php:122 +#: IDF/Views/Admin.php:125 #: IDF/gettexttemplates/idf/gadmin/projects/base.html.php:4 #: IDF/gettexttemplates/idf/gadmin/projects/create.html.php:16 #: IDF/gettexttemplates/idf/index.html.php:5 msgid "Create Project" msgstr "Créer un projet" -#: IDF/Views/Admin.php:128 +#: IDF/Views/Admin.php:131 msgid "The project has been created." msgstr "Le projet a été créé." -#: IDF/Views/Admin.php:154 +#: IDF/Views/Admin.php:157 #, php-format msgid "Delete %s Project" msgstr "Supprimer le projet %s" -#: IDF/Views/Admin.php:161 +#: IDF/Views/Admin.php:164 msgid "The project has been deleted." msgstr "Le projet a été supprimé." -#: IDF/Views/Admin.php:191 +#: IDF/Views/Admin.php:194 msgid "Not Validated User List" msgstr "Liste des utilisateurs non confirmés" -#: IDF/Views/Admin.php:194 +#: IDF/Views/Admin.php:197 #: IDF/gettexttemplates/idf/gadmin/users/base.html.php:3 msgid "User List" msgstr "Liste des utilisateurs" -#: IDF/Views/Admin.php:197 +#: IDF/Views/Admin.php:200 msgid "This table shows the users in the forge." msgstr "Ce tableau montre les utilisateurs de la forge." -#: IDF/Views/Admin.php:202 +#: IDF/Views/Admin.php:205 msgid "login" msgstr "identifiant" -#: IDF/Views/Admin.php:204 +#: IDF/Views/Admin.php:207 #: IDF/Form/Admin/UserUpdate.php:99 msgid "Staff" msgstr "Staff" -#: IDF/Views/Admin.php:205 +#: IDF/Views/Admin.php:208 msgid "Admin" msgstr "Admin" -#: IDF/Views/Admin.php:206 +#: IDF/Views/Admin.php:209 #: IDF/Form/Admin/UserUpdate.php:110 msgid "Active" msgstr "Actif" -#: IDF/Views/Admin.php:207 +#: IDF/Views/Admin.php:210 msgid "Last Login" msgstr "Dernier login" -#: IDF/Views/Admin.php:212 +#: IDF/Views/Admin.php:215 msgid "No users were found." msgstr "Aucun utilisateur trouvé." -#: IDF/Views/Admin.php:249 +#: IDF/Views/Admin.php:252 msgid "You do not have the rights to update this user." msgstr "Vous n'avez pas les droits pour mettre à jour cet utilisateur." -#: IDF/Views/Admin.php:265 +#: IDF/Views/Admin.php:268 msgid "The user has been updated." msgstr "L'utilisateur a été mis à jour." -#: IDF/Views/Admin.php:284 +#: IDF/Views/Admin.php:287 #: IDF/gettexttemplates/idf/login_form.html.php:7 msgid "Yes" msgstr "Oui" -#: IDF/Views/Admin.php:284 +#: IDF/Views/Admin.php:287 msgid "No" msgstr "Non" @@ -1164,16 +1171,16 @@ msgid "The validation key is not valid. Please copy/paste it from your confirmat msgstr "Nous sommes désolés mais cette clef de confirmation est invalide. Vous devriez peut-être faire directement un copier/coller depuis votre email de confirmation." #: IDF/Form/UserChangeEmail.php:80 -#: IDF/Form/Upload.php:137 +#: IDF/Form/Upload.php:147 #: IDF/Form/Register.php:114 #: IDF/Form/UserAccount.php:119 -#: IDF/Form/Admin/ProjectCreate.php:205 -#: IDF/Form/Admin/ProjectUpdate.php:67 +#: IDF/Form/Admin/ProjectCreate.php:215 +#: IDF/Form/Admin/ProjectUpdate.php:77 #: IDF/Form/Admin/UserUpdate.php:129 #: IDF/Form/Admin/ProjectDelete.php:78 -#: IDF/Form/UpdateUpload.php:116 +#: IDF/Form/UpdateUpload.php:126 #: IDF/Form/WikiUpdate.php:178 -#: IDF/Form/TabsConf.php:92 +#: IDF/Form/TabsConf.php:97 #: IDF/Form/ReviewCommentFile.php:166 #: IDF/Form/IssueCreate.php:233 #: IDF/Form/Password.php:61 @@ -1185,8 +1192,18 @@ msgstr "Nous sommes désolés mais cette clef de confirmation est invalide. Vous msgid "Cannot save the model from an invalid form." msgstr "Ne peut pas sauvegarder le modèle depuis un formulaire invalide." -#: IDF/Form/Upload.php:60 -#: IDF/Form/UpdateUpload.php:61 +#: IDF/Form/Upload.php:49 +#: IDF/Form/UpdateUpload.php:51 +#: IDF/Form/WikiUpdate.php:60 +#: IDF/Form/ReviewCommentFile.php:69 +#: IDF/Form/IssueCreate.php:59 +#: IDF/Form/WikiCreate.php:70 +#: IDF/Form/ReviewCreate.php:54 +msgid "Description" +msgstr "Description" + +#: IDF/Form/Upload.php:70 +#: IDF/Form/UpdateUpload.php:71 #: IDF/Form/WikiUpdate.php:104 #: IDF/Form/ReviewCommentFile.php:92 #: IDF/Form/IssueCreate.php:120 @@ -1195,19 +1212,19 @@ msgstr "Ne peut pas sauvegarder le modèle depuis un formulaire invalide." msgid "Labels" msgstr "Étiquettes" -#: IDF/Form/Upload.php:75 +#: IDF/Form/Upload.php:85 msgid "For security reason, you cannot upload a file with this extension." msgstr "Pour des raisons de sécurité, vous ne pouvez pas mettre en ligne un fichier avec cette extension." -#: IDF/Form/Upload.php:108 -#: IDF/Form/UpdateUpload.php:99 +#: IDF/Form/Upload.php:118 +#: IDF/Form/UpdateUpload.php:109 #: IDF/Form/IssueCreate.php:169 #, php-format msgid "You cannot provide more than label from the %s class to an issue." msgstr "Vous ne pouvez pas fournir plus d'une étiquette de la classe %s à un ticket." -#: IDF/Form/Upload.php:109 -#: IDF/Form/UpdateUpload.php:100 +#: IDF/Form/Upload.php:119 +#: IDF/Form/UpdateUpload.php:110 #: IDF/Form/WikiUpdate.php:162 #: IDF/Form/ReviewCommentFile.php:150 #: IDF/Form/IssueCreate.php:163 @@ -1216,7 +1233,7 @@ msgstr "Vous ne pouvez pas fournir plus d'une étiquette de la classe %s à un t msgid "You provided an invalid label." msgstr "Vous avez donné une étiquette invalide." -#: IDF/Form/Upload.php:176 +#: IDF/Form/Upload.php:187 #, php-format msgid "New download - %s (%s)" msgstr "Nouveau téléchargement - %s (%s)" @@ -1359,7 +1376,7 @@ msgid "The email \"%s\" is already used." msgstr "L'adresse email \"%s\" est déjà utilisée." #: IDF/Form/UserAccount.php:240 -#: IDF/Form/Admin/UserUpdate.php:211 +#: IDF/Form/Admin/UserUpdate.php:214 msgid "The passwords do not match. Please give them again." msgstr "Les mots de passe ne sont pas identiques, veuillez les donner de nouveau." @@ -1427,27 +1444,27 @@ msgstr "Propriétaires du projet" msgid "Project members" msgstr "Membres du projet" -#: IDF/Form/Admin/ProjectCreate.php:144 +#: IDF/Form/Admin/ProjectCreate.php:154 msgid "Only a remote repository available throught http or https are allowed. For example \"http://somewhere.com/svn/trunk\"." msgstr "Only a remote repository available throught http or https are allowed. For example \"http://somewhere.com/svn/trunk\"." -#: IDF/Form/Admin/ProjectCreate.php:153 +#: IDF/Form/Admin/ProjectCreate.php:163 msgid "This shortname contains illegal characters, please use only letters, digits and dash (-)." msgstr "Ce nom court contient des caractères non autorisés, il ne doit être composé que de lettres, de chiffres et du tiret (-)." -#: IDF/Form/Admin/ProjectCreate.php:156 +#: IDF/Form/Admin/ProjectCreate.php:166 msgid "The shortname cannot start with the dash (-) character." msgstr "Le nom court ne doit pas démarrer avec un tiret (-)." -#: IDF/Form/Admin/ProjectCreate.php:159 +#: IDF/Form/Admin/ProjectCreate.php:169 msgid "The shortname cannot end with the dash (-) character." msgstr "Le nom court ne doit pas se terminer avec un tiret (-)." -#: IDF/Form/Admin/ProjectCreate.php:164 +#: IDF/Form/Admin/ProjectCreate.php:174 msgid "This shortname is already used. Please select another one." msgstr "Ce nom court est déjà utilisé, veuillez en sélectionner un autre." -#: IDF/Form/Admin/ProjectCreate.php:211 +#: IDF/Form/Admin/ProjectCreate.php:221 msgid "Click on the Administer tab to set the description of your project." msgstr "Cliquez sur l'onglet Administration pour définir la description du projet." @@ -1479,7 +1496,11 @@ msgstr "Si vous donnez les droits de staff à un utilisateur, vous devez vraimen msgid "If the user is not getting the confirmation email or is abusing the system, you can directly enable or disable his account here." msgstr "Si l'utilisateur ne reçoit pas l'email de confirmation ou s'il abuse du système, vous pouvez directement activer ou désactiver son compte ici." -#: IDF/Form/Admin/UserUpdate.php:196 +#: IDF/Form/Admin/UserUpdate.php:183 +msgid "--- is not a valid first name." +msgstr "--- n'est pas un prénom acceptable." + +#: IDF/Form/Admin/UserUpdate.php:199 msgid "A user with this email already exists, please provide another email address." msgstr "Un utilisateur avec cet email existe déjà, merci de fournir une autre adresse email." @@ -1511,14 +1532,6 @@ msgstr "Titre" msgid "The page name must contains only letters, digits and the dash (-) character." msgstr "Le nom de la page ne doit contenir que des lettres, chiffres et le tiret (-)." -#: IDF/Form/WikiUpdate.php:60 -#: IDF/Form/ReviewCommentFile.php:69 -#: IDF/Form/IssueCreate.php:59 -#: IDF/Form/WikiCreate.php:70 -#: IDF/Form/ReviewCreate.php:54 -msgid "Description" -msgstr "Description" - #: IDF/Form/WikiUpdate.php:61 #: IDF/Form/ReviewCommentFile.php:70 #: IDF/Form/WikiCreate.php:71 @@ -1715,6 +1728,13 @@ msgstr "Vous devez au moins apporter un commentaire à un fichier." msgid "New Documentation Page %s - %s (%s)" msgstr "Nouvelle page de documentation %s - %s (%s)" +#: IDF/Form/MembersConf.php:104 +#, php-format +msgid "The following login is invalid: %s." +msgid_plural "The following login are invalids: %s." +msgstr[0] "L'identifiant suivant n'est pas valide : %s." +msgstr[1] "Les identifiants suivants ne sont pas valides: %s." + #: IDF/Form/WikiConf.php:49 msgid "Predefined documentation page labels" msgstr "Étiquettes prédéfinies des pages" @@ -1760,14 +1780,14 @@ msgstr "Patch initial à discuter." msgid "New Code Review %s - %s (%s)" msgstr "Nouvelle revue de code %s - %s (%s)" -#: IDF/Scm/Mercurial.php:123 -#: IDF/Scm/Git.php:137 +#: IDF/Scm/Mercurial.php:125 +#: IDF/Scm/Git.php:145 #, php-format msgid "Folder %1$s not found in commit %2$s." msgstr "Répertoire %1$s non trouvé dans le commit %2$s." -#: IDF/Scm/Mercurial.php:140 -#: IDF/Scm/Git.php:187 +#: IDF/Scm/Mercurial.php:142 +#: IDF/Scm/Git.php:245 #, php-format msgid "Not a valid tree: %s." msgstr "Arbre non valide : %s." @@ -1994,6 +2014,7 @@ msgstr "Télécharger ce fichier" #: IDF/gettexttemplates/idf/source/mercurial/file.html.php:8 #: IDF/gettexttemplates/idf/source/mercurial/tree.html.php:15 +#: IDF/gettexttemplates/idf/source/svn/tree.html.php:17 #: IDF/gettexttemplates/idf/source/commit.html.php:13 #: IDF/gettexttemplates/idf/source/git/file.html.php:8 #: IDF/gettexttemplates/idf/source/git/tree.html.php:15 @@ -2078,12 +2099,14 @@ msgstr "mise à :" #: IDF/gettexttemplates/idf/source/svn/file.html.php:10 #: IDF/gettexttemplates/idf/source/svn/tree.html.php:15 +#: IDF/gettexttemplates/idf/source/commit.html.php:14 #: IDF/gettexttemplates/idf/source/changelog.html.php:8 msgid "Revision:" msgstr "Révision :" #: IDF/gettexttemplates/idf/source/svn/file.html.php:11 #: IDF/gettexttemplates/idf/source/svn/tree.html.php:16 +#: IDF/gettexttemplates/idf/source/commit.html.php:15 #: IDF/gettexttemplates/idf/source/changelog.html.php:9 msgid "Go to revision" msgstr "Voir révision" @@ -2208,9 +2231,9 @@ msgstr "Mise à jour" #: IDF/gettexttemplates/idf/review/create.html.php:12 #: IDF/gettexttemplates/idf/issues/view.html.php:18 #: IDF/gettexttemplates/idf/issues/create.html.php:14 -#: IDF/gettexttemplates/idf/downloads/view.html.php:7 +#: IDF/gettexttemplates/idf/downloads/view.html.php:8 #: IDF/gettexttemplates/idf/downloads/delete.html.php:7 -#: IDF/gettexttemplates/idf/downloads/submit.html.php:8 +#: IDF/gettexttemplates/idf/downloads/submit.html.php:9 msgid "Cancel" msgstr "Annuler" @@ -2315,7 +2338,7 @@ msgstr "Supprimer ce projet" #: IDF/gettexttemplates/idf/gadmin/projects/update.html.php:18 #: IDF/gettexttemplates/idf/wiki/view.html.php:11 -#: IDF/gettexttemplates/idf/downloads/view.html.php:9 +#: IDF/gettexttemplates/idf/downloads/view.html.php:10 msgid "Trash" msgstr "Poubelle" @@ -2381,6 +2404,34 @@ msgstr "Pour de gros projets, la suppression peut durer un moment, merci de votr msgid "Change Project Details" msgstr "Changer les détails du projet" +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:3 +msgid "Space Usage Statistics" +msgstr "Statistiques de l'utilisation" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:4 +msgid "Repositories:" +msgstr "Dépôts :" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:5 +#: IDF/gettexttemplates/idf/issues/issue-updated-email.txt.php:17 +#: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:11 +msgid "Attachments:" +msgstr "Pièces jointes :" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:6 +#: IDF/gettexttemplates/idf/downloads/view.html.php:15 +#: IDF/gettexttemplates/idf/downloads/delete.html.php:10 +msgid "Downloads:" +msgstr "Téléchargements :" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:7 +msgid "Database:" +msgstr "Base de données :" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:8 +msgid "Total Forge:" +msgstr "Total forge:" + #: IDF/gettexttemplates/idf/gadmin/projects/create.html.php:3 msgid "You can select the type of repository you want. In the case of subversion, you can use optionally a remote repository instead of the local one." msgstr "Vous pouvez sélectionner le type de dépôt souhaité. Dans le cas d'un dépôt Subversion, vous pouvez aussi choisir un dépôt distant." @@ -2411,7 +2462,7 @@ msgid "Welcome" msgstr "Bienvenue" #: IDF/gettexttemplates/idf/admin/members.html.php:13 -#: IDF/gettexttemplates/idf/admin/source.html.php:7 +#: IDF/gettexttemplates/idf/admin/source.html.php:8 #: IDF/gettexttemplates/idf/admin/tabs.html.php:10 #: IDF/gettexttemplates/idf/admin/issue-tracking.html.php:8 #: IDF/gettexttemplates/idf/admin/wiki.html.php:8 @@ -2436,6 +2487,10 @@ msgstr "Type de dépôt :" msgid "Repository access:" msgstr "Accès au dépôt :" +#: IDF/gettexttemplates/idf/admin/source.html.php:7 +msgid "Repository size:" +msgstr "Taille des dépôts :" + #: IDF/gettexttemplates/idf/admin/tabs.html.php:3 msgid "You can configure here the project tabs access rights and notification emails." msgstr "Vous pouvez configurer ici les droits d'accès aux onglets et les emails de notification." @@ -2562,7 +2617,7 @@ msgstr "Créé :" #: IDF/gettexttemplates/idf/wiki/delete.html.php:12 #: IDF/gettexttemplates/idf/review/view.html.php:24 #: IDF/gettexttemplates/idf/issues/view.html.php:20 -#: IDF/gettexttemplates/idf/downloads/view.html.php:13 +#: IDF/gettexttemplates/idf/downloads/view.html.php:14 #: IDF/gettexttemplates/idf/downloads/delete.html.php:9 msgid "Updated:" msgstr "Mis à jour :" @@ -2717,7 +2772,7 @@ msgstr "Récupérer votre mot de passe" #: IDF/gettexttemplates/idf/user/passrecovery-inputkey.html.php:6 #: IDF/gettexttemplates/idf/user/changeemail.html.php:6 #: IDF/gettexttemplates/idf/register/inputkey.html.php:6 -#: IDF/gettexttemplates/idf/downloads/submit.html.php:9 +#: IDF/gettexttemplates/idf/downloads/submit.html.php:10 msgid "Instructions" msgstr "Instructions" @@ -3128,6 +3183,7 @@ msgstr "Le formulaire contient des erreurs. Merci de les corriger pour soumettre #: IDF/gettexttemplates/idf/review/view.html.php:28 #: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:10 +#: IDF/gettexttemplates/idf/downloads/download-created-email.txt.php:9 msgid "Description:" msgstr "Description :" @@ -3260,11 +3316,6 @@ msgstr "Par %%who%%, %%c.creation_dtime%%" msgid "(No comments were given for this change.)" msgstr "(Aucun commentaire n'a été donné pour ce changement.)" -#: IDF/gettexttemplates/idf/issues/issue-updated-email.txt.php:17 -#: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:11 -msgid "Attachments:" -msgstr "Pièces jointes :" - #: IDF/gettexttemplates/idf/issues/issue-updated-email.txt.php:18 #: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:12 msgid "Issue:" @@ -3404,32 +3455,31 @@ msgid "Attention! This file is marked as deprecated, download i msgstr "Attention ! Ce fichier est marqué comme obsolète, téléchargez ce fichier uniquement si vous avez besoin de cette version." #: IDF/gettexttemplates/idf/downloads/view.html.php:5 +msgid "Changes" +msgstr "Changements" + +#: IDF/gettexttemplates/idf/downloads/view.html.php:6 msgid "The form contains some errors. Please correct them to update the file." msgstr "Le formulaire contient des erreurs. Merci de les corriger pour mettre en ligne le fichier." -#: IDF/gettexttemplates/idf/downloads/view.html.php:6 +#: IDF/gettexttemplates/idf/downloads/view.html.php:7 msgid "Update File" msgstr "Mettre à jour le fichier" -#: IDF/gettexttemplates/idf/downloads/view.html.php:8 -#: IDF/gettexttemplates/idf/downloads/view.html.php:10 +#: IDF/gettexttemplates/idf/downloads/view.html.php:9 +#: IDF/gettexttemplates/idf/downloads/view.html.php:11 msgid "Remove this file" msgstr "Supprimer ce fichier" -#: IDF/gettexttemplates/idf/downloads/view.html.php:11 +#: IDF/gettexttemplates/idf/downloads/view.html.php:12 msgid "Delete this file" msgstr "Supprimer ce fichier" -#: IDF/gettexttemplates/idf/downloads/view.html.php:12 +#: IDF/gettexttemplates/idf/downloads/view.html.php:13 #: IDF/gettexttemplates/idf/downloads/delete.html.php:8 msgid "Uploaded:" msgstr "Mis en ligne :" -#: IDF/gettexttemplates/idf/downloads/view.html.php:14 -#: IDF/gettexttemplates/idf/downloads/delete.html.php:10 -msgid "Downloads:" -msgstr "Téléchargements :" - #: IDF/gettexttemplates/idf/downloads/delete.html.php:3 msgid "Attention! If you want to delete a specific version of your software, maybe, someone is depending on this specific version to run his systems. Are you sure, you will not affect anybody when removing this file?" msgstr "Attention ! Si vous voulez supprimer une version spécifique de votre logiciel, peut-être que quelqu'un dépend encore de cette version. Êtes-vous certain que supprimer ce fichier ne va pas importuner certaines personnes ?" @@ -3460,10 +3510,15 @@ msgid "" msgstr "Chaque fichier doit avoir un nom différent et ce nom ne peut pas être changé. Faites attention de bien mettre le numéro de révision dans le nom du fichier." #: IDF/gettexttemplates/idf/downloads/submit.html.php:6 +#, php-format +msgid "You can use the Markdown syntax for the changes." +msgstr "Vous pouvez utiliser la syntaxe Markdown pour la description." + +#: IDF/gettexttemplates/idf/downloads/submit.html.php:7 msgid "The form contains some errors. Please correct them to submit the file." msgstr "Le formulaire contient des erreurs. Merci de les corriger pour mettre en ligne le fichier." -#: IDF/gettexttemplates/idf/downloads/submit.html.php:7 +#: IDF/gettexttemplates/idf/downloads/submit.html.php:8 msgid "Submit File" msgstr "Mettre en ligne" @@ -3495,3 +3550,8 @@ msgstr "Moi" msgid "Create this documentation page" msgstr "Créer cette page de documentation" +#: IDF/gettexttemplates/idf/downloads/submit.html.php:6 +#, php-format +msgid "You can use the Markdown syntax for the description." +msgstr "Vous pouvez utiliser la syntaxe Markdown pour la description." + diff --git a/src/IDF/locale/idf.pot b/src/IDF/locale/idf.pot index 53d51d7..39f6e7e 100644 --- a/src/IDF/locale/idf.pot +++ b/src/IDF/locale/idf.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-16 13:36+0200\n" +"POT-Creation-Date: 2009-06-22 21:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgid "project" msgstr "" #: IDF/Commit.php:62 IDF/IssueComment.php:65 IDF/IssueFile.php:57 -#: IDF/Issue.php:67 IDF/Review.php:71 IDF/Upload.php:79 IDF/WikiPage.php:78 +#: IDF/Issue.php:67 IDF/Review.php:71 IDF/Upload.php:85 IDF/WikiPage.php:78 #: IDF/WikiRevision.php:79 IDF/Review/Comment.php:69 #: IDF/Review/FileComment.php:69 msgid "submitter" @@ -40,30 +40,28 @@ msgid "changelog" msgstr "" #: IDF/Commit.php:99 IDF/IssueComment.php:79 IDF/IssueFile.php:96 -#: IDF/Issue.php:105 IDF/Review.php:99 IDF/Upload.php:100 IDF/WikiPage.php:100 +#: IDF/Issue.php:105 IDF/Review.php:99 IDF/Upload.php:106 IDF/WikiPage.php:100 #: IDF/WikiRevision.php:92 IDF/Review/Patch.php:83 IDF/Review/Comment.php:83 #: IDF/Review/FileComment.php:76 msgid "creation date" msgstr "" -#: IDF/Commit.php:170 +#: IDF/Commit.php:172 #, php-format msgid "New Commit %s - %s (%s)" msgstr "" -#: IDF/Commit.php:205 IDF/Commit.php:232 IDF/Form/ReviewCreate.php:74 +#: IDF/Commit.php:239 +#, php-format +msgid "Commit %s, by %s" +msgstr "" + +#: IDF/Commit.php:266 IDF/Form/ReviewCreate.php:74 #: IDF/gettexttemplates/idf/source/base.html.php:5 #: IDF/gettexttemplates/idf/source/changelog.html.php:5 msgid "Commit" msgstr "" -#: IDF/Commit.php:205 IDF/IssueComment.php:173 IDF/Issue.php:196 -#: IDF/Upload.php:186 IDF/WikiPage.php:199 IDF/WikiRevision.php:189 -#: IDF/Review/Comment.php:177 -#: IDF/gettexttemplates/idf/source/changelog.html.php:6 -msgid "by" -msgstr "" - #: IDF/Conf.php:61 IDF/Conf.php:61 msgid "key" msgstr "" @@ -81,7 +79,8 @@ msgstr "" msgid "comment" msgstr "" -#: IDF/IssueComment.php:72 IDF/WikiRevision.php:85 IDF/Review/Comment.php:76 +#: IDF/IssueComment.php:72 IDF/Upload.php:63 IDF/WikiRevision.php:85 +#: IDF/Review/Comment.php:76 msgid "changes" msgstr "" @@ -138,15 +137,15 @@ msgstr "" #: IDF/gettexttemplates/idf/issues/view.html.php:13 #: IDF/gettexttemplates/idf/issues/view.html.php:24 #: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:9 -#: IDF/gettexttemplates/idf/downloads/view.html.php:15 +#: IDF/gettexttemplates/idf/downloads/view.html.php:16 #: IDF/gettexttemplates/idf/downloads/delete.html.php:11 #: IDF/gettexttemplates/idf/downloads/download-created-email.txt.php:7 msgid "Labels:" msgstr "" -#: IDF/IssueComment.php:173 IDF/Review/Comment.php:177 +#: IDF/IssueComment.php:173 #, php-format -msgid "Comment on issue %d" +msgid "Comment on issue %d, by %s" msgstr "" #: IDF/IssueComment.php:195 IDF/Review/Comment.php:199 @@ -179,7 +178,7 @@ msgid "Other" msgstr "" #: IDF/IssueFile.php:102 IDF/Issue.php:111 IDF/Review.php:105 -#: IDF/Upload.php:106 IDF/WikiPage.php:106 +#: IDF/Upload.php:112 IDF/WikiPage.php:106 msgid "modification date" msgstr "" @@ -196,7 +195,7 @@ msgid "" "Interested users will get an email notification when the issue is changed." msgstr "" -#: IDF/Issue.php:92 IDF/Review.php:86 IDF/Upload.php:87 IDF/WikiPage.php:94 +#: IDF/Issue.php:92 IDF/Review.php:86 IDF/Upload.php:93 IDF/WikiPage.php:94 msgid "labels" msgstr "" @@ -206,7 +205,7 @@ msgstr "" #: IDF/Issue.php:196 #, php-format -msgid "Creation of issue %d" +msgid "Creation of issue %d, by %s" msgstr "" #: IDF/Issue.php:215 @@ -277,33 +276,33 @@ msgstr "" msgid "Lower case version of the name for fast searching." msgstr "" -#: IDF/Upload.php:64 +#: IDF/Upload.php:70 msgid "file" msgstr "" -#: IDF/Upload.php:65 +#: IDF/Upload.php:71 msgid "The path is relative to the upload path." msgstr "" -#: IDF/Upload.php:72 +#: IDF/Upload.php:78 msgid "file size in bytes" msgstr "" -#: IDF/Upload.php:94 +#: IDF/Upload.php:100 msgid "number of downloads" msgstr "" -#: IDF/Upload.php:183 +#: IDF/Upload.php:189 #, php-format msgid "Download %2$d, %3$s" msgstr "" -#: IDF/Upload.php:186 +#: IDF/Upload.php:192 #, php-format -msgid "Addition of download %d" +msgid "Addition of download %d, by %s" msgstr "" -#: IDF/Upload.php:204 +#: IDF/Upload.php:210 #, php-format msgid "%s: Download %d added - %s" msgstr "" @@ -368,7 +367,7 @@ msgstr "" #: IDF/WikiPage.php:199 #, php-format -msgid "Creation of page %s" +msgid "Creation of page %s, by %s" msgstr "" #: IDF/WikiPage.php:218 @@ -390,7 +389,7 @@ msgstr "" #: IDF/WikiRevision.php:189 #, php-format -msgid "Change of %s" +msgid "Change of %s, by %s" msgstr "" #: IDF/WikiRevision.php:209 @@ -434,6 +433,16 @@ msgstr "" msgid "patch" msgstr "" +#: IDF/Review/Comment.php:177 +#, php-format +msgid "Comment on issue %d" +msgstr "" + +#: IDF/Review/Comment.php:177 +#: IDF/gettexttemplates/idf/source/changelog.html.php:6 +msgid "by" +msgstr "" + #: IDF/Plugin/SyncSvn.php:75 IDF/Plugin/SyncMercurial.php:75 #, php-format msgid "The repository %s already exists." @@ -459,8 +468,8 @@ msgstr "" #: IDF/Views/Wiki.php:62 IDF/Views/Wiki.php:109 IDF/Views/Wiki.php:150 #: IDF/Views/Review.php:58 IDF/Views/User.php:83 IDF/Views/Issue.php:61 -#: IDF/Views/Issue.php:137 IDF/Views/Issue.php:249 IDF/Views/Issue.php:442 -#: IDF/Views/Issue.php:500 IDF/Views/Download.php:65 +#: IDF/Views/Issue.php:137 IDF/Views/Issue.php:247 IDF/Views/Issue.php:436 +#: IDF/Views/Issue.php:494 IDF/Views/Download.php:65 #: IDF/Views/Download.php:272 IDF/Form/Upload.php:40 #: IDF/Form/UpdateUpload.php:42 IDF/Form/IssueCreate.php:50 #: IDF/Form/IssueUpdate.php:45 IDF/Form/ReviewCreate.php:45 @@ -518,7 +527,7 @@ msgstr "" msgid "Delete Old Revision of %s" msgstr "" -#: IDF/Views/Wiki.php:316 IDF/Views/Admin.php:90 IDF/Views/Admin.php:242 +#: IDF/Views/Wiki.php:316 IDF/Views/Admin.php:93 IDF/Views/Admin.php:245 #, php-format msgid "Update %s" msgstr "" @@ -562,7 +571,7 @@ msgstr "" msgid "%s Project Summary" msgstr "" -#: IDF/Views/Project.php:221 IDF/Views/Admin.php:98 +#: IDF/Views/Project.php:221 IDF/Views/Admin.php:101 msgid "The project has been updated." msgstr "" @@ -642,21 +651,21 @@ msgid "This table shows the latest reviews." msgstr "" #: IDF/Views/Review.php:57 IDF/Views/User.php:81 IDF/Views/Issue.php:60 -#: IDF/Views/Issue.php:136 IDF/Views/Issue.php:248 IDF/Views/Issue.php:441 -#: IDF/Views/Issue.php:499 +#: IDF/Views/Issue.php:136 IDF/Views/Issue.php:246 IDF/Views/Issue.php:435 +#: IDF/Views/Issue.php:493 msgid "Id" msgstr "" #: IDF/Views/Review.php:59 IDF/Views/User.php:84 IDF/Views/Issue.php:62 -#: IDF/Views/Issue.php:138 IDF/Views/Issue.php:250 IDF/Views/Issue.php:443 -#: IDF/Views/Issue.php:501 IDF/Form/IssueCreate.php:92 +#: IDF/Views/Issue.php:138 IDF/Views/Issue.php:248 IDF/Views/Issue.php:437 +#: IDF/Views/Issue.php:495 IDF/Form/IssueCreate.php:92 #: IDF/Form/IssueUpdate.php:88 IDF/Form/ReviewCreate.php:103 msgid "Status" msgstr "" #: IDF/Views/Review.php:60 IDF/Views/User.php:85 IDF/Views/Issue.php:63 -#: IDF/Views/Issue.php:139 IDF/Views/Issue.php:251 IDF/Views/Issue.php:444 -#: IDF/Views/Issue.php:502 +#: IDF/Views/Issue.php:139 IDF/Views/Issue.php:249 IDF/Views/Issue.php:438 +#: IDF/Views/Issue.php:496 msgid "Last Updated" msgstr "" @@ -739,17 +748,17 @@ msgstr "" msgid "Your new email address \"%s\" has been validated. Thank you!" msgstr "" -#: IDF/Views/Source.php:49 +#: IDF/Views/Source.php:50 #, php-format msgid "%s Source Help" msgstr "" -#: IDF/Views/Source.php:64 +#: IDF/Views/Source.php:65 #, php-format msgid "%1$s %2$s Change Log" msgstr "" -#: IDF/Views/Source.php:105 IDF/Views/Source.php:154 IDF/Views/Source.php:316 +#: IDF/Views/Source.php:108 IDF/Views/Source.php:152 IDF/Views/Source.php:318 #, php-format msgid "%1$s %2$s Source Tree" msgstr "" @@ -769,8 +778,8 @@ msgstr "" msgid "%s Open Issues" msgstr "" -#: IDF/Views/Issue.php:67 IDF/Views/Issue.php:143 IDF/Views/Issue.php:255 -#: IDF/Views/Issue.php:448 IDF/Views/Issue.php:506 +#: IDF/Views/Issue.php:67 IDF/Views/Issue.php:143 IDF/Views/Issue.php:253 +#: IDF/Views/Issue.php:442 IDF/Views/Issue.php:500 msgid "No issues were found." msgstr "" @@ -798,78 +807,78 @@ msgstr "" msgid "Submit a new issue" msgstr "" -#: IDF/Views/Issue.php:178 +#: IDF/Views/Issue.php:194 #, php-format -msgid "Issue %d has been created." +msgid "Issue %s - %s (%s)" msgstr "" -#: IDF/Views/Issue.php:197 +#: IDF/Views/Issue.php:201 #, php-format -msgid "Issue %s - %s (%s)" +msgid "Issue %d has been created." msgstr "" -#: IDF/Views/Issue.php:232 +#: IDF/Views/Issue.php:230 #, php-format msgid "Search Issues - %s" msgstr "" -#: IDF/Views/Issue.php:244 +#: IDF/Views/Issue.php:242 msgid "This table shows the found issues." msgstr "" -#: IDF/Views/Issue.php:274 +#: IDF/Views/Issue.php:272 #, php-format msgid "Issue %d: %s" msgstr "" -#: IDF/Views/Issue.php:298 +#: IDF/Views/Issue.php:322 #, php-format -msgid "Issue %d has been updated." +msgid "Updated Issue %s - %s (%s)" msgstr "" -#: IDF/Views/Issue.php:329 +#: IDF/Views/Issue.php:330 #, php-format -msgid "Updated Issue %s - %s (%s)" +msgid "Issue %d has been updated." msgstr "" -#: IDF/Views/Issue.php:402 +#: IDF/Views/Issue.php:396 #, php-format msgid "View %s" msgstr "" -#: IDF/Views/Issue.php:422 +#: IDF/Views/Issue.php:416 #, php-format msgid "%s Closed Issues" msgstr "" -#: IDF/Views/Issue.php:432 +#: IDF/Views/Issue.php:426 msgid "This table shows the closed issues." msgstr "" -#: IDF/Views/Issue.php:474 +#: IDF/Views/Issue.php:468 #, php-format msgid "%1$s Issues with Label %2$s" msgstr "" -#: IDF/Views/Issue.php:477 +#: IDF/Views/Issue.php:471 #, php-format msgid "%1$s Closed Issues with Label %2$s" msgstr "" -#: IDF/Views/Issue.php:490 +#: IDF/Views/Issue.php:484 #, php-format msgid "This table shows the issues with label %s." msgstr "" -#: IDF/Views/Issue.php:539 +#: IDF/Views/Issue.php:533 msgid "The issue has been removed from your watch list." msgstr "" -#: IDF/Views/Issue.php:542 +#: IDF/Views/Issue.php:536 msgid "The issue has been added to your watch list." msgstr "" -#: IDF/Views/Issue.php:620 +#: IDF/Views/Issue.php:614 msgid "On your watch list." msgstr "" @@ -882,7 +891,7 @@ msgstr "" msgid "This table shows the files to download." msgstr "" -#: IDF/Views/Download.php:64 IDF/Views/Download.php:271 IDF/Form/Upload.php:49 +#: IDF/Views/Download.php:64 IDF/Views/Download.php:271 IDF/Form/Upload.php:59 #: IDF/gettexttemplates/idf/source/mercurial/tree.html.php:6 #: IDF/gettexttemplates/idf/source/svn/tree.html.php:6 #: IDF/gettexttemplates/idf/source/git/tree.html.php:6 @@ -959,85 +968,89 @@ msgstr "" msgid "Short Name" msgstr "" -#: IDF/Views/Admin.php:66 IDF/Views/Admin.php:203 +#: IDF/Views/Admin.php:66 IDF/Views/Admin.php:206 #: IDF/Form/Admin/ProjectCreate.php:48 IDF/Form/Admin/ProjectUpdate.php:42 msgid "Name" msgstr "" -#: IDF/Views/Admin.php:71 +#: IDF/Views/Admin.php:67 +msgid "Repository Size" +msgstr "" + +#: IDF/Views/Admin.php:73 msgid "No projects were found." msgstr "" -#: IDF/Views/Admin.php:122 +#: IDF/Views/Admin.php:125 #: IDF/gettexttemplates/idf/gadmin/projects/base.html.php:4 #: IDF/gettexttemplates/idf/gadmin/projects/create.html.php:16 #: IDF/gettexttemplates/idf/index.html.php:5 msgid "Create Project" msgstr "" -#: IDF/Views/Admin.php:128 +#: IDF/Views/Admin.php:131 msgid "The project has been created." msgstr "" -#: IDF/Views/Admin.php:154 +#: IDF/Views/Admin.php:157 #, php-format msgid "Delete %s Project" msgstr "" -#: IDF/Views/Admin.php:161 +#: IDF/Views/Admin.php:164 msgid "The project has been deleted." msgstr "" -#: IDF/Views/Admin.php:191 +#: IDF/Views/Admin.php:194 msgid "Not Validated User List" msgstr "" -#: IDF/Views/Admin.php:194 +#: IDF/Views/Admin.php:197 #: IDF/gettexttemplates/idf/gadmin/users/base.html.php:3 msgid "User List" msgstr "" -#: IDF/Views/Admin.php:197 +#: IDF/Views/Admin.php:200 msgid "This table shows the users in the forge." msgstr "" -#: IDF/Views/Admin.php:202 +#: IDF/Views/Admin.php:205 msgid "login" msgstr "" -#: IDF/Views/Admin.php:204 IDF/Form/Admin/UserUpdate.php:99 +#: IDF/Views/Admin.php:207 IDF/Form/Admin/UserUpdate.php:99 msgid "Staff" msgstr "" -#: IDF/Views/Admin.php:205 +#: IDF/Views/Admin.php:208 msgid "Admin" msgstr "" -#: IDF/Views/Admin.php:206 IDF/Form/Admin/UserUpdate.php:110 +#: IDF/Views/Admin.php:209 IDF/Form/Admin/UserUpdate.php:110 msgid "Active" msgstr "" -#: IDF/Views/Admin.php:207 +#: IDF/Views/Admin.php:210 msgid "Last Login" msgstr "" -#: IDF/Views/Admin.php:212 +#: IDF/Views/Admin.php:215 msgid "No users were found." msgstr "" -#: IDF/Views/Admin.php:249 +#: IDF/Views/Admin.php:252 msgid "You do not have the rights to update this user." msgstr "" -#: IDF/Views/Admin.php:265 +#: IDF/Views/Admin.php:268 msgid "The user has been updated." msgstr "" -#: IDF/Views/Admin.php:284 IDF/gettexttemplates/idf/login_form.html.php:7 +#: IDF/Views/Admin.php:287 IDF/gettexttemplates/idf/login_form.html.php:7 msgid "Yes" msgstr "" -#: IDF/Views/Admin.php:284 +#: IDF/Views/Admin.php:287 msgid "No" msgstr "" @@ -1052,12 +1065,12 @@ msgid "" "email." msgstr "" -#: IDF/Form/UserChangeEmail.php:80 IDF/Form/Upload.php:137 +#: IDF/Form/UserChangeEmail.php:80 IDF/Form/Upload.php:147 #: IDF/Form/Register.php:114 IDF/Form/UserAccount.php:119 -#: IDF/Form/Admin/ProjectCreate.php:205 IDF/Form/Admin/ProjectUpdate.php:67 +#: IDF/Form/Admin/ProjectCreate.php:215 IDF/Form/Admin/ProjectUpdate.php:77 #: IDF/Form/Admin/UserUpdate.php:129 IDF/Form/Admin/ProjectDelete.php:78 -#: IDF/Form/UpdateUpload.php:116 IDF/Form/WikiUpdate.php:178 -#: IDF/Form/TabsConf.php:92 IDF/Form/ReviewCommentFile.php:166 +#: IDF/Form/UpdateUpload.php:126 IDF/Form/WikiUpdate.php:178 +#: IDF/Form/TabsConf.php:97 IDF/Form/ReviewCommentFile.php:166 #: IDF/Form/IssueCreate.php:233 IDF/Form/Password.php:61 #: IDF/Form/IssueUpdate.php:232 IDF/Form/ReviewFileComment.php:77 #: IDF/Form/WikiCreate.php:167 IDF/Form/MembersConf.php:64 @@ -1065,31 +1078,38 @@ msgstr "" msgid "Cannot save the model from an invalid form." msgstr "" -#: IDF/Form/Upload.php:60 IDF/Form/UpdateUpload.php:61 +#: IDF/Form/Upload.php:49 IDF/Form/UpdateUpload.php:51 +#: IDF/Form/WikiUpdate.php:60 IDF/Form/ReviewCommentFile.php:69 +#: IDF/Form/IssueCreate.php:59 IDF/Form/WikiCreate.php:70 +#: IDF/Form/ReviewCreate.php:54 +msgid "Description" +msgstr "" + +#: IDF/Form/Upload.php:70 IDF/Form/UpdateUpload.php:71 #: IDF/Form/WikiUpdate.php:104 IDF/Form/ReviewCommentFile.php:92 #: IDF/Form/IssueCreate.php:120 IDF/Form/IssueUpdate.php:117 #: IDF/Form/WikiCreate.php:93 msgid "Labels" msgstr "" -#: IDF/Form/Upload.php:75 +#: IDF/Form/Upload.php:85 msgid "For security reason, you cannot upload a file with this extension." msgstr "" -#: IDF/Form/Upload.php:108 IDF/Form/UpdateUpload.php:99 +#: IDF/Form/Upload.php:118 IDF/Form/UpdateUpload.php:109 #: IDF/Form/IssueCreate.php:169 #, php-format msgid "You cannot provide more than label from the %s class to an issue." msgstr "" -#: IDF/Form/Upload.php:109 IDF/Form/UpdateUpload.php:100 +#: IDF/Form/Upload.php:119 IDF/Form/UpdateUpload.php:110 #: IDF/Form/WikiUpdate.php:162 IDF/Form/ReviewCommentFile.php:150 #: IDF/Form/IssueCreate.php:163 IDF/Form/IssueCreate.php:170 #: IDF/Form/WikiCreate.php:151 msgid "You provided an invalid label." msgstr "" -#: IDF/Form/Upload.php:176 +#: IDF/Form/Upload.php:187 #, php-format msgid "New download - %s (%s)" msgstr "" @@ -1237,7 +1257,7 @@ msgstr "" msgid "The email \"%s\" is already used." msgstr "" -#: IDF/Form/UserAccount.php:240 IDF/Form/Admin/UserUpdate.php:211 +#: IDF/Form/UserAccount.php:240 IDF/Form/Admin/UserUpdate.php:214 msgid "The passwords do not match. Please give them again." msgstr "" @@ -1301,31 +1321,31 @@ msgstr "" msgid "Project members" msgstr "" -#: IDF/Form/Admin/ProjectCreate.php:144 +#: IDF/Form/Admin/ProjectCreate.php:154 msgid "" "Only a remote repository available throught http or https are allowed. For " "example \"http://somewhere.com/svn/trunk\"." msgstr "" -#: IDF/Form/Admin/ProjectCreate.php:153 +#: IDF/Form/Admin/ProjectCreate.php:163 msgid "" "This shortname contains illegal characters, please use only letters, digits " "and dash (-)." msgstr "" -#: IDF/Form/Admin/ProjectCreate.php:156 +#: IDF/Form/Admin/ProjectCreate.php:166 msgid "The shortname cannot start with the dash (-) character." msgstr "" -#: IDF/Form/Admin/ProjectCreate.php:159 +#: IDF/Form/Admin/ProjectCreate.php:169 msgid "The shortname cannot end with the dash (-) character." msgstr "" -#: IDF/Form/Admin/ProjectCreate.php:164 +#: IDF/Form/Admin/ProjectCreate.php:174 msgid "This shortname is already used. Please select another one." msgstr "" -#: IDF/Form/Admin/ProjectCreate.php:211 +#: IDF/Form/Admin/ProjectCreate.php:221 msgid "Click on the Administer tab to set the description of your project." msgstr "" @@ -1361,7 +1381,11 @@ msgid "" "you can directly enable or disable his account here." msgstr "" -#: IDF/Form/Admin/UserUpdate.php:196 +#: IDF/Form/Admin/UserUpdate.php:183 +msgid "--- is not a valid first name." +msgstr "" + +#: IDF/Form/Admin/UserUpdate.php:199 msgid "" "A user with this email already exists, please provide another email address." msgstr "" @@ -1395,12 +1419,6 @@ msgid "" "The page name must contains only letters, digits and the dash (-) character." msgstr "" -#: IDF/Form/WikiUpdate.php:60 IDF/Form/ReviewCommentFile.php:69 -#: IDF/Form/IssueCreate.php:59 IDF/Form/WikiCreate.php:70 -#: IDF/Form/ReviewCreate.php:54 -msgid "Description" -msgstr "" - #: IDF/Form/WikiUpdate.php:61 IDF/Form/ReviewCommentFile.php:70 #: IDF/Form/WikiCreate.php:71 msgid "This one line description is displayed in the list of pages." @@ -1570,6 +1588,13 @@ msgstr "" msgid "New Documentation Page %s - %s (%s)" msgstr "" +#: IDF/Form/MembersConf.php:104 +#, php-format +msgid "The following login is invalid: %s." +msgid_plural "The following login are invalids: %s." +msgstr[0] "" +msgstr[1] "" + #: IDF/Form/WikiConf.php:49 msgid "Predefined documentation page labels" msgstr "" @@ -1616,12 +1641,12 @@ msgstr "" msgid "New Code Review %s - %s (%s)" msgstr "" -#: IDF/Scm/Mercurial.php:123 IDF/Scm/Git.php:137 +#: IDF/Scm/Mercurial.php:125 IDF/Scm/Git.php:145 #, php-format msgid "Folder %1$s not found in commit %2$s." msgstr "" -#: IDF/Scm/Mercurial.php:140 IDF/Scm/Git.php:187 +#: IDF/Scm/Mercurial.php:142 IDF/Scm/Git.php:245 #, php-format msgid "Not a valid tree: %s." msgstr "" @@ -1850,6 +1875,7 @@ msgstr "" #: IDF/gettexttemplates/idf/source/mercurial/file.html.php:8 #: IDF/gettexttemplates/idf/source/mercurial/tree.html.php:15 +#: IDF/gettexttemplates/idf/source/svn/tree.html.php:17 #: IDF/gettexttemplates/idf/source/commit.html.php:13 #: IDF/gettexttemplates/idf/source/git/file.html.php:8 #: IDF/gettexttemplates/idf/source/git/tree.html.php:15 @@ -1936,12 +1962,14 @@ msgstr "" #: IDF/gettexttemplates/idf/source/svn/file.html.php:10 #: IDF/gettexttemplates/idf/source/svn/tree.html.php:15 +#: IDF/gettexttemplates/idf/source/commit.html.php:14 #: IDF/gettexttemplates/idf/source/changelog.html.php:8 msgid "Revision:" msgstr "" #: IDF/gettexttemplates/idf/source/svn/file.html.php:11 #: IDF/gettexttemplates/idf/source/svn/tree.html.php:16 +#: IDF/gettexttemplates/idf/source/commit.html.php:15 #: IDF/gettexttemplates/idf/source/changelog.html.php:9 msgid "Go to revision" msgstr "" @@ -2070,9 +2098,9 @@ msgstr "" #: IDF/gettexttemplates/idf/review/create.html.php:12 #: IDF/gettexttemplates/idf/issues/view.html.php:18 #: IDF/gettexttemplates/idf/issues/create.html.php:14 -#: IDF/gettexttemplates/idf/downloads/view.html.php:7 +#: IDF/gettexttemplates/idf/downloads/view.html.php:8 #: IDF/gettexttemplates/idf/downloads/delete.html.php:7 -#: IDF/gettexttemplates/idf/downloads/submit.html.php:8 +#: IDF/gettexttemplates/idf/downloads/submit.html.php:9 msgid "Cancel" msgstr "" @@ -2175,7 +2203,7 @@ msgstr "" #: IDF/gettexttemplates/idf/gadmin/projects/update.html.php:18 #: IDF/gettexttemplates/idf/wiki/view.html.php:11 -#: IDF/gettexttemplates/idf/downloads/view.html.php:9 +#: IDF/gettexttemplates/idf/downloads/view.html.php:10 msgid "Trash" msgstr "" @@ -2241,6 +2269,34 @@ msgstr "" msgid "Change Project Details" msgstr "" +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:3 +msgid "Space Usage Statistics" +msgstr "" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:4 +msgid "Repositories:" +msgstr "" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:5 +#: IDF/gettexttemplates/idf/issues/issue-updated-email.txt.php:17 +#: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:11 +msgid "Attachments:" +msgstr "" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:6 +#: IDF/gettexttemplates/idf/downloads/view.html.php:15 +#: IDF/gettexttemplates/idf/downloads/delete.html.php:10 +msgid "Downloads:" +msgstr "" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:7 +msgid "Database:" +msgstr "" + +#: IDF/gettexttemplates/idf/gadmin/projects/index.html.php:8 +msgid "Total Forge:" +msgstr "" + #: IDF/gettexttemplates/idf/gadmin/projects/create.html.php:3 msgid "" "You can select the type of repository you want. In the case of subversion, " @@ -2277,7 +2333,7 @@ msgid "Welcome" msgstr "" #: IDF/gettexttemplates/idf/admin/members.html.php:13 -#: IDF/gettexttemplates/idf/admin/source.html.php:7 +#: IDF/gettexttemplates/idf/admin/source.html.php:8 #: IDF/gettexttemplates/idf/admin/tabs.html.php:10 #: IDF/gettexttemplates/idf/admin/issue-tracking.html.php:8 #: IDF/gettexttemplates/idf/admin/wiki.html.php:8 @@ -2304,6 +2360,10 @@ msgstr "" msgid "Repository access:" msgstr "" +#: IDF/gettexttemplates/idf/admin/source.html.php:7 +msgid "Repository size:" +msgstr "" + #: IDF/gettexttemplates/idf/admin/tabs.html.php:3 msgid "" "You can configure here the project tabs access rights and notification " @@ -2438,7 +2498,7 @@ msgstr "" #: IDF/gettexttemplates/idf/wiki/delete.html.php:12 #: IDF/gettexttemplates/idf/review/view.html.php:24 #: IDF/gettexttemplates/idf/issues/view.html.php:20 -#: IDF/gettexttemplates/idf/downloads/view.html.php:13 +#: IDF/gettexttemplates/idf/downloads/view.html.php:14 #: IDF/gettexttemplates/idf/downloads/delete.html.php:9 msgid "Updated:" msgstr "" @@ -2594,7 +2654,7 @@ msgstr "" #: IDF/gettexttemplates/idf/user/passrecovery-inputkey.html.php:6 #: IDF/gettexttemplates/idf/user/changeemail.html.php:6 #: IDF/gettexttemplates/idf/register/inputkey.html.php:6 -#: IDF/gettexttemplates/idf/downloads/submit.html.php:9 +#: IDF/gettexttemplates/idf/downloads/submit.html.php:10 msgid "Instructions" msgstr "" @@ -2979,6 +3039,7 @@ msgstr "" #: IDF/gettexttemplates/idf/review/view.html.php:28 #: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:10 +#: IDF/gettexttemplates/idf/downloads/download-created-email.txt.php:9 msgid "Description:" msgstr "" @@ -3113,11 +3174,6 @@ msgstr "" msgid "(No comments were given for this change.)" msgstr "" -#: IDF/gettexttemplates/idf/issues/issue-updated-email.txt.php:17 -#: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:11 -msgid "Attachments:" -msgstr "" - #: IDF/gettexttemplates/idf/issues/issue-updated-email.txt.php:18 #: IDF/gettexttemplates/idf/issues/issue-created-email.txt.php:12 msgid "Issue:" @@ -3255,32 +3311,31 @@ msgid "" msgstr "" #: IDF/gettexttemplates/idf/downloads/view.html.php:5 -msgid "The form contains some errors. Please correct them to update the file." +msgid "Changes" msgstr "" #: IDF/gettexttemplates/idf/downloads/view.html.php:6 +msgid "The form contains some errors. Please correct them to update the file." +msgstr "" + +#: IDF/gettexttemplates/idf/downloads/view.html.php:7 msgid "Update File" msgstr "" -#: IDF/gettexttemplates/idf/downloads/view.html.php:8 -#: IDF/gettexttemplates/idf/downloads/view.html.php:10 +#: IDF/gettexttemplates/idf/downloads/view.html.php:9 +#: IDF/gettexttemplates/idf/downloads/view.html.php:11 msgid "Remove this file" msgstr "" -#: IDF/gettexttemplates/idf/downloads/view.html.php:11 +#: IDF/gettexttemplates/idf/downloads/view.html.php:12 msgid "Delete this file" msgstr "" -#: IDF/gettexttemplates/idf/downloads/view.html.php:12 +#: IDF/gettexttemplates/idf/downloads/view.html.php:13 #: IDF/gettexttemplates/idf/downloads/delete.html.php:8 msgid "Uploaded:" msgstr "" -#: IDF/gettexttemplates/idf/downloads/view.html.php:14 -#: IDF/gettexttemplates/idf/downloads/delete.html.php:10 -msgid "Downloads:" -msgstr "" - #: IDF/gettexttemplates/idf/downloads/delete.html.php:3 msgid "" "Attention! If you want to delete a specific version of your " @@ -3316,10 +3371,16 @@ msgid "" msgstr "" #: IDF/gettexttemplates/idf/downloads/submit.html.php:6 -msgid "The form contains some errors. Please correct them to submit the file." +#, php-format +msgid "" +"You can use the Markdown syntax for the changes." msgstr "" #: IDF/gettexttemplates/idf/downloads/submit.html.php:7 +msgid "The form contains some errors. Please correct them to submit the file." +msgstr "" + +#: IDF/gettexttemplates/idf/downloads/submit.html.php:8 msgid "Submit File" msgstr "" @@ -3350,3 +3411,9 @@ msgstr "" #: IDF/Template/Markdown.php:61 msgid "Create this documentation page" msgstr "" + +#: IDF/gettexttemplates/idf/downloads/submit.html.php:6 +#, php-format +msgid "" +"You can use the Markdown syntax for the description." +msgstr "" diff --git a/src/IDF/templates/idf/downloads/download-created-email.txt b/src/IDF/templates/idf/downloads/download-created-email.txt index 0022a39..6d7dfb0 100644 --- a/src/IDF/templates/idf/downloads/download-created-email.txt +++ b/src/IDF/templates/idf/downloads/download-created-email.txt @@ -10,3 +10,8 @@ {foreach $tags as $tag} {$tag.class|safe}:{$tag.name|safe} {/foreach}{/if} {trans 'Download:'} {$urlfile} +{if $file.changelog} +{trans 'Description:'} + +{$file.changelog} +{/if} diff --git a/src/IDF/templates/idf/downloads/submit.html b/src/IDF/templates/idf/downloads/submit.html index 3773331..ed7b44b 100644 --- a/src/IDF/templates/idf/downloads/submit.html +++ b/src/IDF/templates/idf/downloads/submit.html @@ -19,6 +19,12 @@ +{$form.f.changelog.labelTag}: +{if $form.f.changelog.errors}{$form.f.changelog.fieldErrors}{/if} +{$form.f.changelog|unsafe} + + + {$form.f.file.labelTag}: {if $form.f.file.errors}{$form.f.file.fieldErrors}{/if} {$form.f.file|unsafe} @@ -50,6 +56,8 @@

{blocktrans}Each file must have a distinct name and file contents cannot be changed, so be sure to include release numbers in each file name.{/blocktrans}

+{assign $url = 'http://daringfireball.net/projects/markdown/syntax'} +

{blocktrans}You can use the Markdown syntax for the description.{/blocktrans}

{/block} {block javascript} diff --git a/src/IDF/templates/idf/downloads/view.html b/src/IDF/templates/idf/downloads/view.html index d509e63..d687867 100644 --- a/src/IDF/templates/idf/downloads/view.html +++ b/src/IDF/templates/idf/downloads/view.html @@ -6,7 +6,11 @@ {if $deprecated}

{blocktrans}Attention! This file is marked as deprecated, download it only if you are sure you need this specific version.{/blocktrans}

{/if} {$file} - {$file.filesize|size} +{if $file.changelog} +

{trans 'Changes'}

+{markdown $file.changelog, $request} +{/if} {if $form} {if $form.errors} @@ -19,7 +23,7 @@ {/if}
- +
+ + + +
{$form.f.summary.labelTag}: {if $form.f.summary.errors}{$form.f.summary.fieldErrors}{/if} @@ -27,6 +31,12 @@
{$form.f.changelog.labelTag}:{if $form.f.changelog.errors}{$form.f.changelog.fieldErrors}{/if} +{$form.f.changelog|unsafe} +
{$form.f.label1.labelTag}: {if $form.f.label1.errors}{$form.f.label1.fieldErrors}{/if}{$form.f.label1|unsafe} diff --git a/www/media/idf/css/style.css b/www/media/idf/css/style.css index 908d4f7..38a2050 100644 --- a/www/media/idf/css/style.css +++ b/www/media/idf/css/style.css @@ -626,13 +626,17 @@ div.download-file { background-repeat: no-repeat; background-position: 1em 1em; font-size: 140%; - margin-bottom: 3em; + margin-bottom: 1.5em; background-color: #bbe394; width: 40%; -moz-border-radius: 5px; -webkit-border-radius: 5px; } +table.download { + margin-top: 1.5em; +} + /** * Wiki */