# HG changeset patch # User Marcin Kuzminski # Date 1370626245 -7200 # Node ID 22f925aea8b481f6e09b672f2305320f9a524ebe # Parent c9ca7fa55b0de20373ae434a720d50f1ae51c1ce updated i18n diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/fr/LC_MESSAGES/rhodecode.mo has changed diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Fri Jun 07 19:23:20 2013 +0200 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Fri Jun 07 19:30:45 2013 +0200 @@ -1,21 +1,22 @@ -# French translations for RhodeCode. -# Copyright (C) 2011 ORGANIZATION +# Translations template for RhodeCode. +# Copyright (C) 2013 Marcin Kuzminski RhodeCode # This file is distributed under the same license as the RhodeCode project. -# FIRST AUTHOR , 2011. -# +# Translators: +# FIRST AUTHOR , 2011 msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.1.5\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-06-01 18:38+0200\n" -"PO-Revision-Date: 2012-10-02 11:32+0100\n" -"Last-Translator: Vincent Duvert \n" -"Language-Team: fr \n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Project-Id-Version: RhodeCode\n" +"Report-Msgid-Bugs-To: marcin@maq.io\n" +"POT-Creation-Date: 2013-06-05 19:55+0200\n" +"PO-Revision-Date: 2013-06-02 13:31+0000\n" +"Last-Translator: marcinkuzminski \n" +"Language-Team: French (http://www.transifex.com/projects/p/RhodeCode/language/fr/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" +"Language: fr\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: rhodecode/controllers/changelog.py:149 msgid "All Branches" @@ -35,22 +36,19 @@ msgstr "Afficher %s lignes de contexte" #: rhodecode/controllers/changeset.py:345 -#: rhodecode/controllers/pullrequests.py:481 +#: rhodecode/controllers/pullrequests.py:478 #, python-format msgid "Status change -> %s" msgstr "Changement de statut -> %s" #: rhodecode/controllers/changeset.py:376 -#, fuzzy msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" -"Le changement de statut d’un changeset associé à une pull request fermée " -"n’est pas autorisé." +"Changing status on a changeset associated with a closed pull request is not " +"allowed" +msgstr "" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:259 +#: rhodecode/controllers/pullrequests.py:256 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" @@ -59,10 +57,9 @@ msgstr "Accueil" #: rhodecode/controllers/error.py:98 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" -"Le serveur n’a pas pu interpréter la requête à cause d’une erreur de " -"syntaxe" +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de syntaxe" #: rhodecode/controllers/error.py:101 msgid "Unauthorized access to resource" @@ -80,9 +77,7 @@ msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." -msgstr "" -"La requête n’a pu être traitée en raison d’une erreur survenue sur le " -"serveur." +msgstr "La requête n’a pu être traitée en raison d’une erreur survenue sur le serveur." #: rhodecode/controllers/feed.py:52 #, python-format @@ -110,7 +105,6 @@ msgstr "%s a commité, le %s" #: rhodecode/controllers/files.py:89 -# msgid "Click here to add new file" msgstr "Ajouter un nouveau fichier" @@ -147,7 +141,6 @@ msgstr "Une erreur est survenue durant le commit" #: rhodecode/controllers/files.py:351 -# msgid "Added file via RhodeCode" msgstr "%s ajouté par RhodeCode" @@ -164,7 +157,6 @@ msgstr "" #: rhodecode/controllers/files.py:431 -# msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" @@ -188,14 +180,16 @@ msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/files.py:632 +#: rhodecode/controllers/pullrequests.py:149 #: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "Branches" -#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/files.py:633 +#: rhodecode/controllers/pullrequests.py:150 #: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: rhodecode/templates/switch_to_list.html:15 #: rhodecode/templates/tags/tags.html:10 @@ -222,7 +216,6 @@ msgstr "Journal" #: rhodecode/controllers/login.py:138 -# msgid "You have successfully registered into RhodeCode" msgstr "Vous vous êtes inscrits avec succès à RhodeCode" @@ -232,60 +225,56 @@ #: rhodecode/controllers/login.py:179 msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "" -"Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " -"été envoyé par e-mail." - -#: rhodecode/controllers/pullrequests.py:139 +"Your password reset was successful, new password has been sent to your email" +msgstr "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a été envoyé par e-mail." + +#: rhodecode/controllers/pullrequests.py:136 #: rhodecode/templates/changeset/changeset.html:10 #: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "Changements" -#: rhodecode/controllers/pullrequests.py:149 +#: rhodecode/controllers/pullrequests.py:146 msgid "Special" msgstr "" -#: rhodecode/controllers/pullrequests.py:150 -# +#: rhodecode/controllers/pullrequests.py:147 msgid "Peer branches" msgstr "" -#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 +#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Signets" -#: rhodecode/controllers/pullrequests.py:324 +#: rhodecode/controllers/pullrequests.py:321 msgid "Pull request requires a title with min. 3 chars" msgstr "Les requêtes de pull nécessitent un titre d’au moins 3 caractères." -#: rhodecode/controllers/pullrequests.py:326 -# +#: rhodecode/controllers/pullrequests.py:323 msgid "Error creating pull request" msgstr "Une erreur est survenue lors de la création de la requête de pull." -#: rhodecode/controllers/pullrequests.py:346 +#: rhodecode/controllers/pullrequests.py:343 msgid "Successfully opened new pull request" msgstr "La requête de pull a été ouverte avec succès." -#: rhodecode/controllers/pullrequests.py:349 +#: rhodecode/controllers/pullrequests.py:346 msgid "Error occurred during sending pull request" msgstr "Une erreur est survenue durant l’envoi de la requête de pull." -#: rhodecode/controllers/pullrequests.py:388 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès." -#: rhodecode/controllers/pullrequests.py:484 +#: rhodecode/controllers/pullrequests.py:481 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:521 -msgid "Closing pull request on other statuses than rejected or approved forbidden" +#: rhodecode/controllers/pullrequests.py:518 +msgid "" +"Closing pull request on other statuses than rejected or approved forbidden" msgstr "" #: rhodecode/controllers/search.py:132 @@ -294,9 +283,7 @@ #: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" -msgstr "" -"L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de " -"code Whoosh." +msgstr "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de code Whoosh." #: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" @@ -312,37 +299,30 @@ msgstr "La mise à jour des statistiques est désactivée pour ce dépôt." #: rhodecode/controllers/admin/defaults.py:96 -#, fuzzy msgid "Default settings updated successfully" -msgstr "Mise à jour réussie des réglages LDAP" +msgstr "" #: rhodecode/controllers/admin/defaults.py:110 -#, fuzzy msgid "Error occurred during update of defaults" -msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s." +msgstr "" #: rhodecode/controllers/admin/gists.py:56 -# msgid "forever" msgstr "" #: rhodecode/controllers/admin/gists.py:57 -# msgid "5 minutes" msgstr "5 minute" #: rhodecode/controllers/admin/gists.py:58 -# msgid "1 hour" msgstr "1 heure" #: rhodecode/controllers/admin/gists.py:59 -# msgid "1 day" msgstr "1 jour" #: rhodecode/controllers/admin/gists.py:60 -# msgid "1 month" msgstr "1 mois" @@ -351,14 +331,13 @@ msgstr "" #: rhodecode/controllers/admin/gists.py:127 -#, fuzzy msgid "Error occurred during gist creation" -msgstr "Une erreur est survenue durant la création du hook." +msgstr "" #: rhodecode/controllers/admin/gists.py:165 -#, fuzzy, python-format +#, python-format msgid "Deleted gist %s" -msgstr "Dépôt %s supprimé" +msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" @@ -413,9 +392,8 @@ msgstr "Impossible d’activer LDAP. La bibliothèque « python-ldap » est manquante." #: rhodecode/controllers/admin/ldap_settings.py:145 -#, fuzzy msgid "Error occurred during update of ldap settings" -msgstr "Une erreur est survenue durant la mise à jour des réglages du LDAP." +msgstr "" #: rhodecode/controllers/admin/permissions.py:58 #: rhodecode/controllers/admin/permissions.py:62 @@ -474,14 +452,12 @@ msgstr "Interdite" #: rhodecode/controllers/admin/permissions.py:74 -#, fuzzy msgid "Allowed with manual account activation" -msgstr "Autorisé avec activation manuelle du compte" +msgstr "" #: rhodecode/controllers/admin/permissions.py:76 -#, fuzzy msgid "Allowed with automatic account activation" -msgstr "Autorisé avec activation automatique du compte" +msgstr "" #: rhodecode/controllers/admin/permissions.py:79 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 @@ -505,28 +481,27 @@ msgstr "Permissions par défaut mises à jour avec succès" #: rhodecode/controllers/admin/permissions.py:152 -#, fuzzy msgid "Error occurred during update of permissions" -msgstr "erreur pendant la mise à jour des permissions" +msgstr "" #: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "[Pas un fork]" #: rhodecode/controllers/admin/repos.py:168 -#, fuzzy, python-format +#, python-format msgid "Created repository %s from %s" -msgstr "Le dépôt %s a été créé depuis %s." +msgstr "" #: rhodecode/controllers/admin/repos.py:174 -#, fuzzy, python-format +#, python-format msgid "Created repository %s" -msgstr "Le dépôt %s a été créé." +msgstr "" #: rhodecode/controllers/admin/repos.py:197 -#, fuzzy, python-format +#, python-format msgid "Error creating repository %s" -msgstr "Le dépôt %s a été créé." +msgstr "" #: rhodecode/controllers/admin/repos.py:270 #, python-format @@ -534,9 +509,9 @@ msgstr "Dépôt %s mis à jour avec succès." #: rhodecode/controllers/admin/repos.py:288 -#, fuzzy, python-format +#, python-format msgid "Error occurred during update of repository %s" -msgstr "Une erreur est survenue lors de la mise à jour du dépôt %s." +msgstr "" #: rhodecode/controllers/admin/repos.py:315 #, python-format @@ -544,14 +519,14 @@ msgstr "" #: rhodecode/controllers/admin/repos.py:318 -#, fuzzy, python-format +#, python-format msgid "Deleted %s forks" -msgstr "Dépôt %s supprimé" +msgstr "" #: rhodecode/controllers/admin/repos.py:323 -#, fuzzy, python-format +#, python-format msgid "Deleted repository %s" -msgstr "Dépôt %s supprimé" +msgstr "" #: rhodecode/controllers/admin/repos.py:326 #, python-format @@ -564,16 +539,14 @@ msgstr "Erreur pendant la suppression de %s" #: rhodecode/controllers/admin/repos.py:345 -#, fuzzy msgid "Repository permissions updated" -msgstr "Création de dépôt désactivée" +msgstr "" #: rhodecode/controllers/admin/repos.py:375 #: rhodecode/controllers/admin/repos_groups.py:332 #: rhodecode/controllers/admin/users_groups.py:312 -#, fuzzy msgid "An error occurred during revoking of permission" -msgstr "erreur pendant la mise à jour des permissions" +msgstr "" #: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" @@ -589,14 +562,12 @@ msgstr "Une erreur est survenue durant le déverrouillage." #: rhodecode/controllers/admin/repos.py:447 -#, fuzzy msgid "Unlocked" -msgstr "déverrouillé" +msgstr "" #: rhodecode/controllers/admin/repos.py:450 -#, fuzzy msgid "Locked" -msgstr "verrouillé" +msgstr "" #: rhodecode/controllers/admin/repos.py:452 #, python-format @@ -609,9 +580,7 @@ #: rhodecode/controllers/admin/repos.py:480 msgid "An error occurred during setting this repository in public journal" -msgstr "" -"Une erreur est survenue durant la configuration du journal public pour ce" -" dépôt." +msgstr "Une erreur est survenue durant la configuration du journal public pour ce dépôt." #: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302 msgid "Token mismatch" @@ -639,34 +608,32 @@ msgstr "Une erreur est survenue durant cette opération." #: rhodecode/controllers/admin/repos.py:562 -#, fuzzy msgid "An error occurred during creation of field" -msgstr "Une erreur est survenue durant la création de l’utilisateur %s." +msgstr "" #: rhodecode/controllers/admin/repos.py:576 -#, fuzzy msgid "An error occurred during removal of field" -msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail." +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:147 -#, fuzzy, python-format +#, python-format msgid "Created repository group %s" -msgstr "Le groupe de dépôts %s a été créé." +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:159 -#, fuzzy, python-format +#, python-format msgid "Error occurred during creation of repository group %s" -msgstr "Une erreur est survenue durant la création du groupe de dépôts %s." +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:217 -#, fuzzy, python-format +#, python-format msgid "Updated repository group %s" -msgstr "Le groupe de dépôts %s a été mis à jour." +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:232 -#, fuzzy, python-format +#, python-format msgid "Error occurred during update of repository group %s" -msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s." +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:250 #, python-format @@ -674,19 +641,19 @@ msgstr "Ce groupe contient %s dépôts et ne peut être supprimé." #: rhodecode/controllers/admin/repos_groups.py:257 -#, fuzzy, python-format +#, python-format msgid "This group contains %s subgroups and cannot be deleted" -msgstr "Ce groupe contient %s dépôts et ne peut être supprimé." +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:263 -#, fuzzy, python-format +#, python-format msgid "Removed repository group %s" -msgstr "Le groupe de dépôts %s a été supprimé." +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:268 -#, fuzzy, python-format -msgid "Error occurred during deletion of repos group %s" -msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s." +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:279 #: rhodecode/controllers/admin/repos_groups.py:314 @@ -695,14 +662,13 @@ msgstr "" #: rhodecode/controllers/admin/repos_groups.py:294 -#, fuzzy msgid "Repository Group permissions updated" -msgstr "Création de dépôt désactivée" +msgstr "" #: rhodecode/controllers/admin/settings.py:123 -#, fuzzy, python-format +#, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "Après re-scan : %s ajouté(s), %s enlevé(s)" +msgstr "" #: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" @@ -714,18 +680,16 @@ #: rhodecode/controllers/admin/settings.py:167 #: rhodecode/controllers/admin/settings.py:304 -#, fuzzy msgid "Error occurred during updating application settings" -msgstr "Une erreur est survenue durant la mise à jour des options." +msgstr "" #: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour." #: rhodecode/controllers/admin/settings.py:224 -#, fuzzy msgid "Error occurred during updating visualisation settings" -msgstr "Une erreur est survenue durant la mise à jour des réglages d’affichages." +msgstr "" #: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" @@ -740,9 +704,8 @@ msgstr "Hooks mis à jour" #: rhodecode/controllers/admin/settings.py:330 -#, fuzzy msgid "Error occurred during hook creation" -msgstr "Une erreur est survenue durant la création du hook." +msgstr "" #: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" @@ -750,9 +713,7 @@ #: rhodecode/controllers/admin/settings.py:413 msgid "You can't edit this user since it's crucial for entire application" -msgstr "" -"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" -" fonctionnement de l’application." +msgstr "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." #: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" @@ -760,28 +721,27 @@ #: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 -#, fuzzy, python-format +#, python-format msgid "Error occurred during update of user %s" -msgstr "Une erreur est survenue durant la mise à jour de l’utilisateur %s." +msgstr "" #: rhodecode/controllers/admin/users.py:130 -#, fuzzy, python-format +#, python-format msgid "Created user %s" -msgstr "utilisateur %s créé" +msgstr "" #: rhodecode/controllers/admin/users.py:142 -#, fuzzy, python-format +#, python-format msgid "Error occurred during creation of user %s" -msgstr "Une erreur est survenue durant la création de l’utilisateur %s." +msgstr "" #: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès." #: rhodecode/controllers/admin/users.py:214 -#, fuzzy msgid "Successfully deleted user" -msgstr "L’utilisateur a été supprimé avec succès." +msgstr "" #: rhodecode/controllers/admin/users.py:219 msgid "An error occurred during deletion of user" @@ -793,9 +753,8 @@ #: rhodecode/controllers/admin/users.py:293 #: rhodecode/controllers/admin/users_groups.py:372 -#, fuzzy msgid "Updated permissions" -msgstr "Copier les permissions" +msgstr "" #: rhodecode/controllers/admin/users.py:297 #: rhodecode/controllers/admin/users_groups.py:376 @@ -816,63 +775,58 @@ msgstr "L’e-mail a été enlevé de l’utilisateur." #: rhodecode/controllers/admin/users.py:340 -#, fuzzy, python-format +#, python-format msgid "Added ip %s to user" -msgstr "L’e-mail « %s » a été ajouté à l’utilisateur." +msgstr "" #: rhodecode/controllers/admin/users.py:346 -#, fuzzy msgid "An error occurred during ip saving" -msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail." +msgstr "" #: rhodecode/controllers/admin/users.py:358 -#, fuzzy msgid "Removed ip from user" -msgstr "L’e-mail a été enlevé de l’utilisateur." +msgstr "" #: rhodecode/controllers/admin/users_groups.py:162 -#, fuzzy, python-format +#, python-format msgid "Created user group %s" -msgstr "Le groupe d’utilisateurs %s a été créé." +msgstr "" #: rhodecode/controllers/admin/users_groups.py:173 -#, fuzzy, python-format +#, python-format msgid "Error occurred during creation of user group %s" -msgstr "Une erreur est survenue durant la création du groupe d’utilisateurs %s." +msgstr "" #: rhodecode/controllers/admin/users_groups.py:210 -#, fuzzy, python-format +#, python-format msgid "Updated user group %s" -msgstr "Le groupe d’utilisateurs %s a été mis à jour." +msgstr "" #: rhodecode/controllers/admin/users_groups.py:232 -#, fuzzy, python-format +#, python-format msgid "Error occurred during update of user group %s" -msgstr "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s." +msgstr "" #: rhodecode/controllers/admin/users_groups.py:250 -#, fuzzy msgid "Successfully deleted user group" -msgstr "Le groupe d’utilisateurs a été supprimé avec succès." +msgstr "" #: rhodecode/controllers/admin/users_groups.py:255 -#, fuzzy msgid "An error occurred during deletion of user group" -msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs." +msgstr "" #: rhodecode/controllers/admin/users_groups.py:274 msgid "Target group cannot be the same" msgstr "" #: rhodecode/controllers/admin/users_groups.py:280 -#, fuzzy msgid "User Group permissions updated" -msgstr "Création de dépôt désactivée" +msgstr "" #: rhodecode/lib/auth.py:544 -#, fuzzy, python-format +#, python-format msgid "IP %s not allowed" -msgstr "Followers de %s" +msgstr "" #: rhodecode/lib/auth.py:593 msgid "You need to be a registered user to perform this action" @@ -883,25 +837,18 @@ msgstr "Vous devez être connecté pour visualiser cette page." #: rhodecode/lib/diffs.py:66 -#, fuzzy msgid "Binary file" -msgstr "Fichier binaire" +msgstr "" #: rhodecode/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" -"Cet ensemble de changements était trop gros pour être affiché et a été " -"découpé, utilisez le menu « Diff » pour afficher les différences." +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "Cet ensemble de changements était trop gros pour être affiché et a été découpé, utilisez le menu « Diff » pour afficher les différences." #: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/helpers.py:428 -#, python-format -msgid "%a, %d %b %Y %H:%M:%S" -msgstr "%d/%m/%Y à %H:%M:%S" - #: rhodecode/lib/helpers.py:539 msgid "True" msgstr "Vrai" @@ -911,14 +858,14 @@ msgstr "Faux" #: rhodecode/lib/helpers.py:580 -#, fuzzy, python-format +#, python-format msgid "Deleted branch: %s" -msgstr "Dépôt %s supprimé" +msgstr "" #: rhodecode/lib/helpers.py:583 -#, fuzzy, python-format +#, python-format msgid "Created tag: %s" -msgstr "utilisateur %s créé" +msgstr "" #: rhodecode/lib/helpers.py:596 msgid "Changeset not found" @@ -942,14 +889,15 @@ msgid "%s more" msgstr "%s de plus" -#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53 +#: rhodecode/lib/helpers.py:674 +#: rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "révisions" #: rhodecode/lib/helpers.py:698 -#, fuzzy, python-format +#, python-format msgid "fork name %s" -msgstr "Nom du fork %s" +msgstr "" #: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 @@ -978,9 +926,8 @@ msgstr "[a mis à jour] le dépôt" #: rhodecode/lib/helpers.py:735 -#, fuzzy msgid "[downloaded] archive from repository" -msgstr "Les téléchargements sont désactivés pour ce dépôt." +msgstr "" #: rhodecode/lib/helpers.py:737 msgid "[delete] repository" @@ -995,14 +942,12 @@ msgstr "[a mis à jour] l’utilisateur" #: rhodecode/lib/helpers.py:749 -#, fuzzy msgid "[created] user group" -msgstr "[a créé] le groupe d’utilisateurs" +msgstr "" #: rhodecode/lib/helpers.py:751 -#, fuzzy msgid "[updated] user group" -msgstr "[a mis à jour] le groupe d’utilisateurs" +msgstr "" #: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" @@ -1050,24 +995,20 @@ msgstr "Aucun fichier" #: rhodecode/lib/helpers.py:1158 -#, fuzzy msgid "new file" -msgstr "Ajouter un nouveau fichier" +msgstr "" #: rhodecode/lib/helpers.py:1161 -#, fuzzy msgid "mod" -msgstr "Supprimés" +msgstr "" #: rhodecode/lib/helpers.py:1164 -#, fuzzy msgid "del" -msgstr "Supprimer" +msgstr "" #: rhodecode/lib/helpers.py:1167 -#, fuzzy msgid "rename" -msgstr "Nom d’utilisateur" +msgstr "" #: rhodecode/lib/helpers.py:1172 msgid "chmod" @@ -1076,18 +1017,13 @@ #: rhodecode/lib/helpers.py:1404 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"Le dépôt %s n’est pas représenté dans la base de données. Il a " -"probablement été créé ou renommé manuellement. Veuillez relancer " -"l’application pour rescanner les dépôts." +"%s repository is not mapped to db perhaps it was created or renamed from the" +" filesystem please run the application again in order to rescan repositories" +msgstr "Le dépôt %s n’est pas représenté dans la base de données. Il a probablement été créé ou renommé manuellement. Veuillez relancer l’application pour rescanner les dépôts." #: rhodecode/lib/unionrepo.py:193 -#, fuzzy msgid "cannot create new union repository" -msgstr "[a créé] le dépôt" +msgstr "" #: rhodecode/lib/utils2.py:410 #, python-format @@ -1132,9 +1068,9 @@ msgstr[1] "%d secondes" #: rhodecode/lib/utils2.py:431 -#, fuzzy, python-format +#, python-format msgid "in %s" -msgstr "à la ligne %s" +msgstr "" #: rhodecode/lib/utils2.py:433 #, python-format @@ -1142,9 +1078,9 @@ msgstr "Il y a %s" #: rhodecode/lib/utils2.py:435 -#, fuzzy, python-format +#, python-format msgid "in %s and %s" -msgstr "Il y a %s et %s" +msgstr "" #: rhodecode/lib/utils2.py:438 #, python-format @@ -1311,82 +1247,67 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 -#, fuzzy msgid "Repository group no access" -msgstr "Aucun accès au groupe de dépôts" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 -#, fuzzy msgid "Repository group read access" -msgstr "Accès en lecture au groupe de dépôts" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 -#, fuzzy msgid "Repository group write access" -msgstr "Accès en écriture au groupe de dépôts" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 -#, fuzzy msgid "Repository group admin access" -msgstr "Accès administrateur au groupe de dépôts" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 -#, fuzzy msgid "User group no access" -msgstr "Aucun accès au groupe de dépôts" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 -#, fuzzy msgid "User group read access" -msgstr "Accès en lecture au groupe de dépôts" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 -#, fuzzy msgid "User group write access" -msgstr "Accès en écriture au groupe de dépôts" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 -#, fuzzy msgid "User group admin access" -msgstr "Accès administrateur au groupe de dépôts" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 -#, fuzzy msgid "Repository Group creation disabled" -msgstr "Création de dépôt désactivée" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 -#, fuzzy msgid "Repository Group creation enabled" -msgstr "Création de dépôt activée" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 -#, fuzzy msgid "User Group creation disabled" -msgstr "Création de dépôt désactivée" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 -#, fuzzy msgid "User Group creation enabled" -msgstr "Création de dépôt activée" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 -#, fuzzy msgid "Registration disabled" -msgstr "Enregistrement désactivé" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 -#, fuzzy msgid "User Registration with manual account activation" -msgstr "Autorisé avec activation manuelle du compte" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 -#, fuzzy msgid "User Registration with automatic account activation" -msgstr "Autorisé avec activation automatique du compte" +msgstr "" #: rhodecode/model/comment.py:75 #, python-format @@ -1416,81 +1337,70 @@ msgstr "Entrez au moins %(min)i caractères" #: rhodecode/model/notification.py:228 -#, fuzzy, python-format +#, python-format msgid "%(user)s commented on changeset at %(when)s" -msgstr "%(user)s a posté un commentaire sur le commit %(when)s" +msgstr "" #: rhodecode/model/notification.py:229 -#, fuzzy, python-format +#, python-format msgid "%(user)s sent message at %(when)s" -msgstr "%(user)s a envoyé un message %(when)s" +msgstr "" #: rhodecode/model/notification.py:230 -#, fuzzy, python-format +#, python-format msgid "%(user)s mentioned you at %(when)s" -msgstr "%(user)s vous a mentioné %(when)s" +msgstr "" #: rhodecode/model/notification.py:231 -#, fuzzy, python-format +#, python-format msgid "%(user)s registered in RhodeCode at %(when)s" -msgstr "%(user)s s’est enregistré sur RhodeCode %(when)s" +msgstr "" #: rhodecode/model/notification.py:232 -#, fuzzy, python-format +#, python-format msgid "%(user)s opened new pull request at %(when)s" -msgstr "%(user)s a ouvert une nouvelle requête de pull %(when)s" +msgstr "" #: rhodecode/model/notification.py:233 -#, fuzzy, python-format +#, python-format msgid "%(user)s commented on pull request at %(when)s" -msgstr "%(user)s a commenté sur la requête de pull %(when)s" +msgstr "" #: rhodecode/model/pull_request.py:98 -#, fuzzy, python-format +#, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -"%(user)s voudrait que vous examiniez sa requête de pull nº%(pr_id)s: " -"%(pr_title)s" #: rhodecode/model/scm.py:674 msgid "latest tip" msgstr "Dernier sommet" #: rhodecode/model/user.py:232 -#, fuzzy msgid "New user registration" -msgstr "Nouveau compte utilisateur enregistré" +msgstr "" #: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" -msgstr "" -"Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" -" fonctionnement de l’application." +msgstr "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." #: rhodecode/model/user.py:303 msgid "You can't remove this user since it's crucial for entire application" -msgstr "" -"Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " -"bon fonctionnement de l’application." +msgstr "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le bon fonctionnement de l’application." #: rhodecode/model/user.py:309 #, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" -msgstr "" -"L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez " -"les propriétaires de ces dépôts. %s" +"user \"%s\" still owns %s repositories and cannot be removed. Switch owners " +"or remove those repositories. %s" +msgstr "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez les propriétaires de ces dépôts. %s" #: rhodecode/model/user.py:334 -#, fuzzy msgid "Password reset link" -msgstr "Réinitialisation du mot de passe" +msgstr "" #: rhodecode/model/user.py:366 -#, fuzzy msgid "Your new password" -msgstr "Nouveau mot de passe" +msgstr "" #: rhodecode/model/user.py:367 #, python-format @@ -1512,14 +1422,10 @@ msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé" #: rhodecode/model/validators.py:89 -#, fuzzy msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character or underscore" -msgstr "" -"Le nom d’utilisateur peut contenir uniquement des caractères alpha-" -"numériques ainsi que les caractères suivants : « _ . - ». Il doit " -"commencer par un caractère alpha-numérique." +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with alphanumeric character or underscore" +msgstr "" #: rhodecode/model/validators.py:117 #, python-format @@ -1527,24 +1433,19 @@ msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide." #: rhodecode/model/validators.py:136 -#, fuzzy msgid "Invalid user group name" -msgstr "Nom de groupe d’utilisateurs invalide." +msgstr "" #: rhodecode/model/validators.py:137 -#, fuzzy, python-format +#, python-format msgid "User group \"%(usergroup)s\" already exists" -msgstr "Le groupe d’utilisateurs « %(usergroup)s » existe déjà." +msgstr "" #: rhodecode/model/validators.py:139 -#, fuzzy msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -"Le nom de groupe d’utilisateurs peut contenir uniquement des caractères " -"alpha-numériques ainsi que les caractères suivants : « _ . - ». Il doit " -"commencer par un caractère alpha-numérique." #: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" @@ -1596,9 +1497,9 @@ msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »." #: rhodecode/model/validators.py:321 -#, fuzzy, python-format +#, python-format msgid "Repository group with name \"%(repo)s\" already exists" -msgstr "Un groupe de dépôts portant le nom « %(repo)s » existe déjà." +msgstr "" #: rhodecode/model/validators.py:438 msgid "invalid clone url" @@ -1606,9 +1507,7 @@ #: rhodecode/model/validators.py:439 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" -"URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou " -"svn+http(s)." +msgstr "URL à cloner invalide. Veuillez fournir une URL valide en http(s) ou svn+http(s)." #: rhodecode/model/validators.py:464 msgid "Fork have to be the same type as parent" @@ -1619,19 +1518,16 @@ msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe." #: rhodecode/model/validators.py:481 -#, fuzzy msgid "no permission to create repository in root location" -msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe." +msgstr "" #: rhodecode/model/validators.py:518 -#, fuzzy msgid "You don't have permissions to create a group in this location" -msgstr "Vous n’avez pas la permission de créer un dépôt dans ce groupe." +msgstr "" #: rhodecode/model/validators.py:559 -#, fuzzy msgid "This username or user group name is not valid" -msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide." +msgstr "" #: rhodecode/model/validators.py:652 msgid "This is not a valid path" @@ -1648,18 +1544,14 @@ #: rhodecode/model/validators.py:724 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name " -"of the attribute that is equivalent to \"username\"" -msgstr "" -"L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" -" d’utilisateur." +"The LDAP Login attribute of the CN must be specified - this is the name of " +"the attribute that is equivalent to \"username\"" +msgstr "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom d’utilisateur." #: rhodecode/model/validators.py:737 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" -msgstr "" -"Les révisions %(revs)s font déjà partie de la requête de pull ou on des " -"statuts définis." +msgstr "Les révisions %(revs)s font déjà partie de la requête de pull ou on des statuts définis." #: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" @@ -1667,7 +1559,8 @@ #: rhodecode/model/validators.py:770 #, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" #: rhodecode/model/validators.py:803 @@ -1704,21 +1597,19 @@ #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repos.html:21 +#: rhodecode/templates/admin/repos/repos.html:22 msgid "Add repository" msgstr "Ajouter un dépôt" #: rhodecode/templates/index_base.html:15 #: rhodecode/templates/index_base.html:20 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 -#, fuzzy msgid "Add group" -msgstr "Édition du groupe de dépôt" +msgstr "" #: rhodecode/templates/index_base.html:27 -#, fuzzy msgid "Edit group" -msgstr "Édition du groupe de dépôt" +msgstr "" #: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" @@ -1738,7 +1629,7 @@ #: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:68 -#: rhodecode/templates/admin/repos/repos.html:73 +#: rhodecode/templates/admin/repos/repos.html:75 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 @@ -1763,7 +1654,7 @@ #: rhodecode/templates/index_base.html:121 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:71 +#: rhodecode/templates/admin/repos/repos.html:73 #: rhodecode/templates/admin/users/user_edit_my_account.html:172 #: rhodecode/templates/base/perms_summary.html:37 #: rhodecode/templates/bookmarks/bookmarks.html:48 @@ -1785,7 +1676,7 @@ msgstr "Dernière modification" #: rhodecode/templates/index_base.html:126 -#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/repos/repos.html:76 #: rhodecode/templates/admin/users/user_edit_my_account.html:174 #: rhodecode/templates/journal/journal.html:195 #: rhodecode/templates/journal/journal.html:285 @@ -1794,12 +1685,12 @@ #: rhodecode/templates/index_base.html:128 #: rhodecode/templates/admin/repos/repo_edit.html:114 -#: rhodecode/templates/admin/repos/repos.html:76 +#: rhodecode/templates/admin/repos/repos.html:78 msgid "Owner" msgstr "Propriétaire" #: rhodecode/templates/index_base.html:136 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:86 #: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:74 @@ -1811,7 +1702,7 @@ msgstr "Tri ascendant" #: rhodecode/templates/index_base.html:137 -#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/repos/repos.html:87 #: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:75 @@ -1823,12 +1714,11 @@ msgstr "Tri descendant" #: rhodecode/templates/index_base.html:138 -#, fuzzy msgid "No repositories found." -msgstr "Groupes de dépôts" +msgstr "" #: rhodecode/templates/index_base.html:139 -#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/repos/repos.html:89 #: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:77 @@ -1840,7 +1730,7 @@ msgstr "Erreur d’intégrité des données." #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos/repos.html:88 +#: rhodecode/templates/admin/repos/repos.html:90 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 #: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 @@ -1896,9 +1786,8 @@ msgstr "Vous n’avez pas de compte ?" #: rhodecode/templates/password_reset.html:5 -#, fuzzy msgid "Password Reset" -msgstr "Réinitialisation du mot de passe" +msgstr "" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1995,15 +1884,13 @@ msgstr "Historique d’administration" #: rhodecode/templates/admin/admin.html:10 -#, fuzzy msgid "journal filter..." -msgstr "Filtre rapide…" +msgstr "" #: rhodecode/templates/admin/admin.html:12 #: rhodecode/templates/journal/journal.html:11 -#, fuzzy msgid "filter" -msgstr "Fichiers" +msgstr "" #: rhodecode/templates/admin/admin.html:13 #: rhodecode/templates/journal/journal.html:12 @@ -2014,7 +1901,7 @@ msgstr[1] "" #: rhodecode/templates/admin/admin_log.html:6 -#: rhodecode/templates/admin/repos/repos.html:77 +#: rhodecode/templates/admin/repos/repos.html:79 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 #: rhodecode/templates/admin/users/user_edit_my_account.html:176 #: rhodecode/templates/admin/users/users.html:87 @@ -2049,15 +1936,13 @@ #: rhodecode/templates/admin/defaults/defaults.html:5 #: rhodecode/templates/admin/defaults/defaults.html:25 -#, fuzzy msgid "Repositories defaults" -msgstr "Groupes de dépôts" +msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:11 #: rhodecode/templates/base/base.html:80 -#, fuzzy msgid "Defaults" -msgstr "[Par défaut]" +msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 @@ -2071,9 +1956,7 @@ msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." -msgstr "" -"Les dépôts privés sont visibles seulement par les utilisateurs ajoutés " -"comme collaborateurs." +msgstr "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés comme collaborateurs." #: rhodecode/templates/admin/defaults/defaults.html:55 #: rhodecode/templates/admin/repos/repo_edit.html:87 @@ -2130,9 +2013,9 @@ msgstr "" #: rhodecode/templates/admin/gists/index.html:10 -#, fuzzy, python-format +#, python-format msgid "Private Gists for user %s" -msgstr "utilisateur %s créé" +msgstr "" #: rhodecode/templates/admin/gists/index.html:12 #, python-format @@ -2146,33 +2029,28 @@ #: rhodecode/templates/admin/gists/index.html:31 #: rhodecode/templates/admin/gists/show.html:24 #: rhodecode/templates/base/base.html:302 -#, fuzzy msgid "Create new gist" -msgstr "Créer un nouveau fichier" +msgstr "" #: rhodecode/templates/admin/gists/index.html:48 -#, fuzzy msgid "Created" -msgstr "Lecture" +msgstr "" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/index.html:53 #: rhodecode/templates/admin/gists/show.html:43 #: rhodecode/templates/admin/gists/show.html:45 -#, fuzzy msgid "Expires" -msgstr "Dépôts" +msgstr "" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/show.html:43 -#, fuzzy msgid "never" -msgstr "%d relecteur" +msgstr "" #: rhodecode/templates/admin/gists/index.html:68 -#, fuzzy msgid "There are no gists yet" -msgstr "Aucun tag n’a été créé pour le moment." +msgstr "" #: rhodecode/templates/admin/gists/new.html:5 #: rhodecode/templates/admin/gists/new.html:16 @@ -2180,9 +2058,8 @@ msgstr "" #: rhodecode/templates/admin/gists/new.html:37 -#, fuzzy msgid "Gist description ..." -msgstr "Description" +msgstr "" #: rhodecode/templates/admin/gists/new.html:52 msgid "Create private gist" @@ -2228,9 +2105,8 @@ msgstr "" #: rhodecode/templates/admin/gists/show.html:38 -#, fuzzy msgid "Private gist" -msgstr "Dépôt privé" +msgstr "" #: rhodecode/templates/admin/gists/show.html:54 #: rhodecode/templates/admin/repos/repo_edit.html:299 @@ -2239,23 +2115,20 @@ msgstr "Supprimer" #: rhodecode/templates/admin/gists/show.html:54 -#, fuzzy msgid "Confirm to delete this gist" -msgstr "Veuillez confirmer la suppression de l’e-mail : %s" +msgstr "" #: rhodecode/templates/admin/gists/show.html:63 #: rhodecode/templates/admin/gists/show.html:84 #: rhodecode/templates/files/files_edit.html:48 #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 -#, fuzzy msgid "Show as raw" -msgstr "montrer le fichier brut" +msgstr "" #: rhodecode/templates/admin/gists/show.html:71 -#, fuzzy msgid "created" -msgstr "Lecture" +msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" @@ -2264,9 +2137,8 @@ #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 #: rhodecode/templates/base/base.html:79 -#, fuzzy msgid "LDAP" -msgstr "LDAP" +msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:28 msgid "Connection settings" @@ -2393,58 +2265,43 @@ msgstr "Accès anonyme" #: rhodecode/templates/admin/permissions/permissions.html:49 -#, fuzzy msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will " -"be lost" -msgstr "" -"Les permissions par défaut de chaque dépôt vont être remplacées par la " -"permission choisie. Toutes les permissions par défaut des dépôts seront " -"perdues." +"permission, note that all custom default permission on repositories will be " +"lost" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 #: rhodecode/templates/admin/permissions/permissions.html:77 -#, fuzzy msgid "Overwrite existing settings" -msgstr "Écraser les permissions existantes" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:62 -#, fuzzy msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -"Les permissions par défaut de chaque dépôt vont être remplacées par la " -"permission choisie. Toutes les permissions par défaut des dépôts seront " -"perdues." #: rhodecode/templates/admin/permissions/permissions.html:69 -#, fuzzy msgid "User group" -msgstr "Groupes d’utilisateurs" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:76 -#, fuzzy msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" msgstr "" -"Les permissions par défaut de chaque dépôt vont être remplacées par la " -"permission choisie. Toutes les permissions par défaut des dépôts seront " -"perdues." #: rhodecode/templates/admin/permissions/permissions.html:83 msgid "Repository creation" msgstr "Création de dépôt" #: rhodecode/templates/admin/permissions/permissions.html:91 -#, fuzzy msgid "User group creation" -msgstr "Gestion des groupes d’utilisateurs" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" @@ -2455,20 +2312,17 @@ msgstr "Enregistrement" #: rhodecode/templates/admin/permissions/permissions.html:115 -#, fuzzy msgid "External auth account activation" -msgstr "Autorisé avec activation automatique du compte" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:133 -#, fuzzy msgid "Default User Permissions" -msgstr "Permissions par défaut" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:144 #: rhodecode/templates/admin/users/user_edit.html:207 -#, fuzzy msgid "Allowed IP addresses" -msgstr "Adresses e-mail" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:158 #: rhodecode/templates/admin/repos/repo_edit.html:340 @@ -2483,9 +2337,9 @@ #: rhodecode/templates/admin/permissions/permissions.html:159 #: rhodecode/templates/admin/users/user_edit.html:221 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this ip: %s" -msgstr "Veuillez confirmer la suppression de l’e-mail : %s" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:165 #: rhodecode/templates/admin/users/user_edit.html:227 @@ -2494,9 +2348,8 @@ #: rhodecode/templates/admin/permissions/permissions.html:176 #: rhodecode/templates/admin/users/user_edit.html:238 -#, fuzzy msgid "New ip address" -msgstr "Nouvelle adrese" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:184 #: rhodecode/templates/admin/repos/repo_add_base.html:73 @@ -2515,9 +2368,8 @@ msgstr "Dépôts" #: rhodecode/templates/admin/repos/repo_add.html:19 -#, fuzzy msgid "Add new" -msgstr "ajouter un nouveau" +msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:96 @@ -2549,17 +2401,14 @@ #: rhodecode/templates/admin/repos/repo_edit.html:63 #: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" -"Révision par défaut pour les pages de fichiers, de téléchargements, de " -"recherche et de documentation." +msgstr "Révision par défaut pour les pages de fichiers, de téléchargements, de recherche et de documentation." #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" -"Gardez cette description précise et concise. Utilisez un fichier README " -"pour des descriptions plus détaillées." +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "Gardez cette description précise et concise. Utilisez un fichier README pour des descriptions plus détaillées." #: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" @@ -2568,15 +2417,15 @@ #: rhodecode/templates/admin/repos/repo_edit.html:12 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:11 -#: rhodecode/templates/base/base.html:81 rhodecode/templates/base/base.html:134 +#: rhodecode/templates/base/base.html:81 +#: rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "Options" #: rhodecode/templates/admin/repos/repo_edit.html:36 -#, fuzzy msgid "Non-changeable id" -msgstr "Identifiant permanent : %s" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" @@ -2591,9 +2440,8 @@ msgstr "Changer le propriétaire de ce dépôt." #: rhodecode/templates/admin/repos/repo_edit.html:177 -#, fuzzy msgid "Advanced settings" -msgstr "Enregister les options" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:180 msgid "Statistics" @@ -2641,11 +2489,9 @@ #: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" -msgstr "" -"Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce " -"dépôt, il sera à nouveau mis en cache." +"Manually invalidate cache for this repository. On first access repository " +"will be cached again" +msgstr "Invalide manuellement le cache de ce dépôt. Au prochain accès sur ce dépôt, il sera à nouveau mis en cache." #: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" @@ -2656,9 +2502,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:227 -#, fuzzy msgid "Key" -msgstr "Clé d’API" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:228 #: rhodecode/templates/admin/users/user_add.html:86 @@ -2686,11 +2531,9 @@ #: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" -msgstr "" -"Le descriptif des actions réalisées sur ce dépôt sera visible à tous " -"depuis le journal public." +"All actions made on this repository will be accessible to everyone in public" +" journal" +msgstr "Le descriptif des actions réalisées sur ce dépôt sera visible à tous depuis le journal public." #: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "Locking" @@ -2705,9 +2548,8 @@ msgstr "Veuillez confirmer le déverrouillage de ce dépôt." #: rhodecode/templates/admin/repos/repo_edit.html:271 -#, fuzzy msgid "Lock repo" -msgstr "Verrouiller le dépôt" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" @@ -2718,19 +2560,17 @@ msgstr "Ce dépôt n’est pas verrouillé." #: rhodecode/templates/admin/repos/repo_edit.html:277 -msgid "Force locking on repository. Works only when anonymous access is disabled" -msgstr "" -"Forcer le verrouillage du dépôt. Ce réglage fonctionne uniquement quand " -"l‘accès anonyme est désactivé." +msgid "" +"Force locking on repository. Works only when anonymous access is disabled" +msgstr "Forcer le verrouillage du dépôt. Ce réglage fonctionne uniquement quand l‘accès anonyme est désactivé." #: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Set as fork of" msgstr "Indiquer comme fork" #: rhodecode/templates/admin/repos/repo_edit.html:289 -#, fuzzy msgid "Set" -msgstr "Définir" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:293 msgid "Manually set this repository as a fork of another from the list" @@ -2745,50 +2585,39 @@ msgstr "Voulez-vous vraiment supprimer ce dépôt ?" #: rhodecode/templates/admin/repos/repo_edit.html:310 -#, fuzzy, python-format +#, python-format msgid "this repository has %s fork" msgid_plural "this repository has %s forks" -msgstr[0] "[a créé] le dépôt en tant que %s fork" -msgstr[1] "[a créé] le dépôt en tant que %s fork" +msgstr[0] "" +msgstr[1] "" #: rhodecode/templates/admin/repos/repo_edit.html:311 -#, fuzzy msgid "Detach forks" -msgstr "Indiquer comme fork" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:312 -#, fuzzy msgid "Delete forks" -msgstr "Supprimer" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:315 -#, fuzzy msgid "" -"This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" -" from file system please do it manually" -msgstr "" -"Ce dépôt sera renommé de manière à le rendre inaccessible à RhodeCode et " -"au système de gestion de versions.\n" -"Si vous voulez le supprimer complètement, effectuez la suppression " -"manuellement. Ce dépôt sera renommé de manière à le rendre inaccessible à" -" RhodeCode et au système de gestion de versions.\n" -"Si vous voulez le supprimer complètement, effectuez la suppression " -"manuellement." +"This repository will be renamed in a special way in order to be unaccesible " +"for RhodeCode and VCS systems. If you need to fully delete it from file " +"system please do it manually" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:341 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this field: %s" -msgstr "Veuillez confirmer la suppression de l’e-mail : %s" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:355 -#, fuzzy msgid "New field key" -msgstr "Ajouter un fichier" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" @@ -2799,9 +2628,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:372 -#, fuzzy msgid "New field description" -msgstr "Description" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:375 msgid "Enter description of a field" @@ -2869,7 +2697,7 @@ msgid "Repositories administration" msgstr "Administration des dépôts" -#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:185 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:76 @@ -2885,13 +2713,10 @@ msgstr "Appliquer aux enfants" #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 -#, fuzzy msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" msgstr "" -"Applique ou révoque les permissions sur tous les éléments de ce groupe, " -"notamment les dépôts et sous-groupes." #: rhodecode/templates/admin/repos_groups/repos_groups.html:4 #, python-format @@ -2907,22 +2732,19 @@ msgstr "comprenant" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -#, fuzzy msgid "Add repository group" -msgstr "Groupe de dépôt" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 #: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 -#, fuzzy msgid "Repository groups" -msgstr "Groupe de dépôt" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 -#, fuzzy msgid "Add new repository group" -msgstr "Nouveau groupe de dépôt" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 @@ -2934,32 +2756,27 @@ msgstr "Enregistrer" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -#, fuzzy msgid "Edit repository group" -msgstr "Édition du groupe de dépôt" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 -#, fuzzy, python-format +#, python-format msgid "Edit repository group %s" -msgstr "Édition du groupe de dépôt %s" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 -#, fuzzy msgid "Add child group" -msgstr "Ajouter un nouveau groupe" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" -"Activer le verrou lors d’un pull sur le groupe. Cette option sera " -"appliquée à tous les sous-groupes et dépôts de ce groupe." +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "Activer le verrou lors d’un pull sur le groupe. Cette option sera appliquée à tous les sous-groupes et dépôts de ce groupe." #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -#, fuzzy msgid "Repository groups administration" -msgstr "Administration des groupes de dépôts" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" @@ -2969,9 +2786,8 @@ #: rhodecode/templates/admin/users_groups/users_groups.html:48 #: rhodecode/templates/changeset/changeset_file_comment.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:171 -#, fuzzy msgid "Edit" -msgstr "éditer" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 #: rhodecode/templates/admin/users_groups/users_groups.html:49 @@ -2986,16 +2802,15 @@ msgstr "éditer" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" msgstr[0] "" msgstr[1] "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 -#, fuzzy msgid "There are no repository groups yet" -msgstr "Aucun groupe de dépôts n’a été créé pour le moment." +msgstr "" #: rhodecode/templates/admin/settings/hooks.html:5 #: rhodecode/templates/admin/settings/settings.html:5 @@ -3023,32 +2838,25 @@ msgstr "Ré-associer et re-scanner les dépôts" #: rhodecode/templates/admin/settings/settings.html:34 -#, fuzzy msgid "Rescan option" -msgstr "Option de re-scan" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:40 msgid "" -"In case a repository was deleted from filesystem and there are leftovers " -"in the database check this option to scan obsolete data in database and " -"remove it." -msgstr "" -"Cochez cette option pour supprimer d’éventuelles données obsolètes " -"(concernant des dépôts manuellement supprimés) de la base de données." +"In case a repository was deleted from filesystem and there are leftovers in " +"the database check this option to scan obsolete data in database and remove " +"it." +msgstr "Cochez cette option pour supprimer d’éventuelles données obsolètes (concernant des dépôts manuellement supprimés) de la base de données." #: rhodecode/templates/admin/settings/settings.html:41 -#, fuzzy msgid "Destroy old data" -msgstr "Supprimer les données obsolètes" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:43 msgid "" -"Rescan repositories location for new repositories. Also deletes obsolete " -"if `destroy` flag is checked " -msgstr "" -"Rescanner le dossier contenant les dépôts pour en trouver de nouveaux. " -"Supprime égalements les entrées de dépôts obsolètes si « Supprimer les " -"données obsolètes » est coché." +"Rescan repositories location for new repositories. Also deletes obsolete if " +"`destroy` flag is checked " +msgstr "Rescanner le dossier contenant les dépôts pour en trouver de nouveaux. Supprime égalements les entrées de dépôts obsolètes si « Supprimer les données obsolètes » est coché." #: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" @@ -3059,14 +2867,12 @@ msgstr "Indexation Whoosh" #: rhodecode/templates/admin/settings/settings.html:62 -#, fuzzy msgid "Index build option" -msgstr "Option d’indexation" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:67 -#, fuzzy msgid "Build from scratch" -msgstr "Purger et reconstruire l’index" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" @@ -3099,14 +2905,12 @@ msgstr "Réglages d’affichage" #: rhodecode/templates/admin/settings/settings.html:129 -#, fuzzy msgid "General" -msgstr "Activer" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:134 -#, fuzzy msgid "Use repository extra fields" -msgstr "Dépôts" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:136 msgid "Allows storing additional customized fields per repository." @@ -3121,9 +2925,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:146 -#, fuzzy msgid "Dashboard items" -msgstr "Tableau de bord" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:150 msgid "" @@ -3144,9 +2947,8 @@ msgstr "Afficher l’icône de dépôt privé sur les dépôts" #: rhodecode/templates/admin/settings/settings.html:166 -#, fuzzy msgid "Show public/private icons next to repositories names" -msgstr "Afficher l’icône de dépôt public sur les dépôts" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" @@ -3165,17 +2967,14 @@ msgstr "Web" #: rhodecode/templates/admin/settings/settings.html:218 -#, fuzzy msgid "Require SSL for vcs operations" -msgstr "SSL requis pour les opérations de push/pull" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:220 msgid "" -"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " -"will return HTTP Error 406: Not Acceptable" -msgstr "" -"RhodeCode requièrera SSL pour les pushs et pulls. Si le SSL n’est pas " -"utilisé l’erreur HTTP 406 (Non Acceptable) sera renvoyée." +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will" +" return HTTP Error 406: Not Acceptable" +msgstr "RhodeCode requièrera SSL pour les pushs et pulls. Si le SSL n’est pas utilisé l’erreur HTTP 406 (Non Acceptable) sera renvoyée." #: rhodecode/templates/admin/settings/settings.html:226 msgid "Hooks" @@ -3198,32 +2997,26 @@ msgstr "Journaliser les commandes de pull" #: rhodecode/templates/admin/settings/settings.html:247 -#, fuzzy msgid "Advanced setup" -msgstr "Avancé" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:252 msgid "Mercurial Extensions" msgstr "Extensions Mercurial" #: rhodecode/templates/admin/settings/settings.html:257 -#, fuzzy msgid "Enable largefiles extension" -msgstr "Extensions largefiles" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:261 -#, fuzzy msgid "Enable hgsubversion extension" -msgstr "Extensions hgsubversion" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:263 -#, fuzzy msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" -"Ceci nécessite l’installation de la bibliothèque hgsubversion. Permet de " -"clôner à partir de dépôts Suversion." #: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" @@ -3231,23 +3024,20 @@ #: rhodecode/templates/admin/settings/settings.html:279 msgid "" -"Click to unlock. You must restart RhodeCode in order to make this setting" -" take effect." +"Click to unlock. You must restart RhodeCode in order to make this setting " +"take effect." msgstr "" #: rhodecode/templates/admin/settings/settings.html:280 #: rhodecode/templates/base/base.html:143 -#, fuzzy msgid "Unlock" -msgstr "Déverrouiller" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:282 msgid "" -"Location where repositories are stored. After changing this value a " -"restart, and rescan is required" -msgstr "" -"Emplacement de stockage des dépôts. Si cette valeur est changée, " -"Rhodecode devra être redémarré les les dépôts rescannés." +"Location where repositories are stored. After changing this value a restart," +" and rescan is required" +msgstr "Emplacement de stockage des dépôts. Si cette valeur est changée, Rhodecode devra être redémarré les les dépôts rescannés." #: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" @@ -3282,9 +3072,8 @@ #: rhodecode/templates/admin/users/user_add.html:12 #: rhodecode/templates/admin/users/users.html:23 -#, fuzzy msgid "Add new user" -msgstr "nouvel utilisateur" +msgstr "" #: rhodecode/templates/admin/users/user_add.html:50 msgid "Password confirmation" @@ -3296,9 +3085,9 @@ #: rhodecode/templates/admin/users/user_edit.html:13 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#, fuzzy, python-format +#, python-format msgid "Edit %s" -msgstr "éditer %s" +msgstr "" #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 @@ -3371,9 +3160,8 @@ #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 -#, fuzzy msgid "Show closed pull requests" -msgstr "[a fermé] la requête de pull de" +msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" @@ -3420,47 +3208,39 @@ msgstr "Utilisateurs" #: rhodecode/templates/admin/users/users.html:80 -#, fuzzy msgid "Firstname" -msgstr "Prénom" +msgstr "" #: rhodecode/templates/admin/users/users.html:81 -#, fuzzy msgid "Lastname" -msgstr "Nom de famille" +msgstr "" #: rhodecode/templates/admin/users/users.html:82 -#, fuzzy msgid "Last login" -msgstr "Dernière connexion" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -#, fuzzy msgid "Add user group" -msgstr "Ajouter un groupe d’utilisateur" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 #: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 -#, fuzzy msgid "User groups" -msgstr "Groupes d’utilisateurs" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 #: rhodecode/templates/admin/users_groups/users_groups.html:26 -#, fuzzy msgid "Add new user group" -msgstr "Ajouter un nouveau groupe" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -#, fuzzy msgid "Edit user group" -msgstr "Éditer le groupe d’utilisateurs" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -#, fuzzy msgid "UserGroups" -msgstr "Groupes d’utilisateurs" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 #: rhodecode/templates/admin/users_groups/users_groups.html:38 @@ -3468,9 +3248,8 @@ msgstr "Membres" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -#, fuzzy msgid "Chosen group members" -msgstr "Membres du groupe" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 msgid "Remove all elements" @@ -3485,29 +3264,25 @@ msgstr "Tout ajouter" #: rhodecode/templates/admin/users_groups/users_group_edit.html:109 -#, fuzzy msgid "No members yet" -msgstr "Membres" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:117 -#, fuzzy msgid "Global Permissions" -msgstr "Copier les permissions" +msgstr "" #: rhodecode/templates/admin/users_groups/users_groups.html:5 -#, fuzzy msgid "User groups administration" -msgstr "Gestion des groupes d’utilisateurs" +msgstr "" #: rhodecode/templates/admin/users_groups/users_groups.html:55 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this user group: %s" -msgstr "Voulez-vous vraiment supprimer le groupe d‘utilisateurs « %s » ?" +msgstr "" #: rhodecode/templates/admin/users_groups/users_groups.html:62 -#, fuzzy msgid "There are no user groups yet" -msgstr "Aucun groupe de dépôts n’a été créé pour le moment." +msgstr "" #: rhodecode/templates/base/base.html:42 #, python-format @@ -3543,9 +3318,8 @@ msgstr "Fichiers" #: rhodecode/templates/base/base.html:125 -#, fuzzy msgid "Switch To" -msgstr "Aller" +msgstr "" #: rhodecode/templates/base/base.html:127 #: rhodecode/templates/base/base.html:279 @@ -3569,19 +3343,16 @@ msgstr "Rechercher" #: rhodecode/templates/base/base.html:145 -#, fuzzy msgid "Lock" -msgstr "Verrouiller" +msgstr "" #: rhodecode/templates/base/base.html:153 -#, fuzzy msgid "Follow" -msgstr "followers" +msgstr "" #: rhodecode/templates/base/base.html:154 -#, fuzzy msgid "Unfollow" -msgstr "followers" +msgstr "" #: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 @@ -3593,24 +3364,20 @@ msgstr "Fork" #: rhodecode/templates/base/base.html:159 -#, fuzzy msgid "Create Pull Request" -msgstr "Nouvelle requête de pull" +msgstr "" #: rhodecode/templates/base/base.html:165 -#, fuzzy msgid "Show Pull Requests" -msgstr "Nouvelle requête de pull" +msgstr "" #: rhodecode/templates/base/base.html:165 -#, fuzzy msgid "Pull Requests" -msgstr "Requêtes de pull" +msgstr "" #: rhodecode/templates/base/base.html:202 -#, fuzzy msgid "Not logged in" -msgstr "Dernière connexion" +msgstr "" #: rhodecode/templates/base/base.html:209 msgid "Login to your account" @@ -3654,22 +3421,19 @@ msgstr "" #: rhodecode/templates/base/base.html:311 -#, fuzzy msgid "Search in repositories" -msgstr "Rechercher dans tous les dépôts" +msgstr "" #: rhodecode/templates/base/default_perms_box.html:14 msgid "Inherit default permissions" msgstr "Utiliser les permissions par défaut" #: rhodecode/templates/base/default_perms_box.html:18 -#, fuzzy, python-format +#, python-format msgid "" "Select to inherit permissions from %s settings. With this selected below " "options does not apply." msgstr "" -"Cochez pour utiliser les permissions des les réglages %s. Si cette option" -" est activée, les réglages ci-dessous n’auront pas d’effet." #: rhodecode/templates/base/default_perms_box.html:26 msgid "Create repositories" @@ -3680,9 +3444,8 @@ msgstr "" #: rhodecode/templates/base/default_perms_box.html:35 -#, fuzzy msgid "Create user groups" -msgstr "[a créé] le groupe d’utilisateurs" +msgstr "" #: rhodecode/templates/base/default_perms_box.html:39 msgid "Select this option to allow user group creation for this user" @@ -3697,9 +3460,8 @@ msgstr "" #: rhodecode/templates/base/perms_summary.html:11 -#, fuzzy msgid "No permissions defined yet" -msgstr "Copier les permissions" +msgstr "" #: rhodecode/templates/base/perms_summary.html:19 #: rhodecode/templates/base/perms_summary.html:38 @@ -3711,83 +3473,73 @@ msgid "Edit Permission" msgstr "Éditer" -#: rhodecode/templates/base/root.html:43 -#, fuzzy +#: rhodecode/templates/base/root.html:44 msgid "Add another comment" -msgstr "Nouveau commentaire" - -#: rhodecode/templates/base/root.html:44 +msgstr "" + +#: rhodecode/templates/base/root.html:45 #: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Start following this repository" msgstr "Suivre ce dépôt" -#: rhodecode/templates/base/root.html:46 +#: rhodecode/templates/base/root.html:47 msgid "Group" msgstr "Groupe" -#: rhodecode/templates/base/root.html:47 -msgid "members" -msgstr "Membres" - #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:203 -#, fuzzy -msgid "Loading ..." -msgstr "Chargement…" +msgid "members" +msgstr "Membres" #: rhodecode/templates/base/root.html:49 -#, fuzzy -msgid "Search truncated" -msgstr "Résultats tronqués" +#: rhodecode/templates/pullrequests/pullrequest.html:203 +msgid "Loading ..." +msgstr "" #: rhodecode/templates/base/root.html:50 -#, fuzzy -msgid "No matching files" -msgstr "Aucun fichier ne correspond" +msgid "Search truncated" +msgstr "" #: rhodecode/templates/base/root.html:51 +msgid "No matching files" +msgstr "" + +#: rhodecode/templates/base/root.html:52 #: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "Nouvelle requête de pull" -#: rhodecode/templates/base/root.html:52 -#, fuzzy +#: rhodecode/templates/base/root.html:53 msgid "Open new pull request for selected changesets" -msgstr "a ouvert une nouvelle requête de pull" - -#: rhodecode/templates/base/root.html:53 -#, fuzzy -msgid "Show selected changesets __S -> __E" -msgstr "Afficher les changements sélections de __S à __E" +msgstr "" #: rhodecode/templates/base/root.html:54 -#, fuzzy -msgid "Show selected changeset __S" -msgstr "Afficher les changements sélections de __S à __E" +msgid "Show selected changesets __S -> __E" +msgstr "" #: rhodecode/templates/base/root.html:55 -msgid "Selection link" -msgstr "Lien vers la sélection" +msgid "Show selected changeset __S" +msgstr "" #: rhodecode/templates/base/root.html:56 -#: rhodecode/templates/changeset/diff_block.html:8 -#, fuzzy -msgid "Collapse diff" -msgstr "Diff de fichier" +msgid "Selection link" +msgstr "Lien vers la sélection" #: rhodecode/templates/base/root.html:57 -#, fuzzy -msgid "Expand diff" -msgstr "Diff brut" +#: rhodecode/templates/changeset/diff_block.html:8 +msgid "Collapse diff" +msgstr "" #: rhodecode/templates/base/root.html:58 -#, fuzzy -msgid "Failed to remoke permission" -msgstr "Échec de suppression de l’utilisateur" +msgid "Expand diff" +msgstr "" + +#: rhodecode/templates/base/root.html:59 +msgid "Failed to revoke permission" +msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format @@ -3795,9 +3547,8 @@ msgstr "Signets de %s" #: rhodecode/templates/bookmarks/bookmarks.html:26 -#, fuzzy msgid "Compare bookmarks" -msgstr "Comparer le fork" +msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 @@ -3850,20 +3601,18 @@ msgstr[1] "Affichage de %d révisions sur %d" #: rhodecode/templates/changelog/changelog.html:39 -#, fuzzy msgid "Clear selection" -msgstr "Réglages de recherche" +msgstr "" #: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 -#, fuzzy, python-format +#, python-format msgid "Compare fork with %s" -msgstr "Comparer le fork avec %s" +msgstr "" #: rhodecode/templates/changelog/changelog.html:42 -#, fuzzy msgid "Compare fork with parent" -msgstr "Comparer le fork avec %s" +msgstr "" #: rhodecode/templates/changelog/changelog.html:78 #: rhodecode/templates/changelog/changelog_summary_data.html:28 @@ -3873,33 +3622,32 @@ #: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/summary/summary.html:403 -#, fuzzy msgid "Show more" -msgstr "montrer plus" +msgstr "" #: rhodecode/templates/changelog/changelog.html:115 #: rhodecode/templates/changelog/changelog_summary_data.html:50 #: rhodecode/templates/changeset/changeset.html:107 #: rhodecode/templates/changeset/changeset_range.html:86 -#, fuzzy, python-format +#, python-format msgid "Bookmark %s" -msgstr "Signets %s" +msgstr "" #: rhodecode/templates/changelog/changelog.html:121 #: rhodecode/templates/changelog/changelog_summary_data.html:56 #: rhodecode/templates/changeset/changeset.html:113 #: rhodecode/templates/changeset/changeset_range.html:92 -#, fuzzy, python-format +#, python-format msgid "Tag %s" -msgstr "Tags %s" +msgstr "" #: rhodecode/templates/changelog/changelog.html:126 #: rhodecode/templates/changelog/changelog_summary_data.html:61 #: rhodecode/templates/changeset/changeset.html:117 #: rhodecode/templates/changeset/changeset_range.html:96 -#, fuzzy, python-format +#, python-format msgid "Branch %s" -msgstr "Branches %s" +msgstr "" #: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" @@ -3907,21 +3655,18 @@ #: rhodecode/templates/changelog/changelog_details.html:4 #: rhodecode/templates/changeset/changeset.html:91 -#, fuzzy msgid "Removed" -msgstr "Supprimés" +msgstr "" #: rhodecode/templates/changelog/changelog_details.html:5 #: rhodecode/templates/changeset/changeset.html:92 -#, fuzzy msgid "Changed" -msgstr "Modifiés" +msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 #: rhodecode/templates/changeset/changeset.html:93 -#, fuzzy msgid "Added" -msgstr "Ajoutés" +msgstr "" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 @@ -3929,21 +3674,19 @@ #: rhodecode/templates/changeset/changeset.html:95 #: rhodecode/templates/changeset/changeset.html:96 #: rhodecode/templates/changeset/changeset.html:97 -#, fuzzy, python-format +#, python-format msgid "Affected %s files" -msgstr "%s fichiers affectés" +msgstr "" #: rhodecode/templates/changelog/changelog_summary_data.html:6 #: rhodecode/templates/files/files_add.html:75 #: rhodecode/templates/files/files_edit.html:61 -#, fuzzy msgid "Commit message" -msgstr "Message de commit" +msgstr "" #: rhodecode/templates/changelog/changelog_summary_data.html:7 -#, fuzzy msgid "Age" -msgstr "Âge" +msgstr "" #: rhodecode/templates/changelog/changelog_summary_data.html:9 msgid "Refs" @@ -3977,9 +3720,8 @@ msgstr "Aucun parent" #: rhodecode/templates/changeset/changeset.html:49 -#, fuzzy msgid "No children" -msgstr "Appliquer aux enfants" +msgstr "" #: rhodecode/templates/changeset/changeset.html:62 #: rhodecode/templates/changeset/changeset_file_comment.html:20 @@ -3989,20 +3731,17 @@ #: rhodecode/templates/changeset/changeset.html:67 #: rhodecode/templates/changeset/diff_block.html:22 -#, fuzzy msgid "Raw diff" -msgstr "Diff brut" +msgstr "" #: rhodecode/templates/changeset/changeset.html:68 -#, fuzzy msgid "Patch diff" -msgstr "Diff brut" +msgstr "" #: rhodecode/templates/changeset/changeset.html:69 #: rhodecode/templates/changeset/diff_block.html:23 -#, fuzzy msgid "Download diff" -msgstr "Télécharger le diff" +msgstr "" #: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:103 @@ -4028,20 +3767,20 @@ #: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 -#, fuzzy, python-format +#, python-format msgid "%s file changed" msgid_plural "%s files changed" -msgstr[0] "%s fichié modifié" -msgstr[1] "%s fichié modifié" +msgstr[0] "" +msgstr[1] "" #: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 -#, fuzzy, python-format +#, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" -msgstr[0] "%s fichiers affectés avec %s insertions et %s suppressions" -msgstr[1] "%s fichiers affectés avec %s insertions et %s suppressions" +msgstr[0] "" +msgstr[1] "" #: rhodecode/templates/changeset/changeset.html:141 #: rhodecode/templates/changeset/changeset.html:153 @@ -4056,19 +3795,18 @@ #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 -#, fuzzy msgid "Show full diff" -msgstr "Chargement de la liste des fichiers…" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:30 -#, fuzzy, python-format +#, python-format msgid "Status change on pull request #%s" -msgstr "Requêtes de pull %s" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:32 -#, fuzzy, python-format +#, python-format msgid "Comment on pull request #%s" -msgstr "[a commenté] la requête de pull pour %s" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." @@ -4082,28 +3820,23 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:145 #, python-format msgid "Comments parsed using %s syntax with %s support." -msgstr "" -"Les commentaires sont analysés avec la syntaxe %s, avec le support de la " -"commande %s." +msgstr "Les commentaires sont analysés avec la syntaxe %s, avec le support de la commande %s." #: rhodecode/templates/changeset/changeset_file_comment.html:61 #: rhodecode/templates/changeset/changeset_file_comment.html:147 -msgid "Use @username inside this text to send notification to this RhodeCode user" -msgstr "" -"Utilisez @nomutilisateur dans ce texte pour envoyer une notification à " -"l’utilisateur RhodeCode en question." +msgid "" +"Use @username inside this text to send notification to this RhodeCode user" +msgstr "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à l’utilisateur RhodeCode en question." #: rhodecode/templates/changeset/changeset_file_comment.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:152 -#, fuzzy msgid "Preview" -msgstr "%d relecteur" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:72 #: rhodecode/templates/changeset/changeset_file_comment.html:170 -#, fuzzy msgid "Comment preview" -msgstr "vue de comparaison" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:80 #: rhodecode/templates/changeset/changeset_file_comment.html:177 @@ -4113,9 +3846,8 @@ msgstr "Commentaire" #: rhodecode/templates/changeset/changeset_file_comment.html:81 -#, fuzzy msgid "Cancel" -msgstr "Modifiés" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." @@ -4130,9 +3862,8 @@ msgstr "Masquer" #: rhodecode/templates/changeset/changeset_file_comment.html:149 -#, fuzzy msgid "Change status" -msgstr "Modifier le statut" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" @@ -4152,9 +3883,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.html:29 -#, fuzzy msgid "Show inline comments" -msgstr "Afficher les commentaires" +msgstr "" #: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" @@ -4169,33 +3899,30 @@ msgstr "Aucun changeset" #: rhodecode/templates/compare/compare_cs.html:32 -#, fuzzy msgid "Ancestor" -msgstr "Branches" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Compare" -msgstr "%s Comparer" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:9 -#, fuzzy msgid "Compare revisions" -msgstr "révision précédente" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:33 #: rhodecode/templates/pullrequests/pullrequest_show.html:106 -#, fuzzy, python-format +#, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" -msgstr[0] "Afficher %s les commentaires" -msgstr[1] "Afficher %s les commentaires" +msgstr[0] "" +msgstr[1] "" #: rhodecode/templates/compare/compare_diff.html:48 #: rhodecode/templates/pullrequests/pullrequest_show.html:121 -#, fuzzy msgid "No files" -msgstr "Fichiers" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 @@ -4213,9 +3940,9 @@ msgstr "Dépôt Git" #: rhodecode/templates/data_table/_dt_elements.html:74 -#, fuzzy, python-format +#, python-format msgid "Fork of %s" -msgstr "Nom du fork %s" +msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -4246,23 +3973,21 @@ #: rhodecode/templates/email_templates/changeset_comment.html:4 #: rhodecode/templates/email_templates/pull_request.html:4 #: rhodecode/templates/email_templates/pull_request_comment.html:4 -#, fuzzy msgid "URL" -msgstr "Journal" +msgstr "" #: rhodecode/templates/email_templates/changeset_comment.html:6 -#, fuzzy, python-format +#, python-format msgid "%s commented on a %s changeset." -msgstr "%s a posté un commentaire sur le commit %s" +msgstr "" #: rhodecode/templates/email_templates/changeset_comment.html:14 msgid "The changeset status was changed to" msgstr "" #: rhodecode/templates/email_templates/main.html:8 -#, fuzzy msgid "This is a notification from RhodeCode." -msgstr "Ceci est une notification de RhodeCode." +msgstr "" #: rhodecode/templates/email_templates/password_reset.html:4 #, python-format @@ -4284,8 +4009,7 @@ #: rhodecode/templates/email_templates/pull_request.html:6 #, python-format msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." +"%s opened a pull request for repository %s and wants you to review changes." msgstr "" #: rhodecode/templates/email_templates/pull_request.html:8 @@ -4296,19 +4020,17 @@ msgstr "Titre" #: rhodecode/templates/email_templates/pull_request_comment.html:6 -#, fuzzy, python-format +#, python-format msgid "%s commented on pull request \"%s\"" -msgstr "%s [a commenté] la requête de pull pour %s" +msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.html:10 -#, fuzzy msgid "Pull request was closed with status" -msgstr "Statut de la requête de pull" +msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.html:12 -#, fuzzy msgid "Pull request changed status" -msgstr "Statut de la requête de pull" +msgstr "" #: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" @@ -4320,9 +4042,9 @@ msgstr "Vous serez redirigé vers %s dans %s secondes." #: rhodecode/templates/files/file_diff.html:4 -#, fuzzy, python-format +#, python-format msgid "%s File Diff" -msgstr "Diff de fichier de %s" +msgstr "" #: rhodecode/templates/files/file_diff.html:8 msgid "File diff" @@ -4330,26 +4052,24 @@ #: rhodecode/templates/files/files.html:4 #: rhodecode/templates/files/files.html:76 -#, fuzzy, python-format +#, python-format msgid "%s Files" msgstr "Fichiers de %s" #: rhodecode/templates/files/files.html:30 #: rhodecode/templates/files/files_add.html:31 #: rhodecode/templates/files/files_edit.html:31 -#, fuzzy msgid "Branch" -msgstr "Branche" +msgstr "" #: rhodecode/templates/files/files_add.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Files Add" -msgstr "Fichiers de %s" +msgstr "" #: rhodecode/templates/files/files_add.html:19 -#, fuzzy msgid "Add file" -msgstr "Ajouter un fichier" +msgstr "" #: rhodecode/templates/files/files_add.html:43 msgid "File Name" @@ -4385,29 +4105,24 @@ msgstr "Commiter les changements" #: rhodecode/templates/files/files_browser.html:13 -#, fuzzy msgid "View" -msgstr "voir" +msgstr "" #: rhodecode/templates/files/files_browser.html:14 -#, fuzzy msgid "Previous revision" -msgstr "révision précédente" +msgstr "" #: rhodecode/templates/files/files_browser.html:16 -#, fuzzy msgid "Next revision" -msgstr "révision suivante" +msgstr "" #: rhodecode/templates/files/files_browser.html:23 -#, fuzzy msgid "Follow current branch" -msgstr "Suivre la branche actuelle" +msgstr "" #: rhodecode/templates/files/files_browser.html:27 -#, fuzzy msgid "Search file list" -msgstr "Rechercher un fichier" +msgstr "" #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." @@ -4434,31 +4149,27 @@ msgstr "Dernier commiteur" #: rhodecode/templates/files/files_edit.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Files Edit" -msgstr "Fichiers de %s" +msgstr "" #: rhodecode/templates/files/files_edit.html:19 -#, fuzzy msgid "Edit file" -msgstr "Éditer le fichier" +msgstr "" #: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -#, fuzzy msgid "Show annotation" -msgstr "Afficher les annotations" +msgstr "" #: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -#, fuzzy msgid "Download as raw" -msgstr "télécharger le fichier brut" +msgstr "" #: rhodecode/templates/files/files_edit.html:52 -#, fuzzy msgid "Source" -msgstr "Source" +msgstr "" #: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" @@ -4469,19 +4180,16 @@ msgstr "Historique" #: rhodecode/templates/files/files_history_box.html:9 -#, fuzzy msgid "Diff to revision" -msgstr "Diff avec la révision" +msgstr "" #: rhodecode/templates/files/files_history_box.html:10 -#, fuzzy msgid "Show at revision" -msgstr "Afficher à la révision" +msgstr "" #: rhodecode/templates/files/files_history_box.html:11 -#, fuzzy msgid "Show full history" -msgstr "Chargement de la liste des fichiers…" +msgstr "" #: rhodecode/templates/files/files_history_box.html:16 #, python-format @@ -4491,24 +4199,21 @@ msgstr[1] "%s auteurs" #: rhodecode/templates/files/files_source.html:6 -#, fuzzy msgid "Load file history" -msgstr "Chargement de la liste des fichiers…" +msgstr "" #: rhodecode/templates/files/files_source.html:21 -#, fuzzy msgid "Show source" -msgstr "montrer les sources" +msgstr "" #: rhodecode/templates/files/files_source.html:29 -#, fuzzy, python-format +#, python-format msgid "Edit on branch:%s" -msgstr "Dépôt %s supprimé" +msgstr "" #: rhodecode/templates/files/files_source.html:31 -#, fuzzy msgid "Edit on branch:?" -msgstr "Dépôt %s supprimé" +msgstr "" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -4580,9 +4285,8 @@ msgstr "Mettre à jour depuis la source après clonage" #: rhodecode/templates/forks/fork.html:93 -#, fuzzy msgid "Fork this repository" -msgstr "Forker ce dépôt" +msgstr "" #: rhodecode/templates/forks/forks.html:5 #, python-format @@ -4596,9 +4300,8 @@ msgstr "Forks" #: rhodecode/templates/forks/forks_data.html:17 -#, fuzzy msgid "Forked" -msgstr "forké" +msgstr "" #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" @@ -4652,20 +4355,17 @@ msgstr "Nouvelle requête de pull" #: rhodecode/templates/pullrequests/pullrequest.html:47 -#, fuzzy msgid "Write a short description on this pull request" -msgstr "Veuillez confirmer la suppression de cette requête de pull." +msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:53 -#, fuzzy msgid "Changeset flow" -msgstr "Changements" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:60 #: rhodecode/templates/pullrequests/pullrequest_show.html:65 -#, fuzzy msgid "Origin repository" -msgstr "Dépôt Git" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:85 msgid "Send pull request" @@ -4690,19 +4390,17 @@ msgstr "Comparaison détaillée" #: rhodecode/templates/pullrequests/pullrequest.html:150 -#, fuzzy msgid "Destination repository" -msgstr "Éditer le dépôt" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Pull Request #%s" -msgstr "%s Requête de pull #%s" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:35 -#, fuzzy msgid "Review status" -msgstr "Modifier le statut" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" @@ -4720,9 +4418,8 @@ msgstr[1] "%d relecteurs" #: rhodecode/templates/pullrequests/pullrequest_show.html:59 -#, fuzzy msgid "Pull request was reviewed by all reviewers" -msgstr "La requête de pull a été relue par tous les relecteurs." +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" @@ -4733,29 +4430,25 @@ msgstr "Vue de comparaison" #: rhodecode/templates/pullrequests/pullrequest_show.html:149 -#, fuzzy msgid "reviewer" -msgstr "%d relecteur" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:164 -#, fuzzy msgid "Add or remove reviewer to this pull request." -msgstr "Ajouter un relecteur à cette requête de pull." +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:168 -#, fuzzy msgid "Save changes" -msgstr "Aucun changement" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Pull Requests" -msgstr "%s Mes requêtes de pull" +msgstr "" #: rhodecode/templates/search/search.html:6 -#, fuzzy msgid "Search repository" -msgstr "Rechercher dans le dépôt : %s" +msgstr "" #: rhodecode/templates/search/search.html:8 #: rhodecode/templates/search/search.html:16 @@ -4794,24 +4487,23 @@ msgstr "Résumé de %s" #: rhodecode/templates/summary/summary.html:16 -#, fuzzy, python-format +#, python-format msgid "%s ATOM feed" -msgstr "Flux %s de" +msgstr "" #: rhodecode/templates/summary/summary.html:17 -#, fuzzy, python-format +#, python-format msgid "%s RSS feed" -msgstr "Flux %s de" +msgstr "" #: rhodecode/templates/summary/summary.html:62 -#, fuzzy, python-format +#, python-format msgid "Repository locked by %s" -msgstr "Ce dépôt n’est pas verrouillé %s." +msgstr "" #: rhodecode/templates/summary/summary.html:64 -#, fuzzy msgid "Repository unlocked" -msgstr "Ce dépôt n’est pas verrouillé." +msgstr "" #: rhodecode/templates/summary/summary.html:83 #, python-format @@ -4819,9 +4511,8 @@ msgstr "Identifiant permanent : %s" #: rhodecode/templates/summary/summary.html:88 -#, fuzzy msgid "Public" -msgstr "publique" +msgstr "" #: rhodecode/templates/summary/summary.html:88 #: rhodecode/templates/summary/summary.html:89 @@ -4829,9 +4520,8 @@ msgstr "Fork de" #: rhodecode/templates/summary/summary.html:97 -#, fuzzy msgid "Remote clone" -msgstr "Clone distant" +msgstr "" #: rhodecode/templates/summary/summary.html:117 msgid "Contact" @@ -4855,9 +4545,8 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#, fuzzy msgid "Enable" -msgstr "Activer" +msgstr "" #: rhodecode/templates/summary/summary.html:159 msgid "Download" @@ -4884,15 +4573,13 @@ msgstr "avec les sous-dépôts" #: rhodecode/templates/summary/summary.html:197 -#, fuzzy msgid "Repository Size" -msgstr "Dépôts" +msgstr "" #: rhodecode/templates/summary/summary.html:204 #: rhodecode/templates/summary/summary.html:206 -#, fuzzy msgid "Feed" -msgstr "Flux RSS" +msgstr "" #: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" @@ -4907,18 +4594,17 @@ msgstr "Statistiques obtenues :" #: rhodecode/templates/summary/summary.html:256 -#, fuzzy msgid "Latest changes" -msgstr "Dernière modification" +msgstr "" #: rhodecode/templates/summary/summary.html:258 msgid "Quick start" msgstr "Démarrage rapide" #: rhodecode/templates/summary/summary.html:272 -#, fuzzy, python-format +#, python-format msgid "Readme file from revision %s" -msgstr "Fichier « Lisez-moi » à la révision « %s »" +msgstr "" #: rhodecode/templates/summary/summary.html:332 #, python-format @@ -4967,7 +4653,5 @@ msgstr "Tags de %s" #: rhodecode/templates/tags/tags.html:26 -#, fuzzy msgid "Compare tags" -msgstr "Comparer" - +msgstr "" diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/ja/LC_MESSAGES/rhodecode.mo has changed diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Fri Jun 07 19:23:20 2013 +0200 +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po Fri Jun 07 19:30:45 2013 +0200 @@ -1,26 +1,24 @@ -# Japanese translations for RhodeCode. -# Copyright (C) 2011 ORGANIZATION +# Translations template for RhodeCode. +# Copyright (C) 2013 Marcin Kuzminski RhodeCode # This file is distributed under the same license as the RhodeCode project. -# FIRST AUTHOR , 2011. -# Takumi IINO 2012 -# WAKAYAMA Shirou 2012 -# -# Mercurial Japanese Translation. -# - http://selenic.com/repo/hg/file/stable/i18n/ja.po -# ======================================== +# Translators: +# しろう <>, 2013 +# FIRST AUTHOR , 2011 +# Takumi IINO , 2013 msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.2.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-06-01 18:38+0200\n" -"PO-Revision-Date: 2013-04-06 21:38+0900\n" -"Last-Translator: FULL NAME \n" -"Language-Team: ja \n" -"Plural-Forms: nplurals=1; plural=0\n" +"Project-Id-Version: RhodeCode\n" +"Report-Msgid-Bugs-To: marcin@maq.io\n" +"POT-Creation-Date: 2013-06-05 19:55+0200\n" +"PO-Revision-Date: 2013-06-05 07:39+0000\n" +"Last-Translator: Takumi IINO \n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/RhodeCode/language/ja/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" +"Language: ja\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: rhodecode/controllers/changelog.py:149 msgid "All Branches" @@ -40,19 +38,19 @@ msgstr "" #: rhodecode/controllers/changeset.py:345 -#: rhodecode/controllers/pullrequests.py:481 +#: rhodecode/controllers/pullrequests.py:478 #, python-format msgid "Status change -> %s" msgstr "ステータス変更 -> %s" #: rhodecode/controllers/changeset.py:376 msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" +"Changing status on a changeset associated with a closed pull request is not " +"allowed" msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:259 +#: rhodecode/controllers/pullrequests.py:256 msgid "There are no changesets yet" msgstr "まだ変更がありません" @@ -61,7 +59,8 @@ msgstr "ホームページ" #: rhodecode/controllers/error.py:98 -msgid "The request could not be understood by the server due to malformed syntax." +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "形式が間違っているため、サーバーはリクエストを処理出来ませんでした" #: rhodecode/controllers/error.py:101 @@ -80,7 +79,7 @@ msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." -msgstr "" +msgstr "サーバーが不正な状態になったため、リクエストに答えることができませんでした。" #: rhodecode/controllers/feed.py:52 #, python-format @@ -183,14 +182,16 @@ msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/files.py:632 +#: rhodecode/controllers/pullrequests.py:149 #: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "ブランチ" -#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/files.py:633 +#: rhodecode/controllers/pullrequests.py:150 #: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: rhodecode/templates/switch_to_list.html:15 #: rhodecode/templates/tags/tags.html:10 @@ -226,56 +227,56 @@ #: rhodecode/controllers/login.py:179 msgid "" -"Your password reset was successful, new password has been sent to your " -"email" +"Your password reset was successful, new password has been sent to your email" msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました" -#: rhodecode/controllers/pullrequests.py:139 +#: rhodecode/controllers/pullrequests.py:136 #: rhodecode/templates/changeset/changeset.html:10 #: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "チェンジセット" -#: rhodecode/controllers/pullrequests.py:149 +#: rhodecode/controllers/pullrequests.py:146 msgid "Special" msgstr "" -#: rhodecode/controllers/pullrequests.py:150 +#: rhodecode/controllers/pullrequests.py:147 msgid "Peer branches" msgstr "相手のブランチ" -#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 +#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/controllers/pullrequests.py:324 +#: rhodecode/controllers/pullrequests.py:321 msgid "Pull request requires a title with min. 3 chars" msgstr "プルリクエストには3文字以上のタイトルが必要です" -#: rhodecode/controllers/pullrequests.py:326 +#: rhodecode/controllers/pullrequests.py:323 msgid "Error creating pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:346 +#: rhodecode/controllers/pullrequests.py:343 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストを作成しました" -#: rhodecode/controllers/pullrequests.py:349 +#: rhodecode/controllers/pullrequests.py:346 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/pullrequests.py:388 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully deleted pull request" msgstr "プルリクエストを削除しました" -#: rhodecode/controllers/pullrequests.py:484 +#: rhodecode/controllers/pullrequests.py:481 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:521 -msgid "Closing pull request on other statuses than rejected or approved forbidden" +#: rhodecode/controllers/pullrequests.py:518 +msgid "" +"Closing pull request on other statuses than rejected or approved forbidden" msgstr "" #: rhodecode/controllers/search.py:132 @@ -308,43 +309,37 @@ msgstr "デフォルト設定の更新中にエラーが発生しました" #: rhodecode/controllers/admin/gists.py:56 -#, fuzzy msgid "forever" -msgstr "レビュアー" +msgstr "" #: rhodecode/controllers/admin/gists.py:57 -#, fuzzy msgid "5 minutes" -msgstr "%d 分" +msgstr "" #: rhodecode/controllers/admin/gists.py:58 -#, fuzzy msgid "1 hour" -msgstr "%d 時間" +msgstr "" #: rhodecode/controllers/admin/gists.py:59 -#, fuzzy msgid "1 day" -msgstr "%d 日" +msgstr "" #: rhodecode/controllers/admin/gists.py:60 -#, fuzzy msgid "1 month" -msgstr "%d ヶ月" +msgstr "" #: rhodecode/controllers/admin/gists.py:62 msgid "Lifetime" msgstr "" #: rhodecode/controllers/admin/gists.py:127 -#, fuzzy msgid "Error occurred during gist creation" -msgstr "フックの作成中にエラーが発生しました" +msgstr "" #: rhodecode/controllers/admin/gists.py:165 -#, fuzzy, python-format +#, python-format msgid "Deleted gist %s" -msgstr "リポジトリ %s を削除しました" +msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" @@ -552,9 +547,8 @@ #: rhodecode/controllers/admin/repos.py:375 #: rhodecode/controllers/admin/repos_groups.py:332 #: rhodecode/controllers/admin/users_groups.py:312 -#, fuzzy msgid "An error occurred during revoking of permission" -msgstr "権限の更新中にエラーが発生しました" +msgstr "" #: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" @@ -660,8 +654,8 @@ #: rhodecode/controllers/admin/repos_groups.py:268 #, python-format -msgid "Error occurred during deletion of repos group %s" -msgstr "リポジトリグループ %s の削除中にエラーが発生しました" +msgid "Error occurred during deletion of repository group %s" +msgstr "" #: rhodecode/controllers/admin/repos_groups.py:279 #: rhodecode/controllers/admin/repos_groups.py:314 @@ -670,9 +664,8 @@ msgstr "" #: rhodecode/controllers/admin/repos_groups.py:294 -#, fuzzy msgid "Repository Group permissions updated" -msgstr "リポジトリ権限を更新しました" +msgstr "" #: rhodecode/controllers/admin/settings.py:123 #, python-format @@ -762,9 +755,8 @@ #: rhodecode/controllers/admin/users.py:293 #: rhodecode/controllers/admin/users_groups.py:372 -#, fuzzy msgid "Updated permissions" -msgstr "権限のコピー" +msgstr "" #: rhodecode/controllers/admin/users.py:297 #: rhodecode/controllers/admin/users_groups.py:376 @@ -830,9 +822,8 @@ msgstr "" #: rhodecode/controllers/admin/users_groups.py:280 -#, fuzzy msgid "User Group permissions updated" -msgstr "リポジトリ権限を更新しました" +msgstr "" #: rhodecode/lib/auth.py:544 #, python-format @@ -852,18 +843,14 @@ msgstr "バイナリファイル" #: rhodecode/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" msgstr "チェンジセットが大きすぎるため省略しました。差分を表示する場合は差分メニューを使用してください" #: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "検出された変更はありません" -#: rhodecode/lib/helpers.py:428 -#, python-format -msgid "%a, %d %b %Y %H:%M:%S" -msgstr "%a, %d %b %Y %H:%M:%S" - #: rhodecode/lib/helpers.py:539 msgid "True" msgstr "True" @@ -904,7 +891,8 @@ msgid "%s more" msgstr "%s 以上" -#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53 +#: rhodecode/lib/helpers.py:674 +#: rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "リビジョン" @@ -940,9 +928,8 @@ msgstr "リポジトリを[更新]" #: rhodecode/lib/helpers.py:735 -#, fuzzy msgid "[downloaded] archive from repository" -msgstr "このリポジトリのダウンロードは無効化されています" +msgstr "" #: rhodecode/lib/helpers.py:737 msgid "[delete] repository" @@ -1010,24 +997,20 @@ msgstr "ファイルなし" #: rhodecode/lib/helpers.py:1158 -#, fuzzy msgid "new file" -msgstr "新しいファイルを追加" +msgstr "" #: rhodecode/lib/helpers.py:1161 -#, fuzzy msgid "mod" -msgstr "削除" +msgstr "" #: rhodecode/lib/helpers.py:1164 -#, fuzzy msgid "del" -msgstr "削除" +msgstr "" #: rhodecode/lib/helpers.py:1167 -#, fuzzy msgid "rename" -msgstr "ユーザー名" +msgstr "" #: rhodecode/lib/helpers.py:1172 msgid "chmod" @@ -1036,12 +1019,9 @@ #: rhodecode/lib/helpers.py:1404 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"%s " -"リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" +"%s repository is not mapped to db perhaps it was created or renamed from the" +" filesystem please run the application again in order to rescan repositories" +msgstr "%s リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" #: rhodecode/lib/unionrepo.py:193 msgid "cannot create new union repository" @@ -1282,57 +1262,48 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 -#, fuzzy msgid "User group no access" -msgstr "不正なユーザーグループ名です" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 -#, fuzzy msgid "User group read access" -msgstr "ユーザーグループ" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 msgid "User group write access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 -#, fuzzy msgid "User group admin access" -msgstr "ユーザーグループ管理" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 -#, fuzzy msgid "Repository Group creation disabled" -msgstr "リポジトリ作成" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 -#, fuzzy msgid "Repository Group creation enabled" -msgstr "リポジトリ作成" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 msgid "User Group creation disabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 -#, fuzzy msgid "User Group creation enabled" -msgstr "ユーザーグループ管理" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 -#, fuzzy msgid "Registration disabled" -msgstr "登録" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 -#, fuzzy msgid "User Registration with manual account activation" -msgstr "手動でアカウントを有効にする" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 -#, fuzzy msgid "User Registration with automatic account activation" -msgstr "自動でアカウントを有効にする" +msgstr "" #: rhodecode/model/comment.py:75 #, python-format @@ -1415,8 +1386,8 @@ #: rhodecode/model/user.py:309 #, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" +"user \"%s\" still owns %s repositories and cannot be removed. Switch owners " +"or remove those repositories. %s" msgstr "" #: rhodecode/model/user.py:334 @@ -1447,11 +1418,10 @@ msgstr "ユーザー名 \"%(username)s\" は許可されていません" #: rhodecode/model/validators.py:89 -#, fuzzy msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character or underscore" -msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with alphanumeric character or underscore" +msgstr "" #: rhodecode/model/validators.py:117 #, python-format @@ -1471,9 +1441,7 @@ msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "" -"ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" -" " +msgstr "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります " #: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" @@ -1572,8 +1540,8 @@ #: rhodecode/model/validators.py:724 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name " -"of the attribute that is equivalent to \"username\"" +"The LDAP Login attribute of the CN must be specified - this is the name of " +"the attribute that is equivalent to \"username\"" msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです" #: rhodecode/model/validators.py:737 @@ -1587,7 +1555,8 @@ #: rhodecode/model/validators.py:770 #, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "" #: rhodecode/model/validators.py:803 @@ -1624,19 +1593,19 @@ #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repos.html:21 +#: rhodecode/templates/admin/repos/repos.html:22 msgid "Add repository" -msgstr "リポジトリの追加" +msgstr "リポジトリを追加" #: rhodecode/templates/index_base.html:15 #: rhodecode/templates/index_base.html:20 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 msgid "Add group" -msgstr "グループの追加" +msgstr "グループを追加" #: rhodecode/templates/index_base.html:27 msgid "Edit group" -msgstr "グループの編集" +msgstr "グループを編集" #: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" @@ -1656,7 +1625,7 @@ #: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:68 -#: rhodecode/templates/admin/repos/repos.html:73 +#: rhodecode/templates/admin/repos/repos.html:75 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 @@ -1681,7 +1650,7 @@ #: rhodecode/templates/index_base.html:121 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:71 +#: rhodecode/templates/admin/repos/repos.html:73 #: rhodecode/templates/admin/users/user_edit_my_account.html:172 #: rhodecode/templates/base/perms_summary.html:37 #: rhodecode/templates/bookmarks/bookmarks.html:48 @@ -1703,7 +1672,7 @@ msgstr "最後の変更点" #: rhodecode/templates/index_base.html:126 -#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/repos/repos.html:76 #: rhodecode/templates/admin/users/user_edit_my_account.html:174 #: rhodecode/templates/journal/journal.html:195 #: rhodecode/templates/journal/journal.html:285 @@ -1712,12 +1681,12 @@ #: rhodecode/templates/index_base.html:128 #: rhodecode/templates/admin/repos/repo_edit.html:114 -#: rhodecode/templates/admin/repos/repos.html:76 +#: rhodecode/templates/admin/repos/repos.html:78 msgid "Owner" msgstr "所有者" #: rhodecode/templates/index_base.html:136 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:86 #: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:74 @@ -1729,7 +1698,7 @@ msgstr "昇順で並び換え" #: rhodecode/templates/index_base.html:137 -#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/repos/repos.html:87 #: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:75 @@ -1745,7 +1714,7 @@ msgstr "リポジトリが見つかりません" #: rhodecode/templates/index_base.html:139 -#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/repos/repos.html:89 #: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:77 @@ -1757,7 +1726,7 @@ msgstr "データエラー" #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos/repos.html:88 +#: rhodecode/templates/admin/repos/repos.html:90 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 #: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 @@ -1927,7 +1896,7 @@ msgstr[0] "%s エントリ" #: rhodecode/templates/admin/admin_log.html:6 -#: rhodecode/templates/admin/repos/repos.html:77 +#: rhodecode/templates/admin/repos/repos.html:79 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 #: rhodecode/templates/admin/users/user_edit_my_account.html:176 #: rhodecode/templates/admin/users/users.html:87 @@ -2039,9 +2008,9 @@ msgstr "" #: rhodecode/templates/admin/gists/index.html:10 -#, fuzzy, python-format +#, python-format msgid "Private Gists for user %s" -msgstr "ユーザー %s を作成しました" +msgstr "" #: rhodecode/templates/admin/gists/index.html:12 #, python-format @@ -2055,33 +2024,28 @@ #: rhodecode/templates/admin/gists/index.html:31 #: rhodecode/templates/admin/gists/show.html:24 #: rhodecode/templates/base/base.html:302 -#, fuzzy msgid "Create new gist" -msgstr "新しいファイルを作成" +msgstr "" #: rhodecode/templates/admin/gists/index.html:48 -#, fuzzy msgid "Created" -msgstr "読込" +msgstr "" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/index.html:53 #: rhodecode/templates/admin/gists/show.html:43 #: rhodecode/templates/admin/gists/show.html:45 -#, fuzzy msgid "Expires" -msgstr "リポジトリ" +msgstr "" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/show.html:43 -#, fuzzy msgid "never" -msgstr "レビュアー" +msgstr "" #: rhodecode/templates/admin/gists/index.html:68 -#, fuzzy msgid "There are no gists yet" -msgstr "まだタグがありません" +msgstr "" #: rhodecode/templates/admin/gists/new.html:5 #: rhodecode/templates/admin/gists/new.html:16 @@ -2089,9 +2053,8 @@ msgstr "" #: rhodecode/templates/admin/gists/new.html:37 -#, fuzzy msgid "Gist description ..." -msgstr "説明" +msgstr "" #: rhodecode/templates/admin/gists/new.html:52 msgid "Create private gist" @@ -2137,9 +2100,8 @@ msgstr "" #: rhodecode/templates/admin/gists/show.html:38 -#, fuzzy msgid "Private gist" -msgstr "非公開リポジトリ" +msgstr "" #: rhodecode/templates/admin/gists/show.html:54 #: rhodecode/templates/admin/repos/repo_edit.html:299 @@ -2148,9 +2110,8 @@ msgstr "削除" #: rhodecode/templates/admin/gists/show.html:54 -#, fuzzy msgid "Confirm to delete this gist" -msgstr "このIPアドレスを削除してよろしいですか: %s" +msgstr "" #: rhodecode/templates/admin/gists/show.html:63 #: rhodecode/templates/admin/gists/show.html:84 @@ -2161,9 +2122,8 @@ msgstr "元のファイルを表示" #: rhodecode/templates/admin/gists/show.html:71 -#, fuzzy msgid "created" -msgstr "読込" +msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" @@ -2302,8 +2262,8 @@ #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will " -"be lost" +"permission, note that all custom default permission on repositories will be " +"lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:50 @@ -2320,9 +2280,8 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 -#, fuzzy msgid "User group" -msgstr "ユーザーグループ" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:76 msgid "" @@ -2336,9 +2295,8 @@ msgstr "リポジトリ作成" #: rhodecode/templates/admin/permissions/permissions.html:91 -#, fuzzy msgid "User group creation" -msgstr "ユーザーグループ管理" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" @@ -2349,9 +2307,8 @@ msgstr "登録" #: rhodecode/templates/admin/permissions/permissions.html:115 -#, fuzzy msgid "External auth account activation" -msgstr "自動でアカウントを有効にする" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:133 msgid "Default User Permissions" @@ -2444,7 +2401,8 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 -msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" #: rhodecode/templates/admin/repos/repo_edit.html:8 @@ -2454,15 +2412,15 @@ #: rhodecode/templates/admin/repos/repo_edit.html:12 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:11 -#: rhodecode/templates/base/base.html:81 rhodecode/templates/base/base.html:134 +#: rhodecode/templates/base/base.html:81 +#: rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "設定" #: rhodecode/templates/admin/repos/repo_edit.html:36 -#, fuzzy msgid "Non-changeable id" -msgstr "変更不能ID %s" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" @@ -2526,8 +2484,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"Manually invalidate cache for this repository. On first access repository " +"will be cached again" msgstr "このリポジトリのキャッシュを手動で無効化します。リポジトリへの初回アクセス時に再びキャッシュされます。" #: rhodecode/templates/admin/repos/repo_edit.html:223 @@ -2568,8 +2526,8 @@ #: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" +"All actions made on this repository will be accessible to everyone in public" +" journal" msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" #: rhodecode/templates/admin/repos/repo_edit.html:263 @@ -2585,9 +2543,8 @@ msgstr "このリポジトリのロックを外しますか？" #: rhodecode/templates/admin/repos/repo_edit.html:271 -#, fuzzy msgid "Lock repo" -msgstr "リポジトリのロック" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" @@ -2598,7 +2555,8 @@ msgstr "リポジトリはロックされていません" #: rhodecode/templates/admin/repos/repo_edit.html:277 -msgid "Force locking on repository. Works only when anonymous access is disabled" +msgid "" +"Force locking on repository. Works only when anonymous access is disabled" msgstr "リポジトリを強制ロックします。匿名アクセスが無効になっている場合のみ動作します。" #: rhodecode/templates/admin/repos/repo_edit.html:284 @@ -2606,9 +2564,8 @@ msgstr "フォーク元の設定" #: rhodecode/templates/admin/repos/repo_edit.html:289 -#, fuzzy msgid "Set" -msgstr "保存" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:293 msgid "Manually set this repository as a fork of another from the list" @@ -2638,12 +2595,10 @@ #: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "" -"This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" -" from file system please do it manually" -msgstr "" -"このリポジトリはRhodeCodeとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n" -"完全な削除が必要な場合はファイルシステムから手動で削除してください" +"This repository will be renamed in a special way in order to be unaccesible " +"for RhodeCode and VCS systems. If you need to fully delete it from file " +"system please do it manually" +msgstr "このリポジトリはRhodeCodeとVCSシステムからアクセス出来ないようにするために特別な方法でリネームされます。\n完全な削除が必要な場合はファイルシステムから手動で削除してください" #: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" @@ -2736,7 +2691,7 @@ msgid "Repositories administration" msgstr "リポジトリ管理" -#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:185 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:76 @@ -2772,7 +2727,7 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 msgid "Add repository group" -msgstr "リポジトリグループの追加" +msgstr "リポジトリグループを追加" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 @@ -2805,12 +2760,12 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 msgid "Add child group" -msgstr "子グループの追加" +msgstr "子グループを追加" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 @@ -2881,9 +2836,9 @@ #: rhodecode/templates/admin/settings/settings.html:40 msgid "" -"In case a repository was deleted from filesystem and there are leftovers " -"in the database check this option to scan obsolete data in database and " -"remove it." +"In case a repository was deleted from filesystem and there are leftovers in " +"the database check this option to scan obsolete data in database and remove " +"it." msgstr "" #: rhodecode/templates/admin/settings/settings.html:41 @@ -2892,8 +2847,8 @@ #: rhodecode/templates/admin/settings/settings.html:43 msgid "" -"Rescan repositories location for new repositories. Also deletes obsolete " -"if `destroy` flag is checked " +"Rescan repositories location for new repositories. Also deletes obsolete if " +"`destroy` flag is checked " msgstr "" #: rhodecode/templates/admin/settings/settings.html:48 @@ -2963,9 +2918,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:146 -#, fuzzy msgid "Dashboard items" -msgstr "ダッシュボード" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:150 msgid "" @@ -2986,9 +2940,8 @@ msgstr "非公開リポジトリのアイコンを表示" #: rhodecode/templates/admin/settings/settings.html:166 -#, fuzzy msgid "Show public/private icons next to repositories names" -msgstr "公開リポジトリのアイコンを表示" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" @@ -3012,11 +2965,9 @@ #: rhodecode/templates/admin/settings/settings.html:220 msgid "" -"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " -"will return HTTP Error 406: Not Acceptable" -msgstr "" -"RhodeCodeはPushとPullにSSLを要求します。もしSSLでない場合、HTTP Error 406: Not " -"Acceptalbeを返します" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will" +" return HTTP Error 406: Not Acceptable" +msgstr "RhodeCodeはPushとPullにSSLを要求します。もしSSLでない場合、HTTP Error 406: Not Acceptalbeを返します" #: rhodecode/templates/admin/settings/settings.html:226 msgid "Hooks" @@ -3066,8 +3017,8 @@ #: rhodecode/templates/admin/settings/settings.html:279 msgid "" -"Click to unlock. You must restart RhodeCode in order to make this setting" -" take effect." +"Click to unlock. You must restart RhodeCode in order to make this setting " +"take effect." msgstr "" #: rhodecode/templates/admin/settings/settings.html:280 @@ -3077,8 +3028,8 @@ #: rhodecode/templates/admin/settings/settings.html:282 msgid "" -"Location where repositories are stored. After changing this value a " -"restart, and rescan is required" +"Location where repositories are stored. After changing this value a restart," +" and rescan is required" msgstr "" #: rhodecode/templates/admin/settings/settings.html:303 @@ -3115,7 +3066,7 @@ #: rhodecode/templates/admin/users/user_add.html:12 #: rhodecode/templates/admin/users/users.html:23 msgid "Add new user" -msgstr "新しいユーザーの追加" +msgstr "新しいユーザーを追加" #: rhodecode/templates/admin/users/user_add.html:50 msgid "Password confirmation" @@ -3123,7 +3074,7 @@ #: rhodecode/templates/admin/users/user_edit.html:5 msgid "Edit user" -msgstr "ユーザー編集" +msgstr "ユーザーを編集" #: rhodecode/templates/admin/users/user_edit.html:13 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 @@ -3263,7 +3214,7 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add user group" -msgstr "ユーザーグループの追加" +msgstr "ユーザーグループを追加" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 @@ -3274,7 +3225,7 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:12 #: rhodecode/templates/admin/users_groups/users_groups.html:26 msgid "Add new user group" -msgstr "新しいユーザーグループの追加" +msgstr "新しいユーザーグループを追加" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 msgid "Edit user group" @@ -3310,9 +3261,8 @@ msgstr "まだメンバーがいません" #: rhodecode/templates/admin/users_groups/users_group_edit.html:117 -#, fuzzy msgid "Global Permissions" -msgstr "権限のコピー" +msgstr "" #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "User groups administration" @@ -3324,9 +3274,8 @@ msgstr "ユーザグループを削除しますか？: %s" #: rhodecode/templates/admin/users_groups/users_groups.html:62 -#, fuzzy msgid "There are no user groups yet" -msgstr "まだリポジトリグループがありません" +msgstr "" #: rhodecode/templates/base/base.html:42 #, python-format @@ -3488,9 +3437,8 @@ msgstr "" #: rhodecode/templates/base/default_perms_box.html:35 -#, fuzzy msgid "Create user groups" -msgstr "ユーザーグループを[作成]" +msgstr "" #: rhodecode/templates/base/default_perms_box.html:39 msgid "Select this option to allow user group creation for this user" @@ -3516,76 +3464,75 @@ #: rhodecode/templates/base/perms_summary.html:20 #: rhodecode/templates/base/perms_summary.html:39 msgid "Edit Permission" -msgstr "権限の編集" - -#: rhodecode/templates/base/root.html:43 +msgstr "権限を編集" + +#: rhodecode/templates/base/root.html:44 msgid "Add another comment" msgstr "別のコメントを追加" -#: rhodecode/templates/base/root.html:44 +#: rhodecode/templates/base/root.html:45 #: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "このリポジトリのフォローをやめる" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Start following this repository" msgstr "このリポジトリのフォローする" -#: rhodecode/templates/base/root.html:46 +#: rhodecode/templates/base/root.html:47 msgid "Group" msgstr "グループ" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "members" msgstr "メンバー" -#: rhodecode/templates/base/root.html:48 +#: rhodecode/templates/base/root.html:49 #: rhodecode/templates/pullrequests/pullrequest.html:203 msgid "Loading ..." msgstr "読み込み中..." -#: rhodecode/templates/base/root.html:49 +#: rhodecode/templates/base/root.html:50 msgid "Search truncated" msgstr "検索結果は省略されています" -#: rhodecode/templates/base/root.html:50 +#: rhodecode/templates/base/root.html:51 msgid "No matching files" msgstr "マッチするファイルはありません" -#: rhodecode/templates/base/root.html:51 +#: rhodecode/templates/base/root.html:52 #: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "新しいプルリクエストを作成" -#: rhodecode/templates/base/root.html:52 +#: rhodecode/templates/base/root.html:53 msgid "Open new pull request for selected changesets" msgstr "選択したチェンジセットから新しいプルリクエストを作成" -#: rhodecode/templates/base/root.html:53 -msgid "Show selected changesets __S -> __E" -msgstr "選択した変更 __S -> __E を表示" - #: rhodecode/templates/base/root.html:54 -msgid "Show selected changeset __S" -msgstr "選択した変更 __S を表示" +msgid "Show selected changesets __S -> __E" +msgstr "選択した変更 __S -> __E を表示" #: rhodecode/templates/base/root.html:55 +msgid "Show selected changeset __S" +msgstr "選択した変更 __S を表示" + +#: rhodecode/templates/base/root.html:56 msgid "Selection link" msgstr "" -#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/base/root.html:57 #: rhodecode/templates/changeset/diff_block.html:8 msgid "Collapse diff" msgstr "差分を折りたたむ" -#: rhodecode/templates/base/root.html:57 +#: rhodecode/templates/base/root.html:58 msgid "Expand diff" msgstr "差分を表示" -#: rhodecode/templates/base/root.html:58 -#, fuzzy -msgid "Failed to remoke permission" -msgstr "ユーザーの削除に失敗しました" +#: rhodecode/templates/base/root.html:59 +msgid "Failed to revoke permission" +msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format @@ -3593,9 +3540,8 @@ msgstr "%s ブックマーク" #: rhodecode/templates/bookmarks/bookmarks.html:26 -#, fuzzy msgid "Compare bookmarks" -msgstr "フォークを比較" +msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 @@ -3735,9 +3681,8 @@ msgstr "経過時間" #: rhodecode/templates/changelog/changelog_summary_data.html:9 -#, fuzzy msgid "Refs" -msgstr "プレフィックス" +msgstr "" #: rhodecode/templates/changelog/changelog_summary_data.html:86 msgid "Add or upload files directly via RhodeCode" @@ -3867,20 +3812,19 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:61 #: rhodecode/templates/changeset/changeset_file_comment.html:147 -msgid "Use @username inside this text to send notification to this RhodeCode user" +msgid "" +"Use @username inside this text to send notification to this RhodeCode user" msgstr "テキスト内で @username を使うと、この RhodeCode のユーザーに通知を送信します" #: rhodecode/templates/changeset/changeset_file_comment.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:152 -#, fuzzy msgid "Preview" -msgstr "レビュアー" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:72 #: rhodecode/templates/changeset/changeset_file_comment.html:170 -#, fuzzy msgid "Comment preview" -msgstr "比較の表示" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:80 #: rhodecode/templates/changeset/changeset_file_comment.html:177 @@ -4016,14 +3960,13 @@ #: rhodecode/templates/email_templates/changeset_comment.html:4 #: rhodecode/templates/email_templates/pull_request.html:4 #: rhodecode/templates/email_templates/pull_request_comment.html:4 -#, fuzzy msgid "URL" -msgstr "ジャーナル" +msgstr "" #: rhodecode/templates/email_templates/changeset_comment.html:6 -#, fuzzy, python-format +#, python-format msgid "%s commented on a %s changeset." -msgstr "%s がコミットにコメント %s" +msgstr "" #: rhodecode/templates/email_templates/changeset_comment.html:14 msgid "The changeset status was changed to" @@ -4053,8 +3996,7 @@ #: rhodecode/templates/email_templates/pull_request.html:6 #, python-format msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." +"%s opened a pull request for repository %s and wants you to review changes." msgstr "ユーザ %s がリポジトリ %s で新しいプルリクエストを作成しました。変更をレビューしてください。" #: rhodecode/templates/email_templates/pull_request.html:8 @@ -4065,19 +4007,17 @@ msgstr "タイトル" #: rhodecode/templates/email_templates/pull_request_comment.html:6 -#, fuzzy, python-format +#, python-format msgid "%s commented on pull request \"%s\"" -msgstr "%s プルリクエストにコメント #%s" +msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.html:10 -#, fuzzy msgid "Pull request was closed with status" -msgstr "このステータスでプルリクエストをクローズ" +msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.html:12 -#, fuzzy msgid "Pull request changed status" -msgstr "プルリクエストステータス" +msgstr "" #: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" @@ -4401,14 +4341,12 @@ msgstr "新しいプルリクエストを作成" #: rhodecode/templates/pullrequests/pullrequest.html:47 -#, fuzzy msgid "Write a short description on this pull request" -msgstr "このプルリクエストを削除しますか？" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:53 -#, fuzzy msgid "Changeset flow" -msgstr "チェンジセット" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:60 #: rhodecode/templates/pullrequests/pullrequest_show.html:65 @@ -4438,9 +4376,8 @@ msgstr "比較ビュー詳細" #: rhodecode/templates/pullrequests/pullrequest.html:150 -#, fuzzy msgid "Destination repository" -msgstr "リポジトリを編集" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #, python-format @@ -4593,9 +4530,8 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#, fuzzy msgid "Enable" -msgstr "有効にする" +msgstr "" #: rhodecode/templates/summary/summary.html:159 msgid "Download" @@ -4651,9 +4587,9 @@ msgstr "クイックスタート" #: rhodecode/templates/summary/summary.html:272 -#, fuzzy, python-format +#, python-format msgid "Readme file from revision %s" -msgstr "リビジョン '%s' のReadmeファイル" +msgstr "" #: rhodecode/templates/summary/summary.html:332 #, python-format @@ -4704,4 +4640,3 @@ #: rhodecode/templates/tags/tags.html:26 msgid "Compare tags" msgstr "タグの比較" - diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/pl/LC_MESSAGES/rhodecode.mo has changed diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Fri Jun 07 19:23:20 2013 +0200 +++ b/rhodecode/i18n/pl/LC_MESSAGES/rhodecode.po Fri Jun 07 19:30:45 2013 +0200 @@ -1,8 +1,8 @@ # Translations template for RhodeCode. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2013 Marcin Kuzminski RhodeCode # This file is distributed under the same license as the RhodeCode project. -# # Translators: +# Nemcio , 2013 # FIRST AUTHOR , 2010 # marcinkuzminski , 2013 # Nemcio , 2012 @@ -10,10 +10,10 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-06-01 18:38+0200\n" -"PO-Revision-Date: 2013-06-02 14:12+0000\n" -"Last-Translator: marcinkuzminski \n" +"Report-Msgid-Bugs-To: marcin@maq.io\n" +"POT-Creation-Date: 2013-06-05 19:55+0200\n" +"PO-Revision-Date: 2013-06-07 16:50+0000\n" +"Last-Translator: Nemcio \n" "Language-Team: Polish (http://www.transifex.com/projects/p/RhodeCode/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,11 +28,11 @@ #: rhodecode/controllers/changeset.py:84 msgid "Show white space" -msgstr "Pokaż białe znaki" +msgstr "pokazuj spacje" #: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 msgid "Ignore white space" -msgstr "Ignoruj białe znaki" +msgstr "Ignoruj pokazywanie spacji" #: rhodecode/controllers/changeset.py:164 #, python-format @@ -40,7 +40,7 @@ msgstr "%s linia w kontekście" #: rhodecode/controllers/changeset.py:345 -#: rhodecode/controllers/pullrequests.py:481 +#: rhodecode/controllers/pullrequests.py:478 #, python-format msgid "Status change -> %s" msgstr "Zmiana statusu -> %s" @@ -52,7 +52,7 @@ msgstr "Zmiana statusu na grupy zmian powiązania łączy zamkniętego wniosku jest niedozwolona" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:259 +#: rhodecode/controllers/pullrequests.py:256 msgid "There are no changesets yet" msgstr "Brak zestawienia zmian" @@ -106,11 +106,11 @@ #: rhodecode/controllers/feed.py:90 #, python-format msgid "%s committed on %s" -msgstr "%s zakomitowal %s" +msgstr "%s zakomitowal w %s" #: rhodecode/controllers/files.py:89 msgid "Click here to add new file" -msgstr "Kliknij tu aby dodać nowy plik" +msgstr "Kliknij tutaj, by dodać nowy plik" #: rhodecode/controllers/files.py:90 #, python-format @@ -129,7 +129,7 @@ #: rhodecode/controllers/files.py:297 #, python-format msgid "Edited file %s via RhodeCode" -msgstr "Wyedytowano plik %s przez RhodeCode" +msgstr "Edytowanie %s w RhodeCode" #: rhodecode/controllers/files.py:313 msgid "No changes" @@ -146,7 +146,7 @@ #: rhodecode/controllers/files.py:351 msgid "Added file via RhodeCode" -msgstr "Dodano plik poprzez RhodeCode" +msgstr "Dodano %s poprzez RhodeCode" #: rhodecode/controllers/files.py:368 msgid "No content" @@ -162,7 +162,7 @@ #: rhodecode/controllers/files.py:431 msgid "Downloads disabled" -msgstr "pobieranie wyłączone" +msgstr "Pobieranie wyłączone" #: rhodecode/controllers/files.py:442 #, python-format @@ -185,7 +185,7 @@ msgstr "Różnice" #: rhodecode/controllers/files.py:632 -#: rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/pullrequests.py:149 #: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 @@ -193,7 +193,7 @@ msgstr "Gałęzie" #: rhodecode/controllers/files.py:633 -#: rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/pullrequests.py:150 #: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: rhodecode/templates/switch_to_list.html:15 #: rhodecode/templates/tags/tags.html:10 @@ -203,7 +203,7 @@ #: rhodecode/controllers/forks.py:176 #, python-format msgid "Forked repository %s as %s" -msgstr "" +msgstr "Gałęzi %s w repozytorium %s" #: rhodecode/controllers/forks.py:190 #, python-format @@ -221,7 +221,7 @@ #: rhodecode/controllers/login.py:138 msgid "You have successfully registered into RhodeCode" -msgstr "Rejstracja w RhodeCode przebiegła poprawnie" +msgstr "Udało Ci się zarejestrować na stronie" #: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" @@ -232,54 +232,54 @@ "Your password reset was successful, new password has been sent to your email" msgstr "Twoje hasło zostało zresetowane, nowe hasło zostanie wysłane na e-mail" -#: rhodecode/controllers/pullrequests.py:139 +#: rhodecode/controllers/pullrequests.py:136 #: rhodecode/templates/changeset/changeset.html:10 #: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "Grupy zmian" -#: rhodecode/controllers/pullrequests.py:149 +#: rhodecode/controllers/pullrequests.py:146 msgid "Special" msgstr "Specjalne" -#: rhodecode/controllers/pullrequests.py:150 +#: rhodecode/controllers/pullrequests.py:147 msgid "Peer branches" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 +msgstr "gałęzie" + +#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Zakładki" -#: rhodecode/controllers/pullrequests.py:324 +#: rhodecode/controllers/pullrequests.py:321 msgid "Pull request requires a title with min. 3 chars" msgstr "Wniosek połączenia gałęzi wymaga tytułu z min. 3 znakami" -#: rhodecode/controllers/pullrequests.py:326 +#: rhodecode/controllers/pullrequests.py:323 msgid "Error creating pull request" -msgstr "Wystąpił błąd podczas tworzenia wniosku o rozgałęzienie" - -#: rhodecode/controllers/pullrequests.py:346 +msgstr "Błąd podczas tworzenia prośby o łączenie gałęzi" + +#: rhodecode/controllers/pullrequests.py:343 msgid "Successfully opened new pull request" msgstr "Prośba o wykonanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:349 +#: rhodecode/controllers/pullrequests.py:346 msgid "Error occurred during sending pull request" msgstr "Wystąpił błąd podczas prośby o połączenie gałęzi" -#: rhodecode/controllers/pullrequests.py:388 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully deleted pull request" msgstr "Prośba o skasowanie połączenia gałęzi została wykonana prawidłowo" -#: rhodecode/controllers/pullrequests.py:484 +#: rhodecode/controllers/pullrequests.py:481 msgid "Closing with" msgstr "Zamykanie" -#: rhodecode/controllers/pullrequests.py:521 +#: rhodecode/controllers/pullrequests.py:518 msgid "" "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" +msgstr "Zamknij wszystkie wnioski połączenia gałęzi innych stanów niż odrzucony, zatwierdzony lub zabroniony" #: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." @@ -308,7 +308,7 @@ #: rhodecode/controllers/admin/defaults.py:110 msgid "Error occurred during update of defaults" -msgstr "" +msgstr "wystąpił błąd podczas aktualizacji wartości domyślnych" #: rhodecode/controllers/admin/gists.py:56 msgid "forever" @@ -328,20 +328,20 @@ #: rhodecode/controllers/admin/gists.py:60 msgid "1 month" -msgstr "1 miesiąć" +msgstr "1 miesiąc" #: rhodecode/controllers/admin/gists.py:62 msgid "Lifetime" -msgstr "Na zawsze" +msgstr "Czas życia" #: rhodecode/controllers/admin/gists.py:127 msgid "Error occurred during gist creation" -msgstr "" +msgstr "Wystąpił błąd podczas tworzenia git" #: rhodecode/controllers/admin/gists.py:165 #, python-format msgid "Deleted gist %s" -msgstr "" +msgstr "Usuń git %s" #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" @@ -397,7 +397,7 @@ #: rhodecode/controllers/admin/ldap_settings.py:145 msgid "Error occurred during update of ldap settings" -msgstr "" +msgstr "Wystąpił błąd podczas aktualizacji ustawień ldap" #: rhodecode/controllers/admin/permissions.py:58 #: rhodecode/controllers/admin/permissions.py:62 @@ -457,21 +457,21 @@ #: rhodecode/controllers/admin/permissions.py:74 msgid "Allowed with manual account activation" -msgstr "" +msgstr "Dozwolona z ręczną aktywacją konta" #: rhodecode/controllers/admin/permissions.py:76 msgid "Allowed with automatic account activation" -msgstr "" +msgstr "Dozwolona z automatyczną aktywacją konta" #: rhodecode/controllers/admin/permissions.py:79 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 msgid "Manual activation of external account" -msgstr "" +msgstr "Ręczna aktywacja nowego konta" #: rhodecode/controllers/admin/permissions.py:80 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 msgid "Automatic activation of external account" -msgstr "" +msgstr "Automatyczna aktywacja nowego konta" #: rhodecode/controllers/admin/permissions.py:84 #: rhodecode/controllers/admin/permissions.py:87 @@ -486,7 +486,7 @@ #: rhodecode/controllers/admin/permissions.py:152 msgid "Error occurred during update of permissions" -msgstr "" +msgstr "Wystąpił błąd podczas aktualizacji uprawnień" #: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" @@ -495,17 +495,17 @@ #: rhodecode/controllers/admin/repos.py:168 #, python-format msgid "Created repository %s from %s" -msgstr "" +msgstr "utworzone repozytorium %s z %s" #: rhodecode/controllers/admin/repos.py:174 #, python-format msgid "Created repository %s" -msgstr "Stworzona repozytorium %s" +msgstr "Utworzone repozytorium %s" #: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "Error creating repository %s" -msgstr "Wystapił błąd podczas tworzenia repozytorium %s" +msgstr "utworzone repozytorium %s" #: rhodecode/controllers/admin/repos.py:270 #, python-format @@ -515,7 +515,7 @@ #: rhodecode/controllers/admin/repos.py:288 #, python-format msgid "Error occurred during update of repository %s" -msgstr "Wystąpił błąd podczas uaktualniania repozytorium %s" +msgstr "Wystąpił błąd podczas aktualizacji repozytorium %s" #: rhodecode/controllers/admin/repos.py:315 #, python-format @@ -525,12 +525,12 @@ #: rhodecode/controllers/admin/repos.py:318 #, python-format msgid "Deleted %s forks" -msgstr "" +msgstr "Usunięte repozytorium %s" #: rhodecode/controllers/admin/repos.py:323 #, python-format msgid "Deleted repository %s" -msgstr "Skasowano repozytorium %s" +msgstr "Usunięte repozytorium %s" #: rhodecode/controllers/admin/repos.py:326 #, python-format @@ -544,13 +544,13 @@ #: rhodecode/controllers/admin/repos.py:345 msgid "Repository permissions updated" -msgstr "Uprawnienia repozytorium zostały zakutalizowane" +msgstr "Repozytorium wyłączone" #: rhodecode/controllers/admin/repos.py:375 #: rhodecode/controllers/admin/repos_groups.py:332 #: rhodecode/controllers/admin/users_groups.py:312 msgid "An error occurred during revoking of permission" -msgstr "" +msgstr "Wystąpił błąd podczas cofania zezwolenia" #: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" @@ -567,11 +567,11 @@ #: rhodecode/controllers/admin/repos.py:447 msgid "Unlocked" -msgstr "Odblokowane" +msgstr "Odblokowany" #: rhodecode/controllers/admin/repos.py:450 msgid "Locked" -msgstr "Zablokowane" +msgstr "Zablokowany" #: rhodecode/controllers/admin/repos.py:452 #, python-format @@ -613,31 +613,31 @@ #: rhodecode/controllers/admin/repos.py:562 msgid "An error occurred during creation of field" -msgstr "" +msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" #: rhodecode/controllers/admin/repos.py:576 msgid "An error occurred during removal of field" -msgstr "" +msgstr "Wystąpił błąd podczas zapisywania e-maila" #: rhodecode/controllers/admin/repos_groups.py:147 #, python-format msgid "Created repository group %s" -msgstr "Utworzono groupę z repozytoriami %s" +msgstr "Utworzono grupę repo %s" #: rhodecode/controllers/admin/repos_groups.py:159 #, python-format msgid "Error occurred during creation of repository group %s" -msgstr "" +msgstr "Wystąpił błąd podczas tworzenia grupy repo %s" #: rhodecode/controllers/admin/repos_groups.py:217 #, python-format msgid "Updated repository group %s" -msgstr "" +msgstr "Zaktualizowano grupę repo %s" #: rhodecode/controllers/admin/repos_groups.py:232 #, python-format msgid "Error occurred during update of repository group %s" -msgstr "" +msgstr "Wystąpił błąd podczas aktualizacji grupy repo %s" #: rhodecode/controllers/admin/repos_groups.py:250 #, python-format @@ -647,17 +647,17 @@ #: rhodecode/controllers/admin/repos_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" +msgstr "Ta grupa zawiera %s repozytorium i nie może być usunięta" #: rhodecode/controllers/admin/repos_groups.py:263 #, python-format msgid "Removed repository group %s" -msgstr "" +msgstr "Usunięto grupę repo %s" #: rhodecode/controllers/admin/repos_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" -msgstr "" +msgstr "Wystąpił błąd podczas usuwania z repozytorium grupy %s" #: rhodecode/controllers/admin/repos_groups.py:279 #: rhodecode/controllers/admin/repos_groups.py:314 @@ -667,12 +667,12 @@ #: rhodecode/controllers/admin/repos_groups.py:294 msgid "Repository Group permissions updated" -msgstr "" +msgstr "Aktualizacja uprawnień grup repozytorium" #: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "" +msgstr "Repozytoria z powodzeniem zostały ponownie zeskanowane dodano: %s, usunięto: %s" #: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" @@ -685,7 +685,7 @@ #: rhodecode/controllers/admin/settings.py:167 #: rhodecode/controllers/admin/settings.py:304 msgid "Error occurred during updating application settings" -msgstr "" +msgstr "Wystąpił błąd podczas aktualizacji ustawień aplikacji" #: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" @@ -693,7 +693,7 @@ #: rhodecode/controllers/admin/settings.py:224 msgid "Error occurred during updating visualisation settings" -msgstr "" +msgstr "Wystąpił błąd podczas aktualizacji ustawień wizualizacji" #: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" @@ -709,7 +709,7 @@ #: rhodecode/controllers/admin/settings.py:330 msgid "Error occurred during hook creation" -msgstr "" +msgstr "Wystąpił błąd podczas tworzenia hooku" #: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" @@ -727,17 +727,17 @@ #: rhodecode/controllers/admin/users.py:198 #, python-format msgid "Error occurred during update of user %s" -msgstr "" +msgstr "wystąpił błąd podczas aktualizacji użytkownika %s" #: rhodecode/controllers/admin/users.py:130 #, python-format msgid "Created user %s" -msgstr "Stworzono użytkownika %s" +msgstr "Utworzono użytkownika %s" #: rhodecode/controllers/admin/users.py:142 #, python-format msgid "Error occurred during creation of user %s" -msgstr "" +msgstr "Wystąpił błąd podczas tworzenia użytkownika %s" #: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" @@ -745,7 +745,7 @@ #: rhodecode/controllers/admin/users.py:214 msgid "Successfully deleted user" -msgstr "" +msgstr "Użytkownik został usunięty" #: rhodecode/controllers/admin/users.py:219 msgid "An error occurred during deletion of user" @@ -758,7 +758,7 @@ #: rhodecode/controllers/admin/users.py:293 #: rhodecode/controllers/admin/users_groups.py:372 msgid "Updated permissions" -msgstr "" +msgstr "Aktualizacja uprawnień" #: rhodecode/controllers/admin/users.py:297 #: rhodecode/controllers/admin/users_groups.py:376 @@ -781,56 +781,56 @@ #: rhodecode/controllers/admin/users.py:340 #, python-format msgid "Added ip %s to user" -msgstr "" +msgstr "Dodano e-mail %s do użytkownika" #: rhodecode/controllers/admin/users.py:346 msgid "An error occurred during ip saving" -msgstr "" +msgstr "Wystąpił błąd podczas zapisywania e-maila" #: rhodecode/controllers/admin/users.py:358 msgid "Removed ip from user" -msgstr "" +msgstr "Usunięto e-mail użytkownikowi" #: rhodecode/controllers/admin/users_groups.py:162 #, python-format msgid "Created user group %s" -msgstr "" +msgstr "Utworzono grupę użytkowników %s" #: rhodecode/controllers/admin/users_groups.py:173 #, python-format msgid "Error occurred during creation of user group %s" -msgstr "" +msgstr "Wystąpił błąd podczas tworzenia grupy użytkowników %s" #: rhodecode/controllers/admin/users_groups.py:210 #, python-format msgid "Updated user group %s" -msgstr "" +msgstr "Zaktualizowano grupę użytkowników %s" #: rhodecode/controllers/admin/users_groups.py:232 #, python-format msgid "Error occurred during update of user group %s" -msgstr "" +msgstr "Wystąpił błąd podczas aktualizacji grupy użytkowników %s" #: rhodecode/controllers/admin/users_groups.py:250 msgid "Successfully deleted user group" -msgstr "" +msgstr "Grupa użytkowników została usunięta z powodzeniem" #: rhodecode/controllers/admin/users_groups.py:255 msgid "An error occurred during deletion of user group" -msgstr "" +msgstr "Wystąpił błąd podczas usuwania grupy użytkowników" #: rhodecode/controllers/admin/users_groups.py:274 msgid "Target group cannot be the same" -msgstr "" +msgstr "Grupa docelowa nie może być taka sama" #: rhodecode/controllers/admin/users_groups.py:280 msgid "User Group permissions updated" -msgstr "" +msgstr "Aktualizacja uprawnień grupy użytkowników" #: rhodecode/lib/auth.py:544 #, python-format msgid "IP %s not allowed" -msgstr "" +msgstr "Obserwatorzy %s" #: rhodecode/lib/auth.py:593 msgid "You need to be a registered user to perform this action" @@ -842,7 +842,7 @@ #: rhodecode/lib/diffs.py:66 msgid "Binary file" -msgstr "" +msgstr "Plik binarny" #: rhodecode/lib/diffs.py:82 msgid "" @@ -853,11 +853,6 @@ msgid "No changes detected" msgstr "Nie wykryto zmian" -#: rhodecode/lib/helpers.py:428 -#, python-format -msgid "%a, %d %b %Y %H:%M:%S" -msgstr "%d.%m.%Y, %H:%M:%S" - #: rhodecode/lib/helpers.py:539 msgid "True" msgstr "Prawda" @@ -936,7 +931,7 @@ #: rhodecode/lib/helpers.py:735 msgid "[downloaded] archive from repository" -msgstr "" +msgstr "[pobierz] archiwum z repozytorium" #: rhodecode/lib/helpers.py:737 msgid "[delete] repository" @@ -952,11 +947,11 @@ #: rhodecode/lib/helpers.py:749 msgid "[created] user group" -msgstr "" +msgstr "[utworzona] grupa użytkowników" #: rhodecode/lib/helpers.py:751 msgid "[updated] user group" -msgstr "" +msgstr "[zaktualizowana] grupa użytkowników" #: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" @@ -976,7 +971,7 @@ #: rhodecode/lib/helpers.py:761 msgid "[committed via RhodeCode] into repository" -msgstr "[committed przez RhodeCode] do repozytorium" +msgstr "[synchronizacja przez RhodeCode] z repozytorium" #: rhodecode/lib/helpers.py:763 msgid "[pulled from remote] into repository" @@ -984,7 +979,7 @@ #: rhodecode/lib/helpers.py:765 msgid "[pulled] from" -msgstr "[pobrano] z" +msgstr "[pobrano] " #: rhodecode/lib/helpers.py:767 msgid "[started following] repository" @@ -1005,23 +1000,23 @@ #: rhodecode/lib/helpers.py:1158 msgid "new file" -msgstr "" +msgstr "nowy plik" #: rhodecode/lib/helpers.py:1161 msgid "mod" -msgstr "" +msgstr "modyfikuj" #: rhodecode/lib/helpers.py:1164 msgid "del" -msgstr "" +msgstr "kasuj" #: rhodecode/lib/helpers.py:1167 msgid "rename" -msgstr "" +msgstr "zmień nazwę" #: rhodecode/lib/helpers.py:1172 msgid "chmod" -msgstr "" +msgstr "chmod" #: rhodecode/lib/helpers.py:1404 #, python-format @@ -1032,7 +1027,7 @@ #: rhodecode/lib/unionrepo.py:193 msgid "cannot create new union repository" -msgstr "" +msgstr "[utworzone] repozytorium" #: rhodecode/lib/utils2.py:410 #, python-format @@ -1263,66 +1258,66 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 msgid "Repository group no access" -msgstr "" +msgstr "Grupy repozytoriów brak dostępu" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 msgid "Repository group read access" -msgstr "" +msgstr "Grupy repozytoriów dostęp do odczytu" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 msgid "Repository group write access" -msgstr "" +msgstr "Grupy repozytoriów dostęp do zapisu" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 msgid "Repository group admin access" -msgstr "" +msgstr "Repozytoria Grupy dostęp administratora" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 msgid "User group no access" -msgstr "" +msgstr "Ta grupa użytkowników nie ma dostępu" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 msgid "User group read access" -msgstr "" +msgstr "Dostęp do grupy parametrów użytkownika" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 msgid "User group write access" -msgstr "" +msgstr "Ta grupa użytkowników ma prawo do zapisu" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 msgid "User group admin access" -msgstr "" +msgstr "Ta grupa użytkowników ma uprawnienia administratora" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 msgid "Repository Group creation disabled" -msgstr "" +msgstr "Tworzenie grup repozytoriów wyłączone" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 msgid "Repository Group creation enabled" -msgstr "" +msgstr "Tworzenie grup repozytoriów włączone" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 msgid "User Group creation disabled" -msgstr "" +msgstr "Tworzenie grup użytkowników wyłączone" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 msgid "User Group creation enabled" -msgstr "" +msgstr "Tworzenie grup użytkowników właczone" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 msgid "Registration disabled" -msgstr "" +msgstr "Rejestracja wyłączona" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 msgid "User Registration with manual account activation" -msgstr "" +msgstr "Rejestracja użytkownika z ręczną aktywacją konta" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 msgid "User Registration with automatic account activation" -msgstr "" +msgstr "Rejestracja użytkownika z automatyczną aktywacją konta" #: rhodecode/model/comment.py:75 #, python-format @@ -1354,37 +1349,37 @@ #: rhodecode/model/notification.py:228 #, python-format msgid "%(user)s commented on changeset at %(when)s" -msgstr "" +msgstr "%(user)s skomentował zatwierdzenie %(when)s" #: rhodecode/model/notification.py:229 #, python-format msgid "%(user)s sent message at %(when)s" -msgstr "" +msgstr "%(user)s wysłał wiadomość do %(when)s" #: rhodecode/model/notification.py:230 #, python-format msgid "%(user)s mentioned you at %(when)s" -msgstr "" +msgstr "%(user)s wspomniał o Tobie w %(when)s" #: rhodecode/model/notification.py:231 #, python-format msgid "%(user)s registered in RhodeCode at %(when)s" -msgstr "" +msgstr "%(user)s zarejestrował na stronie w %(when)s" #: rhodecode/model/notification.py:232 #, python-format msgid "%(user)s opened new pull request at %(when)s" -msgstr "" +msgstr "%(user)s otworzył nowe połączenie gałęzi w %(when)s" #: rhodecode/model/notification.py:233 #, python-format msgid "%(user)s commented on pull request at %(when)s" -msgstr "" +msgstr "%(user)s skomentował nowe połączenie gałęzi w %(when)s" #: rhodecode/model/pull_request.py:98 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -msgstr "" +msgstr "%(user)s chce żeby przejrzeć nowe gałęzie #%(pr_id)s: %(pr_title)s" #: rhodecode/model/scm.py:674 msgid "latest tip" @@ -1392,7 +1387,7 @@ #: rhodecode/model/user.py:232 msgid "New user registration" -msgstr "" +msgstr "nowy użytkownik się zarejestrował" #: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" @@ -1411,11 +1406,11 @@ #: rhodecode/model/user.py:334 msgid "Password reset link" -msgstr "" +msgstr "łącze resetowania hasła" #: rhodecode/model/user.py:366 msgid "Your new password" -msgstr "" +msgstr "Nowe hasło" #: rhodecode/model/user.py:367 #, python-format @@ -1440,7 +1435,7 @@ msgid "" "Username may only contain alphanumeric characters underscores, periods or " "dashes and must begin with alphanumeric character or underscore" -msgstr "" +msgstr "Nazwa użytkownika może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i muszą zaczynać się znakiem alfanumerycznym lub podkreśleniem" #: rhodecode/model/validators.py:117 #, python-format @@ -1449,18 +1444,18 @@ #: rhodecode/model/validators.py:136 msgid "Invalid user group name" -msgstr "" +msgstr "Niewłaściwa nazwa grupy" #: rhodecode/model/validators.py:137 #, python-format msgid "User group \"%(usergroup)s\" already exists" -msgstr "" +msgstr "Nazwa grupy \"%(usergroup)s\" już istnieje" #: rhodecode/model/validators.py:139 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "" +msgstr "nazwa grupy może zawierać tylko znaki alfanumeryczne, podkreślenia, kropki lub myślniki i musi zaczynać się znakiem alfanumerycznym" #: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" @@ -1514,7 +1509,7 @@ #: rhodecode/model/validators.py:321 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" -msgstr "" +msgstr "Grupa repozytoriów z nazwą \"%(repo)s\" już istnieje" #: rhodecode/model/validators.py:438 msgid "invalid clone url" @@ -1534,15 +1529,15 @@ #: rhodecode/model/validators.py:481 msgid "no permission to create repository in root location" -msgstr "" +msgstr "nie masz uprawnień do tworzenia repozytorium w tej grupie" #: rhodecode/model/validators.py:518 msgid "You don't have permissions to create a group in this location" -msgstr "" +msgstr "Nie masz uprawnień do tworzenia repozytorium w tej grupie" #: rhodecode/model/validators.py:559 msgid "This username or user group name is not valid" -msgstr "" +msgstr "Ta nazwa użytkownika lub grupy użytkowników nie jest prawidłowa" #: rhodecode/model/validators.py:652 msgid "This is not a valid path" @@ -1576,7 +1571,7 @@ #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "Rozmiar sieci (bity) może mieścić się w zakresie od 0-32 (nie %(bits)r)" +msgstr "Rozmiar sieci (bits) może mieścić się w zakresie od 0-32 (nie %(bits)r)" #: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" @@ -1584,7 +1579,7 @@ #: rhodecode/model/validators.py:817 msgid "Filename cannot be inside a directory" -msgstr "" +msgstr "Nazwa pliku nie może znajdować się w katalogu" #: rhodecode/templates/index.html:5 msgid "Dashboard" @@ -1612,7 +1607,7 @@ #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repos.html:21 +#: rhodecode/templates/admin/repos/repos.html:22 msgid "Add repository" msgstr "Dodaj repozytorium" @@ -1620,11 +1615,11 @@ #: rhodecode/templates/index_base.html:20 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 msgid "Add group" -msgstr "" +msgstr "Dodaj grupę" #: rhodecode/templates/index_base.html:27 msgid "Edit group" -msgstr "" +msgstr "Edytuj grupę" #: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" @@ -1644,7 +1639,7 @@ #: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:68 -#: rhodecode/templates/admin/repos/repos.html:73 +#: rhodecode/templates/admin/repos/repos.html:75 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 @@ -1669,7 +1664,7 @@ #: rhodecode/templates/index_base.html:121 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:71 +#: rhodecode/templates/admin/repos/repos.html:73 #: rhodecode/templates/admin/users/user_edit_my_account.html:172 #: rhodecode/templates/base/perms_summary.html:37 #: rhodecode/templates/bookmarks/bookmarks.html:48 @@ -1691,7 +1686,7 @@ msgstr "Ostatnia akytwność" #: rhodecode/templates/index_base.html:126 -#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/repos/repos.html:76 #: rhodecode/templates/admin/users/user_edit_my_account.html:174 #: rhodecode/templates/journal/journal.html:195 #: rhodecode/templates/journal/journal.html:285 @@ -1700,12 +1695,12 @@ #: rhodecode/templates/index_base.html:128 #: rhodecode/templates/admin/repos/repo_edit.html:114 -#: rhodecode/templates/admin/repos/repos.html:76 +#: rhodecode/templates/admin/repos/repos.html:78 msgid "Owner" msgstr "Właściciel" #: rhodecode/templates/index_base.html:136 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:86 #: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:74 @@ -1717,7 +1712,7 @@ msgstr "Kliknij, aby posortować rosnąco" #: rhodecode/templates/index_base.html:137 -#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/repos/repos.html:87 #: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:75 @@ -1730,10 +1725,10 @@ #: rhodecode/templates/index_base.html:138 msgid "No repositories found." -msgstr "" +msgstr "Nie znaleziono repozytorium." #: rhodecode/templates/index_base.html:139 -#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/repos/repos.html:89 #: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:77 @@ -1745,7 +1740,7 @@ msgstr "Błąd danych." #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos/repos.html:88 +#: rhodecode/templates/admin/repos/repos.html:90 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 #: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 @@ -1802,7 +1797,7 @@ #: rhodecode/templates/password_reset.html:5 msgid "Password Reset" -msgstr "" +msgstr "Łącze resetowania hasła" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1917,7 +1912,7 @@ msgstr[2] "%s wejść" #: rhodecode/templates/admin/admin_log.html:6 -#: rhodecode/templates/admin/repos/repos.html:77 +#: rhodecode/templates/admin/repos/repos.html:79 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 #: rhodecode/templates/admin/users/user_edit_my_account.html:176 #: rhodecode/templates/admin/users/users.html:87 @@ -1944,7 +1939,7 @@ #: rhodecode/templates/admin/admin_log.html:9 msgid "From IP" -msgstr "z IP" +msgstr "Z IP" #: rhodecode/templates/admin/admin_log.html:63 msgid "No actions yet" @@ -2026,64 +2021,64 @@ #: rhodecode/templates/admin/gists/index.html:5 #: rhodecode/templates/base/base.html:299 msgid "Gists" -msgstr "" +msgstr "Git" #: rhodecode/templates/admin/gists/index.html:10 #, python-format msgid "Private Gists for user %s" -msgstr "" +msgstr "Prywatne git użytkownika %s" #: rhodecode/templates/admin/gists/index.html:12 #, python-format msgid "Public Gists for user %s" -msgstr "" +msgstr "Publiczne git użytkownika %s" #: rhodecode/templates/admin/gists/index.html:14 msgid "Public Gists" -msgstr "" +msgstr "Publiczne git" #: rhodecode/templates/admin/gists/index.html:31 #: rhodecode/templates/admin/gists/show.html:24 #: rhodecode/templates/base/base.html:302 msgid "Create new gist" -msgstr "" +msgstr "Utwórz nowe git" #: rhodecode/templates/admin/gists/index.html:48 msgid "Created" -msgstr "" +msgstr "Utworzono" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/index.html:53 #: rhodecode/templates/admin/gists/show.html:43 #: rhodecode/templates/admin/gists/show.html:45 msgid "Expires" -msgstr "" +msgstr "Wygasa" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/show.html:43 msgid "never" -msgstr "" +msgstr "nigdy" #: rhodecode/templates/admin/gists/index.html:68 msgid "There are no gists yet" -msgstr "" +msgstr "Nie ma jeszcze repozytorium git" #: rhodecode/templates/admin/gists/new.html:5 #: rhodecode/templates/admin/gists/new.html:16 msgid "New gist" -msgstr "" +msgstr "Nowe git" #: rhodecode/templates/admin/gists/new.html:37 msgid "Gist description ..." -msgstr "" +msgstr "Opis git ..." #: rhodecode/templates/admin/gists/new.html:52 msgid "Create private gist" -msgstr "" +msgstr "Utwórz prywatne git" #: rhodecode/templates/admin/gists/new.html:53 msgid "Create public gist" -msgstr "" +msgstr "Utwórz publiczne git" #: rhodecode/templates/admin/gists/new.html:54 #: rhodecode/templates/admin/permissions/permissions.html:123 @@ -2110,19 +2105,19 @@ #: rhodecode/templates/admin/gists/show.html:5 msgid "gist" -msgstr "" +msgstr "git" #: rhodecode/templates/admin/gists/show.html:9 msgid "Gist" -msgstr "" +msgstr "Git" #: rhodecode/templates/admin/gists/show.html:36 msgid "Public gist" -msgstr "" +msgstr "Publiczne git" #: rhodecode/templates/admin/gists/show.html:38 msgid "Private gist" -msgstr "" +msgstr "Prywatne git" #: rhodecode/templates/admin/gists/show.html:54 #: rhodecode/templates/admin/repos/repo_edit.html:299 @@ -2132,7 +2127,7 @@ #: rhodecode/templates/admin/gists/show.html:54 msgid "Confirm to delete this gist" -msgstr "" +msgstr "Potwierdź usunięcie git" #: rhodecode/templates/admin/gists/show.html:63 #: rhodecode/templates/admin/gists/show.html:84 @@ -2140,11 +2135,11 @@ #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 msgid "Show as raw" -msgstr "" +msgstr "wyświetl jako raw" #: rhodecode/templates/admin/gists/show.html:71 msgid "created" -msgstr "" +msgstr "utworzono" #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" @@ -2154,7 +2149,7 @@ #: rhodecode/templates/admin/users/users.html:86 #: rhodecode/templates/base/base.html:79 msgid "LDAP" -msgstr "" +msgstr "LDAP" #: rhodecode/templates/admin/ldap/ldap.html:28 msgid "Connection settings" @@ -2285,31 +2280,31 @@ "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will be " "lost" -msgstr "" +msgstr "Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie niestandardowe uprawnienia w repozytoriach zostaną utracone." #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 #: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Overwrite existing settings" -msgstr "" +msgstr "Nadpisz ustawienia" #: rhodecode/templates/admin/permissions/permissions.html:62 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "" +msgstr "Wszystkie uprawnienia domyślne każdego repozytorium zostaną przywrócone. Wybrane uprawnienie zostaną skasowane. Pamiętaj, że wszystkie niestandardowe uprawnienia w repozytoriach zostaną utracone." #: rhodecode/templates/admin/permissions/permissions.html:69 msgid "User group" -msgstr "" +msgstr "Grupa użytkownika" #: rhodecode/templates/admin/permissions/permissions.html:76 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "" +msgstr "Wszystkie Uprawnienia domyślne każdej grupy użytkowników zostaną przywrócone do wybranego zezwolenia, trzeba pamiętać, że wszystkie niestandardowe uprawnienia domyślne dla grup repozytorium zostaną utracone" #: rhodecode/templates/admin/permissions/permissions.html:83 msgid "Repository creation" @@ -2317,7 +2312,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:91 msgid "User group creation" -msgstr "" +msgstr "Tworzenie grupy użytkowników" #: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" @@ -2329,16 +2324,16 @@ #: rhodecode/templates/admin/permissions/permissions.html:115 msgid "External auth account activation" -msgstr "" +msgstr "Autoryzacja aktywacji zewnętrznego konta" #: rhodecode/templates/admin/permissions/permissions.html:133 msgid "Default User Permissions" -msgstr "" +msgstr "Domyślne uprawnienia" #: rhodecode/templates/admin/permissions/permissions.html:144 #: rhodecode/templates/admin/users/user_edit.html:207 msgid "Allowed IP addresses" -msgstr "" +msgstr "Adresy e-mail" #: rhodecode/templates/admin/permissions/permissions.html:158 #: rhodecode/templates/admin/repos/repo_edit.html:340 @@ -2355,7 +2350,7 @@ #: rhodecode/templates/admin/users/user_edit.html:221 #, python-format msgid "Confirm to delete this ip: %s" -msgstr "" +msgstr "Potwierdź, aby usunąć ten e-mail: %s" #: rhodecode/templates/admin/permissions/permissions.html:165 #: rhodecode/templates/admin/users/user_edit.html:227 @@ -2365,7 +2360,7 @@ #: rhodecode/templates/admin/permissions/permissions.html:176 #: rhodecode/templates/admin/users/user_edit.html:238 msgid "New ip address" -msgstr "" +msgstr "Nowy adres ip" #: rhodecode/templates/admin/permissions/permissions.html:184 #: rhodecode/templates/admin/repos/repo_add_base.html:73 @@ -2385,7 +2380,7 @@ #: rhodecode/templates/admin/repos/repo_add.html:19 msgid "Add new" -msgstr "" +msgstr "Dodaj nowe" #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:96 @@ -2441,7 +2436,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:36 msgid "Non-changeable id" -msgstr "" +msgstr "Brak zmiennej id" #: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" @@ -2457,7 +2452,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:177 msgid "Advanced settings" -msgstr "" +msgstr "Zapisz ustawienia" #: rhodecode/templates/admin/repos/repo_edit.html:180 msgid "Statistics" @@ -2565,7 +2560,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Lock repo" -msgstr "" +msgstr "Blokada repo" #: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" @@ -2586,7 +2581,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:289 msgid "Set" -msgstr "" +msgstr "Ustaw" #: rhodecode/templates/admin/repos/repo_edit.html:293 msgid "Manually set this repository as a fork of another from the list" @@ -2604,24 +2599,24 @@ #, python-format msgid "this repository has %s fork" msgid_plural "this repository has %s forks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "to repozytorium ma %s fork" +msgstr[1] "to repozytorium ma %s forki" +msgstr[2] "to repozytorium ma %s forków" #: rhodecode/templates/admin/repos/repo_edit.html:311 msgid "Detach forks" -msgstr "" +msgstr "Ustaw jako rozwidlenie" #: rhodecode/templates/admin/repos/repo_edit.html:312 msgid "Delete forks" -msgstr "" +msgstr "Usuń rozwidlenie" #: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "" "This repository will be renamed in a special way in order to be unaccesible " "for RhodeCode and VCS systems. If you need to fully delete it from file " "system please do it manually" -msgstr "" +msgstr "To repozytorium zostanie zmienione w sposób szczególny, żeby było niedostępne dla strony i systemów VCS. Jeśli chcesz całkowicie usunąć go z systemu plików prosimy zrobić to ręcznie" #: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" @@ -2630,11 +2625,11 @@ #: rhodecode/templates/admin/repos/repo_edit.html:341 #, python-format msgid "Confirm to delete this field: %s" -msgstr "" +msgstr "Potwierdź, aby usunąć ten e-mail: %s" #: rhodecode/templates/admin/repos/repo_edit.html:355 msgid "New field key" -msgstr "" +msgstr "Nowe pole klucza" #: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" @@ -2646,7 +2641,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:372 msgid "New field description" -msgstr "" +msgstr "Nowy opis pola" #: rhodecode/templates/admin/repos/repo_edit.html:375 msgid "Enter description of a field" @@ -2714,7 +2709,7 @@ msgid "Repositories administration" msgstr "Administracja repozytoriami" -#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:185 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:76 @@ -2727,13 +2722,13 @@ #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "apply to children" -msgstr "" +msgstr "dotyczy dzieci" #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" -msgstr "" +msgstr "Ustawia lub cofa uprawnienia do wszystkich dzieci z tej grupy, w tym repozytoria oraz innych grup" #: rhodecode/templates/admin/repos_groups/repos_groups.html:4 #, python-format @@ -2750,18 +2745,18 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 msgid "Add repository group" -msgstr "" +msgstr "Repozytorium grupy" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 #: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 msgid "Repository groups" -msgstr "" +msgstr "Repozytorium grupy" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 msgid "Add new repository group" -msgstr "" +msgstr "Dodaj nową grupę repozytorium" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 @@ -2774,26 +2769,26 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 msgid "Edit repository group" -msgstr "" +msgstr "Edytuj grupy repozytorium" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 #, python-format msgid "Edit repository group %s" -msgstr "" +msgstr "Edytuj grupę repozytorium %s" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 msgid "Add child group" -msgstr "" +msgstr "Dodaj dzieci grup" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other " "groups and repositories inside" -msgstr "Włącz blokowanie pulling przez grupy. Opcja ta będzie stosowana do wszystkich innych grup i repozytoriów wewnątrz" +msgstr "Włącz blokowanie pobierania przez grupy. Opcja ta będzie stosowana do wszystkich innych grup i repozytoriów wewnątrz" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repository groups administration" -msgstr "" +msgstr "Repozytoria grup administracyjnych" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" @@ -2804,7 +2799,7 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:171 msgid "Edit" -msgstr "" +msgstr "Edycja" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 #: rhodecode/templates/admin/users_groups/users_groups.html:49 @@ -2828,7 +2823,7 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 msgid "There are no repository groups yet" -msgstr "" +msgstr "Nie ma jeszcze grup repozytoriów" #: rhodecode/templates/admin/settings/hooks.html:5 #: rhodecode/templates/admin/settings/settings.html:5 @@ -2857,7 +2852,7 @@ #: rhodecode/templates/admin/settings/settings.html:34 msgid "Rescan option" -msgstr "" +msgstr "ponowne skanowanie opcji" #: rhodecode/templates/admin/settings/settings.html:40 msgid "" @@ -2868,7 +2863,7 @@ #: rhodecode/templates/admin/settings/settings.html:41 msgid "Destroy old data" -msgstr "" +msgstr "Zniszcz stare dane" #: rhodecode/templates/admin/settings/settings.html:43 msgid "" @@ -2886,11 +2881,11 @@ #: rhodecode/templates/admin/settings/settings.html:62 msgid "Index build option" -msgstr "" +msgstr "opcja budowania indeksowania" #: rhodecode/templates/admin/settings/settings.html:67 msgid "Build from scratch" -msgstr "" +msgstr "buduj od podstaw" #: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" @@ -2902,7 +2897,7 @@ #: rhodecode/templates/admin/settings/settings.html:88 msgid "Site branding" -msgstr "Branding strony" +msgstr "Nazwa strony" #: rhodecode/templates/admin/settings/settings.html:97 msgid "HTTP authentication realm" @@ -2928,29 +2923,29 @@ #: rhodecode/templates/admin/settings/settings.html:134 msgid "Use repository extra fields" -msgstr "" +msgstr "Używaj w repozytorium dodatkowych pól" #: rhodecode/templates/admin/settings/settings.html:136 msgid "Allows storing additional customized fields per repository." -msgstr "" +msgstr "Umożliwia przechowywanie dodatkowych niestandardowych pól w repozytorium." #: rhodecode/templates/admin/settings/settings.html:139 msgid "Show RhodeCode version" -msgstr "" +msgstr "Pokaż wersję RhodeCode" #: rhodecode/templates/admin/settings/settings.html:141 msgid "Shows or hides displayed version of RhodeCode in the footer" -msgstr "" +msgstr "Pokazuje lub ukrywa wyświetlaną wersję RhodeCode w stopce" #: rhodecode/templates/admin/settings/settings.html:146 msgid "Dashboard items" -msgstr "" +msgstr "Pozycja panelu" #: rhodecode/templates/admin/settings/settings.html:150 msgid "" "Number of items displayed in lightweight dashboard before pagination is " "shown." -msgstr "" +msgstr "Liczba elementów wyświetlanych w lekkim panelu z podziałem na strony." #: rhodecode/templates/admin/settings/settings.html:155 msgid "Icons" @@ -2966,7 +2961,7 @@ #: rhodecode/templates/admin/settings/settings.html:166 msgid "Show public/private icons next to repositories names" -msgstr "" +msgstr "Pokazuj w publicznych/prywatnych repozytoriach ikony obok nazw" #: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" @@ -2986,7 +2981,7 @@ #: rhodecode/templates/admin/settings/settings.html:218 msgid "Require SSL for vcs operations" -msgstr "" +msgstr "Wymagaj ssl dla operacji vcs" #: rhodecode/templates/admin/settings/settings.html:220 msgid "" @@ -3016,7 +3011,7 @@ #: rhodecode/templates/admin/settings/settings.html:247 msgid "Advanced setup" -msgstr "" +msgstr "Zaawansowane ustawienia" #: rhodecode/templates/admin/settings/settings.html:252 msgid "Mercurial Extensions" @@ -3024,17 +3019,17 @@ #: rhodecode/templates/admin/settings/settings.html:257 msgid "Enable largefiles extension" -msgstr "" +msgstr "Rozszerzenia dużych pliów" #: rhodecode/templates/admin/settings/settings.html:261 msgid "Enable hgsubversion extension" -msgstr "" +msgstr "Rozszerzenia hgsubversion" #: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" -msgstr "" +msgstr "Wymaga biblioteki hgsubversion zainstalowanej. Umożliwia klonowanie z zdalnych lokalizacji svn" #: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" @@ -3044,12 +3039,12 @@ msgid "" "Click to unlock. You must restart RhodeCode in order to make this setting " "take effect." -msgstr "" +msgstr "Kliknij, aby odblokować. Musisz ponownie uruchomić RhodeCode żeby wprowadzić to ustawienie w życie." #: rhodecode/templates/admin/settings/settings.html:280 #: rhodecode/templates/base/base.html:143 msgid "Unlock" -msgstr "" +msgstr "Odblokowany" #: rhodecode/templates/admin/settings/settings.html:282 msgid "" @@ -3091,7 +3086,7 @@ #: rhodecode/templates/admin/users/user_add.html:12 #: rhodecode/templates/admin/users/users.html:23 msgid "Add new user" -msgstr "" +msgstr "Dodaj nowego użytkownika" #: rhodecode/templates/admin/users/user_add.html:50 msgid "Password confirmation" @@ -3105,7 +3100,7 @@ #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #, python-format msgid "Edit %s" -msgstr "" +msgstr "Edycja %s" #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 @@ -3179,7 +3174,7 @@ #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 msgid "Show closed pull requests" -msgstr "" +msgstr "[zamknięty] wniosek o połączenie gałęzi" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" @@ -3227,38 +3222,38 @@ #: rhodecode/templates/admin/users/users.html:80 msgid "Firstname" -msgstr "" +msgstr "imię" #: rhodecode/templates/admin/users/users.html:81 msgid "Lastname" -msgstr "" +msgstr "nazwisko" #: rhodecode/templates/admin/users/users.html:82 msgid "Last login" -msgstr "" +msgstr "Ostatnio zalogowany" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add user group" -msgstr "" +msgstr "Dodaj grupę użytkowników" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 #: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 msgid "User groups" -msgstr "" +msgstr "Grupy użytkowników" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 #: rhodecode/templates/admin/users_groups/users_groups.html:26 msgid "Add new user group" -msgstr "" +msgstr "Dodaj nową grupę użytkowników" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 msgid "Edit user group" -msgstr "" +msgstr "Edytuj grupę użytkowników" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 msgid "UserGroups" -msgstr "" +msgstr "Użytkownicy Grupy" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 #: rhodecode/templates/admin/users_groups/users_groups.html:38 @@ -3267,7 +3262,7 @@ #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 msgid "Chosen group members" -msgstr "" +msgstr "Wybrane grupy użytkowników" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 msgid "Remove all elements" @@ -3287,29 +3282,29 @@ #: rhodecode/templates/admin/users_groups/users_group_edit.html:117 msgid "Global Permissions" -msgstr "" +msgstr "Uprawnienia globalne" #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "User groups administration" -msgstr "" +msgstr "Użytkownicy grupy administracji" #: rhodecode/templates/admin/users_groups/users_groups.html:55 #, python-format msgid "Confirm to delete this user group: %s" -msgstr "" +msgstr "Potwierdź usunięcie grupy użytkowników: %s" #: rhodecode/templates/admin/users_groups/users_groups.html:62 msgid "There are no user groups yet" -msgstr "" +msgstr "Nie ma jeszcze grupy użytkowników" #: rhodecode/templates/base/base.html:42 #, python-format msgid "Server instance: %s" -msgstr "" +msgstr "Wystąpienia serwera: %s" #: rhodecode/templates/base/base.html:52 msgid "Report a bug" -msgstr "" +msgstr "Zgłoś błąd" #: rhodecode/templates/base/base.html:121 #: rhodecode/templates/data_table/_dt_elements.html:9 @@ -3337,7 +3332,7 @@ #: rhodecode/templates/base/base.html:125 msgid "Switch To" -msgstr "" +msgstr "Przełącz do" #: rhodecode/templates/base/base.html:127 #: rhodecode/templates/base/base.html:279 @@ -3362,15 +3357,15 @@ #: rhodecode/templates/base/base.html:145 msgid "Lock" -msgstr "" +msgstr "zablokowane" #: rhodecode/templates/base/base.html:153 msgid "Follow" -msgstr "" +msgstr "Obserwuj" #: rhodecode/templates/base/base.html:154 msgid "Unfollow" -msgstr "" +msgstr "Nie obserwuj" #: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 @@ -3383,19 +3378,19 @@ #: rhodecode/templates/base/base.html:159 msgid "Create Pull Request" -msgstr "" +msgstr "Stwórz nowe żądanie połączenia gałęzi" #: rhodecode/templates/base/base.html:165 msgid "Show Pull Requests" -msgstr "" +msgstr "Nowa prośba o połączenie gałęzi" #: rhodecode/templates/base/base.html:165 msgid "Pull Requests" -msgstr "" +msgstr "Połączone gałęzie" #: rhodecode/templates/base/base.html:202 msgid "Not logged in" -msgstr "" +msgstr "Zaloguj się" #: rhodecode/templates/base/base.html:209 msgid "Login to your account" @@ -3424,23 +3419,23 @@ #: rhodecode/templates/base/base.html:298 msgid "Show public gists" -msgstr "" +msgstr "Wyświetl publiczne git" #: rhodecode/templates/base/base.html:303 msgid "All public gists" -msgstr "" +msgstr "Wszystkie publiczne git" #: rhodecode/templates/base/base.html:305 msgid "My public gists" -msgstr "" +msgstr "Moje publiczne git" #: rhodecode/templates/base/base.html:306 msgid "My private gists" -msgstr "" +msgstr "Moje prywatne git" #: rhodecode/templates/base/base.html:311 msgid "Search in repositories" -msgstr "" +msgstr "Szukaj we wszystkich repozytoriach" #: rhodecode/templates/base/default_perms_box.html:14 msgid "Inherit default permissions" @@ -3451,7 +3446,7 @@ msgid "" "Select to inherit permissions from %s settings. With this selected below " "options does not apply." -msgstr "Zaznacz, żeby dziedziczyć uprawnienia z %s ustawień. Po wybraniu tej opcji, poniżej nie ma żadnych działań" +msgstr "Wybierz dziedziczone uprawnienia z %s ustawień. Po wybraniu tej opcji poniżej, nie ma ta opcja zastosowania." #: rhodecode/templates/base/default_perms_box.html:26 msgid "Create repositories" @@ -3459,15 +3454,15 @@ #: rhodecode/templates/base/default_perms_box.html:30 msgid "Select this option to allow repository creation for this user" -msgstr "Wybierz tą opcje aby zezwolnic na tworzenie repozytoriów dla tego użytkownika" +msgstr "Wybierz tę opcję, aby umożliwić stworzenie repozytorium dla tego użytkownika" #: rhodecode/templates/base/default_perms_box.html:35 msgid "Create user groups" -msgstr "" +msgstr "Tworzenie grup użytkowników" #: rhodecode/templates/base/default_perms_box.html:39 msgid "Select this option to allow user group creation for this user" -msgstr "" +msgstr "Wybierz tę opcję, aby umożliwić utworzenie grupy użytkowników dla tego użytkownika" #: rhodecode/templates/base/default_perms_box.html:44 msgid "Fork repositories" @@ -3475,11 +3470,11 @@ #: rhodecode/templates/base/default_perms_box.html:48 msgid "Select this option to allow repository forking for this user" -msgstr "" +msgstr "Wybierz tę opcję, aby umożliwić rozwidlania repozytorium dla tego użytkownika" #: rhodecode/templates/base/perms_summary.html:11 msgid "No permissions defined yet" -msgstr "" +msgstr "Nie ma jeszcze ustawionych uprawnień" #: rhodecode/templates/base/perms_summary.html:19 #: rhodecode/templates/base/perms_summary.html:38 @@ -3491,73 +3486,73 @@ msgid "Edit Permission" msgstr "Edycja Uprawnień" -#: rhodecode/templates/base/root.html:43 +#: rhodecode/templates/base/root.html:44 msgid "Add another comment" -msgstr "" - -#: rhodecode/templates/base/root.html:44 +msgstr "Dodaj kolejny komentarz" + +#: rhodecode/templates/base/root.html:45 #: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "Zakończyć obserwację tego repozytorium" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Start following this repository" msgstr "Zacznij obserwację tego repozytorium" -#: rhodecode/templates/base/root.html:46 +#: rhodecode/templates/base/root.html:47 msgid "Group" msgstr "Grupa" -#: rhodecode/templates/base/root.html:47 -msgid "members" -msgstr "użytkownik" - #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:203 -msgid "Loading ..." -msgstr "" +msgid "members" +msgstr "użytkownik" #: rhodecode/templates/base/root.html:49 -msgid "Search truncated" -msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.html:203 +msgid "Loading ..." +msgstr "Ładuję..." #: rhodecode/templates/base/root.html:50 -msgid "No matching files" -msgstr "" +msgid "Search truncated" +msgstr "Szukaj obcięte" #: rhodecode/templates/base/root.html:51 +msgid "No matching files" +msgstr "Nie ma plików pasujących" + +#: rhodecode/templates/base/root.html:52 #: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "Otwórz nową prośbę o połączenie gałęzi" -#: rhodecode/templates/base/root.html:52 +#: rhodecode/templates/base/root.html:53 msgid "Open new pull request for selected changesets" msgstr "Otwórz nową prośbę o połączenie gałęzi w zestawieniu zmian" -#: rhodecode/templates/base/root.html:53 +#: rhodecode/templates/base/root.html:54 msgid "Show selected changesets __S -> __E" -msgstr "" - -#: rhodecode/templates/base/root.html:54 -msgid "Show selected changeset __S" -msgstr "" +msgstr "Pokaż wybrane zmiany __S -> __E" #: rhodecode/templates/base/root.html:55 +msgid "Show selected changeset __S" +msgstr "Pokaż wybrane zmiany __S -> __E" + +#: rhodecode/templates/base/root.html:56 msgid "Selection link" msgstr "Wybór linku" -#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/base/root.html:57 #: rhodecode/templates/changeset/diff_block.html:8 msgid "Collapse diff" -msgstr "" - -#: rhodecode/templates/base/root.html:57 -msgid "Expand diff" -msgstr "" +msgstr "Pliki różnic" #: rhodecode/templates/base/root.html:58 -msgid "Failed to remoke permission" -msgstr "" +msgid "Expand diff" +msgstr "poprawka różnic" + +#: rhodecode/templates/base/root.html:59 +msgid "Failed to revoke permission" +msgstr "Nie udało się cofnąć uprawnienia" #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format @@ -3566,7 +3561,7 @@ #: rhodecode/templates/bookmarks/bookmarks.html:26 msgid "Compare bookmarks" -msgstr "" +msgstr "Porównaj zakładki" #: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 @@ -3627,7 +3622,7 @@ #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" -msgstr "" +msgstr "porównaj gałęzie %s" #: rhodecode/templates/changelog/changelog.html:42 msgid "Compare fork with parent" @@ -3637,12 +3632,12 @@ #: rhodecode/templates/changelog/changelog_summary_data.html:28 #, python-format msgid "Click to open associated pull request #%s" -msgstr "" +msgstr "Kliknij żeby otworzyć prośbę o połączenie gałęzi #%s" #: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/summary/summary.html:403 msgid "Show more" -msgstr "" +msgstr "Pokaż więcej" #: rhodecode/templates/changelog/changelog.html:115 #: rhodecode/templates/changelog/changelog_summary_data.html:50 @@ -3650,7 +3645,7 @@ #: rhodecode/templates/changeset/changeset_range.html:86 #, python-format msgid "Bookmark %s" -msgstr "" +msgstr "Zakładki %s" #: rhodecode/templates/changelog/changelog.html:121 #: rhodecode/templates/changelog/changelog_summary_data.html:56 @@ -3658,7 +3653,7 @@ #: rhodecode/templates/changeset/changeset_range.html:92 #, python-format msgid "Tag %s" -msgstr "" +msgstr "Tagi %s" #: rhodecode/templates/changelog/changelog.html:126 #: rhodecode/templates/changelog/changelog_summary_data.html:61 @@ -3666,7 +3661,7 @@ #: rhodecode/templates/changeset/changeset_range.html:96 #, python-format msgid "Branch %s" -msgstr "" +msgstr "Gałęzie %s" #: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" @@ -3675,17 +3670,17 @@ #: rhodecode/templates/changelog/changelog_details.html:4 #: rhodecode/templates/changeset/changeset.html:91 msgid "Removed" -msgstr "Usunięte" +msgstr "Usunięto" #: rhodecode/templates/changelog/changelog_details.html:5 #: rhodecode/templates/changeset/changeset.html:92 msgid "Changed" -msgstr "Zmienione" +msgstr "Zmiana" #: rhodecode/templates/changelog/changelog_details.html:6 #: rhodecode/templates/changeset/changeset.html:93 msgid "Added" -msgstr "Dodane" +msgstr "Dodana" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 @@ -3695,21 +3690,21 @@ #: rhodecode/templates/changeset/changeset.html:97 #, python-format msgid "Affected %s files" -msgstr "" +msgstr "Zarażone pliki %s" #: rhodecode/templates/changelog/changelog_summary_data.html:6 #: rhodecode/templates/files/files_add.html:75 #: rhodecode/templates/files/files_edit.html:61 msgid "Commit message" -msgstr "" +msgstr "Komentarz" #: rhodecode/templates/changelog/changelog_summary_data.html:7 msgid "Age" -msgstr "Wiek" +msgstr "Ostatnia zmiana" #: rhodecode/templates/changelog/changelog_summary_data.html:9 msgid "Refs" -msgstr "" +msgstr "Gałąź/Etykieta" #: rhodecode/templates/changelog/changelog_summary_data.html:86 msgid "Add or upload files directly via RhodeCode" @@ -3751,16 +3746,16 @@ #: rhodecode/templates/changeset/changeset.html:67 #: rhodecode/templates/changeset/diff_block.html:22 msgid "Raw diff" -msgstr "" +msgstr "Raw różnic" #: rhodecode/templates/changeset/changeset.html:68 msgid "Patch diff" -msgstr "" +msgstr "Poprawka różnic" #: rhodecode/templates/changeset/changeset.html:69 #: rhodecode/templates/changeset/diff_block.html:23 msgid "Download diff" -msgstr "" +msgstr "Pobierz różnice" #: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:103 @@ -3819,17 +3814,17 @@ #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Show full diff" -msgstr "" +msgstr "Pokaż pełną historię" #: rhodecode/templates/changeset/changeset_file_comment.html:30 #, python-format msgid "Status change on pull request #%s" -msgstr "" +msgstr "Wszystkie prośby połączenia gałęzi %s" #: rhodecode/templates/changeset/changeset_file_comment.html:32 #, python-format msgid "Comment on pull request #%s" -msgstr "" +msgstr "Komentarz połączenia gałęzi %s" #: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." @@ -3886,7 +3881,7 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:149 msgid "Change status" -msgstr "" +msgstr "Zmień status" #: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" @@ -3899,15 +3894,15 @@ #: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" -msgstr "pliki naruszone" +msgstr "Pliki naruszone" #: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" -msgstr "" +msgstr "Pokaż pełną edycję tego pliku" #: rhodecode/templates/changeset/diff_block.html:29 msgid "Show inline comments" -msgstr "Pokaż komentarze w liniach" +msgstr "Pokaż online komentarz" #: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" @@ -3923,7 +3918,7 @@ #: rhodecode/templates/compare/compare_cs.html:32 msgid "Ancestor" -msgstr "" +msgstr "Przodek" #: rhodecode/templates/compare/compare_diff.html:5 #, python-format @@ -3932,7 +3927,7 @@ #: rhodecode/templates/compare/compare_diff.html:9 msgid "Compare revisions" -msgstr "" +msgstr "Porównaj wersje" #: rhodecode/templates/compare/compare_diff.html:33 #: rhodecode/templates/pullrequests/pullrequest_show.html:106 @@ -3966,7 +3961,7 @@ #: rhodecode/templates/data_table/_dt_elements.html:74 #, python-format msgid "Fork of %s" -msgstr "" +msgstr "Nazwa rozgałęzienia %s" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3998,16 +3993,16 @@ #: rhodecode/templates/email_templates/pull_request.html:4 #: rhodecode/templates/email_templates/pull_request_comment.html:4 msgid "URL" -msgstr "URL" +msgstr "Adres URL" #: rhodecode/templates/email_templates/changeset_comment.html:6 #, python-format msgid "%s commented on a %s changeset." -msgstr "" +msgstr "%s komentarzy %s zestawów zmian." #: rhodecode/templates/email_templates/changeset_comment.html:14 msgid "The changeset status was changed to" -msgstr "Status zmiany został zmieniony na" +msgstr "Status zestawienia zmian został zmieniony na" #: rhodecode/templates/email_templates/main.html:8 msgid "This is a notification from RhodeCode." @@ -4028,13 +4023,13 @@ #: rhodecode/templates/email_templates/password_reset.html:10 msgid "Please ignore this email if you did not request a new password ." -msgstr "" +msgstr "Proszę zignorować tą wiadomość, jeśli nie poproś o nowe hasło." #: rhodecode/templates/email_templates/pull_request.html:6 #, python-format msgid "" "%s opened a pull request for repository %s and wants you to review changes." -msgstr "" +msgstr "%s zgłosił wniosek połączenia w repozytorium %s i chce żeby sprawdzić zmiany." #: rhodecode/templates/email_templates/pull_request.html:8 #: rhodecode/templates/pullrequests/pullrequest.html:34 @@ -4046,15 +4041,15 @@ #: rhodecode/templates/email_templates/pull_request_comment.html:6 #, python-format msgid "%s commented on pull request \"%s\"" -msgstr "" +msgstr "%s skomentował nowe połączenie gałęzi \"%s\"" #: rhodecode/templates/email_templates/pull_request_comment.html:10 msgid "Pull request was closed with status" -msgstr "" +msgstr "Wniosek połączenia został zamknięty ze statusem" #: rhodecode/templates/email_templates/pull_request_comment.html:12 msgid "Pull request changed status" -msgstr "Żądanie statusu połączenia gałęzi" +msgstr "Wniosek połączenia zmienił status" #: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" @@ -4078,18 +4073,18 @@ #: rhodecode/templates/files/files.html:76 #, python-format msgid "%s Files" -msgstr "%s Plików" +msgstr "Pliki %s" #: rhodecode/templates/files/files.html:30 #: rhodecode/templates/files/files_add.html:31 #: rhodecode/templates/files/files_edit.html:31 msgid "Branch" -msgstr "Gałąź" +msgstr "gałąź" #: rhodecode/templates/files/files_add.html:4 #, python-format msgid "%s Files Add" -msgstr "%s Plików Dodano" +msgstr "Pliki %s" #: rhodecode/templates/files/files_add.html:19 msgid "Add file" @@ -4134,19 +4129,19 @@ #: rhodecode/templates/files/files_browser.html:14 msgid "Previous revision" -msgstr "Poprzednia rewizja" +msgstr "poprzednia wersja" #: rhodecode/templates/files/files_browser.html:16 msgid "Next revision" -msgstr "Następna rewizja" +msgstr "następna wersja" #: rhodecode/templates/files/files_browser.html:23 msgid "Follow current branch" -msgstr "" +msgstr "Obserwuj aktualną gałąź" #: rhodecode/templates/files/files_browser.html:27 msgid "Search file list" -msgstr "Szukaj w liście plików" +msgstr "Lista szukanych plików" #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." @@ -4175,16 +4170,16 @@ #: rhodecode/templates/files/files_edit.html:4 #, python-format msgid "%s Files Edit" -msgstr "" +msgstr "Pliki %s" #: rhodecode/templates/files/files_edit.html:19 msgid "Edit file" -msgstr "" +msgstr "Edytuj plik" #: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 msgid "Show annotation" -msgstr "" +msgstr "pokaż adnotacje" #: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 @@ -4193,7 +4188,7 @@ #: rhodecode/templates/files/files_edit.html:52 msgid "Source" -msgstr "źródło" +msgstr "Źródło" #: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" @@ -4209,7 +4204,7 @@ #: rhodecode/templates/files/files_history_box.html:10 msgid "Show at revision" -msgstr "Wskaż zmiany w rewizji" +msgstr "Wskaż zmiany" #: rhodecode/templates/files/files_history_box.html:11 msgid "Show full history" @@ -4234,11 +4229,11 @@ #: rhodecode/templates/files/files_source.html:29 #, python-format msgid "Edit on branch:%s" -msgstr "Edytuj w gałąźi: %s" +msgstr "Usunięta gałąź: %s" #: rhodecode/templates/files/files_source.html:31 msgid "Edit on branch:?" -msgstr "" +msgstr "Usunięta gałąź: %s" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -4274,7 +4269,7 @@ #: rhodecode/templates/summary/summary.html:183 #: rhodecode/templates/summary/summary.html:184 msgid "Followers" -msgstr "Obserwowane" +msgstr "Obserwuje" #: rhodecode/templates/followers/followers_data.html:12 msgid "Started following -" @@ -4311,7 +4306,7 @@ #: rhodecode/templates/forks/fork.html:93 msgid "Fork this repository" -msgstr "" +msgstr "Gałąź tego repozytorium" #: rhodecode/templates/forks/forks.html:5 #, python-format @@ -4326,7 +4321,7 @@ #: rhodecode/templates/forks/forks_data.html:17 msgid "Forked" -msgstr "" +msgstr "Rozgałęziony" #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" @@ -4381,16 +4376,16 @@ #: rhodecode/templates/pullrequests/pullrequest.html:47 msgid "Write a short description on this pull request" -msgstr "" +msgstr "Napisz krótki opis tego tego połączenia gałęzi" #: rhodecode/templates/pullrequests/pullrequest.html:53 msgid "Changeset flow" -msgstr "" +msgstr "Przepływ zestawienia zmian" #: rhodecode/templates/pullrequests/pullrequest.html:60 #: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Origin repository" -msgstr "" +msgstr "Repozytorium git" #: rhodecode/templates/pullrequests/pullrequest.html:85 msgid "Send pull request" @@ -4416,12 +4411,12 @@ #: rhodecode/templates/pullrequests/pullrequest.html:150 msgid "Destination repository" -msgstr "" +msgstr "Repozytorium docelowe" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #, python-format msgid "%s Pull Request #%s" -msgstr "" +msgstr "%s Połączonych gałęzi #%s" #: rhodecode/templates/pullrequests/pullrequest_show.html:35 msgid "Review status" @@ -4445,7 +4440,7 @@ #: rhodecode/templates/pullrequests/pullrequest_show.html:59 msgid "Pull request was reviewed by all reviewers" -msgstr "" +msgstr "Połączenie gałęzi zostało zweryfikowane przez wszystkich recenzentów" #: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" @@ -4461,20 +4456,20 @@ #: rhodecode/templates/pullrequests/pullrequest_show.html:164 msgid "Add or remove reviewer to this pull request." -msgstr "" +msgstr "Pokarz wszystkie zmiany" #: rhodecode/templates/pullrequests/pullrequest_show.html:168 msgid "Save changes" -msgstr "" +msgstr "Bez zmian" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" -msgstr "" +msgstr "%s Moje prośby połączenia gałęzi" #: rhodecode/templates/search/search.html:6 msgid "Search repository" -msgstr "Szukaj w repozytorium" +msgstr "Szukaj w repozytorium: %s" #: rhodecode/templates/search/search.html:8 #: rhodecode/templates/search/search.html:16 @@ -4515,12 +4510,12 @@ #: rhodecode/templates/summary/summary.html:16 #, python-format msgid "%s ATOM feed" -msgstr "" +msgstr "%s ATOM" #: rhodecode/templates/summary/summary.html:17 #, python-format msgid "%s RSS feed" -msgstr "" +msgstr "%s RSS" #: rhodecode/templates/summary/summary.html:62 #, python-format @@ -4547,7 +4542,7 @@ #: rhodecode/templates/summary/summary.html:97 msgid "Remote clone" -msgstr "Zdalne klonowanie" +msgstr "zdalne klonowanie" #: rhodecode/templates/summary/summary.html:117 msgid "Contact" @@ -4600,12 +4595,12 @@ #: rhodecode/templates/summary/summary.html:197 msgid "Repository Size" -msgstr "Rozmiar repozytorium" +msgstr "Rozmiar Repozytorium" #: rhodecode/templates/summary/summary.html:204 #: rhodecode/templates/summary/summary.html:206 msgid "Feed" -msgstr "" +msgstr "Kanał RSS" #: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" @@ -4621,7 +4616,7 @@ #: rhodecode/templates/summary/summary.html:256 msgid "Latest changes" -msgstr "Ostatnie zmiany" +msgstr "Ostatnia aktywność" #: rhodecode/templates/summary/summary.html:258 msgid "Quick start" @@ -4630,7 +4625,7 @@ #: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file from revision %s" -msgstr "Plik readme z rewizji %s" +msgstr "Plik Readme z wersji %s" #: rhodecode/templates/summary/summary.html:332 #, python-format diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.mo has changed diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Fri Jun 07 19:23:20 2013 +0200 +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Fri Jun 07 19:30:45 2013 +0200 @@ -1,35 +1,35 @@ -# Portuguese (Brazil) translations for RhodeCode. -# Copyright (C) 2011-2012 Augusto Herrmann +# Translations template for RhodeCode. +# Copyright (C) 2013 Marcin Kuzminski RhodeCode # This file is distributed under the same license as the RhodeCode project. -# Augusto Herrmann , 2012. -# +# Translators: +# Augusto Herrmann , 2012 +# gnustavo , 2013 msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.2.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-06-01 18:38+0200\n" -"PO-Revision-Date: 2012-05-22 16:47-0300\n" -"Last-Translator: Augusto Herrmann \n" -"Language-Team: pt_BR \n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Project-Id-Version: RhodeCode\n" +"Report-Msgid-Bugs-To: marcin@maq.io\n" +"POT-Creation-Date: 2013-06-05 19:55+0200\n" +"PO-Revision-Date: 2013-06-04 20:47+0000\n" +"Last-Translator: gnustavo \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/RhodeCode/language/pt_BR/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" +"Language: pt_BR\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: rhodecode/controllers/changelog.py:149 msgid "All Branches" msgstr "Todos os Ramos" #: rhodecode/controllers/changeset.py:84 -#, fuzzy msgid "Show white space" -msgstr "mostrar espaços em branco" +msgstr "Mostrar espaços em branco" #: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 -#, fuzzy msgid "Ignore white space" -msgstr "ignorar espaços em branco" +msgstr "Ignorar espaços em branco" #: rhodecode/controllers/changeset.py:164 #, python-format @@ -37,32 +37,30 @@ msgstr "contexto de %s linhas" #: rhodecode/controllers/changeset.py:345 -#: rhodecode/controllers/pullrequests.py:481 -#, fuzzy, python-format +#: rhodecode/controllers/pullrequests.py:478 +#, python-format msgid "Status change -> %s" -msgstr "Última alteração" +msgstr "Mudança de estado -> %s" #: rhodecode/controllers/changeset.py:376 msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "" +"Changing status on a changeset associated with a closed pull request is not " +"allowed" +msgstr "Mudar o estado de um changeset associado a um pull request não é permitido" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:259 -#, fuzzy +#: rhodecode/controllers/pullrequests.py:256 msgid "There are no changesets yet" -msgstr "Ainda não há alteações" +msgstr "Não há nenhum changeset ainda" #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "Página inicial" #: rhodecode/controllers/error.py:98 -msgid "The request could not be understood by the server due to malformed syntax." -msgstr "" -"A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal" -" formada" +msgid "" +"The request could not be understood by the server due to malformed syntax." +msgstr "A requisição não pôde ser compreendida pelo servidor devido à sintaxe mal formada." #: rhodecode/controllers/error.py:101 msgid "Unauthorized access to resource" @@ -80,14 +78,12 @@ msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." -msgstr "" -"O servidor encontrou uma condição inesperada que o impediu de satisfazer " -"a requisição" +msgstr "O servidor encontrou uma condição inesperada que o impediu de satisfazer a requisição." #: rhodecode/controllers/feed.py:52 #, python-format msgid "Changes on %s repository" -msgstr "Alterações no repositório %s" +msgstr "Modificações no repositório %s" #: rhodecode/controllers/feed.py:53 #, python-format @@ -105,14 +101,13 @@ msgstr "Conjunto de mudanças era grande demais e foi cortado..." #: rhodecode/controllers/feed.py:90 -#, fuzzy, python-format +#, python-format msgid "%s committed on %s" -msgstr "commit" +msgstr "%s commitados em %s" #: rhodecode/controllers/files.py:89 -#, fuzzy msgid "Click here to add new file" -msgstr "adicionar novo arquivo" +msgstr "Clique aqui para adicionar um novo arquivo" #: rhodecode/controllers/files.py:90 #, python-format @@ -122,20 +117,20 @@ #: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, python-format msgid "This repository is has been locked by %s on %s" -msgstr "" +msgstr "Este repositório foi travado por %s em %s" #: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " -msgstr "" +msgstr "Só é possível editar arquivos quando a revisão é um ramo válido" #: rhodecode/controllers/files.py:297 -#, fuzzy, python-format +#, python-format msgid "Edited file %s via RhodeCode" -msgstr "Editado %s via RhodeCode" +msgstr "Arquivo %s editado via RhodeCode" #: rhodecode/controllers/files.py:313 msgid "No changes" -msgstr "Sem alterações" +msgstr "Sem modificações" #: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394 #, python-format @@ -147,9 +142,8 @@ msgstr "Ocorreu um erro ao realizar commit" #: rhodecode/controllers/files.py:351 -#, fuzzy msgid "Added file via RhodeCode" -msgstr "Adicionado %s via RhodeCode" +msgstr "Arquivo adicionado via RhodeCode" #: rhodecode/controllers/files.py:368 msgid "No content" @@ -157,16 +151,15 @@ #: rhodecode/controllers/files.py:372 msgid "No filename" -msgstr "Nenhum nomes de arquivo" +msgstr "Nenhum nome de arquivo" #: rhodecode/controllers/files.py:397 msgid "Location must be relative path and must not contain .. in path" -msgstr "" +msgstr "O caminho deve ser relativo e não pode conter .." #: rhodecode/controllers/files.py:431 -#, fuzzy msgid "Downloads disabled" -msgstr "downloads desabilitados" +msgstr "Downloads desabilitados" #: rhodecode/controllers/files.py:442 #, python-format @@ -179,7 +172,7 @@ #: rhodecode/controllers/files.py:446 msgid "Unknown archive type" -msgstr "Arquivo de tipo desconhecido" +msgstr "Tipo de arquivo desconhecido" #: rhodecode/controllers/files.py:631 #: rhodecode/templates/changeset/changeset_range.html:9 @@ -188,14 +181,16 @@ msgid "Changesets" msgstr "Conjuntos de mudanças" -#: rhodecode/controllers/files.py:632 rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/files.py:632 +#: rhodecode/controllers/pullrequests.py:149 #: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "Ramos" -#: rhodecode/controllers/files.py:633 rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/files.py:633 +#: rhodecode/controllers/pullrequests.py:150 #: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: rhodecode/templates/switch_to_list.html:15 #: rhodecode/templates/tags/tags.html:10 @@ -203,9 +198,9 @@ msgstr "Etiquetas" #: rhodecode/controllers/forks.py:176 -#, fuzzy, python-format +#, python-format msgid "Forked repository %s as %s" -msgstr "bifurcado repositório %s como %s" +msgstr "Repositório %s bifurcado como %s" #: rhodecode/controllers/forks.py:190 #, python-format @@ -213,9 +208,8 @@ msgstr "Ocorreu um erro ao bifurcar o repositório %s" #: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153 -#, fuzzy msgid "public journal" -msgstr "Diário público" +msgstr "diário público" #: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157 #: rhodecode/templates/journal/journal.html:12 @@ -223,9 +217,8 @@ msgstr "diário" #: rhodecode/controllers/login.py:138 -#, fuzzy msgid "You have successfully registered into RhodeCode" -msgstr "Você se registrou com sucesso no rhodecode" +msgstr "Você foi registrado no RhodeCode com sucesso" #: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" @@ -233,64 +226,57 @@ #: rhodecode/controllers/login.py:179 msgid "" -"Your password reset was successful, new password has been sent to your " -"email" -msgstr "" -"Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " -"seu e-mail" - -#: rhodecode/controllers/pullrequests.py:139 +"Your password reset was successful, new password has been sent to your email" +msgstr "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao seu e-mail" + +#: rhodecode/controllers/pullrequests.py:136 #: rhodecode/templates/changeset/changeset.html:10 #: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "Conjunto de Mudanças" -#: rhodecode/controllers/pullrequests.py:149 +#: rhodecode/controllers/pullrequests.py:146 msgid "Special" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:150 -#, fuzzy +msgstr "Especial" + +#: rhodecode/controllers/pullrequests.py:147 msgid "Peer branches" -msgstr "ramos" - -#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 +msgstr "Ramos pares" + +#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Marcadores" -#: rhodecode/controllers/pullrequests.py:324 +#: rhodecode/controllers/pullrequests.py:321 msgid "Pull request requires a title with min. 3 chars" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:326 -#, fuzzy +msgstr "O pull request requer um título com no mínimo três caracteres" + +#: rhodecode/controllers/pullrequests.py:323 msgid "Error creating pull request" -msgstr "ocorreu um erro ao criar o usuário %s" +msgstr "Erro criando um pull request" + +#: rhodecode/controllers/pullrequests.py:343 +msgid "Successfully opened new pull request" +msgstr "Novo pull request criado com sucesso" #: rhodecode/controllers/pullrequests.py:346 -#, fuzzy -msgid "Successfully opened new pull request" -msgstr "usuário excluído com sucesso" - -#: rhodecode/controllers/pullrequests.py:349 -#, fuzzy msgid "Error occurred during sending pull request" -msgstr "ocorreu um erro ao criar o repositório %s" - -#: rhodecode/controllers/pullrequests.py:388 -#, fuzzy +msgstr "Ocorreu um erro durante o envio do pull request" + +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully deleted pull request" -msgstr "usuário excluído com sucesso" - -#: rhodecode/controllers/pullrequests.py:484 +msgstr "Pull request excluído com sucesso" + +#: rhodecode/controllers/pullrequests.py:481 msgid "Closing with" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:521 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" +msgstr "Fechando com" + +#: rhodecode/controllers/pullrequests.py:518 +msgid "" +"Closing pull request on other statuses than rejected or approved forbidden" +msgstr "Não é permitido fechar um pull request em um estado diferente de rejeitado ou aprovado" #: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." @@ -314,53 +300,45 @@ msgstr "As estatísticas estão desabillitadas para este repositório" #: rhodecode/controllers/admin/defaults.py:96 -#, fuzzy msgid "Default settings updated successfully" -msgstr "Configurações de LDAP atualizadas com sucesso" +msgstr "Configurações padrão atualizadas com sucesso" #: rhodecode/controllers/admin/defaults.py:110 -#, fuzzy msgid "Error occurred during update of defaults" -msgstr "ocorreu um erro ao atualizar o usuário %s" +msgstr "Ocorreu um erro durnge a atualização dos padrões" #: rhodecode/controllers/admin/gists.py:56 -#, fuzzy msgid "forever" -msgstr "revogar" +msgstr "para sempre" #: rhodecode/controllers/admin/gists.py:57 -#, fuzzy msgid "5 minutes" -msgstr "%d minuto" +msgstr "cinco minutos" #: rhodecode/controllers/admin/gists.py:58 -#, fuzzy msgid "1 hour" -msgstr "%d hora" +msgstr "uma hora" #: rhodecode/controllers/admin/gists.py:59 -#, fuzzy msgid "1 day" -msgstr "%d dia" +msgstr "um dia" #: rhodecode/controllers/admin/gists.py:60 -#, fuzzy msgid "1 month" -msgstr "%d mês" +msgstr "um mês" #: rhodecode/controllers/admin/gists.py:62 msgid "Lifetime" msgstr "" #: rhodecode/controllers/admin/gists.py:127 -#, fuzzy msgid "Error occurred during gist creation" -msgstr "ocorreu um erro ao criar gancho" +msgstr "Ocorreu um erro durante a criação de um gist" #: rhodecode/controllers/admin/gists.py:165 -#, fuzzy, python-format +#, python-format msgid "Deleted gist %s" -msgstr "excluído o repositório %s" +msgstr "Gist %s excluído" #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" @@ -415,9 +393,8 @@ msgstr "Não foi possível ativar LDAP. A biblioteca \"python-ldap\" está faltando." #: rhodecode/controllers/admin/ldap_settings.py:145 -#, fuzzy msgid "Error occurred during update of ldap settings" -msgstr "ocorreu um erro ao atualizar as configurações de LDAP" +msgstr "Ocorreu um erro durante a atualização das configurações de LDAP" #: rhodecode/controllers/admin/permissions.py:58 #: rhodecode/controllers/admin/permissions.py:62 @@ -476,24 +453,22 @@ msgstr "Desabilitado" #: rhodecode/controllers/admin/permissions.py:74 -#, fuzzy msgid "Allowed with manual account activation" -msgstr "permitido com ativação manual de conta" +msgstr "Permitido com ativação manual de conta" #: rhodecode/controllers/admin/permissions.py:76 -#, fuzzy msgid "Allowed with automatic account activation" -msgstr "permitido com ativação automática de conta" +msgstr "Permitido com ativação automática de conta" #: rhodecode/controllers/admin/permissions.py:79 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 msgid "Manual activation of external account" -msgstr "" +msgstr "Ativação manual de conta externa" #: rhodecode/controllers/admin/permissions.py:80 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 msgid "Automatic activation of external account" -msgstr "" +msgstr "Ativação automática de conta externa" #: rhodecode/controllers/admin/permissions.py:84 #: rhodecode/controllers/admin/permissions.py:87 @@ -507,28 +482,27 @@ msgstr "Permissões padrões atualizadas com sucesso" #: rhodecode/controllers/admin/permissions.py:152 -#, fuzzy msgid "Error occurred during update of permissions" -msgstr "ocorreu um erro ao atualizar as permissões" +msgstr "Ocorreu um erro durante a atualização das permissões" #: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "--REMOVER BIFURCAÇÂO--" #: rhodecode/controllers/admin/repos.py:168 -#, fuzzy, python-format +#, python-format msgid "Created repository %s from %s" -msgstr "repositório %s criado a partir de %s" +msgstr "Repositório %s criado de %s" #: rhodecode/controllers/admin/repos.py:174 -#, fuzzy, python-format +#, python-format msgid "Created repository %s" -msgstr "repositório %s criado" +msgstr "Repositório %s criado" #: rhodecode/controllers/admin/repos.py:197 -#, fuzzy, python-format +#, python-format msgid "Error creating repository %s" -msgstr "repositório %s criado" +msgstr "Erro ao criar repositório %s" #: rhodecode/controllers/admin/repos.py:270 #, python-format @@ -536,9 +510,9 @@ msgstr "Repositório %s atualizado com sucesso" #: rhodecode/controllers/admin/repos.py:288 -#, fuzzy, python-format +#, python-format msgid "Error occurred during update of repository %s" -msgstr "ocorreu um erro ao atualizar o repositório %s" +msgstr "Ocorreu um erro durante a atualização do repositório %s" #: rhodecode/controllers/admin/repos.py:315 #, python-format @@ -546,14 +520,14 @@ msgstr "" #: rhodecode/controllers/admin/repos.py:318 -#, fuzzy, python-format +#, python-format msgid "Deleted %s forks" -msgstr "excluído o repositório %s" +msgstr "%s bifurcações excluídas" #: rhodecode/controllers/admin/repos.py:323 -#, fuzzy, python-format +#, python-format msgid "Deleted repository %s" -msgstr "excluído o repositório %s" +msgstr "Repositório %s excluído" #: rhodecode/controllers/admin/repos.py:326 #, python-format @@ -566,16 +540,14 @@ msgstr "Ocorreu um erro durante a exclusão de %s" #: rhodecode/controllers/admin/repos.py:345 -#, fuzzy msgid "Repository permissions updated" -msgstr "Criação de repositório" +msgstr "Permissões do repositório atualizadas" #: rhodecode/controllers/admin/repos.py:375 #: rhodecode/controllers/admin/repos_groups.py:332 #: rhodecode/controllers/admin/users_groups.py:312 -#, fuzzy msgid "An error occurred during revoking of permission" -msgstr "ocorreu um erro ao atualizar as permissões" +msgstr "Ocorreu um erro durante a revocação das permissões" #: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" @@ -587,24 +559,21 @@ #: rhodecode/controllers/admin/repos.py:429 #: rhodecode/controllers/admin/repos.py:456 -#, fuzzy msgid "An error occurred during unlocking" -msgstr "Ocorreu um erro durante essa operação" +msgstr "Ocorreu um erro durante o destravamento" #: rhodecode/controllers/admin/repos.py:447 -#, fuzzy msgid "Unlocked" -msgstr "destravar" +msgstr "Destravado" #: rhodecode/controllers/admin/repos.py:450 -#, fuzzy msgid "Locked" -msgstr "destravar" +msgstr "Travado" #: rhodecode/controllers/admin/repos.py:452 -#, fuzzy, python-format +#, python-format msgid "Repository has been %s" -msgstr "bifurcado repositório %s como %s" +msgstr "O repositório foi %s" #: rhodecode/controllers/admin/repos.py:476 msgid "Updated repository visibility in public journal" @@ -640,34 +609,32 @@ msgstr "Ocorreu um erro durante essa operação" #: rhodecode/controllers/admin/repos.py:562 -#, fuzzy msgid "An error occurred during creation of field" -msgstr "ocorreu um erro ao criar o usuário %s" +msgstr "Ocorreu um erro durante a criação do campo" #: rhodecode/controllers/admin/repos.py:576 -#, fuzzy msgid "An error occurred during removal of field" -msgstr "Ocorreu um erro durante essa operação" +msgstr "Ocorreu um erro durante a remoção do campo" #: rhodecode/controllers/admin/repos_groups.py:147 -#, fuzzy, python-format +#, python-format msgid "Created repository group %s" -msgstr "criado grupo de repositórios %s" +msgstr "Grupo de repositórios %s criado" #: rhodecode/controllers/admin/repos_groups.py:159 -#, fuzzy, python-format +#, python-format msgid "Error occurred during creation of repository group %s" -msgstr "ccorreu um erro ao criar grupo de repositório %s" +msgstr "Ocorreu um erro durante a criação do grupo de repositórios %s" #: rhodecode/controllers/admin/repos_groups.py:217 -#, fuzzy, python-format +#, python-format msgid "Updated repository group %s" -msgstr "atualizado grupo de repositórios %s" +msgstr "Grupo de repositórios %s atualizado" #: rhodecode/controllers/admin/repos_groups.py:232 -#, fuzzy, python-format +#, python-format msgid "Error occurred during update of repository group %s" -msgstr "ocorreu um erro ao atualizar grupo de repositórios %s" +msgstr "Ocorreu um erro durante a atualização do grupo de repositórios %s" #: rhodecode/controllers/admin/repos_groups.py:250 #, python-format @@ -675,35 +642,34 @@ msgstr "Esse grupo contém %s repositórios e não pode ser excluído" #: rhodecode/controllers/admin/repos_groups.py:257 -#, fuzzy, python-format +#, python-format msgid "This group contains %s subgroups and cannot be deleted" -msgstr "Esse grupo contém %s repositórios e não pode ser excluído" +msgstr "Este grupo contém %s subgrupos e não pode ser excluído" #: rhodecode/controllers/admin/repos_groups.py:263 -#, fuzzy, python-format +#, python-format msgid "Removed repository group %s" -msgstr "removido grupo de repositórios %s" +msgstr "Grupo de repositórios %s excluído" #: rhodecode/controllers/admin/repos_groups.py:268 -#, fuzzy, python-format -msgid "Error occurred during deletion of repos group %s" -msgstr "ccorreu um erro ao excluir grupo de repositórios %s" +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "Ocorreu um erro durante a exclusão do grupo de repositórios %s" #: rhodecode/controllers/admin/repos_groups.py:279 #: rhodecode/controllers/admin/repos_groups.py:314 #: rhodecode/controllers/admin/users_groups.py:300 msgid "Cannot revoke permission for yourself as admin" -msgstr "" +msgstr "Você não pode revocar sua própria permissão de administrador" #: rhodecode/controllers/admin/repos_groups.py:294 -#, fuzzy msgid "Repository Group permissions updated" -msgstr "Criação de repositório" +msgstr "Permissões atualizadas do Grupo de Repositórios" #: rhodecode/controllers/admin/settings.py:123 -#, fuzzy, python-format +#, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "Repositórios varridos com sucesso adicionados: %s, removidos: %s" +msgstr "Repositórios varridos com sucesso adicionados: %s ; removidos: %s" #: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" @@ -715,24 +681,20 @@ #: rhodecode/controllers/admin/settings.py:167 #: rhodecode/controllers/admin/settings.py:304 -#, fuzzy msgid "Error occurred during updating application settings" -msgstr "ocorreu um erro ao atualizar as configurações da aplicação" +msgstr "Ocorreu um erro durante a atualização das configurações da aplicação" #: rhodecode/controllers/admin/settings.py:219 -#, fuzzy msgid "Updated visualisation settings" -msgstr "Configurações da aplicação atualizadas" +msgstr "Configurações de visualização atualizadas" #: rhodecode/controllers/admin/settings.py:224 -#, fuzzy msgid "Error occurred during updating visualisation settings" -msgstr "ocorreu um erro ao atualizar as configurações da aplicação" +msgstr "Ocorreu um erro durante a atualização das configurações de visualização" #: rhodecode/controllers/admin/settings.py:300 -#, fuzzy msgid "Updated VCS settings" -msgstr "Atualizadas as configurações do mercurial" +msgstr "Configurações de VCS atualizadas" #: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" @@ -743,9 +705,8 @@ msgstr "Atualizados os ganchos" #: rhodecode/controllers/admin/settings.py:330 -#, fuzzy msgid "Error occurred during hook creation" -msgstr "ocorreu um erro ao criar gancho" +msgstr "Ocorreu um erro durante a criação do hook" #: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" @@ -761,28 +722,27 @@ #: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 -#, fuzzy, python-format +#, python-format msgid "Error occurred during update of user %s" -msgstr "ocorreu um erro ao atualizar o usuário %s" +msgstr "Ocorreu um erro durante a atualização do usuário %s" #: rhodecode/controllers/admin/users.py:130 -#, fuzzy, python-format +#, python-format msgid "Created user %s" -msgstr "usuário %s criado" +msgstr "Usuário %s criado" #: rhodecode/controllers/admin/users.py:142 -#, fuzzy, python-format +#, python-format msgid "Error occurred during creation of user %s" -msgstr "ocorreu um erro ao criar o usuário %s" +msgstr "Ocorreu um erro durante a criação do usuário %s" #: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" #: rhodecode/controllers/admin/users.py:214 -#, fuzzy msgid "Successfully deleted user" -msgstr "usuário excluído com sucesso" +msgstr "Usuário excluído com sucesso" #: rhodecode/controllers/admin/users.py:219 msgid "An error occurred during deletion of user" @@ -794,89 +754,80 @@ #: rhodecode/controllers/admin/users.py:293 #: rhodecode/controllers/admin/users_groups.py:372 -#, fuzzy msgid "Updated permissions" -msgstr "Copiar permissões" +msgstr "Permissões atualizadas" #: rhodecode/controllers/admin/users.py:297 #: rhodecode/controllers/admin/users_groups.py:376 -#, fuzzy msgid "An error occurred during permissions saving" -msgstr "Ocorreu um erro durante essa operação" +msgstr "Ocorreu um erro durante o salvamento das permissões" #: rhodecode/controllers/admin/users.py:311 #, python-format msgid "Added email %s to user" -msgstr "" +msgstr "Email %s adicionado ao usuário" #: rhodecode/controllers/admin/users.py:317 -#, fuzzy msgid "An error occurred during email saving" -msgstr "Ocorreu um erro durante essa operação" +msgstr "Ocorreu um erro durante o salvamento do email" #: rhodecode/controllers/admin/users.py:327 -#, fuzzy msgid "Removed email from user" -msgstr "removido grupo de repositórios %s" +msgstr "Email removido do usuário" #: rhodecode/controllers/admin/users.py:340 #, python-format msgid "Added ip %s to user" -msgstr "" +msgstr "IP %s adicionado ao usuário" #: rhodecode/controllers/admin/users.py:346 -#, fuzzy msgid "An error occurred during ip saving" -msgstr "Ocorreu um erro durante essa operação" +msgstr "Ocorreu um erro durante o salvamento do IP" #: rhodecode/controllers/admin/users.py:358 -#, fuzzy msgid "Removed ip from user" -msgstr "removido grupo de repositórios %s" +msgstr "IP removido do usuário" #: rhodecode/controllers/admin/users_groups.py:162 -#, fuzzy, python-format +#, python-format msgid "Created user group %s" -msgstr "criado grupo de usuários %s" +msgstr "Grupo de usuários %s criado" #: rhodecode/controllers/admin/users_groups.py:173 -#, fuzzy, python-format +#, python-format msgid "Error occurred during creation of user group %s" -msgstr "ocorreu um erro ao criar o grupo de usuários %s" +msgstr "Ocorreu um erro durante a criação do grupo de usuários %s" #: rhodecode/controllers/admin/users_groups.py:210 -#, fuzzy, python-format +#, python-format msgid "Updated user group %s" -msgstr "grupo de usuários %s atualizado" +msgstr "Grupo de usuários %s atualizado" #: rhodecode/controllers/admin/users_groups.py:232 -#, fuzzy, python-format +#, python-format msgid "Error occurred during update of user group %s" -msgstr "ocorreu um erro ao atualizar o grupo de usuários %s" +msgstr "Ocorreu um erro durante a atualização do grupo de usuários %s" #: rhodecode/controllers/admin/users_groups.py:250 -#, fuzzy msgid "Successfully deleted user group" -msgstr "grupo de usuários excluído com sucesso" +msgstr "Grupo de usuários excluído com sucesso" #: rhodecode/controllers/admin/users_groups.py:255 -#, fuzzy msgid "An error occurred during deletion of user group" -msgstr "Ocorreu um erro ao excluir o grupo de usuários" +msgstr "Ocorreu um erro durante a exclusão do grupo de usuários" #: rhodecode/controllers/admin/users_groups.py:274 msgid "Target group cannot be the same" -msgstr "" +msgstr "O grupo destino não pode ser o mesmo" #: rhodecode/controllers/admin/users_groups.py:280 -#, fuzzy msgid "User Group permissions updated" -msgstr "Criação de repositório" +msgstr "Permissões do Grupo de Usuários atualizadas" #: rhodecode/lib/auth.py:544 -#, fuzzy, python-format +#, python-format msgid "IP %s not allowed" -msgstr "seguidores" +msgstr "IP %s não permitido" #: rhodecode/lib/auth.py:593 msgid "You need to be a registered user to perform this action" @@ -887,25 +838,18 @@ msgstr "Você precisa estar logado para ver essa página" #: rhodecode/lib/diffs.py:66 -#, fuzzy msgid "Binary file" -msgstr "arquivo binário" +msgstr "Arquivo binário" #: rhodecode/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "" -"Conjunto de mudanças é grande demais e foi cortado, use o menu de " -"diferenças para ver as diferenças" +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" +msgstr "Conjunto de mudanças é grande demais e foi cortado, use o menu de diferenças para ver as diferenças" #: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: rhodecode/lib/helpers.py:428 -#, python-format -msgid "%a, %d %b %Y %H:%M:%S" -msgstr "" - #: rhodecode/lib/helpers.py:539 msgid "True" msgstr "Verdadeiro" @@ -915,14 +859,14 @@ msgstr "Falso" #: rhodecode/lib/helpers.py:580 -#, fuzzy, python-format +#, python-format msgid "Deleted branch: %s" -msgstr "excluído o repositório %s" +msgstr "Excluído ramo: %s" #: rhodecode/lib/helpers.py:583 -#, fuzzy, python-format +#, python-format msgid "Created tag: %s" -msgstr "usuário %s criado" +msgstr "Tag criada: %s" #: rhodecode/lib/helpers.py:596 msgid "Changeset not found" @@ -946,20 +890,21 @@ msgid "%s more" msgstr "%s mais" -#: rhodecode/lib/helpers.py:674 rhodecode/templates/changelog/changelog.html:53 +#: rhodecode/lib/helpers.py:674 +#: rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "revisões" #: rhodecode/lib/helpers.py:698 -#, fuzzy, python-format +#, python-format msgid "fork name %s" -msgstr "nome da bifurcação" +msgstr "" #: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" -msgstr "" +msgstr "Pull request #%s" #: rhodecode/lib/helpers.py:725 msgid "[deleted] repository" @@ -982,62 +927,52 @@ msgstr "repositório [atualizado]" #: rhodecode/lib/helpers.py:735 -#, fuzzy msgid "[downloaded] archive from repository" -msgstr "Downloads estão desabilitados para este repositório" +msgstr "[baixado] archive do repositório" #: rhodecode/lib/helpers.py:737 msgid "[delete] repository" msgstr "[excluir] repositório" #: rhodecode/lib/helpers.py:745 -#, fuzzy msgid "[created] user" -msgstr "usuário %s criado" +msgstr "usuário [criado]" #: rhodecode/lib/helpers.py:747 -#, fuzzy msgid "[updated] user" -msgstr "grupo de usuários %s atualizado" +msgstr "usuário [atualizado]" #: rhodecode/lib/helpers.py:749 -#, fuzzy msgid "[created] user group" -msgstr "criado grupo de usuários %s" +msgstr "[criado] grupo de usuários" #: rhodecode/lib/helpers.py:751 -#, fuzzy msgid "[updated] user group" -msgstr "grupo de usuários %s atualizado" +msgstr "[atualizado] grupo de usuários" #: rhodecode/lib/helpers.py:753 -#, fuzzy msgid "[commented] on revision in repository" -msgstr "repositório [criado]" +msgstr "[comentado] em revisão no repositório" #: rhodecode/lib/helpers.py:755 -#, fuzzy msgid "[commented] on pull request for" -msgstr "repositório [criado]" +msgstr "[comentado] no pull request para" #: rhodecode/lib/helpers.py:757 -#, fuzzy msgid "[closed] pull request for" -msgstr "repositório [criado]" +msgstr "[fechado] pull request para" #: rhodecode/lib/helpers.py:759 msgid "[pushed] into" msgstr "[realizado push] para" #: rhodecode/lib/helpers.py:761 -#, fuzzy msgid "[committed via RhodeCode] into repository" -msgstr "[realizado commit via RhodeCode] para" +msgstr "[commitado via RhodeCode] no repositório" #: rhodecode/lib/helpers.py:763 -#, fuzzy msgid "[pulled from remote] into repository" -msgstr "[realizado pull remoto] para" +msgstr "[pulled do remote] no repositório" #: rhodecode/lib/helpers.py:765 msgid "[pulled] from" @@ -1061,44 +996,35 @@ msgstr "Nenhum Arquivo" #: rhodecode/lib/helpers.py:1158 -#, fuzzy msgid "new file" -msgstr "Adicionar novo arquivo" +msgstr "novo arquivo" #: rhodecode/lib/helpers.py:1161 -#, fuzzy msgid "mod" -msgstr "removidos" +msgstr "mod" #: rhodecode/lib/helpers.py:1164 -#, fuzzy msgid "del" msgstr "excluir" #: rhodecode/lib/helpers.py:1167 -#, fuzzy msgid "rename" -msgstr "Nome de usuário" +msgstr "renomear" #: rhodecode/lib/helpers.py:1172 msgid "chmod" -msgstr "" +msgstr "chmod" #: rhodecode/lib/helpers.py:1404 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" -msgstr "" -"repositório %s não está mapeado ao bd. Talvez ele tenha sido criado ou " -"renomeado a partir do sistema de arquivos. Por favor execute a aplicação " -"outra vez para varrer novamente por repositórios" +"%s repository is not mapped to db perhaps it was created or renamed from the" +" filesystem please run the application again in order to rescan repositories" +msgstr "O repositório %s não está mapeado ao BD. Talvez ele tenha sido criado ou renomeado a partir do sistema de arquivos. Por favor, execute a aplicação outra vez para varrer novamente por repositórios" #: rhodecode/lib/unionrepo.py:193 -#, fuzzy msgid "cannot create new union repository" -msgstr "repositório [criado]" +msgstr "não é possível criar novo repositório de união" #: rhodecode/lib/utils2.py:410 #, python-format @@ -1143,9 +1069,9 @@ msgstr[1] "%d segundos" #: rhodecode/lib/utils2.py:431 -#, fuzzy, python-format +#, python-format msgid "in %s" -msgstr "na linha %s" +msgstr "em %s" #: rhodecode/lib/utils2.py:433 #, python-format @@ -1153,9 +1079,9 @@ msgstr "%s atrás" #: rhodecode/lib/utils2.py:435 -#, fuzzy, python-format +#, python-format msgid "in %s and %s" -msgstr "%s e %s atrás" +msgstr "em %s e %s" #: rhodecode/lib/utils2.py:438 #, python-format @@ -1171,131 +1097,117 @@ #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 -#, fuzzy msgid "Repository no access" -msgstr "repositórios" +msgstr "Nenhum acesso ao repositório" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 -#, fuzzy msgid "Repository read access" -msgstr "Esse repositório já existe" +msgstr "Acesso de leitura ao repositório" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 -#, fuzzy msgid "Repository write access" -msgstr "repositórios" +msgstr "Acesso de escrita ao repositório" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 -#, fuzzy msgid "Repository admin access" -msgstr "repositórios" +msgstr "Acesso administrativo ao repositório" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 -#, fuzzy msgid "Repositories Group no access" -msgstr "grupos de repositórios" +msgstr "Nenhum acesso ao Grupo de Repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309 -#, fuzzy msgid "Repositories Group read access" -msgstr "grupos de repositórios" +msgstr "Acesso de leitura ao Grupo de Repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310 -#, fuzzy msgid "Repositories Group write access" -msgstr "grupos de repositórios" +msgstr "Acesso de escrita ao Grupo de Repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311 -#, fuzzy msgid "Repositories Group admin access" -msgstr "grupos de repositórios" +msgstr "Acesso administrativo ao Grupo de Repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411 -#, fuzzy msgid "RhodeCode Administrator" -msgstr "Administração de usuários" +msgstr "Administrador do RhodeCode" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434 -#, fuzzy msgid "Repository creation disabled" -msgstr "Criação de repositório" +msgstr "Criação de repositórios desabilitada" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435 -#, fuzzy msgid "Repository creation enabled" -msgstr "Criação de repositório" +msgstr "Criação de repositórios habilitada" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 -#, fuzzy msgid "Repository forking disabled" -msgstr "Criação de repositório" +msgstr "Bifurcação de repositórios desabilitada" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 -#, fuzzy msgid "Repository forking enabled" -msgstr "Criação de repositório" +msgstr "Bifurcação de repositórios habilitada" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403 -#, fuzzy msgid "Register disabled" -msgstr "desabilitado" +msgstr "Registro desabilitado" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404 msgid "Register new user with RhodeCode with manual activation" -msgstr "" +msgstr "Registro de novo usuário no RhodeCode com ativação manual" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with RhodeCode with auto activation" -msgstr "" +msgstr "Registro de novo usuário no RhodeCode com auto-ativação" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 @@ -1303,16 +1215,15 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939 msgid "Not Reviewed" -msgstr "" +msgstr "Não Revisado" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940 -#, fuzzy msgid "Approved" -msgstr "removidos" +msgstr "Aprovado" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 @@ -1320,7 +1231,7 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941 msgid "Rejected" -msgstr "" +msgstr "Rejeitado" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 @@ -1328,7 +1239,7 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942 msgid "Under Review" -msgstr "" +msgstr "Sob Revisão" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 @@ -1337,82 +1248,67 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 -#, fuzzy msgid "Repository group no access" -msgstr "grupos de repositórios" +msgstr "Sem acesso ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 -#, fuzzy msgid "Repository group read access" -msgstr "grupos de repositórios" +msgstr "Acesso de leitura ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 -#, fuzzy msgid "Repository group write access" -msgstr "grupos de repositórios" +msgstr "Acesso de escrita ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 -#, fuzzy msgid "Repository group admin access" -msgstr "grupos de repositórios" +msgstr "Acesso administrativo ao grupo de repositórios" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 -#, fuzzy msgid "User group no access" -msgstr "grupos de repositórios" +msgstr "Sem acesso ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 -#, fuzzy msgid "User group read access" -msgstr "grupos de repositórios" +msgstr "Acesso de leitura ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 -#, fuzzy msgid "User group write access" -msgstr "grupos de repositórios" +msgstr "Acesso de escrita ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 -#, fuzzy msgid "User group admin access" -msgstr "grupos de repositórios" +msgstr "Acesso administrativo ao grupo de usuários" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 -#, fuzzy msgid "Repository Group creation disabled" -msgstr "Criação de repositório" +msgstr "Criação de Grupo de Repositórios desatilibada" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 -#, fuzzy msgid "Repository Group creation enabled" -msgstr "Criação de repositório" +msgstr "Criação de Grupo de Repositórios habilitada" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 -#, fuzzy msgid "User Group creation disabled" -msgstr "Criação de repositório" +msgstr "Criação de Grupo de Usuários desabilitada" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 -#, fuzzy msgid "User Group creation enabled" -msgstr "Criação de repositório" +msgstr "Criação de Grupo de Usuários habilitada" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 -#, fuzzy msgid "Registration disabled" -msgstr "desabilitado" +msgstr "Registro desatilitado" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 -#, fuzzy msgid "User Registration with manual account activation" -msgstr "permitido com ativação manual de conta" +msgstr "Registro de Usuário com ativação manual de conta" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 -#, fuzzy msgid "User Registration with automatic account activation" -msgstr "permitido com ativação automática de conta" +msgstr "Registro de Usuário com ativação automática de conta" #: rhodecode/model/comment.py:75 #, python-format @@ -1442,151 +1338,133 @@ msgstr "Entre com %(min)i caracteres ou mais" #: rhodecode/model/notification.py:228 -#, fuzzy, python-format +#, python-format msgid "%(user)s commented on changeset at %(when)s" -msgstr "comentado no commit" +msgstr "%(user)s comentou no changeset em %(when)s" #: rhodecode/model/notification.py:229 -#, fuzzy, python-format +#, python-format msgid "%(user)s sent message at %(when)s" -msgstr "mensagem enviada" +msgstr "%(user)s enviou mensagem em %(when)s" #: rhodecode/model/notification.py:230 -#, fuzzy, python-format +#, python-format msgid "%(user)s mentioned you at %(when)s" -msgstr "mencionou você" +msgstr "%(user)s mencionou-o em %(when)s" #: rhodecode/model/notification.py:231 -#, fuzzy, python-format +#, python-format msgid "%(user)s registered in RhodeCode at %(when)s" -msgstr "registrado no RhodeCode" +msgstr "%(user)s registrou-se no RhodeCode em %(when)s" #: rhodecode/model/notification.py:232 -#, fuzzy, python-format +#, python-format msgid "%(user)s opened new pull request at %(when)s" -msgstr "comentado no commit" +msgstr "%(user)s abriu um novo pull request em %(when)s" #: rhodecode/model/notification.py:233 -#, fuzzy, python-format +#, python-format msgid "%(user)s commented on pull request at %(when)s" -msgstr "comentado no commit" +msgstr "%(user)s comentou no pull request em %(when)s" #: rhodecode/model/pull_request.py:98 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -msgstr "" +msgstr "%(user)s solicita sua revisão no pull request $%(pr_id)s: %(pr_title)s" #: rhodecode/model/scm.py:674 -#, fuzzy msgid "latest tip" -msgstr "último login" +msgstr "tip mais recente" #: rhodecode/model/user.py:232 -#, fuzzy msgid "New user registration" -msgstr "registro de novo usuário" +msgstr "Novo registro de usuário" #: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" -msgstr "" -"Você não pode Editar esse usuário, pois ele é crucial para toda a " -"aplicação" +msgstr "Você não pode Editar esse usuário, pois ele é crucial para toda a aplicação" #: rhodecode/model/user.py:303 msgid "You can't remove this user since it's crucial for entire application" -msgstr "" -"Você não pode remover esse usuário, pois ele é crucial para toda a " -"aplicação" +msgstr "Você não pode remover esse usuário, pois ele é crucial para toda a aplicação" #: rhodecode/model/user.py:309 #, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" -msgstr "" -"usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " -"Troque os donos ou remova esses repositórios. %s" +"user \"%s\" still owns %s repositories and cannot be removed. Switch owners " +"or remove those repositories. %s" +msgstr "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. Troque os donos ou remova esses repositórios. %s" #: rhodecode/model/user.py:334 -#, fuzzy msgid "Password reset link" -msgstr "link de reinicialização de senha" +msgstr "Link para trocar senha" #: rhodecode/model/user.py:366 -#, fuzzy msgid "Your new password" -msgstr "Nova senha" +msgstr "Sua nova senha" #: rhodecode/model/user.py:367 #, python-format msgid "Your new RhodeCode password:%s" -msgstr "" +msgstr "Sua nova senha no RhodeCode: %s" #: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" -msgstr "" +msgstr "O valor não pode ser uma lista vazia" #: rhodecode/model/validators.py:85 -#, fuzzy, python-format +#, python-format msgid "Username \"%(username)s\" already exists" -msgstr "Esse nome de usuário já existe" +msgstr "O username \\\"%(username)s\\\" já existe" #: rhodecode/model/validators.py:87 #, python-format msgid "Username \"%(username)s\" is forbidden" -msgstr "" +msgstr "O username \\\"%(username)s\\\" é proibido" #: rhodecode/model/validators.py:89 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character or underscore" -msgstr "" -"Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, " -"pontos e hífens e deve iniciar com caractere alfanumérico" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with alphanumeric character or underscore" +msgstr "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere alfanumérico" #: rhodecode/model/validators.py:117 -#, fuzzy, python-format +#, python-format msgid "Username %(username)s is not valid" -msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido" +msgstr "O username \"%(username)s\" não é válido" #: rhodecode/model/validators.py:136 -#, fuzzy msgid "Invalid user group name" -msgstr "nome de usuário inválido" +msgstr "Nome inválido de grupo de usuários" #: rhodecode/model/validators.py:137 -#, fuzzy, python-format +#, python-format msgid "User group \"%(usergroup)s\" already exists" -msgstr "Esse grupo de usuários já existe" +msgstr "O grupo de usuários \"%(usergroup)s\" já existe" #: rhodecode/model/validators.py:139 -#, fuzzy msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "" -"Nome de grupo de repositório pode conter somente caracteres " -"alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere " -"alfanumérico" +msgstr "O nome de um grupo de usuários só pode conter characters alfa-numéricos, underscores, pontos ou hífens, e deve começar om um caractere alfa-numérico" #: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" msgstr "Não é possível associar esse grupo como progenitor" #: rhodecode/model/validators.py:178 -#, fuzzy, python-format +#, python-format msgid "Group \"%(group_name)s\" already exists" -msgstr "Esse nome de usuário já existe" +msgstr "O grupo \\\"%(group_name)s\\\" já existe" #: rhodecode/model/validators.py:180 -#, fuzzy, python-format +#, python-format msgid "Repository with name \"%(group_name)s\" already exists" -msgstr "Já existe um repositório com esse nome" +msgstr "Um repositório com o nome \"%(group_name)s\" já existe" #: rhodecode/model/validators.py:238 -#, fuzzy msgid "Invalid characters (non-ascii) in password" -msgstr "Caracteres inválidos na senha" +msgstr "Caracteres inválidos (não-ascii) na senha" #: rhodecode/model/validators.py:253 msgid "Passwords do not match" @@ -1605,58 +1483,52 @@ msgstr "Sua conta está desabilitada" #: rhodecode/model/validators.py:316 -#, fuzzy, python-format +#, python-format msgid "Repository name %(repo)s is disallowed" -msgstr "Esse nome de repositório não é permitido" +msgstr "O nome de repositório %(repo)s não é permitido" #: rhodecode/model/validators.py:318 -#, fuzzy, python-format +#, python-format msgid "Repository named %(repo)s already exists" -msgstr "Já existe um repositório com esse nome" +msgstr "Um repositório chamado %(repo)s já existe" #: rhodecode/model/validators.py:319 -#, fuzzy, python-format +#, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" -msgstr "Esse repositório já existe em um grupo \"%s\"" +msgstr "Um repositório \"%(repo)s\" já existe no grupo \"%(group)s\"" #: rhodecode/model/validators.py:321 -#, fuzzy, python-format +#, python-format msgid "Repository group with name \"%(repo)s\" already exists" -msgstr "Já existe um repositório com esse nome" +msgstr "Um Grupo de Repositórios chamado \"%(repo)s\" já existe" #: rhodecode/model/validators.py:438 msgid "invalid clone url" msgstr "URL de clonagem inválida" #: rhodecode/model/validators.py:439 -#, fuzzy msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s" +msgstr "URL inválida, por favor, forneça uma URL de clone http(s)/svn+http(s)" #: rhodecode/model/validators.py:464 -#, fuzzy msgid "Fork have to be the same type as parent" -msgstr "Bifurcação precisa ser do mesmo tipo que o original" +msgstr "A bifurcação deve ser do mesmo tipo que o pai" #: rhodecode/model/validators.py:479 -#, fuzzy msgid "You don't have permissions to create repository in this group" -msgstr "Você não tem permissão para ver esta página" +msgstr "Você não tem permissão para criar um repositório neste grupo" #: rhodecode/model/validators.py:481 -#, fuzzy msgid "no permission to create repository in root location" -msgstr "Você não tem permissão para ver esta página" +msgstr "você não tem permissão para criar um repositório na raiz" #: rhodecode/model/validators.py:518 -#, fuzzy msgid "You don't have permissions to create a group in this location" -msgstr "Você não tem permissão para ver esta página" +msgstr "Você não tem permissão para criar um grupo neste local" #: rhodecode/model/validators.py:559 -#, fuzzy msgid "This username or user group name is not valid" -msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido" +msgstr "Este nome de usuário ou de grupo de usuários não é válido" #: rhodecode/model/validators.py:652 msgid "This is not a valid path" @@ -1667,17 +1539,15 @@ msgstr "Esse endereço de e-mail já está tomado" #: rhodecode/model/validators.py:687 -#, fuzzy, python-format +#, python-format msgid "e-mail \"%(email)s\" does not exist." -msgstr "Esse endereço de e-mail não existe." +msgstr "o e-mail \"%(email)s\" não existe." #: rhodecode/model/validators.py:724 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name " -"of the attribute that is equivalent to \"username\"" -msgstr "" -"O atributo de login LDAP do CN deve ser especificado - isto é o nome do " -"atributo que é equivalente ao 'nome de usuário'" +"The LDAP Login attribute of the CN must be specified - this is the name of " +"the attribute that is equivalent to \"username\"" +msgstr "O atributo de login LDAP do CN deve ser especificado - isto é o nome do atributo que é equivalente ao 'nome de usuário'" #: rhodecode/model/validators.py:737 #, python-format @@ -1686,20 +1556,21 @@ #: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" -msgstr "" +msgstr "Por favor, forneça um endereço válido IPv4 ou IPv6" #: rhodecode/model/validators.py:770 #, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "O tamanho da rede (bits) deve estar no intervalo 0-32 (não %(bits)r)" #: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" -msgstr "" +msgstr "O nome da chave só pode conter letras, underscore, hífen ou dígitos" #: rhodecode/model/validators.py:817 msgid "Filename cannot be inside a directory" -msgstr "" +msgstr "O nome de arquivo não pode estar dentro de um diretório" #: rhodecode/templates/index.html:5 msgid "Dashboard" @@ -1727,25 +1598,23 @@ #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repos.html:21 +#: rhodecode/templates/admin/repos/repos.html:22 msgid "Add repository" msgstr "Adicionar repositório" #: rhodecode/templates/index_base.html:15 #: rhodecode/templates/index_base.html:20 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 -#, fuzzy msgid "Add group" -msgstr "editar grupo de repositórios" +msgstr "Adicionar grupo" #: rhodecode/templates/index_base.html:27 -#, fuzzy msgid "Edit group" -msgstr "editar grupo de repositórios" +msgstr "Editar grupo" #: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" -msgstr "" +msgstr "Você tem direitos de administrador neste grupo e pode editá-lo" #: rhodecode/templates/index_base.html:40 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 @@ -1761,7 +1630,7 @@ #: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:68 -#: rhodecode/templates/admin/repos/repos.html:73 +#: rhodecode/templates/admin/repos/repos.html:75 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 @@ -1786,7 +1655,7 @@ #: rhodecode/templates/index_base.html:121 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:71 +#: rhodecode/templates/admin/repos/repos.html:73 #: rhodecode/templates/admin/users/user_edit_my_account.html:172 #: rhodecode/templates/base/perms_summary.html:37 #: rhodecode/templates/bookmarks/bookmarks.html:48 @@ -1808,7 +1677,7 @@ msgstr "Última Alteração" #: rhodecode/templates/index_base.html:126 -#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/repos/repos.html:76 #: rhodecode/templates/admin/users/user_edit_my_account.html:174 #: rhodecode/templates/journal/journal.html:195 #: rhodecode/templates/journal/journal.html:285 @@ -1817,12 +1686,12 @@ #: rhodecode/templates/index_base.html:128 #: rhodecode/templates/admin/repos/repo_edit.html:114 -#: rhodecode/templates/admin/repos/repos.html:76 +#: rhodecode/templates/admin/repos/repos.html:78 msgid "Owner" msgstr "Dono" #: rhodecode/templates/index_base.html:136 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:86 #: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:74 @@ -1834,7 +1703,7 @@ msgstr "Clique para ordenar em ordem crescente" #: rhodecode/templates/index_base.html:137 -#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/repos/repos.html:87 #: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:75 @@ -1846,12 +1715,11 @@ msgstr "Clique para ordenar em ordem descrescente" #: rhodecode/templates/index_base.html:138 -#, fuzzy msgid "No repositories found." -msgstr "grupos de repositórios" +msgstr "Nenhum repositório encontrado." #: rhodecode/templates/index_base.html:139 -#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/repos/repos.html:89 #: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:77 @@ -1863,7 +1731,7 @@ msgstr "Erro de dados." #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos/repos.html:88 +#: rhodecode/templates/admin/repos/repos.html:90 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 #: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 @@ -1882,7 +1750,7 @@ #: rhodecode/templates/login.html:21 #, python-format msgid "Log In to %s" -msgstr "" +msgstr "Log in em %s" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 @@ -1919,9 +1787,8 @@ msgstr "Não possui uma conta ?" #: rhodecode/templates/password_reset.html:5 -#, fuzzy msgid "Password Reset" -msgstr "link de reinicialização de senha" +msgstr "Senha Trocada" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1937,9 +1804,7 @@ #: rhodecode/templates/password_reset.html:31 msgid "Password reset link will be send to matching email address" -msgstr "" -"Link de reinicialização de senha será enviado ao endereço de e-mail " -"correspondente" +msgstr "Link de reinicialização de senha será enviado ao endereço de e-mail correspondente" #: rhodecode/templates/register.html:5 rhodecode/templates/register.html:74 msgid "Sign Up" @@ -2020,26 +1885,24 @@ msgstr "Diário do administrador" #: rhodecode/templates/admin/admin.html:10 -#, fuzzy msgid "journal filter..." -msgstr "filtro rápido..." +msgstr "filtro de diário..." #: rhodecode/templates/admin/admin.html:12 #: rhodecode/templates/journal/journal.html:11 -#, fuzzy msgid "filter" -msgstr "arquivos" +msgstr "filtro" #: rhodecode/templates/admin/admin.html:13 #: rhodecode/templates/journal/journal.html:12 #, python-format msgid "%s entry" msgid_plural "%s entries" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s entrada" +msgstr[1] "%s entradas" #: rhodecode/templates/admin/admin_log.html:6 -#: rhodecode/templates/admin/repos/repos.html:77 +#: rhodecode/templates/admin/repos/repos.html:79 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 #: rhodecode/templates/admin/users/user_edit_my_account.html:176 #: rhodecode/templates/admin/users/users.html:87 @@ -2074,15 +1937,13 @@ #: rhodecode/templates/admin/defaults/defaults.html:5 #: rhodecode/templates/admin/defaults/defaults.html:25 -#, fuzzy msgid "Repositories defaults" -msgstr "grupos de repositórios" +msgstr "Padrões de repositórios" #: rhodecode/templates/admin/defaults/defaults.html:11 #: rhodecode/templates/base/base.html:80 -#, fuzzy msgid "Defaults" -msgstr "excluir" +msgstr "Padrões" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 @@ -2096,9 +1957,7 @@ msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." -msgstr "" -"Repositórios privados são visíveis somente por pessoas explicitamente " -"adicionadas como colaboradores." +msgstr "Repositórios privados são visíveis somente por pessoas explicitamente adicionadas como colaboradores." #: rhodecode/templates/admin/defaults/defaults.html:55 #: rhodecode/templates/admin/repos/repo_edit.html:87 @@ -2123,14 +1982,13 @@ #: rhodecode/templates/admin/defaults/defaults.html:75 #: rhodecode/templates/admin/repos/repo_edit.html:105 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 -#, fuzzy msgid "Enable locking" -msgstr "habilitar" +msgstr "Habilitar travas" #: rhodecode/templates/admin/defaults/defaults.html:79 #: rhodecode/templates/admin/repos/repo_edit.html:109 msgid "Enable lock-by-pulling on repository." -msgstr "" +msgstr "Habilitar trava-por-pulling no repositório." #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 @@ -2153,70 +2011,64 @@ #: rhodecode/templates/admin/gists/index.html:5 #: rhodecode/templates/base/base.html:299 msgid "Gists" -msgstr "" +msgstr "Gists" #: rhodecode/templates/admin/gists/index.html:10 -#, fuzzy, python-format +#, python-format msgid "Private Gists for user %s" -msgstr "usuário %s criado" +msgstr "Gists privados do usuário %s" #: rhodecode/templates/admin/gists/index.html:12 #, python-format msgid "Public Gists for user %s" -msgstr "" +msgstr "Gists públicos do usuário %s" #: rhodecode/templates/admin/gists/index.html:14 msgid "Public Gists" -msgstr "" +msgstr "Gists Públicos" #: rhodecode/templates/admin/gists/index.html:31 #: rhodecode/templates/admin/gists/show.html:24 #: rhodecode/templates/base/base.html:302 -#, fuzzy msgid "Create new gist" -msgstr "Criar novo arquivo" +msgstr "Criar novo gist" #: rhodecode/templates/admin/gists/index.html:48 -#, fuzzy msgid "Created" -msgstr "ler" +msgstr "Criado" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/index.html:53 #: rhodecode/templates/admin/gists/show.html:43 #: rhodecode/templates/admin/gists/show.html:45 -#, fuzzy msgid "Expires" -msgstr "Repositórios" +msgstr "Expira" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/show.html:43 -#, fuzzy msgid "never" -msgstr "Dono" +msgstr "nunca" #: rhodecode/templates/admin/gists/index.html:68 -#, fuzzy msgid "There are no gists yet" -msgstr "Ainda não há etiquetas" +msgstr "Não há nenhum gist ainda" #: rhodecode/templates/admin/gists/new.html:5 #: rhodecode/templates/admin/gists/new.html:16 msgid "New gist" -msgstr "" +msgstr "Novo gist" #: rhodecode/templates/admin/gists/new.html:37 -#, fuzzy msgid "Gist description ..." -msgstr "Descrição" +msgstr "Descrição do gist ..." #: rhodecode/templates/admin/gists/new.html:52 msgid "Create private gist" -msgstr "" +msgstr "Criar gist privado" #: rhodecode/templates/admin/gists/new.html:53 msgid "Create public gist" -msgstr "" +msgstr "Criar gist público" #: rhodecode/templates/admin/gists/new.html:54 #: rhodecode/templates/admin/permissions/permissions.html:123 @@ -2243,20 +2095,19 @@ #: rhodecode/templates/admin/gists/show.html:5 msgid "gist" -msgstr "" +msgstr "gist" #: rhodecode/templates/admin/gists/show.html:9 msgid "Gist" -msgstr "" +msgstr "Gist" #: rhodecode/templates/admin/gists/show.html:36 msgid "Public gist" -msgstr "" +msgstr "Gist público" #: rhodecode/templates/admin/gists/show.html:38 -#, fuzzy msgid "Private gist" -msgstr "repositório privado" +msgstr "Gist privado" #: rhodecode/templates/admin/gists/show.html:54 #: rhodecode/templates/admin/repos/repo_edit.html:299 @@ -2265,23 +2116,20 @@ msgstr "Excluir" #: rhodecode/templates/admin/gists/show.html:54 -#, fuzzy msgid "Confirm to delete this gist" -msgstr "Confirma excluir este usuário: %s" +msgstr "Confirme para excluir este gist" #: rhodecode/templates/admin/gists/show.html:63 #: rhodecode/templates/admin/gists/show.html:84 #: rhodecode/templates/files/files_edit.html:48 #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 -#, fuzzy msgid "Show as raw" -msgstr "mostrar como bruto" +msgstr "Mostrar original" #: rhodecode/templates/admin/gists/show.html:71 -#, fuzzy msgid "created" -msgstr "ler" +msgstr "criado" #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" @@ -2290,9 +2138,8 @@ #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 #: rhodecode/templates/base/base.html:79 -#, fuzzy msgid "LDAP" -msgstr "ldap" +msgstr "LDAP" #: rhodecode/templates/admin/ldap/ldap.html:28 msgid "Connection settings" @@ -2365,17 +2212,16 @@ #: rhodecode/templates/admin/notifications/notifications.html:29 msgid "All" -msgstr "" +msgstr "Todos" #: rhodecode/templates/admin/notifications/notifications.html:30 -#, fuzzy msgid "Comments" -msgstr "commits" +msgstr "Comentários" #: rhodecode/templates/admin/notifications/notifications.html:31 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 msgid "Pull requests" -msgstr "" +msgstr "Pull requests" #: rhodecode/templates/admin/notifications/notifications.html:35 msgid "Mark all read" @@ -2420,82 +2266,64 @@ msgstr "Acesso anônimo" #: rhodecode/templates/admin/permissions/permissions.html:49 -#, fuzzy msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will " -"be lost" -msgstr "" -"Todas as permissões padrão em cada repositório serão reinicializadas para" -" as permissões escolhidas. Note que todas as permissões padrão " -"customizadas nos repositórios serão perdidas" +"permission, note that all custom default permission on repositories will be " +"lost" +msgstr "Todas as permissões padrão em cada repositório serão modificadas para a permissão escolhida, note que todas as permissões padrão customizadas nos repositórios serão perdidas" #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 #: rhodecode/templates/admin/permissions/permissions.html:77 -#, fuzzy msgid "Overwrite existing settings" -msgstr "sobrescrever configurações existentes" +msgstr "Sobrescrever as configurações existentes" #: rhodecode/templates/admin/permissions/permissions.html:62 -#, fuzzy msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "" -"Todas as permissões padrão em cada repositório serão reinicializadas para" -" as permissões escolhidas. Note que todas as permissões padrão " -"customizadas nos repositórios serão perdidas" +msgstr "Todas as permissões padrão em cada grupo de repositórios serão modificadas para a permissão escolhida, note que todas as permissões padrão customizadas em grupos de repositórios serão perdidas" #: rhodecode/templates/admin/permissions/permissions.html:69 -#, fuzzy msgid "User group" -msgstr "grupos de usuários" +msgstr "Grupo de usuários" #: rhodecode/templates/admin/permissions/permissions.html:76 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "" -"Todas as permissões padrão em cada repositório serão reinicializadas para" -" as permissões escolhidas. Note que todas as permissões padrão " -"customizadas nos repositórios serão perdidas" +msgstr "Todas as permissões padrão em cada repositório serão reinicializadas para as permissões escolhidas. Note que todas as permissões padrão customizadas nos repositórios serão perdidas" #: rhodecode/templates/admin/permissions/permissions.html:83 msgid "Repository creation" msgstr "Criação de repositório" #: rhodecode/templates/admin/permissions/permissions.html:91 -#, fuzzy msgid "User group creation" -msgstr "Administração de grupos de usuários" +msgstr "Criação de grupo de usuários" #: rhodecode/templates/admin/permissions/permissions.html:99 -#, fuzzy msgid "Repository forking" -msgstr "Criação de repositório" +msgstr "Bifurcação de repositório" #: rhodecode/templates/admin/permissions/permissions.html:107 msgid "Registration" msgstr "Registro" #: rhodecode/templates/admin/permissions/permissions.html:115 -#, fuzzy msgid "External auth account activation" -msgstr "permitido com ativação automática de conta" +msgstr "Ativação de autenticação de conta externa" #: rhodecode/templates/admin/permissions/permissions.html:133 -#, fuzzy msgid "Default User Permissions" -msgstr "Permissões padrão" +msgstr "Permissões Padrão de Usuários" #: rhodecode/templates/admin/permissions/permissions.html:144 #: rhodecode/templates/admin/users/user_edit.html:207 -#, fuzzy msgid "Allowed IP addresses" -msgstr "Endereço de e-mail" +msgstr "Endereços IP permitidos" #: rhodecode/templates/admin/permissions/permissions.html:158 #: rhodecode/templates/admin/repos/repo_edit.html:340 @@ -2510,29 +2338,27 @@ #: rhodecode/templates/admin/permissions/permissions.html:159 #: rhodecode/templates/admin/users/user_edit.html:221 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this ip: %s" -msgstr "Confirma excluir este usuário: %s" +msgstr "Confirme para excluir este IP: %s" #: rhodecode/templates/admin/permissions/permissions.html:165 #: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" -msgstr "" +msgstr "Todos os endereços IP são permitidos" #: rhodecode/templates/admin/permissions/permissions.html:176 #: rhodecode/templates/admin/users/user_edit.html:238 -#, fuzzy msgid "New ip address" -msgstr "Endereço de e-mail" +msgstr "Novo endereço IP" #: rhodecode/templates/admin/permissions/permissions.html:184 #: rhodecode/templates/admin/repos/repo_add_base.html:73 #: rhodecode/templates/admin/repos/repo_edit.html:380 #: rhodecode/templates/admin/users/user_edit.html:197 #: rhodecode/templates/admin/users/user_edit.html:245 -#, fuzzy msgid "Add" -msgstr "adicionar" +msgstr "Adicionar" #: rhodecode/templates/admin/repos/repo_add.html:12 #: rhodecode/templates/admin/repos/repo_add.html:16 @@ -2543,9 +2369,8 @@ msgstr "Repositórios" #: rhodecode/templates/admin/repos/repo_add.html:19 -#, fuzzy msgid "Add new" -msgstr "adicionar novo" +msgstr "Adicionar novo" #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:96 @@ -2560,9 +2385,8 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:33 #: rhodecode/templates/forks/fork.html:51 -#, fuzzy msgid "Optionaly select a group to put this repository into." -msgstr "Opcionalmente selecione um grupo no qual colocar esse repositório." +msgstr "Opcionalmente, selecione um grupo no qual colocar este repositório" #: rhodecode/templates/admin/repos/repo_add_base.html:42 msgid "Type of repository to create." @@ -2571,23 +2395,21 @@ #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:59 #: rhodecode/templates/forks/fork.html:38 -#, fuzzy msgid "Landing revision" -msgstr "próxima revisão" +msgstr "Revisão de pouso" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:63 #: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" +msgstr "Revisão padrão para página de arquivos, downloads, whoosh e readme" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 -msgid "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" -"Seja sucinto e objetivo. Use um arquivo README para descrições mais " -"longas." +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." +msgstr "Seja sucinto e objetivo. Use um arquivo README para descrições mais longas." #: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" @@ -2596,15 +2418,15 @@ #: rhodecode/templates/admin/repos/repo_edit.html:12 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:11 -#: rhodecode/templates/base/base.html:81 rhodecode/templates/base/base.html:134 +#: rhodecode/templates/base/base.html:81 +#: rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "Configurações" #: rhodecode/templates/admin/repos/repo_edit.html:36 -#, fuzzy msgid "Non-changeable id" -msgstr "ID não alterável %s" +msgstr "ID inalterável" #: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" @@ -2619,9 +2441,8 @@ msgstr "Mudar o dono desse repositório." #: rhodecode/templates/admin/repos/repo_edit.html:177 -#, fuzzy msgid "Advanced settings" -msgstr "Salvar configurações" +msgstr "Configurações avançadas" #: rhodecode/templates/admin/repos/repo_edit.html:180 msgid "Statistics" @@ -2669,22 +2490,21 @@ #: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" -msgstr "" +"Manually invalidate cache for this repository. On first access repository " +"will be cached again" +msgstr "Invalidar manualmente o cache deste repositório. No próximo acesso o repositório será cacheado novamente" #: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" -msgstr "" +msgstr "Lista de valores cacheados" #: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" -msgstr "" +msgstr "Prefixo" #: rhodecode/templates/admin/repos/repo_edit.html:227 -#, fuzzy msgid "Key" -msgstr "Chave de API" +msgstr "Chave" #: rhodecode/templates/admin/repos/repo_edit.html:228 #: rhodecode/templates/admin/users/user_add.html:86 @@ -2712,58 +2532,50 @@ #: rhodecode/templates/admin/repos/repo_edit.html:256 msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" -msgstr "" -"Todas as ações feitas nesse repositório serão acessíveis a todos no " -"diário público" +"All actions made on this repository will be accessible to everyone in public" +" journal" +msgstr "Todas as ações feitas nesse repositório serão acessíveis a todos no diário público" #: rhodecode/templates/admin/repos/repo_edit.html:263 -#, fuzzy msgid "Locking" -msgstr "destravar" +msgstr "Travamento" #: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" -msgstr "" +msgstr "Destravar repo travado" #: rhodecode/templates/admin/repos/repo_edit.html:268 -#, fuzzy msgid "Confirm to unlock repository" -msgstr "Confirma excluir este repositório" +msgstr "Confirme para destravar repositório" #: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Lock repo" -msgstr "" +msgstr "Travar repo" #: rhodecode/templates/admin/repos/repo_edit.html:271 -#, fuzzy msgid "Confirm to lock repository" -msgstr "Confirma excluir este repositório" +msgstr "Confirme para travar repositório" #: rhodecode/templates/admin/repos/repo_edit.html:272 -#, fuzzy msgid "Repository is not locked" -msgstr "repositórios" +msgstr "Repositório não está travado" #: rhodecode/templates/admin/repos/repo_edit.html:277 -msgid "Force locking on repository. Works only when anonymous access is disabled" -msgstr "" +msgid "" +"Force locking on repository. Works only when anonymous access is disabled" +msgstr "Forçar travamento no repositório. Só funciona quando o acesso anônimo está desabilitado" #: rhodecode/templates/admin/repos/repo_edit.html:284 -#, fuzzy msgid "Set as fork of" -msgstr "Marcar como bifurcação" +msgstr "Marque como bifurcação de" #: rhodecode/templates/admin/repos/repo_edit.html:289 -#, fuzzy msgid "Set" -msgstr "ajustar" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:293 -#, fuzzy msgid "Manually set this repository as a fork of another from the list" -msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro" +msgstr "Marque manualmente este repositório como uma bifurcação de um outro da lista" #: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Remove this repository" @@ -2774,64 +2586,55 @@ msgstr "Confirma excluir este repositório" #: rhodecode/templates/admin/repos/repo_edit.html:310 -#, fuzzy, python-format +#, python-format msgid "this repository has %s fork" msgid_plural "this repository has %s forks" -msgstr[0] "repositório [criado] como uma bifurcação" -msgstr[1] "" +msgstr[0] "este repositório tem %s bifurcação" +msgstr[1] "este repositório tem %s bifurcações" #: rhodecode/templates/admin/repos/repo_edit.html:311 -#, fuzzy msgid "Detach forks" -msgstr "Marcar como bifurcação" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:312 -#, fuzzy msgid "Delete forks" -msgstr "excluir" +msgstr "Excluir bifurcações" #: rhodecode/templates/admin/repos/repo_edit.html:315 -#, fuzzy msgid "" -"This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" -" from file system please do it manually" -msgstr "" -"Este repositório será renomeado de uma maneira especial, de forma a ser " -"inacessível ao RhodeCode e sistemas de controle de versão.\n" -" Se você precisa exclui-lo completamente do " -"sistema de arquivos, por favor faça-o manualmente" +"This repository will be renamed in a special way in order to be unaccesible " +"for RhodeCode and VCS systems. If you need to fully delete it from file " +"system please do it manually" +msgstr "Este repositório será renomeado de um modo especial para não ser mais acessívei pelo RhodeCode ou outros sistemas VCS. Se você precisa excluí-lo totalmente do sistema de arquivos, por favor, faça-o manualmente" #: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" -msgstr "" +msgstr "Campos extras" #: rhodecode/templates/admin/repos/repo_edit.html:341 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this field: %s" -msgstr "Confirma excluir este usuário: %s" +msgstr "Confirme para excluir este campo: %s" #: rhodecode/templates/admin/repos/repo_edit.html:355 -#, fuzzy msgid "New field key" -msgstr "adicionar novo arquivo" +msgstr "Próxima chave de campo" #: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" -msgstr "" +msgstr "Próximo rótulo de campo" #: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" -msgstr "" +msgstr "Entre com o rótulo curto" #: rhodecode/templates/admin/repos/repo_edit.html:372 -#, fuzzy msgid "New field description" -msgstr "Descrição" +msgstr "Nova descrição de campo" #: rhodecode/templates/admin/repos/repo_edit.html:375 msgid "Enter description of a field" -msgstr "" +msgstr "Entre com a descrição de um campo" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 @@ -2873,9 +2676,8 @@ #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 #: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20 #: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35 -#, fuzzy msgid "default" -msgstr "excluir" +msgstr "padrão" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 @@ -2896,7 +2698,7 @@ msgid "Repositories administration" msgstr "Administração de repositórios" -#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:185 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:76 @@ -2909,18 +2711,18 @@ #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "apply to children" -msgstr "" +msgstr "aplicar aos filhos" #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" -msgstr "" +msgstr "Dar ou revocar permissão de todos os filhos daquele grupo, incluindo repositórios públicos e outros grupos" #: rhodecode/templates/admin/repos_groups/repos_groups.html:4 #, python-format msgid "%s Group Dashboard" -msgstr "" +msgstr "Dashboard de Grupo %s" #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 msgid "Home" @@ -2931,22 +2733,19 @@ msgstr "com" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -#, fuzzy msgid "Add repository group" -msgstr "Grupo de repositórios" +msgstr "Adicionar grupo de repositórios" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 #: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 -#, fuzzy msgid "Repository groups" msgstr "Grupo de repositórios" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 -#, fuzzy msgid "Add new repository group" -msgstr "adicionar novo grupo de repositórios" +msgstr "Adicionar novo grupo de repositórios" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 @@ -2958,28 +2757,25 @@ msgstr "salvar" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -#, fuzzy msgid "Edit repository group" -msgstr "editar grupo de repositórios" +msgstr "Editar grupo de repositórios" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 -#, fuzzy, python-format +#, python-format msgid "Edit repository group %s" -msgstr "editar grupo de repositórios" +msgstr "Editar grupo de repositórios %s" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 -#, fuzzy msgid "Add child group" -msgstr "Adicionar novo grupo de usuários" +msgstr "Adicionar grupo filho" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" -msgstr "" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "Habilitar trava-por-pulling no grupo. Esta opção será aplicada a todos os outros grupos e repositórios dentro deles" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -#, fuzzy msgid "Repository groups administration" msgstr "Administração de grupos de repositórios" @@ -2991,9 +2787,8 @@ #: rhodecode/templates/admin/users_groups/users_groups.html:48 #: rhodecode/templates/changeset/changeset_file_comment.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:171 -#, fuzzy msgid "Edit" -msgstr "editar" +msgstr "Editar" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 #: rhodecode/templates/admin/users_groups/users_groups.html:49 @@ -3008,16 +2803,15 @@ msgstr "editar" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" -msgstr[0] "Confirma excluir este repositório" -msgstr[1] "" +msgstr[0] "Confirme para excluir este grupo: %s com %s repositório" +msgstr[1] "Confirme para excluir este grupo: %s com %s repositórios" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 -#, fuzzy msgid "There are no repository groups yet" -msgstr "Ainda não há grupos de repositórios" +msgstr "Não há nenhum grupo de repositório ainda" #: rhodecode/templates/admin/settings/hooks.html:5 #: rhodecode/templates/admin/settings/settings.html:5 @@ -3045,30 +2839,25 @@ msgstr "Remapear e varrer novamente repositórios" #: rhodecode/templates/admin/settings/settings.html:34 -#, fuzzy msgid "Rescan option" -msgstr "opção de varredura" +msgstr "Opção de varredura" #: rhodecode/templates/admin/settings/settings.html:40 msgid "" -"In case a repository was deleted from filesystem and there are leftovers " -"in the database check this option to scan obsolete data in database and " -"remove it." -msgstr "" -"Caso um repositório tenha sido excluído do sistema de arquivos e haja " -"restos no banco de dados, marque esta opção para varrer dados obsoletos " -"no banco e removê-los." +"In case a repository was deleted from filesystem and there are leftovers in " +"the database check this option to scan obsolete data in database and remove " +"it." +msgstr "Caso um repositório tenha sido excluído do sistema de arquivos e haja restos no banco de dados, marque esta opção para varrer dados obsoletos no banco e removê-los." #: rhodecode/templates/admin/settings/settings.html:41 -#, fuzzy msgid "Destroy old data" -msgstr "destruir dados antigos" +msgstr "Destruir dados antigos" #: rhodecode/templates/admin/settings/settings.html:43 msgid "" -"Rescan repositories location for new repositories. Also deletes obsolete " -"if `destroy` flag is checked " -msgstr "" +"Rescan repositories location for new repositories. Also deletes obsolete if " +"`destroy` flag is checked " +msgstr "Local de varredura para novos repositórios. Também exclui obsoletos se a opção `destruir` estiver habilitada" #: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" @@ -3079,14 +2868,12 @@ msgstr "Indexação do Whoosh" #: rhodecode/templates/admin/settings/settings.html:62 -#, fuzzy msgid "Index build option" -msgstr "opção de construção de índice" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:67 -#, fuzzy msgid "Build from scratch" -msgstr "construir do início" +msgstr "Construir do zero" #: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" @@ -3098,15 +2885,15 @@ #: rhodecode/templates/admin/settings/settings.html:88 msgid "Site branding" -msgstr "" +msgstr "Marca do site" #: rhodecode/templates/admin/settings/settings.html:97 msgid "HTTP authentication realm" -msgstr "" +msgstr "Realm de autenticação HTTP" #: rhodecode/templates/admin/settings/settings.html:106 msgid "Google Analytics code" -msgstr "" +msgstr "Código do Google Analytics" #: rhodecode/templates/admin/settings/settings.html:114 #: rhodecode/templates/admin/settings/settings.html:195 @@ -3115,90 +2902,80 @@ msgstr "Salvar configurações" #: rhodecode/templates/admin/settings/settings.html:121 -#, fuzzy msgid "Visualisation settings" -msgstr "Configurações globais da aplicação" +msgstr "Configurações de visualização" #: rhodecode/templates/admin/settings/settings.html:129 -#, fuzzy msgid "General" -msgstr "habilitar" +msgstr "Geral" #: rhodecode/templates/admin/settings/settings.html:134 -#, fuzzy msgid "Use repository extra fields" -msgstr "repositórios" +msgstr "Usar campos extras do repositório" #: rhodecode/templates/admin/settings/settings.html:136 msgid "Allows storing additional customized fields per repository." -msgstr "" +msgstr "Permite armazenar campos customizados adicionais por repositório." #: rhodecode/templates/admin/settings/settings.html:139 msgid "Show RhodeCode version" -msgstr "" +msgstr "Mostrar versão do RhodeCode" #: rhodecode/templates/admin/settings/settings.html:141 msgid "Shows or hides displayed version of RhodeCode in the footer" -msgstr "" +msgstr "Mostra ou esconde a versão do RhodeCode no rodapé" #: rhodecode/templates/admin/settings/settings.html:146 -#, fuzzy msgid "Dashboard items" -msgstr "Painel de Controle" +msgstr "Itens do dashboard" #: rhodecode/templates/admin/settings/settings.html:150 msgid "" "Number of items displayed in lightweight dashboard before pagination is " "shown." -msgstr "" +msgstr "Número de itens apresentados no dashboard leve antes de mostrar a paginação." #: rhodecode/templates/admin/settings/settings.html:155 -#, fuzzy msgid "Icons" -msgstr "Opções" +msgstr "Ícones" #: rhodecode/templates/admin/settings/settings.html:160 msgid "Show public repo icon on repositories" -msgstr "" +msgstr "Mostrar ícone de repositório público nos repositórios" #: rhodecode/templates/admin/settings/settings.html:164 -#, fuzzy msgid "Show private repo icon on repositories" -msgstr "repositório privado" +msgstr "Mostrar ícone de repositório privado nos repositórios" #: rhodecode/templates/admin/settings/settings.html:166 -#, fuzzy msgid "Show public/private icons next to repositories names" -msgstr "repositório privado" +msgstr "Mostrar ícones público/privado ao lado dos nomes dos repositórios" #: rhodecode/templates/admin/settings/settings.html:172 -#, fuzzy msgid "Meta-Tagging" -msgstr "configurações" +msgstr "Meta-Tagging" #: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" -msgstr "" +msgstr "Estilizar as metatags reconhecidas:" #: rhodecode/templates/admin/settings/settings.html:204 -#, fuzzy msgid "VCS settings" -msgstr "configurações" +msgstr "Configurações de VCS" #: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" msgstr "Web" #: rhodecode/templates/admin/settings/settings.html:218 -#, fuzzy msgid "Require SSL for vcs operations" -msgstr "exigir ssl para realizar push" +msgstr "Requer SSL para operações de VCS" #: rhodecode/templates/admin/settings/settings.html:220 msgid "" -"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " -"will return HTTP Error 406: Not Acceptable" -msgstr "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will" +" return HTTP Error 406: Not Acceptable" +msgstr "O RhodeCode vai requerer SSL para push ou pull. Conexões não-SSL vão retornar HTTP Error 406: Not Acceptable" #: rhodecode/templates/admin/settings/settings.html:226 msgid "Hooks" @@ -3221,28 +2998,26 @@ msgstr "Armazenar registro de comandos de pull dos usuários" #: rhodecode/templates/admin/settings/settings.html:247 -#, fuzzy msgid "Advanced setup" -msgstr "confirguações avançadas" +msgstr "Configuração avançada" #: rhodecode/templates/admin/settings/settings.html:252 -#, fuzzy msgid "Mercurial Extensions" -msgstr "Repositório Mercurial" +msgstr "Extensões do Mercurial" #: rhodecode/templates/admin/settings/settings.html:257 msgid "Enable largefiles extension" -msgstr "" +msgstr "Habilitar extensão largefiles" #: rhodecode/templates/admin/settings/settings.html:261 msgid "Enable hgsubversion extension" -msgstr "" +msgstr "Habilitar extensão hgsubversion" #: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" -msgstr "" +msgstr "Requer que a biblioteca hgsubversion estaja instalada. Permite clonagem de remotos SVN" #: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" @@ -3250,21 +3025,20 @@ #: rhodecode/templates/admin/settings/settings.html:279 msgid "" -"Click to unlock. You must restart RhodeCode in order to make this setting" -" take effect." -msgstr "" +"Click to unlock. You must restart RhodeCode in order to make this setting " +"take effect." +msgstr "Clique para destravar. Você deve reiniciar o RhodeCode para que esta configuração tenha efeito." #: rhodecode/templates/admin/settings/settings.html:280 #: rhodecode/templates/base/base.html:143 -#, fuzzy msgid "Unlock" -msgstr "destravar" +msgstr "Destravar" #: rhodecode/templates/admin/settings/settings.html:282 msgid "" -"Location where repositories are stored. After changing this value a " -"restart, and rescan is required" -msgstr "" +"Location where repositories are stored. After changing this value a restart," +" and rescan is required" +msgstr "Local onde os repositórios são armazenados. Depois de mudar este valor uma reinicialização e uma nova varredura são requeridas" #: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" @@ -3299,9 +3073,8 @@ #: rhodecode/templates/admin/users/user_add.html:12 #: rhodecode/templates/admin/users/users.html:23 -#, fuzzy msgid "Add new user" -msgstr "adicionar novo usuário" +msgstr "Adicionar novo usuário" #: rhodecode/templates/admin/users/user_add.html:50 msgid "Password confirmation" @@ -3313,9 +3086,9 @@ #: rhodecode/templates/admin/users/user_edit.html:13 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#, fuzzy, python-format +#, python-format msgid "Edit %s" -msgstr "editar" +msgstr "Editar %s" #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 @@ -3335,7 +3108,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 msgid "Current IP" -msgstr "" +msgstr "IP atual" #: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" @@ -3352,19 +3125,17 @@ msgstr "Confirmação de nova senha" #: rhodecode/templates/admin/users/user_edit.html:163 -#, fuzzy msgid "Email addresses" -msgstr "Endereço de e-mail" +msgstr "Endereços de email" #: rhodecode/templates/admin/users/user_edit.html:176 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this email: %s" -msgstr "Confirma excluir este usuário: %s" +msgstr "Confirme para excluir este email: %s" #: rhodecode/templates/admin/users/user_edit.html:190 -#, fuzzy msgid "New email address" -msgstr "Endereço de e-mail" +msgstr "Novo endereço de email" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 #: rhodecode/templates/base/base.html:254 @@ -3385,24 +3156,22 @@ msgstr "Meus repositórios" #: rhodecode/templates/admin/users/user_edit_my_account.html:41 -#, fuzzy msgid "My pull requests" -msgstr "comentado no commit" +msgstr "Meus pull requests" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 -#, fuzzy msgid "Show closed pull requests" -msgstr "repositório [criado]" +msgstr "Mostrar pull requests fechados" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" -msgstr "" +msgstr "Abertos por mim" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 #, python-format msgid "Pull request #%s opened on %s" -msgstr "" +msgstr "Pull request $%s aberto em %s" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 @@ -3410,28 +3179,26 @@ #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" -msgstr "" +msgstr "Fechado" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 -#, fuzzy msgid "Confirm to delete this pull request" -msgstr "Confirma excluir este repositório" +msgstr "Confirme para excluir este pull request" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 -#, fuzzy msgid "Nothing here yet" -msgstr "Ainda não há notificações aqui" +msgstr "Não há nada aqui ainda" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" -msgstr "" +msgstr "Eu participo em" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 #: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" -msgstr "" +msgstr "Pull request #%s aberto por %s em %s" #: rhodecode/templates/admin/users/users.html:5 msgid "Users administration" @@ -3442,47 +3209,39 @@ msgstr "usuários" #: rhodecode/templates/admin/users/users.html:80 -#, fuzzy msgid "Firstname" -msgstr "Primeiro Nome" +msgstr "Primeiro nome" #: rhodecode/templates/admin/users/users.html:81 -#, fuzzy msgid "Lastname" -msgstr "sobrenome" +msgstr "Último nome" #: rhodecode/templates/admin/users/users.html:82 -#, fuzzy msgid "Last login" -msgstr "último login" +msgstr "Último login" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -#, fuzzy msgid "Add user group" msgstr "Adicionar grupo de usuários" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 #: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 -#, fuzzy msgid "User groups" -msgstr "grupos de usuários" +msgstr "Grupos de usuários" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 #: rhodecode/templates/admin/users_groups/users_groups.html:26 -#, fuzzy msgid "Add new user group" msgstr "Adicionar novo grupo de usuários" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -#, fuzzy msgid "Edit user group" msgstr "Editar grupo de usuários" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -#, fuzzy msgid "UserGroups" -msgstr "grupos de usuários" +msgstr "Grupos de Usuários" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 #: rhodecode/templates/admin/users_groups/users_groups.html:38 @@ -3490,7 +3249,6 @@ msgstr "Membros" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -#, fuzzy msgid "Chosen group members" msgstr "Membros escolhidos do grupo" @@ -3507,38 +3265,34 @@ msgstr "Adicionar todos os elementos" #: rhodecode/templates/admin/users_groups/users_group_edit.html:109 -#, fuzzy msgid "No members yet" -msgstr "membros" +msgstr "Nenhum membro ainda" #: rhodecode/templates/admin/users_groups/users_group_edit.html:117 -#, fuzzy msgid "Global Permissions" -msgstr "Copiar permissões" +msgstr "Permissões Globais" #: rhodecode/templates/admin/users_groups/users_groups.html:5 -#, fuzzy msgid "User groups administration" msgstr "Administração de grupos de usuários" #: rhodecode/templates/admin/users_groups/users_groups.html:55 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this user group: %s" -msgstr "Confirme para excluir este grupo de usuários: %s" +msgstr "Confirme para excluir este grupo de usuário: %s" #: rhodecode/templates/admin/users_groups/users_groups.html:62 -#, fuzzy msgid "There are no user groups yet" -msgstr "Ainda não há grupos de repositórios" +msgstr "Ainda não há um grupo de usuários sequer" #: rhodecode/templates/base/base.html:42 #, python-format msgid "Server instance: %s" -msgstr "" +msgstr "Instância de servidor: %s" #: rhodecode/templates/base/base.html:52 msgid "Report a bug" -msgstr "" +msgstr "Relatar um bug" #: rhodecode/templates/base/base.html:121 #: rhodecode/templates/data_table/_dt_elements.html:9 @@ -3565,9 +3319,8 @@ msgstr "Arquivos" #: rhodecode/templates/base/base.html:125 -#, fuzzy msgid "Switch To" -msgstr "Trocar para" +msgstr "Trocar Para" #: rhodecode/templates/base/base.html:127 #: rhodecode/templates/base/base.html:279 @@ -3580,9 +3333,8 @@ #: rhodecode/templates/base/base.html:137 #: rhodecode/templates/forks/forks_data.html:21 -#, fuzzy msgid "Compare fork" -msgstr "comparar exibir" +msgstr "Compare bifurcação" #: rhodecode/templates/base/base.html:139 #: rhodecode/templates/base/base.html:312 @@ -3592,19 +3344,16 @@ msgstr "Pesquisar" #: rhodecode/templates/base/base.html:145 -#, fuzzy msgid "Lock" -msgstr "destravar" +msgstr "Travar" #: rhodecode/templates/base/base.html:153 -#, fuzzy msgid "Follow" -msgstr "seguidores" +msgstr "Seguir" #: rhodecode/templates/base/base.html:154 -#, fuzzy msgid "Unfollow" -msgstr "seguidores" +msgstr "Parar de seguir" #: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 @@ -3616,24 +3365,20 @@ msgstr "Bifurcação" #: rhodecode/templates/base/base.html:159 -#, fuzzy msgid "Create Pull Request" -msgstr "Criar novo arquivo" +msgstr "Criar Pull Request" #: rhodecode/templates/base/base.html:165 -#, fuzzy msgid "Show Pull Requests" -msgstr "comentado no commit" +msgstr "Mostrar Pull Requests" #: rhodecode/templates/base/base.html:165 -#, fuzzy msgid "Pull Requests" -msgstr "comentado no commit" +msgstr "Pull Requests" #: rhodecode/templates/base/base.html:202 -#, fuzzy msgid "Not logged in" -msgstr "último login" +msgstr "Não logado" #: rhodecode/templates/base/base.html:209 msgid "Login to your account" @@ -3653,7 +3398,7 @@ #: rhodecode/templates/base/base.html:286 msgid "Show recent activity" -msgstr "" +msgstr "Mostrar atividade recente" #: rhodecode/templates/base/base.html:287 #: rhodecode/templates/journal/journal.html:4 @@ -3662,36 +3407,34 @@ #: rhodecode/templates/base/base.html:298 msgid "Show public gists" -msgstr "" +msgstr "Mostrar gists públicos" #: rhodecode/templates/base/base.html:303 msgid "All public gists" -msgstr "" +msgstr "Todos os gists públicos" #: rhodecode/templates/base/base.html:305 msgid "My public gists" -msgstr "" +msgstr "Meus gists públicos" #: rhodecode/templates/base/base.html:306 msgid "My private gists" -msgstr "" +msgstr "Meus gists privados" #: rhodecode/templates/base/base.html:311 -#, fuzzy msgid "Search in repositories" -msgstr "em todos os repositórios" +msgstr "Buscar nos repositórios" #: rhodecode/templates/base/default_perms_box.html:14 -#, fuzzy msgid "Inherit default permissions" -msgstr "Permissões padrão" +msgstr "Herdar permissões padrão" #: rhodecode/templates/base/default_perms_box.html:18 #, python-format msgid "" "Select to inherit permissions from %s settings. With this selected below " "options does not apply." -msgstr "" +msgstr "Selecione para herdar permissões das configurações de %s. Com isto selecionado as opções abaixo não se aplicam" #: rhodecode/templates/base/default_perms_box.html:26 msgid "Create repositories" @@ -3699,30 +3442,27 @@ #: rhodecode/templates/base/default_perms_box.html:30 msgid "Select this option to allow repository creation for this user" -msgstr "" +msgstr "Selecione esta opção para permitir a criação de repositórios para este usuário" #: rhodecode/templates/base/default_perms_box.html:35 -#, fuzzy msgid "Create user groups" -msgstr "criado grupo de usuários %s" +msgstr "Criar grupos de usuários" #: rhodecode/templates/base/default_perms_box.html:39 msgid "Select this option to allow user group creation for this user" -msgstr "" +msgstr "Selecione esta opção para permitir a criação de grupos de usuários para este usuário" #: rhodecode/templates/base/default_perms_box.html:44 -#, fuzzy msgid "Fork repositories" -msgstr "repositórios" +msgstr "Bufurcar repositórios" #: rhodecode/templates/base/default_perms_box.html:48 msgid "Select this option to allow repository forking for this user" -msgstr "" +msgstr "Selecione esta opção para permitir a bifurcação de repositórios para este usuário" #: rhodecode/templates/base/perms_summary.html:11 -#, fuzzy msgid "No permissions defined yet" -msgstr "Copiar permissões" +msgstr "Nenhuma permissão definida ainda" #: rhodecode/templates/base/perms_summary.html:19 #: rhodecode/templates/base/perms_summary.html:38 @@ -3731,96 +3471,85 @@ #: rhodecode/templates/base/perms_summary.html:20 #: rhodecode/templates/base/perms_summary.html:39 -#, fuzzy msgid "Edit Permission" -msgstr "Permissão de repositório" - -#: rhodecode/templates/base/root.html:43 -#, fuzzy -msgid "Add another comment" -msgstr "adicionar outro comentário" +msgstr "Editar Permissão" #: rhodecode/templates/base/root.html:44 +msgid "Add another comment" +msgstr "Adicionar outro comentário" + +#: rhodecode/templates/base/root.html:45 #: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "Parar de seguir este repositório" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Start following this repository" msgstr "Passar a seguir este repositório" -#: rhodecode/templates/base/root.html:46 +#: rhodecode/templates/base/root.html:47 msgid "Group" msgstr "Grupo" -#: rhodecode/templates/base/root.html:47 -msgid "members" -msgstr "membros" - #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:203 -#, fuzzy -msgid "Loading ..." -msgstr "carregando..." +msgid "members" +msgstr "membros" #: rhodecode/templates/base/root.html:49 -#, fuzzy -msgid "Search truncated" -msgstr "pesquisa truncada" +#: rhodecode/templates/pullrequests/pullrequest.html:203 +msgid "Loading ..." +msgstr "Carregando..." #: rhodecode/templates/base/root.html:50 -#, fuzzy -msgid "No matching files" -msgstr "nenhum arquivo corresponde" +msgid "Search truncated" +msgstr "Busca truncada" #: rhodecode/templates/base/root.html:51 +msgid "No matching files" +msgstr "Nenhum arquivo encontrado" + +#: rhodecode/templates/base/root.html:52 #: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" -msgstr "" - -#: rhodecode/templates/base/root.html:52 -msgid "Open new pull request for selected changesets" -msgstr "" +msgstr "Crie novo pull request" #: rhodecode/templates/base/root.html:53 -#, fuzzy -msgid "Show selected changesets __S -> __E" -msgstr "Mostrar alterações selecionadas __S -> __E" +msgid "Open new pull request for selected changesets" +msgstr "Abrir novo pull request para os changesets selecionados" #: rhodecode/templates/base/root.html:54 -#, fuzzy -msgid "Show selected changeset __S" -msgstr "Mostrar alterações selecionadas __S -> __E" +msgid "Show selected changesets __S -> __E" +msgstr "Mostrar changesets selecionados __S -> __E" #: rhodecode/templates/base/root.html:55 -msgid "Selection link" -msgstr "Link da seleção" +msgid "Show selected changeset __S" +msgstr "Mostrar changesets selecionados __S" #: rhodecode/templates/base/root.html:56 -#: rhodecode/templates/changeset/diff_block.html:8 -#, fuzzy -msgid "Collapse diff" -msgstr "Diff do arquivo" +msgid "Selection link" +msgstr "Link da seleção" #: rhodecode/templates/base/root.html:57 -#, fuzzy -msgid "Expand diff" -msgstr "diff bruto" +#: rhodecode/templates/changeset/diff_block.html:8 +msgid "Collapse diff" +msgstr "Colapsar diff" #: rhodecode/templates/base/root.html:58 -#, fuzzy -msgid "Failed to remoke permission" -msgstr "Falha ao reomver usuário" +msgid "Expand diff" +msgstr "Expandir diff" + +#: rhodecode/templates/base/root.html:59 +msgid "Failed to revoke permission" +msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Bookmarks" -msgstr "marcadores" +msgstr "%s Bookmarks" #: rhodecode/templates/bookmarks/bookmarks.html:26 -#, fuzzy msgid "Compare bookmarks" -msgstr "comparar exibir" +msgstr "Comparar bookmarks" #: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 @@ -3848,24 +3577,22 @@ #: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:10 -#, fuzzy msgid "Compare" -msgstr "comparar exibir" +msgstr "Compare" #: rhodecode/templates/branches/branches.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Branches" -msgstr "ramos" +msgstr "%s Ramos" #: rhodecode/templates/branches/branches.html:26 -#, fuzzy msgid "Compare branches" -msgstr "ramos" +msgstr "Compare ramos" #: rhodecode/templates/changelog/changelog.html:6 -#, fuzzy, python-format +#, python-format msgid "%s Changelog" -msgstr "Registro de alterações" +msgstr "%s Changelog" #: rhodecode/templates/changelog/changelog.html:19 #, python-format @@ -3875,56 +3602,53 @@ msgstr[1] "mostrando %d de %d revisões" #: rhodecode/templates/changelog/changelog.html:39 -#, fuzzy msgid "Clear selection" -msgstr "Configurações de busca" +msgstr "Deselecionar seleção" #: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 -#, fuzzy, python-format +#, python-format msgid "Compare fork with %s" -msgstr "comparar exibir" +msgstr "Comparar bifurcação com %s" #: rhodecode/templates/changelog/changelog.html:42 -#, fuzzy msgid "Compare fork with parent" -msgstr "comparar exibir" +msgstr "Comparar bifurcação com o pai" #: rhodecode/templates/changelog/changelog.html:78 #: rhodecode/templates/changelog/changelog_summary_data.html:28 -#, fuzzy, python-format +#, python-format msgid "Click to open associated pull request #%s" -msgstr "repositório [criado]" +msgstr "Clique para abrir o pull request #%s associado" #: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/summary/summary.html:403 -#, fuzzy msgid "Show more" -msgstr "mostrar mais" +msgstr "Mostrar mais" #: rhodecode/templates/changelog/changelog.html:115 #: rhodecode/templates/changelog/changelog_summary_data.html:50 #: rhodecode/templates/changeset/changeset.html:107 #: rhodecode/templates/changeset/changeset_range.html:86 -#, fuzzy, python-format +#, python-format msgid "Bookmark %s" -msgstr "marcadores" +msgstr "Bookmark %s" #: rhodecode/templates/changelog/changelog.html:121 #: rhodecode/templates/changelog/changelog_summary_data.html:56 #: rhodecode/templates/changeset/changeset.html:113 #: rhodecode/templates/changeset/changeset_range.html:92 -#, fuzzy, python-format +#, python-format msgid "Tag %s" -msgstr "etiquetas" +msgstr "Tag %s" #: rhodecode/templates/changelog/changelog.html:126 #: rhodecode/templates/changelog/changelog_summary_data.html:61 #: rhodecode/templates/changeset/changeset.html:117 #: rhodecode/templates/changeset/changeset_range.html:96 -#, fuzzy, python-format +#, python-format msgid "Branch %s" -msgstr "ramos" +msgstr "Ramo %s" #: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" @@ -3932,21 +3656,18 @@ #: rhodecode/templates/changelog/changelog_details.html:4 #: rhodecode/templates/changeset/changeset.html:91 -#, fuzzy msgid "Removed" -msgstr "removidos" +msgstr "Removido" #: rhodecode/templates/changelog/changelog_details.html:5 #: rhodecode/templates/changeset/changeset.html:92 -#, fuzzy msgid "Changed" -msgstr "alterados" +msgstr "Modificado" #: rhodecode/templates/changelog/changelog_details.html:6 #: rhodecode/templates/changeset/changeset.html:93 -#, fuzzy msgid "Added" -msgstr "adicionados" +msgstr "Adicionado" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 @@ -3954,25 +3675,23 @@ #: rhodecode/templates/changeset/changeset.html:95 #: rhodecode/templates/changeset/changeset.html:96 #: rhodecode/templates/changeset/changeset.html:97 -#, fuzzy, python-format +#, python-format msgid "Affected %s files" -msgstr "%s arquivos afetados" +msgstr "Afetados %s arquivos" #: rhodecode/templates/changelog/changelog_summary_data.html:6 #: rhodecode/templates/files/files_add.html:75 #: rhodecode/templates/files/files_edit.html:61 -#, fuzzy msgid "Commit message" -msgstr "mensagem de commit" +msgstr "Mensagem de commit" #: rhodecode/templates/changelog/changelog_summary_data.html:7 -#, fuzzy msgid "Age" -msgstr "idade" +msgstr "Idade" #: rhodecode/templates/changelog/changelog_summary_data.html:9 msgid "Refs" -msgstr "" +msgstr "Refs" #: rhodecode/templates/changelog/changelog_summary_data.html:86 msgid "Add or upload files directly via RhodeCode" @@ -3993,9 +3712,9 @@ msgstr "Repositório existente?" #: rhodecode/templates/changeset/changeset.html:6 -#, fuzzy, python-format +#, python-format msgid "%s Changeset" -msgstr "Conjunto de Mudanças" +msgstr "%s Changeset" #: rhodecode/templates/changeset/changeset.html:39 msgid "No parents" @@ -4003,31 +3722,27 @@ #: rhodecode/templates/changeset/changeset.html:49 msgid "No children" -msgstr "" +msgstr "Nenhum filho" #: rhodecode/templates/changeset/changeset.html:62 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:44 -#, fuzzy msgid "Changeset status" -msgstr "Conjuntos de mudanças" +msgstr "Estado do changeset" #: rhodecode/templates/changeset/changeset.html:67 #: rhodecode/templates/changeset/diff_block.html:22 -#, fuzzy msgid "Raw diff" -msgstr "diff bruto" +msgstr "Diff cru" #: rhodecode/templates/changeset/changeset.html:68 -#, fuzzy msgid "Patch diff" -msgstr "diff bruto" +msgstr "D" #: rhodecode/templates/changeset/changeset.html:69 #: rhodecode/templates/changeset/diff_block.html:23 -#, fuzzy msgid "Download diff" -msgstr "descarregar diff" +msgstr "Baixar diff" #: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:103 @@ -4053,27 +3768,27 @@ #: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 -#, fuzzy, python-format +#, python-format msgid "%s file changed" msgid_plural "%s files changed" -msgstr[0] "arquivo alterado" -msgstr[1] "" +msgstr[0] "%s arquivo modificado" +msgstr[1] "%s arquivos modificados" #: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 -#, fuzzy, python-format +#, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" -msgstr[0] "%s arquivos afetados com %s inserções e %s exclusões" -msgstr[1] "" +msgstr[0] "%s arquivo modificado com %s inserções e %s exclusões" +msgstr[1] "%s arquivos modificados com %s inserções e %s exclusões" #: rhodecode/templates/changeset/changeset.html:141 #: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Showing a huge diff might take some time and resources" -msgstr "" +msgstr "Mostrar um diff muito grande pode levar muito tempo e gastar muitos recursos" #: rhodecode/templates/changeset/changeset.html:141 #: rhodecode/templates/changeset/changeset.html:153 @@ -4081,19 +3796,18 @@ #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 -#, fuzzy msgid "Show full diff" -msgstr "Carregando lista de arquivos..." +msgstr "Mostrar diff completo" #: rhodecode/templates/changeset/changeset_file_comment.html:30 -#, fuzzy, python-format +#, python-format msgid "Status change on pull request #%s" -msgstr "Criar novo arquivo" +msgstr "Mudança de estado no pull request $%s" #: rhodecode/templates/changeset/changeset_file_comment.html:32 -#, fuzzy, python-format +#, python-format msgid "Comment on pull request #%s" -msgstr "repositório [criado]" +msgstr "Comentar no pull request #%s" #: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." @@ -4111,22 +3825,19 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:61 #: rhodecode/templates/changeset/changeset_file_comment.html:147 -msgid "Use @username inside this text to send notification to this RhodeCode user" -msgstr "" -"Use @nomedeusuário dentro desse texto para enviar notificação a este " -"usuário do RhodeCode" +msgid "" +"Use @username inside this text to send notification to this RhodeCode user" +msgstr "Use @nomedeusuário dentro desse texto para enviar notificação a este usuário do RhodeCode" #: rhodecode/templates/changeset/changeset_file_comment.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:152 -#, fuzzy msgid "Preview" -msgstr "comparar exibir" +msgstr "Visualizar" #: rhodecode/templates/changeset/changeset_file_comment.html:72 #: rhodecode/templates/changeset/changeset_file_comment.html:170 -#, fuzzy msgid "Comment preview" -msgstr "comparar exibir" +msgstr "Visualizar comentário" #: rhodecode/templates/changeset/changeset_file_comment.html:80 #: rhodecode/templates/changeset/changeset_file_comment.html:177 @@ -4136,9 +3847,8 @@ msgstr "Comentário" #: rhodecode/templates/changeset/changeset_file_comment.html:81 -#, fuzzy msgid "Cancel" -msgstr "alterados" +msgstr "Cancelar" #: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." @@ -4153,18 +3863,17 @@ msgstr "Ocultar" #: rhodecode/templates/changeset/changeset_file_comment.html:149 -#, fuzzy msgid "Change status" -msgstr "Conjuntos de mudanças" +msgstr "Mudar estado" #: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" -msgstr "" +msgstr "Comentar e fechar" #: rhodecode/templates/changeset/changeset_range.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Changesets" -msgstr "Conjuntos de mudanças" +msgstr "%s Changesets" #: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" @@ -4172,59 +3881,54 @@ #: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" -msgstr "" +msgstr "Mostrar diff completo para este arquivo" #: rhodecode/templates/changeset/diff_block.html:29 -#, fuzzy msgid "Show inline comments" -msgstr "mostrar comentários em linha" +msgstr "Mostrar comentários inline" #: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" -msgstr "" +msgstr "Mostrar última versão do arquivo neste repo" #: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" -msgstr "" +msgstr "Mostrar versão inicial do arquivo neste repo" #: rhodecode/templates/compare/compare_cs.html:4 -#, fuzzy msgid "No changesets" -msgstr "Nenhum conjunto de alterações ainda." +msgstr "Nenhum changeset" #: rhodecode/templates/compare/compare_cs.html:32 -#, fuzzy msgid "Ancestor" -msgstr "ramos" +msgstr "Antecessor" #: rhodecode/templates/compare/compare_diff.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Compare" -msgstr "comparar exibir" +msgstr "%s Comparar" #: rhodecode/templates/compare/compare_diff.html:9 -#, fuzzy msgid "Compare revisions" -msgstr "revisão anterior" +msgstr "Comparar revisões" #: rhodecode/templates/compare/compare_diff.html:33 #: rhodecode/templates/pullrequests/pullrequest_show.html:106 -#, fuzzy, python-format +#, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" -msgstr[0] "mostrar comentários em linha" -msgstr[1] "" +msgstr[0] "Mostrando %s commit" +msgstr[1] "Mostrando %s commits" #: rhodecode/templates/compare/compare_diff.html:48 #: rhodecode/templates/pullrequests/pullrequest_show.html:121 -#, fuzzy msgid "No files" -msgstr "arquivos" +msgstr "Nenhum arquivo" #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 msgid "confirm to show potentially huge diff" -msgstr "" +msgstr "confirme para mostrar diff potencialmente muito grande" #: rhodecode/templates/data_table/_dt_elements.html:54 #: rhodecode/templates/summary/summary.html:69 @@ -4237,9 +3941,9 @@ msgstr "Repositório Git" #: rhodecode/templates/data_table/_dt_elements.html:74 -#, fuzzy, python-format +#, python-format msgid "Fork of %s" -msgstr "nome da bifurcação" +msgstr "Bifurcação de %s" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -4270,74 +3974,68 @@ #: rhodecode/templates/email_templates/changeset_comment.html:4 #: rhodecode/templates/email_templates/pull_request.html:4 #: rhodecode/templates/email_templates/pull_request_comment.html:4 -#, fuzzy msgid "URL" -msgstr "diário" +msgstr "URL" #: rhodecode/templates/email_templates/changeset_comment.html:6 -#, fuzzy, python-format +#, python-format msgid "%s commented on a %s changeset." -msgstr "comentado no commit" +msgstr "%s comentou num changeset de %s." #: rhodecode/templates/email_templates/changeset_comment.html:14 msgid "The changeset status was changed to" -msgstr "" +msgstr "O estado do changeset foi alterado para" #: rhodecode/templates/email_templates/main.html:8 -#, fuzzy msgid "This is a notification from RhodeCode." msgstr "Esta é uma notificação do RhodeCode." #: rhodecode/templates/email_templates/password_reset.html:4 #, python-format msgid "Hello %s" -msgstr "" +msgstr "Olá %s" #: rhodecode/templates/email_templates/password_reset.html:5 msgid "We received a request to create a new password for your account." -msgstr "" +msgstr "Recebemos uma requisição para criar uma nova senha para sua conta." #: rhodecode/templates/email_templates/password_reset.html:6 msgid "You can generate it by clicking following URL" -msgstr "" +msgstr "Você pode gerá-la clicando na seguinte URL" #: rhodecode/templates/email_templates/password_reset.html:10 msgid "Please ignore this email if you did not request a new password ." -msgstr "" +msgstr "Por favor, ignore este email se você não requisitou uma nova senha." #: rhodecode/templates/email_templates/pull_request.html:6 #, python-format msgid "" -"%s opened a pull request for repository %s and wants you to review " -"changes." -msgstr "" +"%s opened a pull request for repository %s and wants you to review changes." +msgstr "%s abriu um pull request para o repositório %s e espera sua revisão." #: rhodecode/templates/email_templates/pull_request.html:8 #: rhodecode/templates/pullrequests/pullrequest.html:34 #: rhodecode/templates/pullrequests/pullrequest_data.html:14 #: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#, fuzzy msgid "Title" -msgstr "escrever" +msgstr "Título" #: rhodecode/templates/email_templates/pull_request_comment.html:6 -#, fuzzy, python-format +#, python-format msgid "%s commented on pull request \"%s\"" -msgstr "repositório [criado]" +msgstr "%s comentou no pull request \"%s\"" #: rhodecode/templates/email_templates/pull_request_comment.html:10 -#, fuzzy msgid "Pull request was closed with status" -msgstr "repositório [criado]" +msgstr "O pull request foi fechado com o estado" #: rhodecode/templates/email_templates/pull_request_comment.html:12 -#, fuzzy msgid "Pull request changed status" -msgstr "repositório [criado]" +msgstr "O pull request mudou de estado" #: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" -msgstr "" +msgstr "Veja este usuário aqui" #: rhodecode/templates/errors/error_document.html:55 #, python-format @@ -4345,9 +4043,9 @@ msgstr "Você será redirecionado para %s em %s segundos" #: rhodecode/templates/files/file_diff.html:4 -#, fuzzy, python-format +#, python-format msgid "%s File Diff" -msgstr "Diff do arquivo" +msgstr "%s Diff de Arquivo" #: rhodecode/templates/files/file_diff.html:8 msgid "File diff" @@ -4355,26 +4053,24 @@ #: rhodecode/templates/files/files.html:4 #: rhodecode/templates/files/files.html:76 -#, fuzzy, python-format +#, python-format msgid "%s Files" -msgstr "arquivos" +msgstr "%s Arquivos" #: rhodecode/templates/files/files.html:30 #: rhodecode/templates/files/files_add.html:31 #: rhodecode/templates/files/files_edit.html:31 -#, fuzzy msgid "Branch" -msgstr "ramo" +msgstr "Ramo" #: rhodecode/templates/files/files_add.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Files Add" -msgstr "arquivos" +msgstr "%s Adicionar Arquivos" #: rhodecode/templates/files/files_add.html:19 -#, fuzzy msgid "Add file" -msgstr "adicionar arquivo" +msgstr "Adicionar arquivo" #: rhodecode/templates/files/files_add.html:43 msgid "File Name" @@ -4410,29 +4106,24 @@ msgstr "Realizar commit das alterações" #: rhodecode/templates/files/files_browser.html:13 -#, fuzzy msgid "View" -msgstr "ver" +msgstr "Visualizar" #: rhodecode/templates/files/files_browser.html:14 -#, fuzzy msgid "Previous revision" -msgstr "revisão anterior" +msgstr "Revisão anterior" #: rhodecode/templates/files/files_browser.html:16 -#, fuzzy msgid "Next revision" -msgstr "próxima revisão" +msgstr "Próxima revisão" #: rhodecode/templates/files/files_browser.html:23 -#, fuzzy msgid "Follow current branch" -msgstr "seguir ramo atual" +msgstr "Seguir o ramo atual" #: rhodecode/templates/files/files_browser.html:27 -#, fuzzy msgid "Search file list" -msgstr "pesquisar lista de arquivos" +msgstr "Buscar a lista de arquivos" #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." @@ -4459,31 +4150,27 @@ msgstr "Último commiter" #: rhodecode/templates/files/files_edit.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Files Edit" -msgstr "arquivos" +msgstr "%s Editar Arquivos" #: rhodecode/templates/files/files_edit.html:19 -#, fuzzy msgid "Edit file" -msgstr "editar arquivo" +msgstr "Editar arquivo" #: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -#, fuzzy msgid "Show annotation" -msgstr "mostrar anotação" +msgstr "Mostrar anotação" #: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -#, fuzzy msgid "Download as raw" -msgstr "descarregar como bruto" +msgstr "Baixar original" #: rhodecode/templates/files/files_edit.html:52 -#, fuzzy msgid "Source" -msgstr "fonte" +msgstr "Fonte" #: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" @@ -4494,50 +4181,44 @@ msgstr "Histórico" #: rhodecode/templates/files/files_history_box.html:9 -#, fuzzy msgid "Diff to revision" -msgstr "próxima revisão" +msgstr "Diff para revisão" #: rhodecode/templates/files/files_history_box.html:10 -#, fuzzy msgid "Show at revision" -msgstr "próxima revisão" +msgstr "Mostrar na revisão" #: rhodecode/templates/files/files_history_box.html:11 -#, fuzzy msgid "Show full history" -msgstr "Carregando lista de arquivos..." +msgstr "Mostrar história completa" #: rhodecode/templates/files/files_history_box.html:16 -#, fuzzy, python-format +#, python-format msgid "%s author" msgid_plural "%s authors" -msgstr[0] "autor" -msgstr[1] "autors" +msgstr[0] "%s autor" +msgstr[1] "%s autores" #: rhodecode/templates/files/files_source.html:6 -#, fuzzy msgid "Load file history" -msgstr "Carregando lista de arquivos..." +msgstr "Carregar história do arquivo" #: rhodecode/templates/files/files_source.html:21 -#, fuzzy msgid "Show source" -msgstr "mostrar fonte" +msgstr "Mostrar fonte" #: rhodecode/templates/files/files_source.html:29 -#, fuzzy, python-format +#, python-format msgid "Edit on branch:%s" -msgstr "excluído o repositório %s" +msgstr "Editar no ramo:%s" #: rhodecode/templates/files/files_source.html:31 -#, fuzzy msgid "Edit on branch:?" -msgstr "excluído o repositório %s" +msgstr "Editar no ramo:?" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" -msgstr "" +msgstr "A edição de arquivos só é permitida quando se está na revisão mais recente do ramo" #: rhodecode/templates/files/files_source.html:46 #, python-format @@ -4561,9 +4242,9 @@ msgstr "Nenhum arquivo no caminho especificado" #: rhodecode/templates/followers/followers.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Followers" -msgstr "seguidores" +msgstr "%s Seguidores" #: rhodecode/templates/followers/followers.html:9 #: rhodecode/templates/summary/summary.html:183 @@ -4572,14 +4253,13 @@ msgstr "Seguidores" #: rhodecode/templates/followers/followers_data.html:12 -#, fuzzy msgid "Started following -" -msgstr "Passou a seguir" +msgstr "Começou a seguir -" #: rhodecode/templates/forks/fork.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Fork" -msgstr "bifurcação" +msgstr "%s Bifurcação" #: rhodecode/templates/forks/fork.html:28 msgid "Fork name" @@ -4595,7 +4275,7 @@ #: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" -msgstr "" +msgstr "Copiar permissões do repositório bifurcado" #: rhodecode/templates/forks/fork.html:84 msgid "Update after clone" @@ -4603,17 +4283,16 @@ #: rhodecode/templates/forks/fork.html:88 msgid "Checkout source after making a clone" -msgstr "" +msgstr "Checkout fontes depois de criar o clone" #: rhodecode/templates/forks/fork.html:93 -#, fuzzy msgid "Fork this repository" -msgstr "bifurcar este repositório" +msgstr "Bifurcar este repositório" #: rhodecode/templates/forks/forks.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Forks" -msgstr "bifurcações" +msgstr "%s Bifurcações" #: rhodecode/templates/forks/forks.html:9 #: rhodecode/templates/summary/summary.html:189 @@ -4622,23 +4301,20 @@ msgstr "Bifurcações" #: rhodecode/templates/forks/forks_data.html:17 -#, fuzzy msgid "Forked" -msgstr "bifurcado" +msgstr "Bifurcado" #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "Ainda não há bifurcações" #: rhodecode/templates/journal/journal.html:21 -#, fuzzy msgid "ATOM journal feed" -msgstr "diário público de %s - feed %s" +msgstr "ATOM feed do diário" #: rhodecode/templates/journal/journal.html:22 -#, fuzzy msgid "RSS journal feed" -msgstr "diário público de %s - feed %s" +msgstr "RSS feed do diário" #: rhodecode/templates/journal/journal.html:32 msgid "Refresh" @@ -4647,7 +4323,7 @@ #: rhodecode/templates/journal/journal.html:35 #: rhodecode/templates/journal/public_journal.html:24 msgid "ATOM feed" -msgstr "" +msgstr "ATOM feed" #: rhodecode/templates/journal/journal.html:51 msgid "Watched" @@ -4663,87 +4339,77 @@ msgstr "Diário Público" #: rhodecode/templates/journal/public_journal.html:13 -#, fuzzy msgid "ATOM public journal feed" -msgstr "diário público de %s - feed %s" +msgstr "ATOM feed do diário público" #: rhodecode/templates/journal/public_journal.html:14 -#, fuzzy msgid "RSS public journal feed" -msgstr "diário público de %s - feed %s" +msgstr "RSS feed do diário público" #: rhodecode/templates/pullrequests/pullrequest.html:4 #: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" -msgstr "" +msgstr "Novo pull request" #: rhodecode/templates/pullrequests/pullrequest.html:25 -#, fuzzy msgid "Create new pull request" -msgstr "Criar novo arquivo" +msgstr "Criar novo pull request" #: rhodecode/templates/pullrequests/pullrequest.html:47 -#, fuzzy msgid "Write a short description on this pull request" -msgstr "Confirma excluir este repositório" +msgstr "Escreva uma breve descrição para este pull request" #: rhodecode/templates/pullrequests/pullrequest.html:53 -#, fuzzy msgid "Changeset flow" -msgstr "Conjunto de Mudanças" +msgstr "Fluxo de changesets" #: rhodecode/templates/pullrequests/pullrequest.html:60 #: rhodecode/templates/pullrequests/pullrequest_show.html:65 -#, fuzzy msgid "Origin repository" -msgstr "Repositório Git" +msgstr "Repositório origem" #: rhodecode/templates/pullrequests/pullrequest.html:85 msgid "Send pull request" -msgstr "" +msgstr "Enviar pull request" #: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" -msgstr "" +msgstr "Revisores do pull request" #: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 -#, fuzzy msgid "owner" -msgstr "Dono" +msgstr "dono" #: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." -msgstr "" +msgstr "Adicionar revisor a este pull request" #: rhodecode/templates/pullrequests/pullrequest.html:129 -#, fuzzy msgid "Detailed compare view" -msgstr "comparar exibir" +msgstr "Visão de comparação detalhada" #: rhodecode/templates/pullrequests/pullrequest.html:150 -#, fuzzy msgid "Destination repository" -msgstr "Editar repositório" +msgstr "Repositório de destino" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Pull Request #%s" -msgstr "comentado no commit" +msgstr "%s Pull Request #%s" #: rhodecode/templates/pullrequests/pullrequest_show.html:35 -#, fuzzy msgid "Review status" -msgstr "Conjuntos de mudanças" +msgstr "Estado da revisão" #: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" -msgstr "" +msgstr "Estado do pull request" #: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" -msgstr "" +msgstr "Ainda não revisado por" #: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format @@ -4754,48 +4420,41 @@ #: rhodecode/templates/pullrequests/pullrequest_show.html:59 msgid "Pull request was reviewed by all reviewers" -msgstr "" +msgstr "O pull request foi revisado por todos os revisores" #: rhodecode/templates/pullrequests/pullrequest_show.html:89 -#, fuzzy msgid "Created on" -msgstr "criar um agora" +msgstr "Criado em" #: rhodecode/templates/pullrequests/pullrequest_show.html:102 -#, fuzzy msgid "Compare view" -msgstr "comparar exibir" +msgstr "Visão de comparação" #: rhodecode/templates/pullrequests/pullrequest_show.html:149 -#, fuzzy msgid "reviewer" -msgstr "" +msgstr "revisor" #: rhodecode/templates/pullrequests/pullrequest_show.html:164 -#, fuzzy msgid "Add or remove reviewer to this pull request." -msgstr "Confirma excluir este repositório" +msgstr "Adicionar ou remover revisor a este pull request" #: rhodecode/templates/pullrequests/pullrequest_show.html:168 -#, fuzzy msgid "Save changes" -msgstr "Sem alterações" +msgstr "Salvar modificações" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Pull Requests" -msgstr "comentado no commit" +msgstr "" #: rhodecode/templates/search/search.html:6 -#, fuzzy msgid "Search repository" -msgstr "no repositório" +msgstr "Buscar no repositório" #: rhodecode/templates/search/search.html:8 #: rhodecode/templates/search/search.html:16 -#, fuzzy msgid "Search in all repositories" -msgstr "em todos os repositórios" +msgstr "Buscar em todos os repositórios" #: rhodecode/templates/search/search.html:50 msgid "Search term" @@ -4810,9 +4469,8 @@ msgstr "Conteúdo dos arquivos" #: rhodecode/templates/search/search.html:66 -#, fuzzy msgid "Commit messages" -msgstr "mensagem de commit" +msgstr "Mensagens de commit" #: rhodecode/templates/search/search.html:67 msgid "File names" @@ -4825,29 +4483,28 @@ msgstr "Permissão negada" #: rhodecode/templates/summary/summary.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Summary" -msgstr "sumário" +msgstr "%s Sumário" #: rhodecode/templates/summary/summary.html:16 -#, fuzzy, python-format +#, python-format msgid "%s ATOM feed" -msgstr "%s - feed %s" +msgstr "%s ATOM feed" #: rhodecode/templates/summary/summary.html:17 -#, fuzzy, python-format +#, python-format msgid "%s RSS feed" -msgstr "%s - feed %s" +msgstr "" #: rhodecode/templates/summary/summary.html:62 -#, fuzzy, python-format +#, python-format msgid "Repository locked by %s" -msgstr "repositórios" +msgstr "Repositório travado por %s" #: rhodecode/templates/summary/summary.html:64 -#, fuzzy msgid "Repository unlocked" -msgstr "repositórios" +msgstr "Repositório destravado" #: rhodecode/templates/summary/summary.html:83 #, python-format @@ -4855,9 +4512,8 @@ msgstr "ID não alterável %s" #: rhodecode/templates/summary/summary.html:88 -#, fuzzy msgid "Public" -msgstr "público" +msgstr "Público" #: rhodecode/templates/summary/summary.html:88 #: rhodecode/templates/summary/summary.html:89 @@ -4865,9 +4521,8 @@ msgstr "Bifurcação de" #: rhodecode/templates/summary/summary.html:97 -#, fuzzy msgid "Remote clone" -msgstr "clone remoto" +msgstr "Clone remoto" #: rhodecode/templates/summary/summary.html:117 msgid "Contact" @@ -4891,9 +4546,8 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#, fuzzy msgid "Enable" -msgstr "habilitar" +msgstr "Habilitar" #: rhodecode/templates/summary/summary.html:159 msgid "Download" @@ -4908,9 +4562,8 @@ msgstr "Downloads estão desabilitados para este repositório" #: rhodecode/templates/summary/summary.html:170 -#, fuzzy msgid "Download as zip" -msgstr "descarregar como bruto" +msgstr "Download como zip" #: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" @@ -4921,15 +4574,13 @@ msgstr "com subrepositórios" #: rhodecode/templates/summary/summary.html:197 -#, fuzzy msgid "Repository Size" -msgstr "repositórios" +msgstr "Tamanho do Repositório" #: rhodecode/templates/summary/summary.html:204 #: rhodecode/templates/summary/summary.html:206 -#, fuzzy msgid "Feed" -msgstr "%s - feed %s" +msgstr "" #: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" @@ -4944,9 +4595,8 @@ msgstr "Estatísticas coletadas:" #: rhodecode/templates/summary/summary.html:256 -#, fuzzy msgid "Latest changes" -msgstr "Última alteração" +msgstr "Mudanças mais recentes" #: rhodecode/templates/summary/summary.html:258 msgid "Quick start" @@ -4955,7 +4605,7 @@ #: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file from revision %s" -msgstr "" +msgstr "Arquivo README da revisão %s" #: rhodecode/templates/summary/summary.html:332 #, python-format @@ -4999,12 +4649,10 @@ msgstr "arquivo removido" #: rhodecode/templates/tags/tags.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Tags" -msgstr "%s atrás" +msgstr "%s Tags" #: rhodecode/templates/tags/tags.html:26 -#, fuzzy msgid "Compare tags" -msgstr "comparar exibir" - +msgstr "Comparar tags" diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/ru/LC_MESSAGES/rhodecode.mo has changed diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po Fri Jun 07 19:23:20 2013 +0200 +++ b/rhodecode/i18n/ru/LC_MESSAGES/rhodecode.po Fri Jun 07 19:30:45 2013 +0200 @@ -1,20 +1,26 @@ # Translations template for RhodeCode. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2013 Marcin Kuzminski RhodeCode # This file is distributed under the same license as the RhodeCode project. -# # Translators: +# ArcheR , 2013 # mokeev1995 , 2013 +# Andrey Mivrenik , 2013 +# ivlevdenis , 2013 # ivlevdenis , 2013 # Михаил Жолобов , 2013 +# mokeev1995 , 2013 # Andrey Mivrenik , 2013 +# Ruslan Bekenev , 2013 +# softforwinxp , 2013 # zhmylove , 2013 +# Михаил Жолобов , 2013 msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-06-01 18:38+0200\n" -"PO-Revision-Date: 2013-06-02 08:29+0000\n" -"Last-Translator: marcinkuzminski \n" +"Report-Msgid-Bugs-To: marcin@maq.io\n" +"POT-Creation-Date: 2013-06-05 19:55+0200\n" +"PO-Revision-Date: 2013-06-07 13:54+0000\n" +"Last-Translator: Михаил Жолобов \n" "Language-Team: Russian (http://www.transifex.com/projects/p/RhodeCode/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,11 +35,11 @@ #: rhodecode/controllers/changeset.py:84 msgid "Show white space" -msgstr "" +msgstr "Отображать пробелы" #: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 msgid "Ignore white space" -msgstr "" +msgstr "Игнорировать пробелы" #: rhodecode/controllers/changeset.py:164 #, python-format @@ -41,21 +47,21 @@ msgstr "контекст строки %s" #: rhodecode/controllers/changeset.py:345 -#: rhodecode/controllers/pullrequests.py:481 +#: rhodecode/controllers/pullrequests.py:478 #, python-format msgid "Status change -> %s" -msgstr "" +msgstr "Изменение статуса -> %s" #: rhodecode/controllers/changeset.py:376 msgid "" "Changing status on a changeset associated with a closed pull request is not " "allowed" -msgstr "" +msgstr "Изменение статуса в наборе изменений ассоциированных с закрытым запросом на внесение изменений не разрешён." #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:259 +#: rhodecode/controllers/pullrequests.py:256 msgid "There are no changesets yet" -msgstr "" +msgstr "Ещё не было изменений" #: rhodecode/controllers/error.py:69 msgid "Home page" @@ -92,7 +98,7 @@ #: rhodecode/controllers/feed.py:53 #, python-format msgid "%s %s feed" -msgstr "%s %s обзор" +msgstr "Лента новостей %s %s" #: rhodecode/controllers/feed.py:86 #: rhodecode/templates/changeset/changeset.html:141 @@ -107,11 +113,11 @@ #: rhodecode/controllers/feed.py:90 #, python-format msgid "%s committed on %s" -msgstr "" +msgstr "%s сделал изменения в %s" #: rhodecode/controllers/files.py:89 msgid "Click here to add new file" -msgstr "" +msgstr "Нажмите чтобы добавить новый файл" #: rhodecode/controllers/files.py:90 #, python-format @@ -121,7 +127,7 @@ #: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, python-format msgid "This repository is has been locked by %s on %s" -msgstr "" +msgstr "Репозиторий заблокировал %s в %s" #: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " @@ -130,7 +136,7 @@ #: rhodecode/controllers/files.py:297 #, python-format msgid "Edited file %s via RhodeCode" -msgstr "" +msgstr "Файл %s отредактирован с помощью RhodeCode" #: rhodecode/controllers/files.py:313 msgid "No changes" @@ -147,7 +153,7 @@ #: rhodecode/controllers/files.py:351 msgid "Added file via RhodeCode" -msgstr "" +msgstr "Файл добавлен с помощью RhodeCode" #: rhodecode/controllers/files.py:368 msgid "No content" @@ -159,11 +165,11 @@ #: rhodecode/controllers/files.py:397 msgid "Location must be relative path and must not contain .. in path" -msgstr "" +msgstr "Расположение должно быть относительным путем, и не должно содержать \"..\" в пути" #: rhodecode/controllers/files.py:431 msgid "Downloads disabled" -msgstr "" +msgstr "Возможность скачивать отключена" #: rhodecode/controllers/files.py:442 #, python-format @@ -183,10 +189,10 @@ #: rhodecode/templates/email_templates/pull_request.html:12 #: rhodecode/templates/pullrequests/pullrequest.html:124 msgid "Changesets" -msgstr "Изменения" +msgstr "Набор изменений" #: rhodecode/controllers/files.py:632 -#: rhodecode/controllers/pullrequests.py:152 +#: rhodecode/controllers/pullrequests.py:149 #: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 @@ -194,7 +200,7 @@ msgstr "Ветки" #: rhodecode/controllers/files.py:633 -#: rhodecode/controllers/pullrequests.py:153 +#: rhodecode/controllers/pullrequests.py:150 #: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: rhodecode/templates/switch_to_list.html:15 #: rhodecode/templates/tags/tags.html:10 @@ -204,7 +210,7 @@ #: rhodecode/controllers/forks.py:176 #, python-format msgid "Forked repository %s as %s" -msgstr "" +msgstr "Сделан форк(копия) репозитория %s на %s" #: rhodecode/controllers/forks.py:190 #, python-format @@ -222,7 +228,7 @@ #: rhodecode/controllers/login.py:138 msgid "You have successfully registered into RhodeCode" -msgstr "" +msgstr "Регистрация в RhodeCode прошла успешно" #: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" @@ -233,51 +239,51 @@ "Your password reset was successful, new password has been sent to your email" msgstr "Сброс пароля прошел успешно, новый пароль был отправлен на ваш email" -#: rhodecode/controllers/pullrequests.py:139 +#: rhodecode/controllers/pullrequests.py:136 #: rhodecode/templates/changeset/changeset.html:10 #: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "Изменения" -#: rhodecode/controllers/pullrequests.py:149 +#: rhodecode/controllers/pullrequests.py:146 msgid "Special" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:150 +msgstr "Специальный" + +#: rhodecode/controllers/pullrequests.py:147 msgid "Peer branches" msgstr "" -#: rhodecode/controllers/pullrequests.py:151 rhodecode/model/scm.py:688 +#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Закладки" -#: rhodecode/controllers/pullrequests.py:324 +#: rhodecode/controllers/pullrequests.py:321 msgid "Pull request requires a title with min. 3 chars" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:326 +msgstr "Заголовок Pull запроса должен быть не менее 3-х символов" + +#: rhodecode/controllers/pullrequests.py:323 msgid "Error creating pull request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:346 +msgstr "Произошла ошибка при создании Pull запроса" + +#: rhodecode/controllers/pullrequests.py:343 msgid "Successfully opened new pull request" msgstr "Pull запрос создан успешно" -#: rhodecode/controllers/pullrequests.py:349 +#: rhodecode/controllers/pullrequests.py:346 msgid "Error occurred during sending pull request" msgstr "Произошла ошибка при создании Pull запроса" -#: rhodecode/controllers/pullrequests.py:388 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully deleted pull request" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:484 +msgstr "Pull запрос успешно удалён" + +#: rhodecode/controllers/pullrequests.py:481 msgid "Closing with" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:521 +msgstr "Закрытый с" + +#: rhodecode/controllers/pullrequests.py:518 msgid "" "Closing pull request on other statuses than rejected or approved forbidden" msgstr "" @@ -305,44 +311,44 @@ #: rhodecode/controllers/admin/defaults.py:96 msgid "Default settings updated successfully" -msgstr "" +msgstr "Стандартные настройки успешно обновлены" #: rhodecode/controllers/admin/defaults.py:110 msgid "Error occurred during update of defaults" -msgstr "" +msgstr "Произошла ошибка при обновлении стандартных настроек" #: rhodecode/controllers/admin/gists.py:56 msgid "forever" -msgstr "" +msgstr "навсегда" #: rhodecode/controllers/admin/gists.py:57 msgid "5 minutes" -msgstr "" +msgstr "5 минут" #: rhodecode/controllers/admin/gists.py:58 msgid "1 hour" -msgstr "" +msgstr "1 час" #: rhodecode/controllers/admin/gists.py:59 msgid "1 day" -msgstr "" +msgstr "1 день" #: rhodecode/controllers/admin/gists.py:60 msgid "1 month" -msgstr "" +msgstr "1 месяц" #: rhodecode/controllers/admin/gists.py:62 msgid "Lifetime" -msgstr "" +msgstr "Срок" #: rhodecode/controllers/admin/gists.py:127 msgid "Error occurred during gist creation" -msgstr "" +msgstr "Произошла ошибка во время создания сути" #: rhodecode/controllers/admin/gists.py:165 #, python-format msgid "Deleted gist %s" -msgstr "" +msgstr "Запись gist %s удалена" #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" @@ -386,11 +392,11 @@ #: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" -msgstr "" +msgstr "Использовать START_TLS при соединении по LDAP" #: rhodecode/controllers/admin/ldap_settings.py:124 msgid "LDAP settings updated successfully" -msgstr "" +msgstr "Настройки LDAP успешно обновлены" #: rhodecode/controllers/admin/ldap_settings.py:128 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." @@ -398,7 +404,7 @@ #: rhodecode/controllers/admin/ldap_settings.py:145 msgid "Error occurred during update of ldap settings" -msgstr "" +msgstr "Произошла ошибка при обновлении настроек LDAP" #: rhodecode/controllers/admin/permissions.py:58 #: rhodecode/controllers/admin/permissions.py:62 @@ -458,21 +464,21 @@ #: rhodecode/controllers/admin/permissions.py:74 msgid "Allowed with manual account activation" -msgstr "" +msgstr "Разрешено, с ручной активацией учётной записи" #: rhodecode/controllers/admin/permissions.py:76 msgid "Allowed with automatic account activation" -msgstr "" +msgstr "Разрешено, с автоматической активацией учётной записи" #: rhodecode/controllers/admin/permissions.py:79 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 msgid "Manual activation of external account" -msgstr "" +msgstr "Ручная активация внешней учетной записи" #: rhodecode/controllers/admin/permissions.py:80 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 msgid "Automatic activation of external account" -msgstr "" +msgstr "Автоматическая активация внешней учетной записи" #: rhodecode/controllers/admin/permissions.py:84 #: rhodecode/controllers/admin/permissions.py:87 @@ -487,7 +493,7 @@ #: rhodecode/controllers/admin/permissions.py:152 msgid "Error occurred during update of permissions" -msgstr "" +msgstr "Произошла ошибка во время обновления привелегий" #: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" @@ -496,17 +502,17 @@ #: rhodecode/controllers/admin/repos.py:168 #, python-format msgid "Created repository %s from %s" -msgstr "" +msgstr "Репозиторий %s создан из %s" #: rhodecode/controllers/admin/repos.py:174 #, python-format msgid "Created repository %s" -msgstr "" +msgstr "Репозиторий %s создан" #: rhodecode/controllers/admin/repos.py:197 #, python-format msgid "Error creating repository %s" -msgstr "" +msgstr "Произошла ошибка при создании репозитория %s" #: rhodecode/controllers/admin/repos.py:270 #, python-format @@ -516,22 +522,22 @@ #: rhodecode/controllers/admin/repos.py:288 #, python-format msgid "Error occurred during update of repository %s" -msgstr "" +msgstr "Произошла ошибка во время обновления репозитория %s" #: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "Detached %s forks" -msgstr "" +msgstr "Форки %s отсоединены" #: rhodecode/controllers/admin/repos.py:318 #, python-format msgid "Deleted %s forks" -msgstr "" +msgstr "Удалены форки репозитория %s" #: rhodecode/controllers/admin/repos.py:323 #, python-format msgid "Deleted repository %s" -msgstr "" +msgstr "Репозиторий %s удалён" #: rhodecode/controllers/admin/repos.py:326 #, python-format @@ -545,13 +551,13 @@ #: rhodecode/controllers/admin/repos.py:345 msgid "Repository permissions updated" -msgstr "" +msgstr "Привилегии репозитория обновлены" #: rhodecode/controllers/admin/repos.py:375 #: rhodecode/controllers/admin/repos_groups.py:332 #: rhodecode/controllers/admin/users_groups.py:312 msgid "An error occurred during revoking of permission" -msgstr "" +msgstr "Произошла ошибка при отзыве привелегии" #: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" @@ -564,20 +570,20 @@ #: rhodecode/controllers/admin/repos.py:429 #: rhodecode/controllers/admin/repos.py:456 msgid "An error occurred during unlocking" -msgstr "" +msgstr "Произошла ошибка во время разблокирования" #: rhodecode/controllers/admin/repos.py:447 msgid "Unlocked" -msgstr "" +msgstr "Разблокировано" #: rhodecode/controllers/admin/repos.py:450 msgid "Locked" -msgstr "" +msgstr "Заблокировано" #: rhodecode/controllers/admin/repos.py:452 #, python-format msgid "Repository has been %s" -msgstr "" +msgstr "Репозиторий %s" #: rhodecode/controllers/admin/repos.py:476 msgid "Updated repository visibility in public journal" @@ -593,7 +599,7 @@ #: rhodecode/controllers/admin/repos.py:498 msgid "Pulled from remote location" -msgstr "Получено от удалённого репозитория" +msgstr "Обновлено из удалённого репозитория" #: rhodecode/controllers/admin/repos.py:501 msgid "An error occurred during pull from remote location" @@ -614,31 +620,31 @@ #: rhodecode/controllers/admin/repos.py:562 msgid "An error occurred during creation of field" -msgstr "" +msgstr "Произошла ошибка при создании поля" #: rhodecode/controllers/admin/repos.py:576 msgid "An error occurred during removal of field" -msgstr "" +msgstr "Произошла ошибка при удалении поля" #: rhodecode/controllers/admin/repos_groups.py:147 #, python-format msgid "Created repository group %s" -msgstr "" +msgstr "Создана новая группа репозиториев %s" #: rhodecode/controllers/admin/repos_groups.py:159 #, python-format msgid "Error occurred during creation of repository group %s" -msgstr "" +msgstr "Произошла ошибка при создании группы репозиториев %s" #: rhodecode/controllers/admin/repos_groups.py:217 #, python-format msgid "Updated repository group %s" -msgstr "" +msgstr "Группа репозиториев %s обновлена" #: rhodecode/controllers/admin/repos_groups.py:232 #, python-format msgid "Error occurred during update of repository group %s" -msgstr "" +msgstr "Произошла ошибка при обновлении группы репозиториев %s" #: rhodecode/controllers/admin/repos_groups.py:250 #, python-format @@ -648,32 +654,32 @@ #: rhodecode/controllers/admin/repos_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" -msgstr "" +msgstr "Группа содержит в себе %s подгрупп и не может быть удалён" #: rhodecode/controllers/admin/repos_groups.py:263 #, python-format msgid "Removed repository group %s" -msgstr "" +msgstr "Группа репозиториев %s удалена" #: rhodecode/controllers/admin/repos_groups.py:268 #, python-format msgid "Error occurred during deletion of repository group %s" -msgstr "" +msgstr "Произошла ошибка при удалении группы репозиториев %s" #: rhodecode/controllers/admin/repos_groups.py:279 #: rhodecode/controllers/admin/repos_groups.py:314 #: rhodecode/controllers/admin/users_groups.py:300 msgid "Cannot revoke permission for yourself as admin" -msgstr "" +msgstr "Администратор не может отозвать свои привелегии" #: rhodecode/controllers/admin/repos_groups.py:294 msgid "Repository Group permissions updated" -msgstr "" +msgstr "Привилегии группы репозиториев обновлены" #: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "" +msgstr "Репозитории успешно пересканированы, добавлено: %s ; удалено: %s" #: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" @@ -686,19 +692,19 @@ #: rhodecode/controllers/admin/settings.py:167 #: rhodecode/controllers/admin/settings.py:304 msgid "Error occurred during updating application settings" -msgstr "" +msgstr "Произошла ошибка при обновлении настроек приложения" #: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" -msgstr "" +msgstr "Настройки визуализации обновлены" #: rhodecode/controllers/admin/settings.py:224 msgid "Error occurred during updating visualisation settings" -msgstr "" +msgstr "Произошла ошибка при обновлении настроек визуализации" #: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" -msgstr "" +msgstr "Обновлены настройки VCS" #: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" @@ -710,7 +716,7 @@ #: rhodecode/controllers/admin/settings.py:330 msgid "Error occurred during hook creation" -msgstr "" +msgstr "произошла ошибка при создании хука" #: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" @@ -718,7 +724,7 @@ #: rhodecode/controllers/admin/settings.py:413 msgid "You can't edit this user since it's crucial for entire application" -msgstr "Вы не можете редактировать пользователя, поскольку это критично для работы всего приложения" +msgstr "Вы не можете изменить данные пользователя, поскольку это критично для работы всего приложения" #: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" @@ -728,17 +734,17 @@ #: rhodecode/controllers/admin/users.py:198 #, python-format msgid "Error occurred during update of user %s" -msgstr "" +msgstr "Произошла ошибка при обновлении пользователя %s" #: rhodecode/controllers/admin/users.py:130 #, python-format msgid "Created user %s" -msgstr "" +msgstr "Пользователь %s создан" #: rhodecode/controllers/admin/users.py:142 #, python-format msgid "Error occurred during creation of user %s" -msgstr "" +msgstr "Произошла ошибка при создании пользователя %s" #: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" @@ -746,7 +752,7 @@ #: rhodecode/controllers/admin/users.py:214 msgid "Successfully deleted user" -msgstr "" +msgstr "Пользователь успешно удалён" #: rhodecode/controllers/admin/users.py:219 msgid "An error occurred during deletion of user" @@ -759,12 +765,12 @@ #: rhodecode/controllers/admin/users.py:293 #: rhodecode/controllers/admin/users_groups.py:372 msgid "Updated permissions" -msgstr "" +msgstr "Обновлены привилегии" #: rhodecode/controllers/admin/users.py:297 #: rhodecode/controllers/admin/users_groups.py:376 msgid "An error occurred during permissions saving" -msgstr "" +msgstr "Произошла ошибка при сохранении привилегий" #: rhodecode/controllers/admin/users.py:311 #, python-format @@ -782,56 +788,56 @@ #: rhodecode/controllers/admin/users.py:340 #, python-format msgid "Added ip %s to user" -msgstr "" +msgstr "Пользователю добавлен ip %s" #: rhodecode/controllers/admin/users.py:346 msgid "An error occurred during ip saving" -msgstr "" +msgstr "Произошла ошибка при сохранении IP" #: rhodecode/controllers/admin/users.py:358 msgid "Removed ip from user" -msgstr "" +msgstr "Ip пользователя удалён" #: rhodecode/controllers/admin/users_groups.py:162 #, python-format msgid "Created user group %s" -msgstr "" +msgstr "Создана группа пользователей %s" #: rhodecode/controllers/admin/users_groups.py:173 #, python-format msgid "Error occurred during creation of user group %s" -msgstr "" +msgstr "Произошла ошибка при создании группы пользователей %s" #: rhodecode/controllers/admin/users_groups.py:210 #, python-format msgid "Updated user group %s" -msgstr "" +msgstr "Группа пользователей %s обновлена" #: rhodecode/controllers/admin/users_groups.py:232 #, python-format msgid "Error occurred during update of user group %s" -msgstr "" +msgstr "Произошла ошибка при обновлении группы пользователей %s" #: rhodecode/controllers/admin/users_groups.py:250 msgid "Successfully deleted user group" -msgstr "" +msgstr "Группа пользователей успешно удалена" #: rhodecode/controllers/admin/users_groups.py:255 msgid "An error occurred during deletion of user group" -msgstr "" +msgstr "Произошла ошибка при удалении группы пользователей" #: rhodecode/controllers/admin/users_groups.py:274 msgid "Target group cannot be the same" -msgstr "" +msgstr "Целевая группа не может быть такой же" #: rhodecode/controllers/admin/users_groups.py:280 msgid "User Group permissions updated" -msgstr "" +msgstr "Привилегии группы пользователей обновлены" #: rhodecode/lib/auth.py:544 #, python-format msgid "IP %s not allowed" -msgstr "" +msgstr "IP %s заблокирован" #: rhodecode/lib/auth.py:593 msgid "You need to be a registered user to perform this action" @@ -843,22 +849,17 @@ #: rhodecode/lib/diffs.py:66 msgid "Binary file" -msgstr "" +msgstr "Двоичный файл" #: rhodecode/lib/diffs.py:82 msgid "" "Changeset was too big and was cut off, use diff menu to display this diff" -msgstr "Изменения оказались слишком большими и были урезаны, используйте меню сравнения для показа результата сравнения" +msgstr "Набор изменения оказался слишком большими и был урезан, используйте меню сравнения для показа результата сравнения" #: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "Изменений не обнаружено" -#: rhodecode/lib/helpers.py:428 -#, python-format -msgid "%a, %d %b %Y %H:%M:%S" -msgstr "%a, %d %b %Y %H:%M:%S" - #: rhodecode/lib/helpers.py:539 msgid "True" msgstr "Истина" @@ -870,12 +871,12 @@ #: rhodecode/lib/helpers.py:580 #, python-format msgid "Deleted branch: %s" -msgstr "" +msgstr "Удалена ветка: %s" #: rhodecode/lib/helpers.py:583 #, python-format msgid "Created tag: %s" -msgstr "" +msgstr "Создан тег: %s" #: rhodecode/lib/helpers.py:596 msgid "Changeset not found" @@ -902,12 +903,12 @@ #: rhodecode/lib/helpers.py:674 #: rhodecode/templates/changelog/changelog.html:53 msgid "revisions" -msgstr "ревизии" +msgstr "версии" #: rhodecode/lib/helpers.py:698 #, python-format msgid "fork name %s" -msgstr "" +msgstr "имя форка %s" #: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 @@ -937,7 +938,7 @@ #: rhodecode/lib/helpers.py:735 msgid "[downloaded] archive from repository" -msgstr "" +msgstr "[загружен] архив из репозитория" #: rhodecode/lib/helpers.py:737 msgid "[delete] repository" @@ -953,23 +954,23 @@ #: rhodecode/lib/helpers.py:749 msgid "[created] user group" -msgstr "" +msgstr "[создана] группа пользователей" #: rhodecode/lib/helpers.py:751 msgid "[updated] user group" -msgstr "" +msgstr "[обновлена] группа пользователей" #: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" -msgstr "" +msgstr "[комментировано] в версии в репозитории" #: rhodecode/lib/helpers.py:755 msgid "[commented] on pull request for" -msgstr "" +msgstr "[прокомментировано] в запросе на внесение изменений для" #: rhodecode/lib/helpers.py:757 msgid "[closed] pull request for" -msgstr "" +msgstr "[закрыт] Pull запрос" #: rhodecode/lib/helpers.py:759 msgid "[pushed] into" @@ -989,11 +990,11 @@ #: rhodecode/lib/helpers.py:767 msgid "[started following] repository" -msgstr "" +msgstr "[добавлен в наблюдения] репозиторий" #: rhodecode/lib/helpers.py:769 msgid "[stopped following] repository" -msgstr "" +msgstr "[удалён из наблюдения] репозиторий" #: rhodecode/lib/helpers.py:1088 #, python-format @@ -1006,34 +1007,34 @@ #: rhodecode/lib/helpers.py:1158 msgid "new file" -msgstr "" +msgstr "новый файл" #: rhodecode/lib/helpers.py:1161 msgid "mod" -msgstr "" +msgstr "mod" #: rhodecode/lib/helpers.py:1164 msgid "del" -msgstr "" +msgstr "удалить" #: rhodecode/lib/helpers.py:1167 msgid "rename" -msgstr "" +msgstr "переименовать" #: rhodecode/lib/helpers.py:1172 msgid "chmod" -msgstr "" +msgstr "chmod" #: rhodecode/lib/helpers.py:1404 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" " filesystem please run the application again in order to rescan repositories" -msgstr "" +msgstr "Репозитарий %s не отображен в базе данных; возможно, он был создан или переименован из файловой системы. Пожалуйста, перезапустите приложение для сканирования репозитариев." #: rhodecode/lib/unionrepo.py:193 msgid "cannot create new union repository" -msgstr "" +msgstr "не возможно создать объединённый репозитарий" #: rhodecode/lib/utils2.py:410 #, python-format @@ -1086,7 +1087,7 @@ #: rhodecode/lib/utils2.py:431 #, python-format msgid "in %s" -msgstr "" +msgstr "в %s" #: rhodecode/lib/utils2.py:433 #, python-format @@ -1096,7 +1097,7 @@ #: rhodecode/lib/utils2.py:435 #, python-format msgid "in %s and %s" -msgstr "" +msgstr "в %s и %s" #: rhodecode/lib/utils2.py:438 #, python-format @@ -1113,7 +1114,7 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 msgid "Repository no access" -msgstr "Нет доступа к репозиторию" +msgstr "Репозитарий - нет доступа" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 @@ -1121,7 +1122,7 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 msgid "Repository read access" -msgstr "Доступ к репозиторию только в режиме чтения" +msgstr "Репозитарий - доступ на чтение" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 @@ -1129,7 +1130,7 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 msgid "Repository write access" -msgstr "Доступ к репозиторию с возможностью введения изменений" +msgstr "Репозитарий - доступ на запись" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 @@ -1137,7 +1138,7 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 msgid "Repository admin access" -msgstr "Доступ к репозиторию с правами администратора" +msgstr "Репозитарий - администрирование" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 @@ -1193,7 +1194,7 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 msgid "Repository forking disabled" -msgstr "" +msgstr "Возможность создавать форк репозитория отключена" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 @@ -1201,7 +1202,7 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 msgid "Repository forking enabled" -msgstr "" +msgstr "Возможность создавать форк репозитория включена" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 @@ -1259,71 +1260,71 @@ #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 msgid "top level" -msgstr "" +msgstr "верхний уровень" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 msgid "Repository group no access" -msgstr "" +msgstr "Группа Репозиториев - нет доступа" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 msgid "Repository group read access" -msgstr "" +msgstr "Группа репозиториев - доступ на чтение" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 msgid "Repository group write access" -msgstr "" +msgstr "Группа репозиториев - доступ на запись" #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 msgid "Repository group admin access" -msgstr "" +msgstr "Группа репозиториев - администрирование" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 msgid "User group no access" -msgstr "" +msgstr "Группа пользователей - нет доступа" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 msgid "User group read access" -msgstr "" +msgstr "Группа пользователей - доступ на чтение" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 msgid "User group write access" -msgstr "" +msgstr "Группа пользователей - доступ на запись" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 msgid "User group admin access" -msgstr "" +msgstr "Группа пользователей - администрирование" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 msgid "Repository Group creation disabled" -msgstr "" +msgstr "Создание групп репозиториев отключено" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 msgid "Repository Group creation enabled" -msgstr "" +msgstr "Создание групп репозиториев включено" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 msgid "User Group creation disabled" -msgstr "" +msgstr "Создание групп пользователей отключено" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 msgid "User Group creation enabled" -msgstr "" +msgstr "Создание групп пользователей включено" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 msgid "Registration disabled" -msgstr "" +msgstr "Регистрация отключена" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 msgid "User Registration with manual account activation" -msgstr "" +msgstr "Регистрация пользователя с ручной активацией учётной записи" #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 msgid "User Registration with automatic account activation" -msgstr "" +msgstr "Регистрация пользователя с автоматической активацией" #: rhodecode/model/comment.py:75 #, python-format @@ -1355,45 +1356,45 @@ #: rhodecode/model/notification.py:228 #, python-format msgid "%(user)s commented on changeset at %(when)s" -msgstr "" +msgstr "%(user)s оставил комментарий к набору изменений %(when)s" #: rhodecode/model/notification.py:229 #, python-format msgid "%(user)s sent message at %(when)s" -msgstr "" +msgstr "%(user)s отправил сообщение %(when)s" #: rhodecode/model/notification.py:230 #, python-format msgid "%(user)s mentioned you at %(when)s" -msgstr "" +msgstr "%(user)s упомянул вас %(when)s" #: rhodecode/model/notification.py:231 #, python-format msgid "%(user)s registered in RhodeCode at %(when)s" -msgstr "" +msgstr "%(user)s зарегистрировался в RhodeCode %(when)s" #: rhodecode/model/notification.py:232 #, python-format msgid "%(user)s opened new pull request at %(when)s" -msgstr "" +msgstr "%(user)s открыл новый pull request %(when)s" #: rhodecode/model/notification.py:233 #, python-format msgid "%(user)s commented on pull request at %(when)s" -msgstr "" +msgstr "%(user)s оставил комментарий к pull request %(when)s" #: rhodecode/model/pull_request.py:98 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -msgstr "" +msgstr "%(user)s просит вас рассмотреть pull request #%(pr_id)s: %(pr_title)s" #: rhodecode/model/scm.py:674 msgid "latest tip" -msgstr "последняя заметка" +msgstr "последняя версия" #: rhodecode/model/user.py:232 msgid "New user registration" -msgstr "" +msgstr "Регистрация нового пользователя" #: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" @@ -1412,20 +1413,20 @@ #: rhodecode/model/user.py:334 msgid "Password reset link" -msgstr "" +msgstr "Ссылка сброса пароля" #: rhodecode/model/user.py:366 msgid "Your new password" -msgstr "" +msgstr "Ваш новый пароль" #: rhodecode/model/user.py:367 #, python-format msgid "Your new RhodeCode password:%s" -msgstr "" +msgstr "Ваш новый пароль от RhodeCode: %s" #: rhodecode/model/validators.py:38 rhodecode/model/validators.py:39 msgid "Value cannot be an empty list" -msgstr "" +msgstr "Значение не может быть пустым списком" #: rhodecode/model/validators.py:85 #, python-format @@ -1441,7 +1442,7 @@ msgid "" "Username may only contain alphanumeric characters underscores, periods or " "dashes and must begin with alphanumeric character or underscore" -msgstr "" +msgstr "Имя пользователя может содержать только буквы, цифры, символы подчеркивания, точки и тире; а так же должно начинаться с буквы, цифры либо с символа подчеркивания" #: rhodecode/model/validators.py:117 #, python-format @@ -1450,18 +1451,18 @@ #: rhodecode/model/validators.py:136 msgid "Invalid user group name" -msgstr "" +msgstr "Неверное имя группы пользователей" #: rhodecode/model/validators.py:137 #, python-format msgid "User group \"%(usergroup)s\" already exists" -msgstr "" +msgstr "Группа пользователей \"%(usergroup)s\" уже существует" #: rhodecode/model/validators.py:139 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "" +msgstr "имя группы пользователей может содержать только буквы, цифры, символы подчеркивания, точки и тире; а так же должно начинаться с буквы или цифры" #: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" @@ -1515,7 +1516,7 @@ #: rhodecode/model/validators.py:321 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" -msgstr "" +msgstr "Группа репозиториев \"%(repo)s\" уже существует" #: rhodecode/model/validators.py:438 msgid "invalid clone url" @@ -1523,7 +1524,7 @@ #: rhodecode/model/validators.py:439 msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" -msgstr "" +msgstr "Неверная ссылка клонирования, предоставьте действительную ссылку для клонирования - http(s)/svn+http(s)." #: rhodecode/model/validators.py:464 msgid "Fork have to be the same type as parent" @@ -1531,19 +1532,19 @@ #: rhodecode/model/validators.py:479 msgid "You don't have permissions to create repository in this group" -msgstr "" +msgstr "У вас нет прав создания репозиториев в этой группе" #: rhodecode/model/validators.py:481 msgid "no permission to create repository in root location" -msgstr "" +msgstr "нет прав создания репозиториев в корне" #: rhodecode/model/validators.py:518 msgid "You don't have permissions to create a group in this location" -msgstr "" +msgstr "У Вас нет прав создавать группу в этом месте" #: rhodecode/model/validators.py:559 msgid "This username or user group name is not valid" -msgstr "" +msgstr "Данное имя пользователя или группы пользователей недопустимо" #: rhodecode/model/validators.py:652 msgid "This is not a valid path" @@ -1562,7 +1563,7 @@ msgid "" "The LDAP Login attribute of the CN must be specified - this is the name of " "the attribute that is equivalent to \"username\"" -msgstr "" +msgstr "Для входа по LDAP должно быть указано значение аттрибута CN - это эквивалент имени пользователя" #: rhodecode/model/validators.py:737 #, python-format @@ -1571,21 +1572,21 @@ #: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" -msgstr "" +msgstr "Пожалуйста, введите существующий IPv4 или IpV6 адре" #: rhodecode/model/validators.py:770 #, python-format msgid "" "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" +msgstr "Значение маски подсети должно быть в пределах от 0 до 32 (%(bits)r - неверно)" #: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" -msgstr "" +msgstr "Ключевое имя может только состоять из букв, символа подчеркивания, тире или чисел" #: rhodecode/model/validators.py:817 msgid "Filename cannot be inside a directory" -msgstr "" +msgstr "Файла нет в каталоге" #: rhodecode/templates/index.html:5 msgid "Dashboard" @@ -1613,7 +1614,7 @@ #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repos.html:21 +#: rhodecode/templates/admin/repos/repos.html:22 msgid "Add repository" msgstr "Добавить репозиторий" @@ -1621,15 +1622,15 @@ #: rhodecode/templates/index_base.html:20 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 msgid "Add group" -msgstr "" +msgstr "Добавить группу" #: rhodecode/templates/index_base.html:27 msgid "Edit group" -msgstr "" +msgstr "Редактировать группу" #: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" -msgstr "" +msgstr "Вы имеете администраторские права на эту группу и можете редактировать её" #: rhodecode/templates/index_base.html:40 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 @@ -1645,7 +1646,7 @@ #: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:68 -#: rhodecode/templates/admin/repos/repos.html:73 +#: rhodecode/templates/admin/repos/repos.html:75 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 @@ -1670,7 +1671,7 @@ #: rhodecode/templates/index_base.html:121 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:71 +#: rhodecode/templates/admin/repos/repos.html:73 #: rhodecode/templates/admin/users/user_edit_my_account.html:172 #: rhodecode/templates/base/perms_summary.html:37 #: rhodecode/templates/bookmarks/bookmarks.html:48 @@ -1692,7 +1693,7 @@ msgstr "Последнее изменение" #: rhodecode/templates/index_base.html:126 -#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/repos/repos.html:76 #: rhodecode/templates/admin/users/user_edit_my_account.html:174 #: rhodecode/templates/journal/journal.html:195 #: rhodecode/templates/journal/journal.html:285 @@ -1701,12 +1702,12 @@ #: rhodecode/templates/index_base.html:128 #: rhodecode/templates/admin/repos/repo_edit.html:114 -#: rhodecode/templates/admin/repos/repos.html:76 +#: rhodecode/templates/admin/repos/repos.html:78 msgid "Owner" msgstr "Владелец" #: rhodecode/templates/index_base.html:136 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:86 #: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:74 @@ -1718,7 +1719,7 @@ msgstr "По возрастанию" #: rhodecode/templates/index_base.html:137 -#: rhodecode/templates/admin/repos/repos.html:85 +#: rhodecode/templates/admin/repos/repos.html:87 #: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:75 @@ -1731,10 +1732,10 @@ #: rhodecode/templates/index_base.html:138 msgid "No repositories found." -msgstr "" +msgstr "Репозитарии не найдены." #: rhodecode/templates/index_base.html:139 -#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/repos/repos.html:89 #: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:77 @@ -1746,7 +1747,7 @@ msgstr "Ошибка данных." #: rhodecode/templates/index_base.html:140 -#: rhodecode/templates/admin/repos/repos.html:88 +#: rhodecode/templates/admin/repos/repos.html:90 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 #: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 @@ -1765,7 +1766,7 @@ #: rhodecode/templates/login.html:21 #, python-format msgid "Log In to %s" -msgstr "" +msgstr "Войти в %s" #: rhodecode/templates/login.html:31 rhodecode/templates/register.html:20 #: rhodecode/templates/admin/admin_log.html:5 @@ -1803,7 +1804,7 @@ #: rhodecode/templates/password_reset.html:5 msgid "Password Reset" -msgstr "" +msgstr "Сброс пароля" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1901,24 +1902,24 @@ #: rhodecode/templates/admin/admin.html:10 msgid "journal filter..." -msgstr "" +msgstr "Фильтр журнала..." #: rhodecode/templates/admin/admin.html:12 #: rhodecode/templates/journal/journal.html:11 msgid "filter" -msgstr "" +msgstr "фильтр" #: rhodecode/templates/admin/admin.html:13 #: rhodecode/templates/journal/journal.html:12 #, python-format msgid "%s entry" msgid_plural "%s entries" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%s запись" +msgstr[1] "%s записей" +msgstr[2] "%s записи" #: rhodecode/templates/admin/admin_log.html:6 -#: rhodecode/templates/admin/repos/repos.html:77 +#: rhodecode/templates/admin/repos/repos.html:79 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 #: rhodecode/templates/admin/users/user_edit_my_account.html:176 #: rhodecode/templates/admin/users/users.html:87 @@ -1954,12 +1955,12 @@ #: rhodecode/templates/admin/defaults/defaults.html:5 #: rhodecode/templates/admin/defaults/defaults.html:25 msgid "Repositories defaults" -msgstr "" +msgstr " Значения по умолчанию" #: rhodecode/templates/admin/defaults/defaults.html:11 #: rhodecode/templates/base/base.html:80 msgid "Defaults" -msgstr "" +msgstr "Значения по умолчанию" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 @@ -1999,7 +2000,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:105 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 msgid "Enable locking" -msgstr "" +msgstr "Включить блокирование" #: rhodecode/templates/admin/defaults/defaults.html:79 #: rhodecode/templates/admin/repos/repo_edit.html:109 @@ -2027,64 +2028,64 @@ #: rhodecode/templates/admin/gists/index.html:5 #: rhodecode/templates/base/base.html:299 msgid "Gists" -msgstr "" +msgstr "Gist" #: rhodecode/templates/admin/gists/index.html:10 #, python-format msgid "Private Gists for user %s" -msgstr "" +msgstr "Приватная запись Gist для пользователя %s" #: rhodecode/templates/admin/gists/index.html:12 #, python-format msgid "Public Gists for user %s" -msgstr "" +msgstr "Публичная запись Gist для пользователя %s" #: rhodecode/templates/admin/gists/index.html:14 msgid "Public Gists" -msgstr "" +msgstr "Публичные записи Gist" #: rhodecode/templates/admin/gists/index.html:31 #: rhodecode/templates/admin/gists/show.html:24 #: rhodecode/templates/base/base.html:302 msgid "Create new gist" -msgstr "" +msgstr "Создать новую запись" #: rhodecode/templates/admin/gists/index.html:48 msgid "Created" -msgstr "" +msgstr "Создано" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/index.html:53 #: rhodecode/templates/admin/gists/show.html:43 #: rhodecode/templates/admin/gists/show.html:45 msgid "Expires" -msgstr "" +msgstr "Истекает" #: rhodecode/templates/admin/gists/index.html:51 #: rhodecode/templates/admin/gists/show.html:43 msgid "never" -msgstr "" +msgstr "никогда" #: rhodecode/templates/admin/gists/index.html:68 msgid "There are no gists yet" -msgstr "" +msgstr "Записи Gist отсутствуют" #: rhodecode/templates/admin/gists/new.html:5 #: rhodecode/templates/admin/gists/new.html:16 msgid "New gist" -msgstr "" +msgstr "Новая запись" #: rhodecode/templates/admin/gists/new.html:37 msgid "Gist description ..." -msgstr "" +msgstr "Описание..." #: rhodecode/templates/admin/gists/new.html:52 msgid "Create private gist" -msgstr "" +msgstr "Создать приватную запись" #: rhodecode/templates/admin/gists/new.html:53 msgid "Create public gist" -msgstr "" +msgstr "Создать публичную запись" #: rhodecode/templates/admin/gists/new.html:54 #: rhodecode/templates/admin/permissions/permissions.html:123 @@ -2111,19 +2112,19 @@ #: rhodecode/templates/admin/gists/show.html:5 msgid "gist" -msgstr "" +msgstr "gist" #: rhodecode/templates/admin/gists/show.html:9 msgid "Gist" -msgstr "" +msgstr "Gist" #: rhodecode/templates/admin/gists/show.html:36 msgid "Public gist" -msgstr "" +msgstr "Публичная запись gist" #: rhodecode/templates/admin/gists/show.html:38 msgid "Private gist" -msgstr "" +msgstr "Приватная запись gist" #: rhodecode/templates/admin/gists/show.html:54 #: rhodecode/templates/admin/repos/repo_edit.html:299 @@ -2133,7 +2134,7 @@ #: rhodecode/templates/admin/gists/show.html:54 msgid "Confirm to delete this gist" -msgstr "" +msgstr "Подтвердите удаление записи" #: rhodecode/templates/admin/gists/show.html:63 #: rhodecode/templates/admin/gists/show.html:84 @@ -2141,11 +2142,11 @@ #: rhodecode/templates/files/files_source.html:25 #: rhodecode/templates/files/files_source.html:55 msgid "Show as raw" -msgstr "" +msgstr "Показать без форматирования" #: rhodecode/templates/admin/gists/show.html:71 msgid "created" -msgstr "" +msgstr "создал" #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" @@ -2155,7 +2156,7 @@ #: rhodecode/templates/admin/users/users.html:86 #: rhodecode/templates/base/base.html:79 msgid "LDAP" -msgstr "" +msgstr "LDAP" #: rhodecode/templates/admin/ldap/ldap.html:28 msgid "Connection settings" @@ -2286,31 +2287,31 @@ "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will be " "lost" -msgstr "" +msgstr "Выбранные значения прав будут установлены как значения по умолчанию для каждого репозитория. Учтите, что ранее установленные значения прав по умолчанию для репозиториев будут сброшены." #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 #: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Overwrite existing settings" -msgstr "" +msgstr "Перезаписать существующие настройки" #: rhodecode/templates/admin/permissions/permissions.html:62 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "" +msgstr "Выбранные значения прав будут установлены как значения по умолчанию для каждой группы репозиториев. Учтите, что ранее установленные значения прав по умолчанию для групп репозиториев будут сброшены." #: rhodecode/templates/admin/permissions/permissions.html:69 msgid "User group" -msgstr "" +msgstr "Группа пользователей" #: rhodecode/templates/admin/permissions/permissions.html:76 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "" +msgstr "Выбранные значения прав будут установлены как значения по умолчанию для каждой группы пользователей. Учтите, что ранее установленные значения прав по умолчанию для групп пользователей будут сброшены." #: rhodecode/templates/admin/permissions/permissions.html:83 msgid "Repository creation" @@ -2318,11 +2319,11 @@ #: rhodecode/templates/admin/permissions/permissions.html:91 msgid "User group creation" -msgstr "" +msgstr "Создание групп пользователей" #: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" -msgstr "" +msgstr "Создание форка репозитория" #: rhodecode/templates/admin/permissions/permissions.html:107 msgid "Registration" @@ -2334,12 +2335,12 @@ #: rhodecode/templates/admin/permissions/permissions.html:133 msgid "Default User Permissions" -msgstr "" +msgstr "Права по умолчанию" #: rhodecode/templates/admin/permissions/permissions.html:144 #: rhodecode/templates/admin/users/user_edit.html:207 msgid "Allowed IP addresses" -msgstr "" +msgstr "Разрешенные IP-адреса" #: rhodecode/templates/admin/permissions/permissions.html:158 #: rhodecode/templates/admin/repos/repo_edit.html:340 @@ -2356,17 +2357,17 @@ #: rhodecode/templates/admin/users/user_edit.html:221 #, python-format msgid "Confirm to delete this ip: %s" -msgstr "" +msgstr "Подтвердите удаление ip %s" #: rhodecode/templates/admin/permissions/permissions.html:165 #: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" -msgstr "" +msgstr "Разрешены любые IP-адреса" #: rhodecode/templates/admin/permissions/permissions.html:176 #: rhodecode/templates/admin/users/user_edit.html:238 msgid "New ip address" -msgstr "" +msgstr "Новый ip-адрес" #: rhodecode/templates/admin/permissions/permissions.html:184 #: rhodecode/templates/admin/repos/repo_add_base.html:73 @@ -2386,13 +2387,13 @@ #: rhodecode/templates/admin/repos/repo_add.html:19 msgid "Add new" -msgstr "" +msgstr "Добавить новый" #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:96 #: rhodecode/templates/summary/summary.html:97 msgid "Clone from" -msgstr "Склонировать из" +msgstr "Клонировать из" #: rhodecode/templates/admin/repos/repo_add_base.html:24 #: rhodecode/templates/admin/repos/repo_edit.html:45 @@ -2412,20 +2413,20 @@ #: rhodecode/templates/admin/repos/repo_edit.html:59 #: rhodecode/templates/forks/fork.html:38 msgid "Landing revision" -msgstr "" +msgstr "Ревизия для выгрузки" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:63 #: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" -msgstr "" +msgstr "Ревизия по умолчанию, из которой будет производиться выгрузка файлов при скачивании" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." -msgstr "" +msgstr "Короткое и осмысленное. Для развернутого описания используйте файл README." #: rhodecode/templates/admin/repos/repo_edit.html:8 msgid "Edit repository" @@ -2442,7 +2443,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:36 msgid "Non-changeable id" -msgstr "" +msgstr "Неизменяемый id" #: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" @@ -2458,7 +2459,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:177 msgid "Advanced settings" -msgstr "" +msgstr "Дополнительные настройки" #: rhodecode/templates/admin/repos/repo_edit.html:180 msgid "Statistics" @@ -2508,19 +2509,19 @@ msgid "" "Manually invalidate cache for this repository. On first access repository " "will be cached again" -msgstr "" +msgstr "Ручной сброс кэша репозитория. При первом доступе кэш восстановится." #: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" -msgstr "" +msgstr "Список кешированных значений" #: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" -msgstr "" +msgstr "Префикс" #: rhodecode/templates/admin/repos/repo_edit.html:227 msgid "Key" -msgstr "" +msgstr "Ключ" #: rhodecode/templates/admin/repos/repo_edit.html:228 #: rhodecode/templates/admin/users/user_add.html:86 @@ -2554,32 +2555,32 @@ #: rhodecode/templates/admin/repos/repo_edit.html:263 msgid "Locking" -msgstr "" +msgstr "Блокировка" #: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" -msgstr "" +msgstr "Разблокировать репозиторий" #: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Confirm to unlock repository" -msgstr "" +msgstr "Подтвердите снятие блокировки с репозитория" #: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Lock repo" -msgstr "" +msgstr "Заблокировать репозиторий" #: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" -msgstr "" +msgstr "Подтвердите блокировку репозитория" #: rhodecode/templates/admin/repos/repo_edit.html:272 msgid "Repository is not locked" -msgstr "" +msgstr "Репозиторий не заблокирован" #: rhodecode/templates/admin/repos/repo_edit.html:277 msgid "" "Force locking on repository. Works only when anonymous access is disabled" -msgstr "" +msgstr "Принудительная блокировка репозитория. Работает только при отключенном доступе для неавторизованных." #: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Set as fork of" @@ -2587,7 +2588,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:289 msgid "Set" -msgstr "" +msgstr "Набор" #: rhodecode/templates/admin/repos/repo_edit.html:293 msgid "Manually set this repository as a fork of another from the list" @@ -2605,53 +2606,53 @@ #, python-format msgid "this repository has %s fork" msgid_plural "this repository has %s forks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "данный репозиторий имеет %s копию" +msgstr[1] "данный репозиторий имеет %s копии" +msgstr[2] "данный репозиторий имеет %s копий" #: rhodecode/templates/admin/repos/repo_edit.html:311 msgid "Detach forks" -msgstr "" +msgstr "Отсоединить fork'и" #: rhodecode/templates/admin/repos/repo_edit.html:312 msgid "Delete forks" -msgstr "" +msgstr "Удалить fork'и" #: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "" "This repository will be renamed in a special way in order to be unaccesible " "for RhodeCode and VCS systems. If you need to fully delete it from file " "system please do it manually" -msgstr "" +msgstr "Этот репозитарий будет переименован таким образом, чтобы сделать его недоступным для RhodeCode и систем управления версиями. Если вам необходимо полностью удалить его из файловой системы, пожалуйста, сделайте это вручную" #: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" -msgstr "" +msgstr "Дополнительные поля" #: rhodecode/templates/admin/repos/repo_edit.html:341 #, python-format msgid "Confirm to delete this field: %s" -msgstr "" +msgstr "Подтвердите удаление этого поля: %s" #: rhodecode/templates/admin/repos/repo_edit.html:355 msgid "New field key" -msgstr "" +msgstr "Ключ" #: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" -msgstr "" +msgstr "Имя поля" #: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" -msgstr "" +msgstr "Введите краткое имя поля" #: rhodecode/templates/admin/repos/repo_edit.html:372 msgid "New field description" -msgstr "" +msgstr "Описание поля" #: rhodecode/templates/admin/repos/repo_edit.html:375 msgid "Enter description of a field" -msgstr "" +msgstr "Введите описание поля" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 @@ -2703,7 +2704,7 @@ #: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25 #: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55 msgid "revoke" -msgstr "вернуть" +msgstr "отозвать" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 @@ -2715,7 +2716,7 @@ msgid "Repositories administration" msgstr "Администрирование репозиториев" -#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/repos/repos.html:88 #: rhodecode/templates/admin/users/user_edit_my_account.html:185 #: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:76 @@ -2728,18 +2729,18 @@ #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "apply to children" -msgstr "" +msgstr "применить к дочерним" #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" -msgstr "" +msgstr "Назначить или отозвать привилегии всем в группе, включая общедоступные репозитории и другие группы." #: rhodecode/templates/admin/repos_groups/repos_groups.html:4 #, python-format msgid "%s Group Dashboard" -msgstr "" +msgstr "Панель группы %s" #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 msgid "Home" @@ -2751,18 +2752,18 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 msgid "Add repository group" -msgstr "" +msgstr "Добавить группу репозиториев" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 #: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 msgid "Repository groups" -msgstr "" +msgstr "Группы репозиториев" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 msgid "Add new repository group" -msgstr "" +msgstr "Добавить новую группу репозиториев" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 @@ -2775,16 +2776,16 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 msgid "Edit repository group" -msgstr "" +msgstr "Редактировать группу репозиториев" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 #, python-format msgid "Edit repository group %s" -msgstr "" +msgstr "Редактировать группу репозиториев %s" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 msgid "Add child group" -msgstr "" +msgstr "Добавить дочернюю группу" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" @@ -2794,7 +2795,7 @@ #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repository groups administration" -msgstr "" +msgstr "Администрирование групп репозиториев" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" @@ -2805,7 +2806,7 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:171 msgid "Edit" -msgstr "" +msgstr "Редактировать" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 #: rhodecode/templates/admin/users_groups/users_groups.html:49 @@ -2823,13 +2824,13 @@ #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Подтвердите удаление группы %s содержащей %s репозиториев." +msgstr[1] "Подтвердите удаление группы %s содержащей %s репозиториев." +msgstr[2] "Подтвердите удаление группы %s содержащей %s репозиториев." #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 msgid "There are no repository groups yet" -msgstr "" +msgstr "Группы репозиториев еще не созданы" #: rhodecode/templates/admin/settings/hooks.html:5 #: rhodecode/templates/admin/settings/settings.html:5 @@ -2838,7 +2839,7 @@ #: rhodecode/templates/admin/settings/hooks.html:24 msgid "Built in hooks - read only" -msgstr "" +msgstr "Встроенные хуки - только для чтения" #: rhodecode/templates/admin/settings/hooks.html:40 msgid "Custom hooks" @@ -2854,28 +2855,28 @@ #: rhodecode/templates/admin/settings/settings.html:26 msgid "Remap and rescan repositories" -msgstr "Ремапить и пересканировать репозитории" +msgstr "Переназначение и повторное сканирование" #: rhodecode/templates/admin/settings/settings.html:34 msgid "Rescan option" -msgstr "" +msgstr "Опции пересканирования" #: rhodecode/templates/admin/settings/settings.html:40 msgid "" "In case a repository was deleted from filesystem and there are leftovers in " "the database check this option to scan obsolete data in database and remove " "it." -msgstr "" +msgstr "В случае, если репозитарий был удален из файловой системы, и в базе данных осталась информация относящаяся к нему, эта опция найдёт устаревшие данные в базе и удалит их." #: rhodecode/templates/admin/settings/settings.html:41 msgid "Destroy old data" -msgstr "" +msgstr "Уничтожить все данные" #: rhodecode/templates/admin/settings/settings.html:43 msgid "" "Rescan repositories location for new repositories. Also deletes obsolete if " "`destroy` flag is checked " -msgstr "" +msgstr "Обновить месторасположение хранилищ. Также удалить устаревшие хранилища если флаг \"уничтожить все данные\" установлен." #: rhodecode/templates/admin/settings/settings.html:48 msgid "Rescan repositories" @@ -2887,11 +2888,11 @@ #: rhodecode/templates/admin/settings/settings.html:62 msgid "Index build option" -msgstr "" +msgstr "Опции создания индекса" #: rhodecode/templates/admin/settings/settings.html:67 msgid "Build from scratch" -msgstr "" +msgstr "Сборка с нуля" #: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" @@ -2903,7 +2904,7 @@ #: rhodecode/templates/admin/settings/settings.html:88 msgid "Site branding" -msgstr "" +msgstr "Брендинг сайта" #: rhodecode/templates/admin/settings/settings.html:97 msgid "HTTP authentication realm" @@ -2911,7 +2912,7 @@ #: rhodecode/templates/admin/settings/settings.html:106 msgid "Google Analytics code" -msgstr "" +msgstr "Код Google Analytics" #: rhodecode/templates/admin/settings/settings.html:114 #: rhodecode/templates/admin/settings/settings.html:195 @@ -2921,41 +2922,41 @@ #: rhodecode/templates/admin/settings/settings.html:121 msgid "Visualisation settings" -msgstr "" +msgstr "Настройки визуализации" #: rhodecode/templates/admin/settings/settings.html:129 msgid "General" -msgstr "" +msgstr "Главное" #: rhodecode/templates/admin/settings/settings.html:134 msgid "Use repository extra fields" -msgstr "" +msgstr "Использовать дополнительные поля в репозиториях" #: rhodecode/templates/admin/settings/settings.html:136 msgid "Allows storing additional customized fields per repository." -msgstr "" +msgstr "Позволяет хранить дополнительные поля в репозиториях" #: rhodecode/templates/admin/settings/settings.html:139 msgid "Show RhodeCode version" -msgstr "" +msgstr "Отображать версию RhodeCode" #: rhodecode/templates/admin/settings/settings.html:141 msgid "Shows or hides displayed version of RhodeCode in the footer" -msgstr "" +msgstr "Показать или скрыть версию RhodeCode в нижней части страницы" #: rhodecode/templates/admin/settings/settings.html:146 msgid "Dashboard items" -msgstr "" +msgstr "Элементы панели" #: rhodecode/templates/admin/settings/settings.html:150 msgid "" "Number of items displayed in lightweight dashboard before pagination is " "shown." -msgstr "" +msgstr "Число показываемых пунктов, показанных в облегчённой приборной панели перед нумерацией страниц." #: rhodecode/templates/admin/settings/settings.html:155 msgid "Icons" -msgstr "" +msgstr "Иконки" #: rhodecode/templates/admin/settings/settings.html:160 msgid "Show public repo icon on repositories" @@ -2971,15 +2972,15 @@ #: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" -msgstr "" +msgstr "Метатегирование" #: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" -msgstr "" +msgstr "Stylify распознал метатеги:" #: rhodecode/templates/admin/settings/settings.html:204 msgid "VCS settings" -msgstr "" +msgstr "Настройки VCS" #: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" @@ -2987,13 +2988,13 @@ #: rhodecode/templates/admin/settings/settings.html:218 msgid "Require SSL for vcs operations" -msgstr "" +msgstr "Запрашивать SSL для операций с VCS" #: rhodecode/templates/admin/settings/settings.html:220 msgid "" "RhodeCode will require SSL for pushing or pulling. If SSL is missing it will" " return HTTP Error 406: Not Acceptable" -msgstr "" +msgstr "RhodeCode будет запрашивать SSL для таких действий как push или pull. Если SSL не будет получен, то будет возвращена ошибка HTTP Error 406: Not Acceptable" #: rhodecode/templates/admin/settings/settings.html:226 msgid "Hooks" @@ -3017,25 +3018,25 @@ #: rhodecode/templates/admin/settings/settings.html:247 msgid "Advanced setup" -msgstr "" +msgstr "Расширенные настройки" #: rhodecode/templates/admin/settings/settings.html:252 msgid "Mercurial Extensions" -msgstr "" +msgstr "Расширения Mercurial" #: rhodecode/templates/admin/settings/settings.html:257 msgid "Enable largefiles extension" -msgstr "" +msgstr "Включить поддержку больших файлов" #: rhodecode/templates/admin/settings/settings.html:261 msgid "Enable hgsubversion extension" -msgstr "" +msgstr "Включить поддержку hgsubversion" #: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" -msgstr "" +msgstr "Необходимые библиотеки hgsubversion установлены. Разрешено клонировать из svn репозиториев." #: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" @@ -3045,18 +3046,18 @@ msgid "" "Click to unlock. You must restart RhodeCode in order to make this setting " "take effect." -msgstr "" +msgstr "Нажмите для разблокирования. Изменения вступят в силу после перезагрузки RhodeCode." #: rhodecode/templates/admin/settings/settings.html:280 #: rhodecode/templates/base/base.html:143 msgid "Unlock" -msgstr "" +msgstr "Разблокировать" #: rhodecode/templates/admin/settings/settings.html:282 msgid "" "Location where repositories are stored. After changing this value a restart," " and rescan is required" -msgstr "" +msgstr "Расположение репозитариев сохранено. После изменения расположения необходимо перезагрузить и пересканировать" #: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" @@ -3092,7 +3093,7 @@ #: rhodecode/templates/admin/users/user_add.html:12 #: rhodecode/templates/admin/users/users.html:23 msgid "Add new user" -msgstr "" +msgstr "Добавить нового пользователя" #: rhodecode/templates/admin/users/user_add.html:50 msgid "Password confirmation" @@ -3106,7 +3107,7 @@ #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #, python-format msgid "Edit %s" -msgstr "" +msgstr "Редактировать %s" #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 @@ -3116,7 +3117,7 @@ #: rhodecode/templates/admin/users/user_edit.html:35 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:11 msgid "Using" -msgstr "Используемый" +msgstr "Используется" #: rhodecode/templates/admin/users/user_edit.html:43 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:20 @@ -3126,7 +3127,7 @@ #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:25 msgid "Current IP" -msgstr "" +msgstr "Текущий IP" #: rhodecode/templates/admin/users/user_edit.html:70 msgid "LDAP DN" @@ -3175,21 +3176,21 @@ #: rhodecode/templates/admin/users/user_edit_my_account.html:41 msgid "My pull requests" -msgstr "" +msgstr "Мои pull-request'ы" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 msgid "Show closed pull requests" -msgstr "" +msgstr "Отображать закрытые pull-request'ы" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" -msgstr "" +msgstr "Открыто мной" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 #, python-format msgid "Pull request #%s opened on %s" -msgstr "" +msgstr "Pull-request #%s открыт %s" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 @@ -3197,26 +3198,26 @@ #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" -msgstr "" +msgstr "Закрыто" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 msgid "Confirm to delete this pull request" -msgstr "" +msgstr "Подтвердите удаление этого pull-request'а" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 msgid "Nothing here yet" -msgstr "" +msgstr "Здесь ничего нет" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" -msgstr "" +msgstr "Я участвую в" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 #: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" -msgstr "" +msgstr "Pull-request #%s открыт пользователем %s %s" #: rhodecode/templates/admin/users/users.html:5 msgid "Users administration" @@ -3228,38 +3229,38 @@ #: rhodecode/templates/admin/users/users.html:80 msgid "Firstname" -msgstr "" +msgstr "Имя" #: rhodecode/templates/admin/users/users.html:81 msgid "Lastname" -msgstr "" +msgstr "Фамилия" #: rhodecode/templates/admin/users/users.html:82 msgid "Last login" -msgstr "" +msgstr "Последний вход" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add user group" -msgstr "" +msgstr "Добавить группу пользователей" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 #: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 msgid "User groups" -msgstr "" +msgstr "Группы пользователей" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 #: rhodecode/templates/admin/users_groups/users_groups.html:26 msgid "Add new user group" -msgstr "" +msgstr "Добавить новую группу пользователей" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 msgid "Edit user group" -msgstr "" +msgstr "Редактировать группу пользователей" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 msgid "UserGroups" -msgstr "" +msgstr "Группы пользователей" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 #: rhodecode/templates/admin/users_groups/users_groups.html:38 @@ -3268,7 +3269,7 @@ #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 msgid "Chosen group members" -msgstr "" +msgstr "Выбранные участники группы" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 msgid "Remove all elements" @@ -3284,33 +3285,33 @@ #: rhodecode/templates/admin/users_groups/users_group_edit.html:109 msgid "No members yet" -msgstr "" +msgstr "Нет участников" #: rhodecode/templates/admin/users_groups/users_group_edit.html:117 msgid "Global Permissions" -msgstr "" +msgstr "Глобальные права доступа" #: rhodecode/templates/admin/users_groups/users_groups.html:5 msgid "User groups administration" -msgstr "" +msgstr "Администрирование групп пользователей" #: rhodecode/templates/admin/users_groups/users_groups.html:55 #, python-format msgid "Confirm to delete this user group: %s" -msgstr "" +msgstr "Подтвердите удаление следующей группы пользователей: %s" #: rhodecode/templates/admin/users_groups/users_groups.html:62 msgid "There are no user groups yet" -msgstr "" +msgstr "Группы пользователей еще не созданы" #: rhodecode/templates/base/base.html:42 #, python-format msgid "Server instance: %s" -msgstr "" +msgstr "Экземпляр сервера: %s" #: rhodecode/templates/base/base.html:52 msgid "Report a bug" -msgstr "" +msgstr "Сообщить об ошибке" #: rhodecode/templates/base/base.html:121 #: rhodecode/templates/data_table/_dt_elements.html:9 @@ -3318,7 +3319,7 @@ #: rhodecode/templates/data_table/_dt_elements.html:13 #: rhodecode/templates/summary/summary.html:8 msgid "Summary" -msgstr "Итого" +msgstr "Общие сведения" #: rhodecode/templates/base/base.html:122 #: rhodecode/templates/changelog/changelog.html:15 @@ -3326,7 +3327,7 @@ #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" -msgstr "Лог изменений" +msgstr "История изменений" #: rhodecode/templates/base/base.html:123 #: rhodecode/templates/data_table/_dt_elements.html:25 @@ -3338,7 +3339,7 @@ #: rhodecode/templates/base/base.html:125 msgid "Switch To" -msgstr "" +msgstr "Переключиться на" #: rhodecode/templates/base/base.html:127 #: rhodecode/templates/base/base.html:279 @@ -3363,15 +3364,15 @@ #: rhodecode/templates/base/base.html:145 msgid "Lock" -msgstr "" +msgstr "Заблокировать" #: rhodecode/templates/base/base.html:153 msgid "Follow" -msgstr "" +msgstr "Наблюдать" #: rhodecode/templates/base/base.html:154 msgid "Unfollow" -msgstr "" +msgstr "Не наблюдать" #: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 @@ -3384,19 +3385,19 @@ #: rhodecode/templates/base/base.html:159 msgid "Create Pull Request" -msgstr "" +msgstr "Создать Pull запрос" #: rhodecode/templates/base/base.html:165 msgid "Show Pull Requests" -msgstr "" +msgstr "Показать Pull запросы" #: rhodecode/templates/base/base.html:165 msgid "Pull Requests" -msgstr "" +msgstr "Pull-request'ы" #: rhodecode/templates/base/base.html:202 msgid "Not logged in" -msgstr "" +msgstr "Не авторизован" #: rhodecode/templates/base/base.html:209 msgid "Login to your account" @@ -3416,7 +3417,7 @@ #: rhodecode/templates/base/base.html:286 msgid "Show recent activity" -msgstr "" +msgstr "Показать последнюю активность" #: rhodecode/templates/base/base.html:287 #: rhodecode/templates/journal/journal.html:4 @@ -3425,34 +3426,34 @@ #: rhodecode/templates/base/base.html:298 msgid "Show public gists" -msgstr "" +msgstr "Показать публичные записи" #: rhodecode/templates/base/base.html:303 msgid "All public gists" -msgstr "" +msgstr "Все публичные записи" #: rhodecode/templates/base/base.html:305 msgid "My public gists" -msgstr "" +msgstr "Мои публичные записи" #: rhodecode/templates/base/base.html:306 msgid "My private gists" -msgstr "" +msgstr "Мои приватные записи" #: rhodecode/templates/base/base.html:311 msgid "Search in repositories" -msgstr "" +msgstr "Искать в репозитариях" #: rhodecode/templates/base/default_perms_box.html:14 msgid "Inherit default permissions" -msgstr "" +msgstr "Наследовать полномочия по умолчаинию" #: rhodecode/templates/base/default_perms_box.html:18 #, python-format msgid "" "Select to inherit permissions from %s settings. With this selected below " "options does not apply." -msgstr "" +msgstr "Выберите, чтобы унаследовать права из настроек %s. В этом случае опции ниже не будут применены." #: rhodecode/templates/base/default_perms_box.html:26 msgid "Create repositories" @@ -3460,27 +3461,27 @@ #: rhodecode/templates/base/default_perms_box.html:30 msgid "Select this option to allow repository creation for this user" -msgstr "" +msgstr "Опция разрешает пользователю создавать репозитарии" #: rhodecode/templates/base/default_perms_box.html:35 msgid "Create user groups" -msgstr "" +msgstr "Создавать группы пользователей" #: rhodecode/templates/base/default_perms_box.html:39 msgid "Select this option to allow user group creation for this user" -msgstr "" +msgstr "Опция разрешает пользователю создавать группы пользователей" #: rhodecode/templates/base/default_perms_box.html:44 msgid "Fork repositories" -msgstr "" +msgstr "Создавать fork от репозиториев" #: rhodecode/templates/base/default_perms_box.html:48 msgid "Select this option to allow repository forking for this user" -msgstr "" +msgstr "Выберите эту опцию чтобы разрешить данному пользователю создавать fork'и репозиториев" #: rhodecode/templates/base/perms_summary.html:11 msgid "No permissions defined yet" -msgstr "" +msgstr "Права доступа еще не назначены" #: rhodecode/templates/base/perms_summary.html:19 #: rhodecode/templates/base/perms_summary.html:38 @@ -3490,75 +3491,75 @@ #: rhodecode/templates/base/perms_summary.html:20 #: rhodecode/templates/base/perms_summary.html:39 msgid "Edit Permission" -msgstr "" - -#: rhodecode/templates/base/root.html:43 -msgid "Add another comment" -msgstr "" +msgstr "Изменить права доступа" #: rhodecode/templates/base/root.html:44 +msgid "Add another comment" +msgstr "Добавить другой комментарий" + +#: rhodecode/templates/base/root.html:45 #: rhodecode/templates/data_table/_dt_elements.html:147 msgid "Stop following this repository" msgstr "Отменить наблюдение за репозиторием" -#: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/base/root.html:46 msgid "Start following this repository" msgstr "Наблюдать за репозиторием" -#: rhodecode/templates/base/root.html:46 +#: rhodecode/templates/base/root.html:47 msgid "Group" msgstr "Группа" -#: rhodecode/templates/base/root.html:47 -msgid "members" -msgstr "участники" - #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:203 -msgid "Loading ..." -msgstr "" +msgid "members" +msgstr "участники" #: rhodecode/templates/base/root.html:49 -msgid "Search truncated" -msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.html:203 +msgid "Loading ..." +msgstr "Загрузка..." #: rhodecode/templates/base/root.html:50 -msgid "No matching files" -msgstr "" +msgid "Search truncated" +msgstr "Поиск усечен" #: rhodecode/templates/base/root.html:51 +msgid "No matching files" +msgstr "Нет совпадений" + +#: rhodecode/templates/base/root.html:52 #: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "Создать новый pull запрос" -#: rhodecode/templates/base/root.html:52 +#: rhodecode/templates/base/root.html:53 msgid "Open new pull request for selected changesets" -msgstr "" - -#: rhodecode/templates/base/root.html:53 -msgid "Show selected changesets __S -> __E" -msgstr "" +msgstr "Открыть новый pull-request для выделенных наборов изменений" #: rhodecode/templates/base/root.html:54 -msgid "Show selected changeset __S" -msgstr "" +msgid "Show selected changesets __S -> __E" +msgstr "Показать выбранные наборы изменений: __S -> __E" #: rhodecode/templates/base/root.html:55 +msgid "Show selected changeset __S" +msgstr "Показать выбранный набор изменений: __S" + +#: rhodecode/templates/base/root.html:56 msgid "Selection link" msgstr "Ссылка выбора" -#: rhodecode/templates/base/root.html:56 +#: rhodecode/templates/base/root.html:57 #: rhodecode/templates/changeset/diff_block.html:8 msgid "Collapse diff" -msgstr "" - -#: rhodecode/templates/base/root.html:57 -msgid "Expand diff" -msgstr "" +msgstr "Свернуть сравнение" #: rhodecode/templates/base/root.html:58 -msgid "Failed to remoke permission" -msgstr "" +msgid "Expand diff" +msgstr "Раскрыть сравнение" + +#: rhodecode/templates/base/root.html:59 +msgid "Failed to revoke permission" +msgstr "Не удалось отозвать привилегии" #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format @@ -3567,7 +3568,7 @@ #: rhodecode/templates/bookmarks/bookmarks.html:26 msgid "Compare bookmarks" -msgstr "" +msgstr "Сравнить закладки" #: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 @@ -3616,34 +3617,34 @@ #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Показано %d из %d ревизий" +msgstr[1] "Показано %d из %d ревизий" +msgstr[2] "Показаны %d из %d ревизий " #: rhodecode/templates/changelog/changelog.html:39 msgid "Clear selection" -msgstr "" +msgstr "Очистить выбор" #: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" -msgstr "" +msgstr "Сравнить fork с %s" #: rhodecode/templates/changelog/changelog.html:42 msgid "Compare fork with parent" -msgstr "" +msgstr "Сравнить fork с родительским репозиторием" #: rhodecode/templates/changelog/changelog.html:78 #: rhodecode/templates/changelog/changelog_summary_data.html:28 #, python-format msgid "Click to open associated pull request #%s" -msgstr "" +msgstr "Нажмите для открытия ассоциированного запроса на внесение изменений #%s" #: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/summary/summary.html:403 msgid "Show more" -msgstr "" +msgstr "Показать еще" #: rhodecode/templates/changelog/changelog.html:115 #: rhodecode/templates/changelog/changelog_summary_data.html:50 @@ -3651,7 +3652,7 @@ #: rhodecode/templates/changeset/changeset_range.html:86 #, python-format msgid "Bookmark %s" -msgstr "" +msgstr "Закладка %s" #: rhodecode/templates/changelog/changelog.html:121 #: rhodecode/templates/changelog/changelog_summary_data.html:56 @@ -3659,7 +3660,7 @@ #: rhodecode/templates/changeset/changeset_range.html:92 #, python-format msgid "Tag %s" -msgstr "" +msgstr "Метка %s" #: rhodecode/templates/changelog/changelog.html:126 #: rhodecode/templates/changelog/changelog_summary_data.html:61 @@ -3667,7 +3668,7 @@ #: rhodecode/templates/changeset/changeset_range.html:96 #, python-format msgid "Branch %s" -msgstr "" +msgstr "Ветка %s" #: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" @@ -3676,17 +3677,17 @@ #: rhodecode/templates/changelog/changelog_details.html:4 #: rhodecode/templates/changeset/changeset.html:91 msgid "Removed" -msgstr "" +msgstr "Удалено" #: rhodecode/templates/changelog/changelog_details.html:5 #: rhodecode/templates/changeset/changeset.html:92 msgid "Changed" -msgstr "" +msgstr "Изменено" #: rhodecode/templates/changelog/changelog_details.html:6 #: rhodecode/templates/changeset/changeset.html:93 msgid "Added" -msgstr "" +msgstr "Добавлено" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 @@ -3696,21 +3697,21 @@ #: rhodecode/templates/changeset/changeset.html:97 #, python-format msgid "Affected %s files" -msgstr "" +msgstr "Затрагивает %s файлов" #: rhodecode/templates/changelog/changelog_summary_data.html:6 #: rhodecode/templates/files/files_add.html:75 #: rhodecode/templates/files/files_edit.html:61 msgid "Commit message" -msgstr "" +msgstr "Сообщение commit'а" #: rhodecode/templates/changelog/changelog_summary_data.html:7 msgid "Age" -msgstr "" +msgstr "Возраст" #: rhodecode/templates/changelog/changelog_summary_data.html:9 msgid "Refs" -msgstr "" +msgstr "Ссылки" #: rhodecode/templates/changelog/changelog_summary_data.html:86 msgid "Add or upload files directly via RhodeCode" @@ -3741,7 +3742,7 @@ #: rhodecode/templates/changeset/changeset.html:49 msgid "No children" -msgstr "" +msgstr "Нет дочерних репозиториев" #: rhodecode/templates/changeset/changeset.html:62 #: rhodecode/templates/changeset/changeset_file_comment.html:20 @@ -3752,16 +3753,16 @@ #: rhodecode/templates/changeset/changeset.html:67 #: rhodecode/templates/changeset/diff_block.html:22 msgid "Raw diff" -msgstr "" +msgstr "Сравнение без форматирования" #: rhodecode/templates/changeset/changeset.html:68 msgid "Patch diff" -msgstr "" +msgstr "Применить разностное исправление (Patch diff)" #: rhodecode/templates/changeset/changeset.html:69 #: rhodecode/templates/changeset/diff_block.html:23 msgid "Download diff" -msgstr "" +msgstr "Скачать diff" #: rhodecode/templates/changeset/changeset.html:73 #: rhodecode/templates/changeset/changeset_file_comment.html:103 @@ -3777,9 +3778,9 @@ #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "(%d в строке)" +msgstr[1] "(%d в строках)" +msgstr[2] "(%d в строках)" #: rhodecode/templates/changeset/changeset.html:103 #: rhodecode/templates/changeset/changeset_range.html:82 @@ -3792,9 +3793,9 @@ #, python-format msgid "%s file changed" msgid_plural "%s files changed" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%s файл изменён" +msgstr[1] "%s файлов изменено" +msgstr[2] "%s файла изменено" #: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 @@ -3802,16 +3803,16 @@ #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%s файл изменён: %s добавление, %s удаление" +msgstr[1] "%s файла изменёно: %s добавления, %s удаления" +msgstr[2] "%s файлов изменёно: %s добавлений, %s удалений" #: rhodecode/templates/changeset/changeset.html:141 #: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Showing a huge diff might take some time and resources" -msgstr "" +msgstr "Отображение слишком большого diff'а может занять длительное время" #: rhodecode/templates/changeset/changeset.html:141 #: rhodecode/templates/changeset/changeset.html:153 @@ -3820,17 +3821,17 @@ #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Show full diff" -msgstr "" +msgstr "Показать полный diff" #: rhodecode/templates/changeset/changeset_file_comment.html:30 #, python-format msgid "Status change on pull request #%s" -msgstr "" +msgstr "Изменение статуса Pull запрос #%s" #: rhodecode/templates/changeset/changeset_file_comment.html:32 #, python-format msgid "Comment on pull request #%s" -msgstr "" +msgstr "Комментарий в Pull запросе #%s" #: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." @@ -3844,7 +3845,7 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:145 #, python-format msgid "Comments parsed using %s syntax with %s support." -msgstr "" +msgstr "Парсинг комментариев выполнен с использованием синтаксиса %s с поддержкой %s." #: rhodecode/templates/changeset/changeset_file_comment.html:61 #: rhodecode/templates/changeset/changeset_file_comment.html:147 @@ -3855,12 +3856,12 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:65 #: rhodecode/templates/changeset/changeset_file_comment.html:152 msgid "Preview" -msgstr "" +msgstr "Превью" #: rhodecode/templates/changeset/changeset_file_comment.html:72 #: rhodecode/templates/changeset/changeset_file_comment.html:170 msgid "Comment preview" -msgstr "" +msgstr "Превью комментариев" #: rhodecode/templates/changeset/changeset_file_comment.html:80 #: rhodecode/templates/changeset/changeset_file_comment.html:177 @@ -3871,7 +3872,7 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:81 msgid "Cancel" -msgstr "" +msgstr "Отмена" #: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." @@ -3887,11 +3888,11 @@ #: rhodecode/templates/changeset/changeset_file_comment.html:149 msgid "Change status" -msgstr "" +msgstr "Изменить статус" #: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" -msgstr "" +msgstr "Комментировать и закрыть" #: rhodecode/templates/changeset/changeset_range.html:5 #, python-format @@ -3904,19 +3905,19 @@ #: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" -msgstr "" +msgstr "Показать полный diff для этого файла" #: rhodecode/templates/changeset/diff_block.html:29 msgid "Show inline comments" -msgstr "" +msgstr "Показать комментарии в строках" #: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" -msgstr "" +msgstr "Показать последнюю версию файла в данном репозитории" #: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" -msgstr "" +msgstr "Показать исходную версию файла в данном репозитории" #: rhodecode/templates/compare/compare_cs.html:4 msgid "No changesets" @@ -3924,35 +3925,35 @@ #: rhodecode/templates/compare/compare_cs.html:32 msgid "Ancestor" -msgstr "" +msgstr "Предок" #: rhodecode/templates/compare/compare_diff.html:5 #, python-format msgid "%s Compare" -msgstr "" +msgstr "%s Сравнить" #: rhodecode/templates/compare/compare_diff.html:9 msgid "Compare revisions" -msgstr "" +msgstr "Сравнить ревизии" #: rhodecode/templates/compare/compare_diff.html:33 #: rhodecode/templates/pullrequests/pullrequest_show.html:106 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Показать %s коммит" +msgstr[1] "Показать %s коммита" +msgstr[2] "Показать %s коммитов" #: rhodecode/templates/compare/compare_diff.html:48 #: rhodecode/templates/pullrequests/pullrequest_show.html:121 msgid "No files" -msgstr "" +msgstr "Нет файлов" #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 msgid "confirm to show potentially huge diff" -msgstr "" +msgstr "Подтвердите необходимость показа огромного списка сравнения" #: rhodecode/templates/data_table/_dt_elements.html:54 #: rhodecode/templates/summary/summary.html:69 @@ -3967,7 +3968,7 @@ #: rhodecode/templates/data_table/_dt_elements.html:74 #, python-format msgid "Fork of %s" -msgstr "" +msgstr "Fork от %s" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3977,7 +3978,7 @@ #: rhodecode/templates/data_table/_dt_elements.html:97 #, python-format msgid "Subscribe to %s rss feed" -msgstr "Подписаться на ленту %s" +msgstr "Подписаться на ленту RSS %s" #: rhodecode/templates/data_table/_dt_elements.html:103 #: rhodecode/templates/data_table/_dt_elements.html:105 @@ -3999,43 +4000,43 @@ #: rhodecode/templates/email_templates/pull_request.html:4 #: rhodecode/templates/email_templates/pull_request_comment.html:4 msgid "URL" -msgstr "" +msgstr "URL" #: rhodecode/templates/email_templates/changeset_comment.html:6 #, python-format msgid "%s commented on a %s changeset." -msgstr "" +msgstr "прокомментирован %s в наборе изменений %s." #: rhodecode/templates/email_templates/changeset_comment.html:14 msgid "The changeset status was changed to" -msgstr "" +msgstr "Состояние набора изменений изменено на" #: rhodecode/templates/email_templates/main.html:8 msgid "This is a notification from RhodeCode." -msgstr "" +msgstr "Это уведомление от RhodeCode" #: rhodecode/templates/email_templates/password_reset.html:4 #, python-format msgid "Hello %s" -msgstr "" +msgstr "Здравствуйте, %s" #: rhodecode/templates/email_templates/password_reset.html:5 msgid "We received a request to create a new password for your account." -msgstr "" +msgstr "Мы отправили запрос на создание нового пароля для вашего аккаунта." #: rhodecode/templates/email_templates/password_reset.html:6 msgid "You can generate it by clicking following URL" -msgstr "" +msgstr "Вы можете заново сгенерировать его, перейдя по следующей ссылке" #: rhodecode/templates/email_templates/password_reset.html:10 msgid "Please ignore this email if you did not request a new password ." -msgstr "" +msgstr "Пожалуйста, проигнорируйте данное сообщение, если вы не запрашивали новый пароль." #: rhodecode/templates/email_templates/pull_request.html:6 #, python-format msgid "" "%s opened a pull request for repository %s and wants you to review changes." -msgstr "" +msgstr "%s открыл pull-request для репозитория %s и просит вас просмотреть изменения" #: rhodecode/templates/email_templates/pull_request.html:8 #: rhodecode/templates/pullrequests/pullrequest.html:34 @@ -4047,19 +4048,19 @@ #: rhodecode/templates/email_templates/pull_request_comment.html:6 #, python-format msgid "%s commented on pull request \"%s\"" -msgstr "" +msgstr "%s оставил комментарий к pull-request'у \"%s\"" #: rhodecode/templates/email_templates/pull_request_comment.html:10 msgid "Pull request was closed with status" -msgstr "" +msgstr "Pull-request был закрыт со статусом" #: rhodecode/templates/email_templates/pull_request_comment.html:12 msgid "Pull request changed status" -msgstr "" +msgstr "Статус pull-request'а был изменен" #: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" -msgstr "" +msgstr "Подробнее о пользователе" #: rhodecode/templates/errors/error_document.html:55 #, python-format @@ -4069,11 +4070,11 @@ #: rhodecode/templates/files/file_diff.html:4 #, python-format msgid "%s File Diff" -msgstr "" +msgstr "Сравнение файла %s" #: rhodecode/templates/files/file_diff.html:8 msgid "File diff" -msgstr "" +msgstr "Сравнение файлов " #: rhodecode/templates/files/files.html:4 #: rhodecode/templates/files/files.html:76 @@ -4085,16 +4086,16 @@ #: rhodecode/templates/files/files_add.html:31 #: rhodecode/templates/files/files_edit.html:31 msgid "Branch" -msgstr "" +msgstr "Ветка" #: rhodecode/templates/files/files_add.html:4 #, python-format msgid "%s Files Add" -msgstr "" +msgstr "%s Файлов добавлено" #: rhodecode/templates/files/files_add.html:19 msgid "Add file" -msgstr "" +msgstr "Добавить файл" #: rhodecode/templates/files/files_add.html:43 msgid "File Name" @@ -4131,23 +4132,23 @@ #: rhodecode/templates/files/files_browser.html:13 msgid "View" -msgstr "" +msgstr "Просмотр" #: rhodecode/templates/files/files_browser.html:14 msgid "Previous revision" -msgstr "" +msgstr "Предыдущая ревизия" #: rhodecode/templates/files/files_browser.html:16 msgid "Next revision" -msgstr "" +msgstr "Следующая ревизия" #: rhodecode/templates/files/files_browser.html:23 msgid "Follow current branch" -msgstr "" +msgstr "Отслеживать данную ветку" #: rhodecode/templates/files/files_browser.html:27 msgid "Search file list" -msgstr "" +msgstr "Искать файлы" #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." @@ -4163,7 +4164,7 @@ #: rhodecode/templates/files/files_browser.html:50 msgid "Last Revision" -msgstr "Последняя ревизия" +msgstr "Последняя версия" #: rhodecode/templates/files/files_browser.html:51 msgid "Last modified" @@ -4171,30 +4172,30 @@ #: rhodecode/templates/files/files_browser.html:52 msgid "Last committer" -msgstr "" +msgstr "Автор последнего commit'а" #: rhodecode/templates/files/files_edit.html:4 #, python-format msgid "%s Files Edit" -msgstr "" +msgstr "%s Файлов отредактировано" #: rhodecode/templates/files/files_edit.html:19 msgid "Edit file" -msgstr "" +msgstr "Редактировать файл" #: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 msgid "Show annotation" -msgstr "" +msgstr "Показать примечание" #: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 msgid "Download as raw" -msgstr "" +msgstr "Скачать в .raw формате" #: rhodecode/templates/files/files_edit.html:52 msgid "Source" -msgstr "" +msgstr "Исходный код" #: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" @@ -4206,15 +4207,15 @@ #: rhodecode/templates/files/files_history_box.html:9 msgid "Diff to revision" -msgstr "" +msgstr "разница с ревизией" #: rhodecode/templates/files/files_history_box.html:10 msgid "Show at revision" -msgstr "" +msgstr "показать в ревизии" #: rhodecode/templates/files/files_history_box.html:11 msgid "Show full history" -msgstr "" +msgstr "Показать полную историю" #: rhodecode/templates/files/files_history_box.html:16 #, python-format @@ -4226,24 +4227,24 @@ #: rhodecode/templates/files/files_source.html:6 msgid "Load file history" -msgstr "" +msgstr "Загрузить историю фалов" #: rhodecode/templates/files/files_source.html:21 msgid "Show source" -msgstr "" +msgstr "Показать исходный код" #: rhodecode/templates/files/files_source.html:29 #, python-format msgid "Edit on branch:%s" -msgstr "" +msgstr "Редактировать в ветке: %s" #: rhodecode/templates/files/files_source.html:31 msgid "Edit on branch:?" -msgstr "" +msgstr "Редактировать в ветке:?" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" -msgstr "" +msgstr "Редактирование файлов разрешено только в последней версии ветки" #: rhodecode/templates/files/files_source.html:46 #, python-format @@ -4279,7 +4280,7 @@ #: rhodecode/templates/followers/followers_data.html:12 msgid "Started following -" -msgstr "" +msgstr "Наблюдать за репозиторием" #: rhodecode/templates/forks/fork.html:5 #, python-format @@ -4312,7 +4313,7 @@ #: rhodecode/templates/forks/fork.html:93 msgid "Fork this repository" -msgstr "" +msgstr "Форкнуть репозиторий" #: rhodecode/templates/forks/forks.html:5 #, python-format @@ -4327,7 +4328,7 @@ #: rhodecode/templates/forks/forks_data.html:17 msgid "Forked" -msgstr "" +msgstr "Форкнуто" #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" @@ -4382,16 +4383,16 @@ #: rhodecode/templates/pullrequests/pullrequest.html:47 msgid "Write a short description on this pull request" -msgstr "" +msgstr "Написать короткое писание по этому запросу" #: rhodecode/templates/pullrequests/pullrequest.html:53 msgid "Changeset flow" -msgstr "" +msgstr "Поток изменений" #: rhodecode/templates/pullrequests/pullrequest.html:60 #: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Origin repository" -msgstr "" +msgstr "Первоначальный репозиторий" #: rhodecode/templates/pullrequests/pullrequest.html:85 msgid "Send pull request" @@ -4400,16 +4401,16 @@ #: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" -msgstr "" +msgstr "Рецензенты запросов на внесение изменений Pull request" #: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" -msgstr "" +msgstr "владелец" #: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." -msgstr "" +msgstr "Добавить рецензента в данный запрос на внесение изменений" #: rhodecode/templates/pullrequests/pullrequest.html:129 msgid "Detailed compare view" @@ -4417,16 +4418,16 @@ #: rhodecode/templates/pullrequests/pullrequest.html:150 msgid "Destination repository" -msgstr "" +msgstr "Репозиторий назначения" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 #, python-format msgid "%s Pull Request #%s" -msgstr "" +msgstr "%s Запрос на внесение изменений #%s" #: rhodecode/templates/pullrequests/pullrequest_show.html:35 msgid "Review status" -msgstr "" +msgstr "Состояние рассмотрения" #: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" @@ -4434,19 +4435,19 @@ #: rhodecode/templates/pullrequests/pullrequest_show.html:53 msgid "Still not reviewed by" -msgstr "" +msgstr "Еще не рассмотренный" #: rhodecode/templates/pullrequests/pullrequest_show.html:57 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%d рецензент" +msgstr[1] "%d рецензента" +msgstr[2] "%d рецензентов" #: rhodecode/templates/pullrequests/pullrequest_show.html:59 msgid "Pull request was reviewed by all reviewers" -msgstr "" +msgstr "Запрос на внесение изменений был рассмотрен всеми рецензентами." #: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" @@ -4458,24 +4459,24 @@ #: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "reviewer" -msgstr "" +msgstr "рецензент" #: rhodecode/templates/pullrequests/pullrequest_show.html:164 msgid "Add or remove reviewer to this pull request." -msgstr "" +msgstr "Добавить или удалить рецензента данного запроса на внесение изменений" #: rhodecode/templates/pullrequests/pullrequest_show.html:168 msgid "Save changes" -msgstr "" +msgstr "Сохранить изменения" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 #, python-format msgid "%s Pull Requests" -msgstr "" +msgstr "%s Запросы на внесение изменений" #: rhodecode/templates/search/search.html:6 msgid "Search repository" -msgstr "" +msgstr "Искать в репозитории: %s" #: rhodecode/templates/search/search.html:8 #: rhodecode/templates/search/search.html:16 @@ -4496,7 +4497,7 @@ #: rhodecode/templates/search/search.html:66 msgid "Commit messages" -msgstr "" +msgstr "Сообщения коммита" #: rhodecode/templates/search/search.html:67 msgid "File names" @@ -4511,26 +4512,26 @@ #: rhodecode/templates/summary/summary.html:4 #, python-format msgid "%s Summary" -msgstr "Итого %s" +msgstr "%s общие сведения" #: rhodecode/templates/summary/summary.html:16 #, python-format msgid "%s ATOM feed" -msgstr "" +msgstr "ATOM лента репозитория %s" #: rhodecode/templates/summary/summary.html:17 #, python-format msgid "%s RSS feed" -msgstr "" +msgstr "RSS лента репозитория %s" #: rhodecode/templates/summary/summary.html:62 #, python-format msgid "Repository locked by %s" -msgstr "" +msgstr "Репозитарий заблокирован %s" #: rhodecode/templates/summary/summary.html:64 msgid "Repository unlocked" -msgstr "" +msgstr "Репозиторий разблокирован" #: rhodecode/templates/summary/summary.html:83 #, python-format @@ -4539,7 +4540,7 @@ #: rhodecode/templates/summary/summary.html:88 msgid "Public" -msgstr "" +msgstr "Общедоступный" #: rhodecode/templates/summary/summary.html:88 #: rhodecode/templates/summary/summary.html:89 @@ -4548,7 +4549,7 @@ #: rhodecode/templates/summary/summary.html:97 msgid "Remote clone" -msgstr "" +msgstr "Удаленный клон" #: rhodecode/templates/summary/summary.html:117 msgid "Contact" @@ -4556,7 +4557,7 @@ #: rhodecode/templates/summary/summary.html:131 msgid "Clone url" -msgstr "Клонировать URL" +msgstr "Ссылка для клонирования" #: rhodecode/templates/summary/summary.html:136 msgid "Show by Name" @@ -4568,12 +4569,12 @@ #: rhodecode/templates/summary/summary.html:143 msgid "Trending files" -msgstr "" +msgstr "Популярные файлы" #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 msgid "Enable" -msgstr "" +msgstr "Включено" #: rhodecode/templates/summary/summary.html:159 msgid "Download" @@ -4601,12 +4602,12 @@ #: rhodecode/templates/summary/summary.html:197 msgid "Repository Size" -msgstr "" +msgstr "Размер репозитория" #: rhodecode/templates/summary/summary.html:204 #: rhodecode/templates/summary/summary.html:206 msgid "Feed" -msgstr "" +msgstr "Лента новостей" #: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" @@ -4622,7 +4623,7 @@ #: rhodecode/templates/summary/summary.html:256 msgid "Latest changes" -msgstr "" +msgstr "Последние изменения" #: rhodecode/templates/summary/summary.html:258 msgid "Quick start" @@ -4631,7 +4632,7 @@ #: rhodecode/templates/summary/summary.html:272 #, python-format msgid "Readme file from revision %s" -msgstr "" +msgstr "Readme файл из ревизии %s" #: rhodecode/templates/summary/summary.html:332 #, python-format @@ -4677,8 +4678,8 @@ #: rhodecode/templates/tags/tags.html:5 #, python-format msgid "%s Tags" -msgstr "Тэги %s" +msgstr "%s Меток" #: rhodecode/templates/tags/tags.html:26 msgid "Compare tags" -msgstr "" +msgstr "Сравнить метки" diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.mo has changed diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Fri Jun 07 19:23:20 2013 +0200 +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Fri Jun 07 19:30:45 2013 +0200 @@ -1,58 +1,56 @@ -# Chinese (China) translations for RhodeCode. -# Copyright (C) 2011 ORGANIZATION +# Translations template for RhodeCode. +# Copyright (C) 2013 Marcin Kuzminski RhodeCode # This file is distributed under the same license as the RhodeCode project. -# FIRST AUTHOR , 2011. -# mikespook , 2012. -# xpol , 2012. +# Translators: +# FIRST AUTHOR , 2011 +# mikespook , 2012 +# xpol , 2012 msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.4.4\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-04-05 10:17-0700\n" -"PO-Revision-Date: 2012-12-14 12:57+0800\n" -"Last-Translator: xpol \n" -"Language-Team: mikespook\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Project-Id-Version: RhodeCode\n" +"Report-Msgid-Bugs-To: marcin@maq.io\n" +"POT-Creation-Date: 2013-06-05 19:55+0200\n" +"PO-Revision-Date: 2013-06-02 13:22+0000\n" +"Last-Translator: marcinkuzminski \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/RhodeCode/language/zh_CN/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" - -#: rhodecode/controllers/changelog.py:95 +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: rhodecode/controllers/changelog.py:149 msgid "All Branches" msgstr "所有分支" -#: rhodecode/controllers/changeset.py:83 -#, fuzzy +#: rhodecode/controllers/changeset.py:84 msgid "Show white space" -msgstr "显示空白字符" - -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 -#, fuzzy +msgstr "" + +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 msgid "Ignore white space" -msgstr "忽略空白字符" - -#: rhodecode/controllers/changeset.py:163 +msgstr "" + +#: rhodecode/controllers/changeset.py:164 #, python-format msgid "%s line context" msgstr "%s行上下文" -#: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:438 +#: rhodecode/controllers/changeset.py:345 +#: rhodecode/controllers/pullrequests.py:478 #, python-format msgid "Status change -> %s" msgstr "状态修改为%s" -#: rhodecode/controllers/changeset.py:360 -#, fuzzy +#: rhodecode/controllers/changeset.py:376 msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" -msgstr "不允许修改已关闭拉取请求的修订集状态" +"Changing status on a changeset associated with a closed pull request is not " +"allowed" +msgstr "" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:167 -#: rhodecode/controllers/shortlog.py:100 +#: rhodecode/controllers/pullrequests.py:256 msgid "There are no changesets yet" msgstr "还没有修订集" @@ -61,7 +59,8 @@ msgstr "主页" #: rhodecode/controllers/error.py:98 -msgid "The request could not be understood by the server due to malformed syntax." +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "由于错误的语法，服务器无法对请求进行响应。" #: rhodecode/controllers/error.py:101 @@ -93,8 +92,8 @@ msgstr "%s %s订阅" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -102,126 +101,125 @@ msgid "Changeset was too big and was cut off..." msgstr "修订集太大已被截断......" -#: rhodecode/controllers/feed.py:91 -#, fuzzy, python-format +#: rhodecode/controllers/feed.py:90 +#, python-format msgid "%s committed on %s" -msgstr "提交于" - -#: rhodecode/controllers/files.py:88 -#, fuzzy -msgid "Click here to add new file" -msgstr "点击此处添加新文件" +msgstr "" #: rhodecode/controllers/files.py:89 +msgid "Click here to add new file" +msgstr "" + +#: rhodecode/controllers/files.py:90 #, python-format msgid "There are no files yet %s" msgstr "还没有文件%s" -#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 +#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "版本库由%s于%s锁定" -#: rhodecode/controllers/files.py:279 +#: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:293 -#, fuzzy, python-format +#: rhodecode/controllers/files.py:297 +#, python-format msgid "Edited file %s via RhodeCode" -msgstr "通过RhodeCode修改了%s" - -#: rhodecode/controllers/files.py:309 +msgstr "" + +#: rhodecode/controllers/files.py:313 msgid "No changes" msgstr "无变更" -#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 +#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到%s" -#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 +#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: rhodecode/controllers/files.py:347 -#, fuzzy +#: rhodecode/controllers/files.py:351 msgid "Added file via RhodeCode" -msgstr "通过RhodeCode添加了%s" - -#: rhodecode/controllers/files.py:364 -msgid "No content" -msgstr "无内容" +msgstr "" #: rhodecode/controllers/files.py:368 -msgid "No filename" -msgstr "无文件名" +msgid "No content" +msgstr "无内容" #: rhodecode/controllers/files.py:372 +msgid "No filename" +msgstr "无文件名" + +#: rhodecode/controllers/files.py:397 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: rhodecode/controllers/files.py:420 -#, fuzzy -msgid "Downloads disabled" -msgstr "禁止下载" - #: rhodecode/controllers/files.py:431 +msgid "Downloads disabled" +msgstr "" + +#: rhodecode/controllers/files.py:442 #, python-format msgid "Unknown revision %s" msgstr "未知版本%s" -#: rhodecode/controllers/files.py:433 +#: rhodecode/controllers/files.py:444 msgid "Empty repository" msgstr "空版本库" -#: rhodecode/controllers/files.py:435 +#: rhodecode/controllers/files.py:446 msgid "Unknown archive type" msgstr "未知包类型" -#: rhodecode/controllers/files.py:617 +#: rhodecode/controllers/files.py:631 #: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/email_templates/pull_request.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:124 msgid "Changesets" msgstr "修订集" -#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 -#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/controllers/files.py:632 +#: rhodecode/controllers/pullrequests.py:149 +#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 -#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/controllers/files.py:633 +#: rhodecode/controllers/pullrequests.py:150 +#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 #: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "标签" -#: rhodecode/controllers/forks.py:175 -#, fuzzy, python-format +#: rhodecode/controllers/forks.py:176 +#, python-format msgid "Forked repository %s as %s" -msgstr "版本库%s被复刻到%s" - -#: rhodecode/controllers/forks.py:189 +msgstr "" + +#: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" msgstr "在复刻版本库%s的时候发生错误" -#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318 +#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153 msgid "public journal" msgstr "公共日志" -#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 +#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "日志" #: rhodecode/controllers/login.py:138 -#, fuzzy msgid "You have successfully registered into RhodeCode" -msgstr "成功注册到RhodeCode" +msgstr "" #: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" @@ -229,77 +227,75 @@ #: rhodecode/controllers/login.py:179 msgid "" -"Your password reset was successful, new password has been sent to your " -"email" +"Your password reset was successful, new password has been sent to your email" msgstr "密码已经成功重置，新密码已经发送到你的邮箱" -#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/controllers/pullrequests.py:136 #: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/email_templates/changeset_comment.html:15 +#: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "修订集" -#: rhodecode/controllers/pullrequests.py:128 +#: rhodecode/controllers/pullrequests.py:146 msgid "Special" msgstr "" -#: rhodecode/controllers/pullrequests.py:129 -#, fuzzy +#: rhodecode/controllers/pullrequests.py:147 msgid "Peer branches" -msgstr "分支" - -#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +msgstr "" + +#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "书签" -#: rhodecode/controllers/pullrequests.py:228 +#: rhodecode/controllers/pullrequests.py:321 msgid "Pull request requires a title with min. 3 chars" msgstr "拉取请求的标题至少3个字符" -#: rhodecode/controllers/pullrequests.py:230 -#, fuzzy +#: rhodecode/controllers/pullrequests.py:323 msgid "Error creating pull request" -msgstr "提交拉取请求时发生错误" - -#: rhodecode/controllers/pullrequests.py:251 +msgstr "" + +#: rhodecode/controllers/pullrequests.py:343 msgid "Successfully opened new pull request" msgstr "成功提交拉取请求" -#: rhodecode/controllers/pullrequests.py:254 +#: rhodecode/controllers/pullrequests.py:346 msgid "Error occurred during sending pull request" msgstr "提交拉取请求时发生错误" -#: rhodecode/controllers/pullrequests.py:287 +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully deleted pull request" msgstr "成功删除拉取请求" -#: rhodecode/controllers/pullrequests.py:441 +#: rhodecode/controllers/pullrequests.py:481 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:478 -msgid "Closing pull request on other statuses than rejected or approved forbidden" +#: rhodecode/controllers/pullrequests.py:518 +msgid "" +"Closing pull request on other statuses than rejected or approved forbidden" msgstr "只能以批准或者驳回的状态关闭拉取请求" -#: rhodecode/controllers/search.py:134 +#: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" -#: rhodecode/controllers/search.py:139 +#: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" msgstr "没有索引用于搜索。请运行whoosh索引器" -#: rhodecode/controllers/search.py:143 +#: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" msgstr "在搜索操作中发生异常" -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:182 msgid "No data loaded yet" msgstr "数据未加载" -#: rhodecode/controllers/summary.py:147 +#: rhodecode/controllers/summary.py:188 #: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" @@ -309,9 +305,41 @@ msgstr "默认设置已经成功更新" #: rhodecode/controllers/admin/defaults.py:110 -#, fuzzy msgid "Error occurred during update of defaults" -msgstr "更新默认设置时发生错误" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:56 +msgid "forever" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:57 +msgid "5 minutes" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:58 +msgid "1 hour" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:59 +msgid "1 day" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:60 +msgid "1 month" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:62 +msgid "Lifetime" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:127 +msgid "Error occurred during gist creation" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:165 +#, python-format +msgid "Deleted gist %s" +msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" @@ -357,36 +385,39 @@ msgid "START_TLS on LDAP connection" msgstr "LDAP连接上的START_TLS" -#: rhodecode/controllers/admin/ldap_settings.py:126 +#: rhodecode/controllers/admin/ldap_settings.py:124 msgid "LDAP settings updated successfully" msgstr "LDAP设置已经成功更新" -#: rhodecode/controllers/admin/ldap_settings.py:130 +#: rhodecode/controllers/admin/ldap_settings.py:128 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "无法启用LDAP。缺失“python-ldap”库。" -#: rhodecode/controllers/admin/ldap_settings.py:147 -#, fuzzy +#: rhodecode/controllers/admin/ldap_settings.py:145 msgid "Error occurred during update of ldap settings" -msgstr "更新LDAP设置时发生错误" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:58 +#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:66 +msgid "None" +msgstr "无" + +#: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:67 +msgid "Read" +msgstr "读" #: rhodecode/controllers/admin/permissions.py:60 #: rhodecode/controllers/admin/permissions.py:64 -msgid "None" -msgstr "无" +#: rhodecode/controllers/admin/permissions.py:68 +msgid "Write" +msgstr "写" #: rhodecode/controllers/admin/permissions.py:61 #: rhodecode/controllers/admin/permissions.py:65 -msgid "Read" -msgstr "读" - -#: rhodecode/controllers/admin/permissions.py:62 -#: rhodecode/controllers/admin/permissions.py:66 -msgid "Write" -msgstr "写" - -#: rhodecode/controllers/admin/permissions.py:63 -#: rhodecode/controllers/admin/permissions.py:67 +#: rhodecode/controllers/admin/permissions.py:69 #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 @@ -407,826 +438,882 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 -#: rhodecode/templates/base/base.html:292 -#: rhodecode/templates/base/base.html:293 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:325 msgid "Admin" msgstr "管理" -#: rhodecode/controllers/admin/permissions.py:70 -#: rhodecode/controllers/admin/permissions.py:76 -#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:83 +#: rhodecode/controllers/admin/permissions.py:86 +#: rhodecode/controllers/admin/permissions.py:89 +#: rhodecode/controllers/admin/permissions.py:92 msgid "Disabled" msgstr "停用" -#: rhodecode/controllers/admin/permissions.py:72 -#, fuzzy -msgid "Allowed with manual account activation" -msgstr "允许手工启用帐号" - #: rhodecode/controllers/admin/permissions.py:74 -#, fuzzy +msgid "Allowed with manual account activation" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:76 msgid "Allowed with automatic account activation" -msgstr "允许自动启用帐号" - -#: rhodecode/controllers/admin/permissions.py:77 +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 +msgid "Manual activation of external account" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:80 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 +msgid "Automatic activation of external account" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:84 +#: rhodecode/controllers/admin/permissions.py:87 +#: rhodecode/controllers/admin/permissions.py:90 +#: rhodecode/controllers/admin/permissions.py:93 msgid "Enabled" msgstr "启用" -#: rhodecode/controllers/admin/permissions.py:128 +#: rhodecode/controllers/admin/permissions.py:138 msgid "Default permissions updated successfully" msgstr "成功更新默认权限" -#: rhodecode/controllers/admin/permissions.py:142 -#, fuzzy +#: rhodecode/controllers/admin/permissions.py:152 msgid "Error occurred during update of permissions" -msgstr "更新权限时发生错误" - -#: rhodecode/controllers/admin/repos.py:127 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "-- 移除复刻 --" #: rhodecode/controllers/admin/repos.py:168 -#, fuzzy, python-format +#, python-format msgid "Created repository %s from %s" -msgstr "新版本库%s基于%s建立。" +msgstr "" #: rhodecode/controllers/admin/repos.py:174 -#, fuzzy, python-format +#, python-format msgid "Created repository %s" -msgstr "建立版本库%s" +msgstr "" #: rhodecode/controllers/admin/repos.py:197 -#, fuzzy, python-format +#, python-format msgid "Error creating repository %s" -msgstr "建立版本库%s" - -#: rhodecode/controllers/admin/repos.py:266 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Repository %s updated successfully" msgstr "版本库%s成功更新" -#: rhodecode/controllers/admin/repos.py:284 -#, fuzzy, python-format +#: rhodecode/controllers/admin/repos.py:288 +#, python-format msgid "Error occurred during update of repository %s" -msgstr "在更新版本库%s的时候发生错误" - -#: rhodecode/controllers/admin/repos.py:311 -#: rhodecode/controllers/api/api.py:877 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:314 -#: rhodecode/controllers/api/api.py:879 -#, fuzzy, python-format +#: rhodecode/controllers/admin/repos.py:318 +#, python-format msgid "Deleted %s forks" -msgstr "已经删除版本库%s" - -#: rhodecode/controllers/admin/repos.py:319 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos.py:323 +#, python-format msgid "Deleted repository %s" -msgstr "已经删除版本库%s" - -#: rhodecode/controllers/admin/repos.py:322 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:326 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "无法删除%s因为它还有其他分复刻本库" -#: rhodecode/controllers/admin/repos.py:327 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "在删除%s的时候发生错误" -#: rhodecode/controllers/admin/repos.py:365 -#, fuzzy +#: rhodecode/controllers/admin/repos.py:345 msgid "Repository permissions updated" -msgstr "禁用创建版本库" - -#: rhodecode/controllers/admin/repos.py:384 -msgid "An error occurred during deletion of repository user" -msgstr "删除版本库用户时发生错误" - -#: rhodecode/controllers/admin/repos.py:403 -#, fuzzy -msgid "An error occurred during deletion of repository user groups" -msgstr "删除版本库用户组时发生错误" - -#: rhodecode/controllers/admin/repos.py:421 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos_groups.py:332 +#: rhodecode/controllers/admin/users_groups.py:312 +msgid "An error occurred during revoking of permission" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" msgstr "删除版本库统计时发生错误" -#: rhodecode/controllers/admin/repos.py:438 +#: rhodecode/controllers/admin/repos.py:409 msgid "An error occurred during cache invalidation" msgstr "清除缓存时发生错误" -#: rhodecode/controllers/admin/repos.py:458 -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:456 msgid "An error occurred during unlocking" msgstr "解锁时发生错误" -#: rhodecode/controllers/admin/repos.py:476 -#, fuzzy +#: rhodecode/controllers/admin/repos.py:447 msgid "Unlocked" -msgstr "未锁" - -#: rhodecode/controllers/admin/repos.py:479 -#, fuzzy +msgstr "" + +#: rhodecode/controllers/admin/repos.py:450 msgid "Locked" -msgstr "已锁" - -#: rhodecode/controllers/admin/repos.py:481 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:452 #, python-format msgid "Repository has been %s" msgstr "版本库已被%s" -#: rhodecode/controllers/admin/repos.py:505 +#: rhodecode/controllers/admin/repos.py:476 msgid "Updated repository visibility in public journal" msgstr "成功更新在公共日志中的可见性" -#: rhodecode/controllers/admin/repos.py:509 +#: rhodecode/controllers/admin/repos.py:480 msgid "An error occurred during setting this repository in public journal" msgstr "设置版本库到公共日志时发生错误" -#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 +#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "令牌不匹配" -#: rhodecode/controllers/admin/repos.py:527 +#: rhodecode/controllers/admin/repos.py:498 msgid "Pulled from remote location" msgstr "成功拉取自远程路径" -#: rhodecode/controllers/admin/repos.py:529 +#: rhodecode/controllers/admin/repos.py:501 msgid "An error occurred during pull from remote location" msgstr "从远程路径拉取时发生错误" -#: rhodecode/controllers/admin/repos.py:545 +#: rhodecode/controllers/admin/repos.py:517 msgid "Nothing" msgstr "无" -#: rhodecode/controllers/admin/repos.py:547 +#: rhodecode/controllers/admin/repos.py:519 #, python-format msgid "Marked repo %s as fork of %s" msgstr "成功将版本库%s标记为复刻自%s" -#: rhodecode/controllers/admin/repos.py:551 +#: rhodecode/controllers/admin/repos.py:523 msgid "An error occurred during this operation" msgstr "在搜索操作中发生错误" -#: rhodecode/controllers/admin/repos.py:590 -#, fuzzy +#: rhodecode/controllers/admin/repos.py:562 msgid "An error occurred during creation of field" -msgstr "创建用户%s时发生错误" - -#: rhodecode/controllers/admin/repos.py:604 -#, fuzzy +msgstr "" + +#: rhodecode/controllers/admin/repos.py:576 msgid "An error occurred during removal of field" -msgstr "保存电子邮件时发生错误" - -#: rhodecode/controllers/admin/repos_groups.py:145 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:147 +#, python-format msgid "Created repository group %s" -msgstr "建立版本库组%s" - -#: rhodecode/controllers/admin/repos_groups.py:157 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:159 +#, python-format msgid "Error occurred during creation of repository group %s" -msgstr "创建版本库组时发生错误%s" - -#: rhodecode/controllers/admin/repos_groups.py:214 -#: rhodecode/controllers/admin/repos_groups.py:286 -msgid "Cannot revoke permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:220 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:217 +#, python-format msgid "Updated repository group %s" -msgstr "更新版本库组%s" - -#: rhodecode/controllers/admin/repos_groups.py:235 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:232 +#, python-format msgid "Error occurred during update of repository group %s" -msgstr "更新版本库组时发生错误%s" - -#: rhodecode/controllers/admin/repos_groups.py:253 +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:250 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "这个组内有%s个版本库因而无法删除" -#: rhodecode/controllers/admin/repos_groups.py:260 -#, fuzzy, python-format +#: rhodecode/controllers/admin/repos_groups.py:257 +#, python-format msgid "This group contains %s subgroups and cannot be deleted" -msgstr "这个组内有%s个版本库因而无法删除" - -#: rhodecode/controllers/admin/repos_groups.py:266 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:263 +#, python-format msgid "Removed repository group %s" -msgstr "移除版本库组%s" - -#: rhodecode/controllers/admin/repos_groups.py:271 -#, fuzzy, python-format -msgid "Error occurred during deletion of repos group %s" -msgstr "删除版本库组时发生错误%s" - -#: rhodecode/controllers/admin/repos_groups.py:297 -msgid "An error occurred during deletion of group user" -msgstr "删除组用户时发生错误" - -#: rhodecode/controllers/admin/repos_groups.py:318 -#, fuzzy -msgid "An error occurred during deletion of group user groups" -msgstr "删除版本库组的用户组时发生错误" - -#: rhodecode/controllers/admin/settings.py:126 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:268 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:279 +#: rhodecode/controllers/admin/repos_groups.py:314 +#: rhodecode/controllers/admin/users_groups.py:300 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:294 +msgid "Repository Group permissions updated" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:123 +#, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" -msgstr "重新扫描版本库成功，增加%s， 移除%s" - -#: rhodecode/controllers/admin/settings.py:135 +msgstr "" + +#: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" msgstr "Whoosh重新索引任务调度" -#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:163 msgid "Updated application settings" msgstr "更新应用设置" -#: rhodecode/controllers/admin/settings.py:170 -#: rhodecode/controllers/admin/settings.py:301 -#, fuzzy +#: rhodecode/controllers/admin/settings.py:167 +#: rhodecode/controllers/admin/settings.py:304 msgid "Error occurred during updating application settings" -msgstr "更新设置时发生错误" - -#: rhodecode/controllers/admin/settings.py:216 +msgstr "" + +#: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" msgstr "成功更新可视化设置" -#: rhodecode/controllers/admin/settings.py:221 -#, fuzzy +#: rhodecode/controllers/admin/settings.py:224 msgid "Error occurred during updating visualisation settings" -msgstr "更新可视化设置时发生错误" - -#: rhodecode/controllers/admin/settings.py:297 +msgstr "" + +#: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" msgstr "成功更新版本控制系统设置" -#: rhodecode/controllers/admin/settings.py:311 +#: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" msgstr "新建钩子" -#: rhodecode/controllers/admin/settings.py:323 +#: rhodecode/controllers/admin/settings.py:326 msgid "Updated hooks" msgstr "更新钩子" -#: rhodecode/controllers/admin/settings.py:327 -#, fuzzy +#: rhodecode/controllers/admin/settings.py:330 msgid "Error occurred during hook creation" -msgstr "创建钩子时发生错误" - -#: rhodecode/controllers/admin/settings.py:346 +msgstr "" + +#: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" msgstr "已创建电子邮件任务" -#: rhodecode/controllers/admin/settings.py:410 +#: rhodecode/controllers/admin/settings.py:413 msgid "You can't edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/controllers/admin/settings.py:452 +#: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: rhodecode/controllers/admin/settings.py:467 +#: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 -#, fuzzy, python-format +#, python-format msgid "Error occurred during update of user %s" -msgstr "更新用户%s时发生错误" +msgstr "" #: rhodecode/controllers/admin/users.py:130 -#, fuzzy, python-format +#, python-format msgid "Created user %s" -msgstr "创建用户%s" +msgstr "" #: rhodecode/controllers/admin/users.py:142 -#, fuzzy, python-format +#, python-format msgid "Error occurred during creation of user %s" -msgstr "创建用户%s时发生错误" +msgstr "" #: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "用户更新成功" #: rhodecode/controllers/admin/users.py:214 -#, fuzzy msgid "Successfully deleted user" -msgstr "用户删除成功" +msgstr "" #: rhodecode/controllers/admin/users.py:219 msgid "An error occurred during deletion of user" msgstr "删除用户时发生错误" -#: rhodecode/controllers/admin/users.py:233 +#: rhodecode/controllers/admin/users.py:234 msgid "You can't edit this user" msgstr "无法编辑该用户" -#: rhodecode/controllers/admin/users.py:276 -msgid "Granted 'repository create' permission to user" -msgstr "已授予用户“创建版本库”的权限" - -#: rhodecode/controllers/admin/users.py:281 -msgid "Revoked 'repository create' permission to user" -msgstr "已撤销用户“创建版本库”的权限" - -#: rhodecode/controllers/admin/users.py:287 -msgid "Granted 'repository fork' permission to user" -msgstr "成功授予了用户“复刻版本库”权限" - -#: rhodecode/controllers/admin/users.py:292 -msgid "Revoked 'repository fork' permission to user" -msgstr "成功撤销用户“复刻版本库”权限" - -#: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:281 +#: rhodecode/controllers/admin/users.py:293 +#: rhodecode/controllers/admin/users_groups.py:372 +msgid "Updated permissions" +msgstr "" + +#: rhodecode/controllers/admin/users.py:297 +#: rhodecode/controllers/admin/users_groups.py:376 msgid "An error occurred during permissions saving" msgstr "保存权限时发生错误" -#: rhodecode/controllers/admin/users.py:312 +#: rhodecode/controllers/admin/users.py:311 #, python-format msgid "Added email %s to user" msgstr "已为用户添加电子邮件 %s" -#: rhodecode/controllers/admin/users.py:318 +#: rhodecode/controllers/admin/users.py:317 msgid "An error occurred during email saving" msgstr "保存电子邮件时发生错误" -#: rhodecode/controllers/admin/users.py:328 +#: rhodecode/controllers/admin/users.py:327 msgid "Removed email from user" msgstr "成功删除用户电子邮件" -#: rhodecode/controllers/admin/users.py:341 -#, fuzzy, python-format +#: rhodecode/controllers/admin/users.py:340 +#, python-format msgid "Added ip %s to user" -msgstr "已为用户添加电子邮件 %s" - -#: rhodecode/controllers/admin/users.py:347 -#, fuzzy +msgstr "" + +#: rhodecode/controllers/admin/users.py:346 msgid "An error occurred during ip saving" -msgstr "保存电子邮件时发生错误" - -#: rhodecode/controllers/admin/users.py:359 -#, fuzzy +msgstr "" + +#: rhodecode/controllers/admin/users.py:358 msgid "Removed ip from user" -msgstr "成功删除用户电子邮件" - -#: rhodecode/controllers/admin/users_groups.py:86 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:162 +#, python-format msgid "Created user group %s" -msgstr "建立用户组%s" - -#: rhodecode/controllers/admin/users_groups.py:97 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:173 +#, python-format msgid "Error occurred during creation of user group %s" -msgstr "创建用户组%s时发生错误" - -#: rhodecode/controllers/admin/users_groups.py:166 -#, fuzzy, python-format -msgid "Updated user group %s" -msgstr "更新用户组%s" - -#: rhodecode/controllers/admin/users_groups.py:188 -#, fuzzy, python-format -msgid "Error occurred during update of user group %s" -msgstr "更新用户组%s时发生错误" - -#: rhodecode/controllers/admin/users_groups.py:205 -#, fuzzy -msgid "Successfully deleted user group" -msgstr "删除用户组成功" +msgstr "" #: rhodecode/controllers/admin/users_groups.py:210 -#, fuzzy +#, python-format +msgid "Updated user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:232 +#, python-format +msgid "Error occurred during update of user group %s" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:250 +msgid "Successfully deleted user group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:255 msgid "An error occurred during deletion of user group" -msgstr "删除用户组时发生错误" - -#: rhodecode/controllers/admin/users_groups.py:259 -#, fuzzy -msgid "Granted 'repository create' permission to user group" -msgstr "已授予用户组“创建版本库”的权限" - -#: rhodecode/controllers/admin/users_groups.py:264 -#, fuzzy -msgid "Revoked 'repository create' permission to user group" -msgstr "已撤销用户组“创建版本库”的权限" - -#: rhodecode/controllers/admin/users_groups.py:270 -#, fuzzy -msgid "Granted 'repository fork' permission to user group" -msgstr "已授予用户组“复刻版本库”的权限" - -#: rhodecode/controllers/admin/users_groups.py:275 -#, fuzzy -msgid "Revoked 'repository fork' permission to user group" -msgstr "已撤销用户组“复刻版本库”的权限" - -#: rhodecode/lib/auth.py:530 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:274 +msgid "Target group cannot be the same" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:280 +msgid "User Group permissions updated" +msgstr "" + +#: rhodecode/lib/auth.py:544 +#, python-format msgid "IP %s not allowed" -msgstr "%s个关注者" - -#: rhodecode/lib/auth.py:579 +msgstr "" + +#: rhodecode/lib/auth.py:593 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: rhodecode/lib/auth.py:620 +#: rhodecode/lib/auth.py:634 msgid "You need to be a signed in to view this page" msgstr "必须登录才能访问该页面" #: rhodecode/lib/diffs.py:66 -#, fuzzy msgid "Binary file" -msgstr "二进制文件" +msgstr "" #: rhodecode/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" msgstr "修订集因过大而被截断，可查看原始修订集作为替代" #: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "未发现差异" -#: rhodecode/lib/helpers.py:394 -#, python-format -msgid "%a, %d %b %Y %H:%M:%S" -msgstr "%Y/%m/%d %H:%M:%S" - -#: rhodecode/lib/helpers.py:506 +#: rhodecode/lib/helpers.py:539 msgid "True" msgstr "是" -#: rhodecode/lib/helpers.py:509 +#: rhodecode/lib/helpers.py:542 msgid "False" msgstr "否" -#: rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:580 #, python-format msgid "Deleted branch: %s" msgstr "已经删除分支%s" -#: rhodecode/lib/helpers.py:550 +#: rhodecode/lib/helpers.py:583 #, python-format msgid "Created tag: %s" msgstr "创建标签%s" -#: rhodecode/lib/helpers.py:563 +#: rhodecode/lib/helpers.py:596 msgid "Changeset not found" msgstr "未找到修订集" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:646 #, python-format msgid "Show all combined changesets %s->%s" msgstr "显示合并的修订集%s->%s" -#: rhodecode/lib/helpers.py:621 +#: rhodecode/lib/helpers.py:652 msgid "compare view" msgstr "比较显示" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:672 msgid "and" msgstr "还有" -#: rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:673 #, python-format msgid "%s more" msgstr "%s个" -#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/lib/helpers.py:674 +#: rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "修订" -#: rhodecode/lib/helpers.py:667 +#: rhodecode/lib/helpers.py:698 #, python-format msgid "fork name %s" msgstr "复刻名称%s" -#: rhodecode/lib/helpers.py:684 +#: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "拉取请求#%s" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:725 msgid "[deleted] repository" msgstr "[删除]版本库" -#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739 msgid "[created] repository" msgstr "[创建]版本库" -#: rhodecode/lib/helpers.py:694 +#: rhodecode/lib/helpers.py:729 msgid "[created] repository as fork" msgstr "[创建]复刻版本库" -#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741 msgid "[forked] repository" msgstr "[复刻]版本库" -#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743 msgid "[updated] repository" msgstr "[更新]版本库" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:735 +msgid "[downloaded] archive from repository" +msgstr "" + +#: rhodecode/lib/helpers.py:737 msgid "[delete] repository" msgstr "[删除]版本库" -#: rhodecode/lib/helpers.py:708 +#: rhodecode/lib/helpers.py:745 msgid "[created] user" msgstr "[创建]用户" -#: rhodecode/lib/helpers.py:710 +#: rhodecode/lib/helpers.py:747 msgid "[updated] user" msgstr "[更新]用户" -#: rhodecode/lib/helpers.py:712 -#, fuzzy +#: rhodecode/lib/helpers.py:749 msgid "[created] user group" -msgstr "[创建]用户组" - -#: rhodecode/lib/helpers.py:714 -#, fuzzy +msgstr "" + +#: rhodecode/lib/helpers.py:751 msgid "[updated] user group" -msgstr "[更新]用户组" - -#: rhodecode/lib/helpers.py:716 +msgstr "" + +#: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" msgstr "[评论]了版本库中的修订" -#: rhodecode/lib/helpers.py:718 +#: rhodecode/lib/helpers.py:755 msgid "[commented] on pull request for" msgstr "[评论]拉取请求" -#: rhodecode/lib/helpers.py:720 +#: rhodecode/lib/helpers.py:757 msgid "[closed] pull request for" msgstr "[关闭] 拉取请求" -#: rhodecode/lib/helpers.py:722 +#: rhodecode/lib/helpers.py:759 msgid "[pushed] into" msgstr "[推送]到" -#: rhodecode/lib/helpers.py:724 +#: rhodecode/lib/helpers.py:761 msgid "[committed via RhodeCode] into repository" msgstr "[通过RhodeCode提交]到版本库" -#: rhodecode/lib/helpers.py:726 +#: rhodecode/lib/helpers.py:763 msgid "[pulled from remote] into repository" msgstr "[远程拉取]到版本库" -#: rhodecode/lib/helpers.py:728 +#: rhodecode/lib/helpers.py:765 msgid "[pulled] from" msgstr "[拉取]自" -#: rhodecode/lib/helpers.py:730 +#: rhodecode/lib/helpers.py:767 msgid "[started following] repository" msgstr "[开始关注]版本库" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:769 msgid "[stopped following] repository" msgstr "[停止关注]版本库" -#: rhodecode/lib/helpers.py:910 +#: rhodecode/lib/helpers.py:1088 #, python-format msgid " and %s more" msgstr "还有%s个" -#: rhodecode/lib/helpers.py:914 +#: rhodecode/lib/helpers.py:1092 msgid "No Files" msgstr "没有文件" -#: rhodecode/lib/helpers.py:1198 +#: rhodecode/lib/helpers.py:1158 +msgid "new file" +msgstr "" + +#: rhodecode/lib/helpers.py:1161 +msgid "mod" +msgstr "" + +#: rhodecode/lib/helpers.py:1164 +msgid "del" +msgstr "" + +#: rhodecode/lib/helpers.py:1167 +msgid "rename" +msgstr "" + +#: rhodecode/lib/helpers.py:1172 +msgid "chmod" +msgstr "" + +#: rhodecode/lib/helpers.py:1404 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" +"%s repository is not mapped to db perhaps it was created or renamed from the" +" filesystem please run the application again in order to rescan repositories" msgstr "版本库%s没有映射到数据库，可能是从文件系统创建或者重命名，请重启RhodeCode以重新扫描版本库" #: rhodecode/lib/unionrepo.py:193 -#, fuzzy msgid "cannot create new union repository" -msgstr "[创建]版本库" - -#: rhodecode/lib/utils2.py:411 +msgstr "" + +#: rhodecode/lib/utils2.py:410 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d年" -#: rhodecode/lib/utils2.py:412 +#: rhodecode/lib/utils2.py:411 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d月" -#: rhodecode/lib/utils2.py:413 +#: rhodecode/lib/utils2.py:412 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d天" -#: rhodecode/lib/utils2.py:414 +#: rhodecode/lib/utils2.py:413 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d时" -#: rhodecode/lib/utils2.py:415 +#: rhodecode/lib/utils2.py:414 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d分" -#: rhodecode/lib/utils2.py:416 +#: rhodecode/lib/utils2.py:415 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d秒" -#: rhodecode/lib/utils2.py:432 +#: rhodecode/lib/utils2.py:431 #, python-format msgid "in %s" msgstr "%s" -#: rhodecode/lib/utils2.py:434 +#: rhodecode/lib/utils2.py:433 #, python-format msgid "%s ago" msgstr "%s前" -#: rhodecode/lib/utils2.py:436 +#: rhodecode/lib/utils2.py:435 #, python-format msgid "in %s and %s" msgstr "%s零%s" -#: rhodecode/lib/utils2.py:439 +#: rhodecode/lib/utils2.py:438 #, python-format msgid "%s and %s ago" msgstr "%s零%s前" -#: rhodecode/lib/utils2.py:442 +#: rhodecode/lib/utils2.py:441 msgid "just now" msgstr "刚才" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 msgid "Repository no access" msgstr "无版本库访问权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 msgid "Repository read access" msgstr "版本库读取权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 msgid "Repository write access" msgstr "版本库写入权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 msgid "Repository admin access" msgstr "版本库管理权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 msgid "Repositories Group no access" msgstr "无版本库组访问权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309 msgid "Repositories Group read access" msgstr "版本库组读取权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310 msgid "Repositories Group write access" msgstr "版本库组写入" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311 msgid "Repositories Group admin access" msgstr "版本库组管理权限" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411 msgid "RhodeCode Administrator" msgstr "RhodeCode 管理员" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434 msgid "Repository creation disabled" msgstr "禁用创建版本库" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435 msgid "Repository creation enabled" msgstr "允许创建版本库" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 msgid "Repository forking disabled" msgstr "禁用复刻版本库" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 msgid "Repository forking enabled" msgstr "允许复刻版本库" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403 msgid "Register disabled" msgstr "禁用注册" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "用手动激活注册新用户" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "用自动激活注册新用户" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939 msgid "Not Reviewed" msgstr "未检视" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940 msgid "Approved" msgstr "已批准" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941 msgid "Rejected" msgstr "驳回" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942 msgid "Under Review" msgstr "检视中" +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 +msgid "top level" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 +msgid "Repository group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 +msgid "Repository group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 +msgid "Repository group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 +msgid "Repository group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 +msgid "User group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 +msgid "User group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 +msgid "User group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 +msgid "User group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 +msgid "Repository Group creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 +msgid "Repository Group creation enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 +msgid "User Group creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 +msgid "User Group creation enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 +msgid "Registration disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 +msgid "User Registration with manual account activation" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 +msgid "User Registration with automatic account activation" +msgstr "" + #: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "在%s行" -#: rhodecode/model/comment.py:219 +#: rhodecode/model/comment.py:220 msgid "[Mention]" msgstr "[提及]" -#: rhodecode/model/db.py:1252 -msgid "top level" -msgstr "" - -#: rhodecode/model/db.py:1393 -#, fuzzy -msgid "Repository group no access" -msgstr "无版本库组访问权限" - -#: rhodecode/model/db.py:1394 -#, fuzzy -msgid "Repository group read access" -msgstr "版本库组读取权限" - -#: rhodecode/model/db.py:1395 -#, fuzzy -msgid "Repository group write access" -msgstr "版本库组写入" - -#: rhodecode/model/db.py:1396 -#, fuzzy -msgid "Repository group admin access" -msgstr "版本库组管理权限" - #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "请登录" @@ -1245,49 +1332,48 @@ msgid "Enter %(min)i characters or more" msgstr "输入少于%(min)i个字符" -#: rhodecode/model/notification.py:224 -#, fuzzy, python-format +#: rhodecode/model/notification.py:228 +#, python-format msgid "%(user)s commented on changeset at %(when)s" -msgstr "在%(when)s评论了提交" - -#: rhodecode/model/notification.py:225 -#, fuzzy, python-format -msgid "%(user)s sent message at %(when)s" -msgstr "在%(when)s发送信息" - -#: rhodecode/model/notification.py:226 -#, fuzzy, python-format -msgid "%(user)s mentioned you at %(when)s" -msgstr "在%(when)s提到了你" - -#: rhodecode/model/notification.py:227 -#, fuzzy, python-format -msgid "%(user)s registered in RhodeCode at %(when)s" -msgstr "在%(when)s注册到RhodeCode" - -#: rhodecode/model/notification.py:228 -#, fuzzy, python-format -msgid "%(user)s opened new pull request at %(when)s" -msgstr "在%(when)s创建新的拉取请求" +msgstr "" #: rhodecode/model/notification.py:229 -#, fuzzy, python-format +#, python-format +msgid "%(user)s sent message at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:230 +#, python-format +msgid "%(user)s mentioned you at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:231 +#, python-format +msgid "%(user)s registered in RhodeCode at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:232 +#, python-format +msgid "%(user)s opened new pull request at %(when)s" +msgstr "" + +#: rhodecode/model/notification.py:233 +#, python-format msgid "%(user)s commented on pull request at %(when)s" -msgstr "在%(when)s评论了拉取请求" - -#: rhodecode/model/pull_request.py:104 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/model/pull_request.py:98 +#, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" -msgstr "%(user)s想要你检视拉取请求#%(pr_id)s" - -#: rhodecode/model/scm.py:598 +msgstr "" + +#: rhodecode/model/scm.py:674 msgid "latest tip" msgstr "最新tip版本" #: rhodecode/model/user.py:232 -#, fuzzy msgid "New user registration" -msgstr "[RhodeCode]新用户注册" +msgstr "" #: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" @@ -1300,19 +1386,17 @@ #: rhodecode/model/user.py:309 #, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" +"user \"%s\" still owns %s repositories and cannot be removed. Switch owners " +"or remove those repositories. %s" msgstr "由于用户 \"%s\" 拥有版本库%s因而无法删除，请修改版本库所有者或删除版本库。%s" #: rhodecode/model/user.py:334 -#, fuzzy msgid "Password reset link" -msgstr "密码重置链接" +msgstr "" #: rhodecode/model/user.py:366 -#, fuzzy msgid "Your new password" -msgstr "新密码" +msgstr "" #: rhodecode/model/user.py:367 #, python-format @@ -1335,9 +1419,9 @@ #: rhodecode/model/validators.py:89 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character" -msgstr "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with alphanumeric character or underscore" +msgstr "" #: rhodecode/model/validators.py:117 #, python-format @@ -1345,21 +1429,19 @@ msgstr "用户名称 %(username)s 无效" #: rhodecode/model/validators.py:136 -#, fuzzy msgid "Invalid user group name" -msgstr "无效的用户组名" +msgstr "" #: rhodecode/model/validators.py:137 -#, fuzzy, python-format +#, python-format msgid "User group \"%(usergroup)s\" already exists" -msgstr "用户组 \"%(usersgroup)s\" 已经存在" +msgstr "" #: rhodecode/model/validators.py:139 -#, fuzzy msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头" +msgstr "" #: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" @@ -1411,9 +1493,9 @@ msgstr "版本库组 \"%(group)s\" 中已经存在版本库 \"%(repo)s\"" #: rhodecode/model/validators.py:321 -#, fuzzy, python-format +#, python-format msgid "Repository group with name \"%(repo)s\" already exists" -msgstr "已经存在名为 \"%(repo)s\" 的版本库组" +msgstr "" #: rhodecode/model/validators.py:438 msgid "invalid clone url" @@ -1432,57 +1514,59 @@ msgstr "没有在该版本库组中创建版本库的权限" #: rhodecode/model/validators.py:481 -#, fuzzy msgid "no permission to create repository in root location" -msgstr "没有在该版本库组中创建版本库的权限" +msgstr "" #: rhodecode/model/validators.py:518 -#, fuzzy msgid "You don't have permissions to create a group in this location" -msgstr "没有在该版本库组中创建版本库的权限" - -#: rhodecode/model/validators.py:557 -#, fuzzy +msgstr "" + +#: rhodecode/model/validators.py:559 msgid "This username or user group name is not valid" -msgstr "用户或用户组名称无效" - -#: rhodecode/model/validators.py:650 +msgstr "" + +#: rhodecode/model/validators.py:652 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:667 msgid "This e-mail address is already taken" msgstr "该邮件地址已被使用" -#: rhodecode/model/validators.py:685 +#: rhodecode/model/validators.py:687 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "邮件地址\"%(email)s\"不存在" -#: rhodecode/model/validators.py:722 +#: rhodecode/model/validators.py:724 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name " -"of the attribute that is equivalent to \"username\"" +"The LDAP Login attribute of the CN must be specified - this is the name of " +"the attribute that is equivalent to \"username\"" msgstr "LDAP 登陆属性的 CN 必须指定 - 这个名字作为用户名" -#: rhodecode/model/validators.py:735 +#: rhodecode/model/validators.py:737 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态" -#: rhodecode/model/validators.py:767 +#: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:768 +#: rhodecode/model/validators.py:770 #, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: rhodecode/model/validators.py:800 +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" +#: rhodecode/model/validators.py:817 +msgid "Filename cannot be inside a directory" +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "控制面板" @@ -1509,50 +1593,47 @@ #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repos.html:21 +#: rhodecode/templates/admin/repos/repos.html:22 msgid "Add repository" msgstr "添加版本库" #: rhodecode/templates/index_base.html:15 #: rhodecode/templates/index_base.html:20 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 -#, fuzzy msgid "Add group" -msgstr "编辑版本库组" +msgstr "" #: rhodecode/templates/index_base.html:27 -#, fuzzy msgid "Edit group" -msgstr "编辑版本库组" +msgstr "" #: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/index_base.html:140 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 msgid "Group name" msgstr "组名" #: rhodecode/templates/index_base.html:41 -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:270 +#: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:68 +#: rhodecode/templates/admin/repos/repos.html:75 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request.html:9 #: rhodecode/templates/forks/fork.html:56 -#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/pullrequests/pullrequest.html:43 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "描述" @@ -1560,27 +1641,25 @@ #: rhodecode/templates/index_base.html:51 #: rhodecode/templates/admin/permissions/permissions.html:55 #: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos/repo_edit.html:50 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 #: rhodecode/templates/forks/fork.html:47 msgid "Repository group" msgstr "版本库组" -#: rhodecode/templates/index_base.html:82 -#: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:268 +#: rhodecode/templates/index_base.html:121 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:71 +#: rhodecode/templates/admin/repos/repos.html:73 #: rhodecode/templates/admin/users/user_edit_my_account.html:172 -#: rhodecode/templates/base/perms_summary.html:14 -#: rhodecode/templates/bookmarks/bookmarks.html:34 +#: rhodecode/templates/base/perms_summary.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:48 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 #: rhodecode/templates/journal/journal.html:193 -#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/journal/journal.html:283 #: rhodecode/templates/summary/summary.html:55 #: rhodecode/templates/summary/summary.html:124 #: rhodecode/templates/tags/tags.html:48 @@ -1588,110 +1667,78 @@ msgid "Name" msgstr "名称" -#: rhodecode/templates/index_base.html:84 -msgid "Last change" +#: rhodecode/templates/index_base.html:124 +msgid "Last Change" msgstr "最后修改" -#: rhodecode/templates/index_base.html:85 -#: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:273 -#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/index_base.html:126 +#: rhodecode/templates/admin/repos/repos.html:76 #: rhodecode/templates/admin/users/user_edit_my_account.html:174 #: rhodecode/templates/journal/journal.html:195 -#: rhodecode/templates/journal/journal.html:298 +#: rhodecode/templates/journal/journal.html:285 msgid "Tip" msgstr "Tip" -#: rhodecode/templates/index_base.html:86 -#: rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:275 -#: rhodecode/templates/admin/repos/repo_edit.html:121 -#: rhodecode/templates/admin/repos/repos.html:76 +#: rhodecode/templates/index_base.html:128 +#: rhodecode/templates/admin/repos/repo_edit.html:114 +#: rhodecode/templates/admin/repos/repos.html:78 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.html:87 -msgid "Atom" -msgstr "Atom" - -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/index_base.html:209 -#: rhodecode/templates/index_base.html:296 -#: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:196 +#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/bookmarks/bookmarks.html:74 #: rhodecode/templates/branches/branches.html:73 -#: rhodecode/templates/journal/journal.html:217 -#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/journal/journal.html:294 #: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "点击以升序排列" -#: rhodecode/templates/index_base.html:172 -#: rhodecode/templates/index_base.html:210 -#: rhodecode/templates/index_base.html:297 -#: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:197 +#: rhodecode/templates/index_base.html:137 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/bookmarks/bookmarks.html:75 #: rhodecode/templates/branches/branches.html:74 -#: rhodecode/templates/journal/journal.html:218 -#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/journal/journal.html:295 #: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "点击以降序排列" -#: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:271 -msgid "Last Change" -msgstr "最后修改" - -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:198 -#: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:75 -#: rhodecode/templates/journal/journal.html:219 -#: rhodecode/templates/journal/journal.html:322 -#: rhodecode/templates/tags/tags.html:76 -msgid "No records found." -msgstr "没有找到记录" - -#: rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:299 -#: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:199 +#: rhodecode/templates/index_base.html:138 +msgid "No repositories found." +msgstr "" + +#: rhodecode/templates/index_base.html:139 +#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/bookmarks/bookmarks.html:77 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:220 -#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/journal/journal.html:207 +#: rhodecode/templates/journal/journal.html:297 #: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "数据错误" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:300 -#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/index_base.html:140 +#: rhodecode/templates/admin/repos/repos.html:90 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 -#: rhodecode/templates/admin/users/user_edit_my_account.html:200 +#: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/bookmarks/bookmarks.html:78 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:221 -#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/journal/journal.html:208 +#: rhodecode/templates/journal/journal.html:298 #: rhodecode/templates/tags/tags.html:78 msgid "Loading..." msgstr "载入中..." -#: rhodecode/templates/index_base.html:298 -#, fuzzy -msgid "No repositories found." -msgstr "版本库组" - -#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239 msgid "Log In" msgstr "登录" @@ -1706,7 +1753,7 @@ #: rhodecode/templates/admin/users/user_edit.html:57 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 #: rhodecode/templates/admin/users/users.html:77 -#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/base/base.html:215 #: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "帐号" @@ -1714,7 +1761,7 @@ #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:212 +#: rhodecode/templates/base/base.html:224 msgid "Password" msgstr "密码" @@ -1730,14 +1777,13 @@ msgid "Forgot your password ?" msgstr "忘记了密码？" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235 msgid "Don't have an account ?" msgstr "还没有帐号？" #: rhodecode/templates/password_reset.html:5 -#, fuzzy msgid "Password Reset" -msgstr "密码重置链接" +msgstr "" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1800,7 +1846,7 @@ #: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:85 +#: rhodecode/templates/admin/repos/repo_edit.html:78 #: rhodecode/templates/data_table/_dt_elements.html:61 #: rhodecode/templates/summary/summary.html:77 msgid "Private repository" @@ -1823,13 +1869,13 @@ msgstr "没有任何标签" #: rhodecode/templates/switch_to_list.html:35 -#: rhodecode/templates/bookmarks/bookmarks_data.html:32 +#: rhodecode/templates/bookmarks/bookmarks_data.html:37 msgid "There are no bookmarks yet" msgstr "无书签" #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 -#: rhodecode/templates/base/base.html:68 +#: rhodecode/templates/base/base.html:73 msgid "Admin journal" msgstr "系统日志" @@ -1850,13 +1896,13 @@ msgstr[0] "%s条" #: rhodecode/templates/admin/admin_log.html:6 -#: rhodecode/templates/admin/repos/repos.html:77 +#: rhodecode/templates/admin/repos/repos.html:79 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 #: rhodecode/templates/admin/users/user_edit_my_account.html:176 #: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/admin/users_groups/users_groups.html:40 #: rhodecode/templates/journal/journal.html:197 -#: rhodecode/templates/journal/journal.html:300 +#: rhodecode/templates/journal/journal.html:287 msgid "Action" msgstr "操作" @@ -1866,7 +1912,7 @@ msgstr "版本库" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:35 +#: rhodecode/templates/bookmarks/bookmarks.html:49 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 #: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 @@ -1889,19 +1935,18 @@ msgstr "版本库默认设置" #: rhodecode/templates/admin/defaults/defaults.html:11 -#: rhodecode/templates/base/base.html:75 +#: rhodecode/templates/base/base.html:80 msgid "Defaults" msgstr "默认设置" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "类型" #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:82 #: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " @@ -1909,63 +1954,186 @@ msgstr "私有版本库只对成员可见。" #: rhodecode/templates/admin/defaults/defaults.html:55 -#: rhodecode/templates/admin/repos/repo_edit.html:94 +#: rhodecode/templates/admin/repos/repo_edit.html:87 msgid "Enable statistics" msgstr "启用统计" #: rhodecode/templates/admin/defaults/defaults.html:59 -#: rhodecode/templates/admin/repos/repo_edit.html:98 +#: rhodecode/templates/admin/repos/repo_edit.html:91 msgid "Enable statistics window on summary page." msgstr "启用概况页的统计窗口" #: rhodecode/templates/admin/defaults/defaults.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repo_edit.html:96 msgid "Enable downloads" msgstr "启用下载" #: rhodecode/templates/admin/defaults/defaults.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:107 +#: rhodecode/templates/admin/repos/repo_edit.html:100 msgid "Enable download menu on summary page." msgstr "启用概况页的下载菜单" #: rhodecode/templates/admin/defaults/defaults.html:75 -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos/repo_edit.html:105 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 msgid "Enable locking" msgstr "启用锁定" #: rhodecode/templates/admin/defaults/defaults.html:79 -#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: rhodecode/templates/admin/repos/repo_edit.html:109 msgid "Enable lock-by-pulling on repository." msgstr "启用版本库的拉取锁定" #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:148 -#: rhodecode/templates/admin/repos/repo_edit.html:173 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 +#: rhodecode/templates/admin/permissions/permissions.html:122 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users/user_edit.html:140 -#: rhodecode/templates/admin/users/user_edit.html:185 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:143 +#: rhodecode/templates/base/default_perms_box.html:53 msgid "Save" msgstr "保存" +#: rhodecode/templates/admin/gists/index.html:5 +#: rhodecode/templates/base/base.html:299 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:10 +#, python-format +msgid "Private Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:12 +#, python-format +msgid "Public Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:14 +msgid "Public Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:31 +#: rhodecode/templates/admin/gists/show.html:24 +#: rhodecode/templates/base/base.html:302 +msgid "Create new gist" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:48 +msgid "Created" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/index.html:53 +#: rhodecode/templates/admin/gists/show.html:43 +#: rhodecode/templates/admin/gists/show.html:45 +msgid "Expires" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/show.html:43 +msgid "never" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:68 +msgid "There are no gists yet" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:5 +#: rhodecode/templates/admin/gists/new.html:16 +msgid "New gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:37 +msgid "Gist description ..." +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:52 +msgid "Create private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:53 +msgid "Create public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:54 +#: rhodecode/templates/admin/permissions/permissions.html:123 +#: rhodecode/templates/admin/permissions/permissions.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos/repo_edit.html:167 +#: rhodecode/templates/admin/repos/repo_edit.html:381 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users/user_edit.html:246 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:144 +#: rhodecode/templates/base/default_perms_box.html:54 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:86 +msgid "Reset" +msgstr "重置" + +#: rhodecode/templates/admin/gists/show.html:5 +msgid "gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:36 +msgid "Public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:38 +msgid "Private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:54 +#: rhodecode/templates/admin/repos/repo_edit.html:299 +#: rhodecode/templates/changeset/changeset_file_comment.html:40 +msgid "Delete" +msgstr "删除" + +#: rhodecode/templates/admin/gists/show.html:54 +msgid "Confirm to delete this gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:63 +#: rhodecode/templates/admin/gists/show.html:84 +#: rhodecode/templates/files/files_edit.html:48 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:55 +msgid "Show as raw" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:71 +msgid "created" +msgstr "" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "LDAP管理员" #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:74 -#, fuzzy +#: rhodecode/templates/base/base.html:79 msgid "LDAP" -msgstr "LDAP" +msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:28 msgid "Connection settings" @@ -2063,7 +2231,7 @@ msgstr "显示通知" #: rhodecode/templates/admin/notifications/show_notification.html:9 -#: rhodecode/templates/base/base.html:241 +#: rhodecode/templates/base/base.html:253 msgid "Notifications" msgstr "通知" @@ -2072,12 +2240,14 @@ msgstr "权限管理" #: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:151 #: rhodecode/templates/admin/repos/repo_edit.html:158 -#: rhodecode/templates/admin/repos/repo_edit.html:165 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88 #: rhodecode/templates/admin/users/user_edit.html:150 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/base/base.html:73 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:129 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: rhodecode/templates/base/base.html:78 msgid "Permissions" msgstr "权限" @@ -2090,118 +2260,111 @@ msgstr "匿名访问" #: rhodecode/templates/admin/permissions/permissions.html:49 -#, fuzzy msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will " -"be lost" -msgstr "所有版本库的默认权限将被重置到选择的权限，所有版本库的自定义权限将被丢弃" +"permission, note that all custom default permission on repositories will be " +"lost" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -#, fuzzy +#: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Overwrite existing settings" -msgstr "覆盖已有设置" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:62 -#, fuzzy msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " "will be lost" -msgstr "所有版本库组的默认权限将被重置到选择的权限，所有版本库组的自定义权限将被丢弃" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 -msgid "Registration" -msgstr "注册" - -#: rhodecode/templates/admin/permissions/permissions.html:77 +msgid "User group" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:76 +msgid "" +"All default permissions on each user group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:83 msgid "Repository creation" msgstr "建立版本库" -#: rhodecode/templates/admin/permissions/permissions.html:85 +#: rhodecode/templates/admin/permissions/permissions.html:91 +msgid "User group creation" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" msgstr "版本库复刻" -#: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:154 -#: rhodecode/templates/admin/repos/repo_edit.html:149 -#: rhodecode/templates/admin/repos/repo_edit.html:174 -#: rhodecode/templates/admin/repos/repo_edit.html:388 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 -#: rhodecode/templates/admin/settings/settings.html:115 -#: rhodecode/templates/admin/settings/settings.html:187 -#: rhodecode/templates/admin/settings/settings.html:278 -#: rhodecode/templates/admin/users/user_edit.html:141 -#: rhodecode/templates/admin/users/user_edit.html:186 -#: rhodecode/templates/admin/users/user_edit.html:235 -#: rhodecode/templates/admin/users/user_edit.html:283 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:80 -#: rhodecode/templates/files/files_edit.html:66 -#: rhodecode/templates/pullrequests/pullrequest.html:110 -msgid "Reset" -msgstr "重置" - -#: rhodecode/templates/admin/permissions/permissions.html:103 -#, fuzzy +#: rhodecode/templates/admin/permissions/permissions.html:107 +msgid "Registration" +msgstr "注册" + +#: rhodecode/templates/admin/permissions/permissions.html:115 +msgid "External auth account activation" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:133 msgid "Default User Permissions" -msgstr "默认权限" - -#: rhodecode/templates/admin/permissions/permissions.html:113 -#: rhodecode/templates/admin/users/user_edit.html:244 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:144 +#: rhodecode/templates/admin/users/user_edit.html:207 msgid "Allowed IP addresses" -msgstr "邮件地址" - -#: rhodecode/templates/admin/permissions/permissions.html:127 -#: rhodecode/templates/admin/repos/repo_edit.html:347 +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:340 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 -#: rhodecode/templates/admin/users/user_edit.html:212 -#: rhodecode/templates/admin/users/user_edit.html:257 -#: rhodecode/templates/admin/users_groups/users_groups.html:46 +#: rhodecode/templates/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:220 +#: rhodecode/templates/admin/users_groups/users_groups.html:54 #: rhodecode/templates/data_table/_dt_elements.html:122 -#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:136 msgid "delete" msgstr "删除" -#: rhodecode/templates/admin/permissions/permissions.html:128 -#: rhodecode/templates/admin/users/user_edit.html:258 -#, fuzzy, python-format +#: rhodecode/templates/admin/permissions/permissions.html:159 +#: rhodecode/templates/admin/users/user_edit.html:221 +#, python-format msgid "Confirm to delete this ip: %s" -msgstr "确认删除邮箱：%s" - -#: rhodecode/templates/admin/permissions/permissions.html:134 -#: rhodecode/templates/admin/users/user_edit.html:264 +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:165 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:145 -#: rhodecode/templates/admin/users/user_edit.html:275 -#, fuzzy +#: rhodecode/templates/admin/permissions/permissions.html:176 +#: rhodecode/templates/admin/users/user_edit.html:238 msgid "New ip address" -msgstr "增加邮箱" - -#: rhodecode/templates/admin/permissions/permissions.html:153 +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:184 #: rhodecode/templates/admin/repos/repo_add_base.html:73 -#: rhodecode/templates/admin/repos/repo_edit.html:387 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users/user_edit.html:282 +#: rhodecode/templates/admin/repos/repo_edit.html:380 +#: rhodecode/templates/admin/users/user_edit.html:197 +#: rhodecode/templates/admin/users/user_edit.html:245 msgid "Add" msgstr "增加" #: rhodecode/templates/admin/repos/repo_add.html:12 #: rhodecode/templates/admin/repos/repo_add.html:16 -#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 -#: rhodecode/templates/base/base.html:263 +#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88 +#: rhodecode/templates/base/base.html:116 +#: rhodecode/templates/base/base.html:275 msgid "Repositories" msgstr "版本库" #: rhodecode/templates/admin/repos/repo_add.html:19 -#, fuzzy msgid "Add new" -msgstr "新建" +msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:96 @@ -2210,7 +2373,7 @@ msgstr "克隆自" #: rhodecode/templates/admin/repos/repo_add_base.html:24 -#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/admin/repos/repo_edit.html:45 msgid "Optional http[s] url from which repository should be cloned." msgstr "可选的，指定版本库应该从哪个http[s]地址克隆。" @@ -2224,21 +2387,22 @@ msgstr "要创建的版本库类型" #: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:59 #: rhodecode/templates/forks/fork.html:38 msgid "Landing revision" msgstr "默认修订" #: rhodecode/templates/admin/repos/repo_add_base.html:51 -#: rhodecode/templates/admin/repos/repo_edit.html:70 +#: rhodecode/templates/admin/repos/repo_edit.html:63 #: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "文件浏览、下载、whoosh和README的默认修订版本" #: rhodecode/templates/admin/repos/repo_add_base.html:60 -#: rhodecode/templates/admin/repos/repo_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 -msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." msgstr "保持简短。用README文件来写更长的描述。" #: rhodecode/templates/admin/repos/repo_edit.html:8 @@ -2248,250 +2412,250 @@ #: rhodecode/templates/admin/repos/repo_edit.html:12 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:11 -#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/base/base.html:81 +#: rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "设置" -#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/admin/repos/repo_edit.html:36 +msgid "Non-changeable id" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" msgstr "克隆地址" -#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/admin/repos/repo_edit.html:54 msgid "Optional select a group to put this repository into." msgstr "可选的，选择一个组将版本库放到其中" -#: rhodecode/templates/admin/repos/repo_edit.html:126 +#: rhodecode/templates/admin/repos/repo_edit.html:119 msgid "Change owner of this repository." msgstr "修改这个版本库的所有者" +#: rhodecode/templates/admin/repos/repo_edit.html:177 +msgid "Advanced settings" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:180 +msgid "Statistics" +msgstr "统计" + #: rhodecode/templates/admin/repos/repo_edit.html:184 -#, fuzzy -msgid "Advanced settings" -msgstr "保存设置" +msgid "Reset current statistics" +msgstr "重置统计" + +#: rhodecode/templates/admin/repos/repo_edit.html:184 +msgid "Confirm to remove current statistics" +msgstr "确认移除当前统计" #: rhodecode/templates/admin/repos/repo_edit.html:187 -msgid "Statistics" -msgstr "统计" - -#: rhodecode/templates/admin/repos/repo_edit.html:191 -msgid "Reset current statistics" -msgstr "重置统计" - -#: rhodecode/templates/admin/repos/repo_edit.html:191 -msgid "Confirm to remove current statistics" -msgstr "确认移除当前统计" - -#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "获取到修订" -#: rhodecode/templates/admin/repos/repo_edit.html:195 +#: rhodecode/templates/admin/repos/repo_edit.html:188 msgid "Stats gathered" msgstr "已收集的统计" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:196 msgid "Remote" msgstr "远程" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Pull changes from remote location" msgstr "从远程路径拉取修订集" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Confirm to pull changes from remote side" msgstr "确认从远程拉取修订集" -#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/admin/repos/repo_edit.html:211 msgid "Cache" msgstr "缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Invalidate repository cache" msgstr "清除版本库缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Confirm to invalidate repository cache" msgstr "确认清除版本库缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:225 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" +"Manually invalidate cache for this repository. On first access repository " +"will be cached again" msgstr "手动清除版本库缓存。之后第一次访问的时候将重建缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:230 +#: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" msgstr "缓存值列表" -#: rhodecode/templates/admin/repos/repo_edit.html:233 +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" msgstr "前缀" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:227 msgid "Key" msgstr "键" -#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/repos/repo_edit.html:228 #: rhodecode/templates/admin/users/user_add.html:86 #: rhodecode/templates/admin/users/user_edit.html:124 #: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_group_add.html:41 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -#: rhodecode/templates/admin/users_groups/users_groups.html:36 +#: rhodecode/templates/admin/users_groups/users_groups.html:39 msgid "Active" msgstr "启用" -#: rhodecode/templates/admin/repos/repo_edit.html:250 -#: rhodecode/templates/base/base.html:280 -#: rhodecode/templates/base/base.html:281 +#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 msgid "Public journal" msgstr "公共日志" -#: rhodecode/templates/admin/repos/repo_edit.html:256 +#: rhodecode/templates/admin/repos/repo_edit.html:249 msgid "Remove from public journal" msgstr "从公共日志删除" -#: rhodecode/templates/admin/repos/repo_edit.html:258 +#: rhodecode/templates/admin/repos/repo_edit.html:251 msgid "Add to public journal" msgstr "添加到公共日志" +#: rhodecode/templates/admin/repos/repo_edit.html:256 +msgid "" +"All actions made on this repository will be accessible to everyone in public" +" journal" +msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" + #: rhodecode/templates/admin/repos/repo_edit.html:263 -msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" -msgstr "任何人都可以在公共日志上看到这个版本库上的所有动作" - -#: rhodecode/templates/admin/repos/repo_edit.html:270 msgid "Locking" msgstr "锁定" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" msgstr "解锁版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:275 +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Confirm to unlock repository" msgstr "确认解锁版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:278 -msgid "lock repo" -msgstr "锁定版本库" - -#: rhodecode/templates/admin/repos/repo_edit.html:278 +#: rhodecode/templates/admin/repos/repo_edit.html:271 +msgid "Lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" msgstr "确认锁定版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:279 +#: rhodecode/templates/admin/repos/repo_edit.html:272 msgid "Repository is not locked" msgstr "版本库未锁定" -#: rhodecode/templates/admin/repos/repo_edit.html:284 -msgid "Force locking on repository. Works only when anonymous access is disabled" +#: rhodecode/templates/admin/repos/repo_edit.html:277 +msgid "" +"Force locking on repository. Works only when anonymous access is disabled" msgstr "强制锁定版本库。只有在禁止匿名访问时候才有效" -#: rhodecode/templates/admin/repos/repo_edit.html:291 +#: rhodecode/templates/admin/repos/repo_edit.html:284 msgid "Set as fork of" msgstr "设置复刻自" -#: rhodecode/templates/admin/repos/repo_edit.html:296 -msgid "set" -msgstr "设置" - -#: rhodecode/templates/admin/repos/repo_edit.html:300 +#: rhodecode/templates/admin/repos/repo_edit.html:289 +msgid "Set" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:293 msgid "Manually set this repository as a fork of another from the list" msgstr "从列表中手动设置这个版本库复刻自另一版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:306 -#: rhodecode/templates/changeset/changeset_file_comment.html:41 -msgid "Delete" -msgstr "删除" - -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Remove this repository" msgstr "删除版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Confirm to delete this repository" msgstr "确认删除版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:317 -#, fuzzy, python-format +#: rhodecode/templates/admin/repos/repo_edit.html:310 +#, python-format msgid "this repository has %s fork" msgid_plural "this repository has %s forks" -msgstr[0] "[创建]复刻版本库" - -#: rhodecode/templates/admin/repos/repo_edit.html:318 -#, fuzzy +msgstr[0] "" + +#: rhodecode/templates/admin/repos/repo_edit.html:311 msgid "Detach forks" -msgstr "设置复刻自" - -#: rhodecode/templates/admin/repos/repo_edit.html:319 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:312 msgid "Delete forks" -msgstr "删除" - -#: rhodecode/templates/admin/repos/repo_edit.html:322 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "" -"This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" -" from file system please do it manually" -msgstr "这个版本库将以特殊的方式重命名这样RhodeCode和版本控制系统将不能访问它。如果需要从文件系统完全删除，请要手动操作" - -#: rhodecode/templates/admin/repos/repo_edit.html:336 +"This repository will be renamed in a special way in order to be unaccesible " +"for RhodeCode and VCS systems. If you need to fully delete it from file " +"system please do it manually" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:348 -#, fuzzy, python-format +#: rhodecode/templates/admin/repos/repo_edit.html:341 +#, python-format msgid "Confirm to delete this field: %s" -msgstr "确认删除邮箱：%s" - -#: rhodecode/templates/admin/repos/repo_edit.html:362 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:355 msgid "New field key" -msgstr "新建文件" - -#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:373 +#: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:379 -#, fuzzy +#: rhodecode/templates/admin/repos/repo_edit.html:372 msgid "New field description" -msgstr "描述" - -#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:375 msgid "Enter description of a field" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3 msgid "none" msgstr "无" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4 msgid "read" msgstr "读" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5 msgid "write" msgstr "写" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6 msgid "admin" msgstr "管理" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7 msgid "member" msgstr "成员" @@ -2503,6 +2667,8 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35 msgid "default" msgstr "默认" @@ -2510,44 +2676,46 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55 msgid "revoke" msgstr "移除" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81 msgid "Add another member" msgstr "添加成员" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 -msgid "Failed to remove user" -msgstr "删除用户失败" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 -#, fuzzy -msgid "Failed to remove user group" -msgstr "删除用户组失败" - #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "版本库管理员" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 +#: rhodecode/templates/admin/repos/repos.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account.html:185 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:76 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/tags/tags.html:76 +msgid "No records found." +msgstr "没有找到记录" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 msgid "apply to children" msgstr "应用到成员" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 -#, fuzzy +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" -msgstr "设置或者撤销该组所有成员的权限，包括版本库和其他组" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Group Dashboard" -msgstr "使用轻量的控制面板" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups.html:9 msgid "Home" @@ -2558,22 +2726,19 @@ msgstr "有" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -#, fuzzy msgid "Add repository group" -msgstr "版本库组" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 -#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 -#, fuzzy +#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 msgid "Repository groups" -msgstr "版本库组" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 -#, fuzzy msgid "Add new repository group" -msgstr "添加新版本库组" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 @@ -2585,46 +2750,48 @@ msgstr "保存" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -#, fuzzy msgid "Edit repository group" -msgstr "编辑版本库组" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 -#, fuzzy, python-format +#, python-format msgid "Edit repository group %s" -msgstr "编辑版本库组" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 -#, fuzzy msgid "Add child group" -msgstr "添加新用户组" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" msgstr "启用组的拉取锁定。这个选项将应用到组内的其他组和版本库" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -#, fuzzy msgid "Repository groups administration" -msgstr "版本库管理员" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 msgid "Number of toplevel repositories" msgstr "顶层版本库数量" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 -#, fuzzy +#: rhodecode/templates/admin/users_groups/users_groups.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:73 +#: rhodecode/templates/changeset/changeset_file_comment.html:171 msgid "Edit" -msgstr "编辑" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/admin/users_groups/users_groups.html:49 #: rhodecode/templates/base/perms_summary.html:29 -#: rhodecode/templates/base/perms_summary.html:48 -#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/base/perms_summary.html:60 +#: rhodecode/templates/base/perms_summary.html:62 #: rhodecode/templates/data_table/_dt_elements.html:116 #: rhodecode/templates/data_table/_dt_elements.html:117 +#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:131 msgid "edit" msgstr "编辑" @@ -2635,9 +2802,8 @@ msgstr[0] "确认删除这个版本库组：%s包含%s个版本库" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 -#, fuzzy msgid "There are no repository groups yet" -msgstr "没有版本库组" +msgstr "" #: rhodecode/templates/admin/settings/hooks.html:5 #: rhodecode/templates/admin/settings/settings.html:5 @@ -2665,26 +2831,24 @@ msgstr "重新扫描并映射版本库" #: rhodecode/templates/admin/settings/settings.html:34 -#, fuzzy msgid "Rescan option" -msgstr "重新扫描选项" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:40 msgid "" -"In case a repository was deleted from filesystem and there are leftovers " -"in the database check this option to scan obsolete data in database and " -"remove it." +"In case a repository was deleted from filesystem and there are leftovers in " +"the database check this option to scan obsolete data in database and remove " +"it." msgstr "如果版本库已经从文件系统删除，但数据库仍然有遗留信息，请勾选该项进行清理" #: rhodecode/templates/admin/settings/settings.html:41 -#, fuzzy msgid "Destroy old data" -msgstr "清理旧数据" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:43 msgid "" -"Rescan repositories location for new repositories. Also deletes obsolete " -"if `destroy` flag is checked " +"Rescan repositories location for new repositories. Also deletes obsolete if " +"`destroy` flag is checked " msgstr "重新扫描版本库路径以发现新版本库。 同时删除过时的，如果设置有 `destroy` 标志" #: rhodecode/templates/admin/settings/settings.html:48 @@ -2696,14 +2860,12 @@ msgstr "Whoosh索引" #: rhodecode/templates/admin/settings/settings.html:62 -#, fuzzy msgid "Index build option" -msgstr "构建索引选项" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:67 -#, fuzzy msgid "Build from scratch" -msgstr "重新建立" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" @@ -2726,8 +2888,8 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:114 -#: rhodecode/templates/admin/settings/settings.html:186 -#: rhodecode/templates/admin/settings/settings.html:277 +#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:287 msgid "Save settings" msgstr "保存设置" @@ -2740,140 +2902,154 @@ msgstr "通用" #: rhodecode/templates/admin/settings/settings.html:134 -msgid "Use lightweight dashboard" -msgstr "使用轻量的控制面板" - -#: rhodecode/templates/admin/settings/settings.html:140 -#, fuzzy msgid "Use repository extra fields" -msgstr "版本库" - -#: rhodecode/templates/admin/settings/settings.html:147 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:136 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Show RhodeCode version" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 +msgid "Shows or hides displayed version of RhodeCode in the footer" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:146 +msgid "Dashboard items" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:150 +msgid "" +"Number of items displayed in lightweight dashboard before pagination is " +"shown." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Icons" msgstr "图标" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Show public repo icon on repositories" msgstr "显示公共版本库图标" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:164 msgid "Show private repo icon on repositories" msgstr "显示私有版本库图标" -#: rhodecode/templates/admin/settings/settings.html:163 +#: rhodecode/templates/admin/settings/settings.html:166 +msgid "Show public/private icons next to repositories names" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" msgstr "元标记" -#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" msgstr "样式化识别的元标记" -#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:204 msgid "VCS settings" msgstr "版本控制系统设置" -#: rhodecode/templates/admin/settings/settings.html:204 +#: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" msgstr "网络" -#: rhodecode/templates/admin/settings/settings.html:209 -#, fuzzy +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Require SSL for vcs operations" -msgstr "要求使用SSL进行版本控制系统操作" - -#: rhodecode/templates/admin/settings/settings.html:211 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:220 msgid "" -"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " -"will return HTTP Error 406: Not Acceptable" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will" +" return HTTP Error 406: Not Acceptable" msgstr "勾选后RhodeCode将要求使用SSL进行推送和拉取。如果没有使用SSL将返回HTTP 406错误：Not Acceptable" -#: rhodecode/templates/admin/settings/settings.html:217 +#: rhodecode/templates/admin/settings/settings.html:226 msgid "Hooks" msgstr "钩子" -#: rhodecode/templates/admin/settings/settings.html:222 +#: rhodecode/templates/admin/settings/settings.html:231 msgid "Update repository after push (hg update)" msgstr "推送后更新版本库（hg update）" -#: rhodecode/templates/admin/settings/settings.html:226 +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Show repository size after push" msgstr "推送后显示版本库大小" -#: rhodecode/templates/admin/settings/settings.html:230 +#: rhodecode/templates/admin/settings/settings.html:239 msgid "Log user push commands" msgstr "记录用户推送命令" -#: rhodecode/templates/admin/settings/settings.html:234 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Log user pull commands" msgstr "记录用户拉取命令" -#: rhodecode/templates/admin/settings/settings.html:238 -#, fuzzy +#: rhodecode/templates/admin/settings/settings.html:247 msgid "Advanced setup" -msgstr "高级设置" - -#: rhodecode/templates/admin/settings/settings.html:243 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:252 msgid "Mercurial Extensions" msgstr "Mercurial扩展" -#: rhodecode/templates/admin/settings/settings.html:248 -#, fuzzy +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Enable largefiles extension" -msgstr "大文件扩展" - -#: rhodecode/templates/admin/settings/settings.html:252 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:261 msgid "Enable hgsubversion extension" -msgstr "hgsubversion扩展" - -#: rhodecode/templates/admin/settings/settings.html:254 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" -msgstr " 允许从远程svn地址克隆。需要安装hgsubversion库" - -#: rhodecode/templates/admin/settings/settings.html:264 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" msgstr "版本库路径" -#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/settings/settings.html:279 msgid "" -"This a crucial application setting. If you are really sure you need to " -"change this, you must restart application in order to make this setting " -"take effect. Click this label to unlock." -msgstr "这是一个关键设置。如果确认修改该项设置，请重启服务以便设置生效。" - -#: rhodecode/templates/admin/settings/settings.html:270 -#: rhodecode/templates/base/base.html:131 -#, fuzzy +"Click to unlock. You must restart RhodeCode in order to make this setting " +"take effect." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/base/base.html:143 msgid "Unlock" -msgstr "解锁" - -#: rhodecode/templates/admin/settings/settings.html:272 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:282 msgid "" -"Location where repositories are stored. After changing this value a " -"restart, and rescan is required" +"Location where repositories are stored. After changing this value a restart," +" and rescan is required" msgstr "版本库存储路径。 修改后需要重启和重新扫描" -#: rhodecode/templates/admin/settings/settings.html:292 +#: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" msgstr "测试邮件" -#: rhodecode/templates/admin/settings/settings.html:300 +#: rhodecode/templates/admin/settings/settings.html:311 msgid "Email to" msgstr "发送到" -#: rhodecode/templates/admin/settings/settings.html:308 +#: rhodecode/templates/admin/settings/settings.html:319 msgid "Send" msgstr "发送" -#: rhodecode/templates/admin/settings/settings.html:314 +#: rhodecode/templates/admin/settings/settings.html:325 msgid "System Info and Packages" msgstr "系统和软件包信息" -#: rhodecode/templates/admin/settings/settings.html:317 -#: rhodecode/templates/changelog/changelog.html:42 +#: rhodecode/templates/admin/settings/settings.html:328 +#: rhodecode/templates/changelog/changelog.html:51 msgid "Show" msgstr "显示" @@ -2883,15 +3059,14 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/base/base.html:71 +#: rhodecode/templates/base/base.html:76 msgid "Users" msgstr "用户" #: rhodecode/templates/admin/users/user_add.html:12 #: rhodecode/templates/admin/users/users.html:23 -#, fuzzy msgid "Add new user" -msgstr "添加新用户" +msgstr "" #: rhodecode/templates/admin/users/user_add.html:50 msgid "Password confirmation" @@ -2903,9 +3078,9 @@ #: rhodecode/templates/admin/users/user_edit.html:13 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#, fuzzy, python-format +#, python-format msgid "Edit %s" -msgstr "编辑" +msgstr "" #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 @@ -2941,44 +3116,21 @@ msgid "New password confirmation" msgstr "确认新密码" -#: rhodecode/templates/admin/users/user_edit.html:158 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:108 -msgid "Inherit default permissions" -msgstr "继承默认权限" - #: rhodecode/templates/admin/users/user_edit.html:163 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 -#, python-format -msgid "" -"Select to inherit permissions from %s settings. With this selected below " -"options does not have any action" -msgstr "勾选以从%s继承权限设置。 勾选后下面的选项将不起作用" - -#: rhodecode/templates/admin/users/user_edit.html:169 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 -msgid "Create repositories" -msgstr "创建版本库" - -#: rhodecode/templates/admin/users/user_edit.html:177 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 -msgid "Fork repositories" -msgstr "复刻版本库" - -#: rhodecode/templates/admin/users/user_edit.html:200 msgid "Email addresses" msgstr "邮件地址" -#: rhodecode/templates/admin/users/user_edit.html:213 +#: rhodecode/templates/admin/users/user_edit.html:176 #, python-format msgid "Confirm to delete this email: %s" msgstr "确认删除邮箱：%s" -#: rhodecode/templates/admin/users/user_edit.html:227 +#: rhodecode/templates/admin/users/user_edit.html:190 msgid "New email address" msgstr "增加邮箱" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:242 +#: rhodecode/templates/base/base.html:254 msgid "My account" msgstr "我的账户" @@ -3001,9 +3153,8 @@ #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 -#, fuzzy msgid "Show closed pull requests" -msgstr "[关闭] 拉取请求" +msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" @@ -3016,7 +3167,7 @@ #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 -#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" @@ -3036,7 +3187,7 @@ msgstr "我参与的" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 -#: rhodecode/templates/pullrequests/pullrequest_data.html:11 +#: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "拉取请求#%s由%s创建于%s" @@ -3050,57 +3201,48 @@ msgstr "用户" #: rhodecode/templates/admin/users/users.html:80 -#, fuzzy msgid "Firstname" -msgstr "名" +msgstr "" #: rhodecode/templates/admin/users/users.html:81 -#, fuzzy msgid "Lastname" -msgstr "姓" +msgstr "" #: rhodecode/templates/admin/users/users.html:82 -#, fuzzy msgid "Last login" -msgstr "最后登录" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -#, fuzzy msgid "Add user group" -msgstr "添加用户组" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 -#: rhodecode/templates/base/base.html:72 -#, fuzzy +#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 msgid "User groups" -msgstr "用户组" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -#: rhodecode/templates/admin/users_groups/users_groups.html:25 -#, fuzzy +#: rhodecode/templates/admin/users_groups/users_groups.html:26 msgid "Add new user group" -msgstr "添加新用户组" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -#, fuzzy msgid "Edit user group" -msgstr "编辑用户组" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -#, fuzzy msgid "UserGroups" -msgstr "用户组" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 +#: rhodecode/templates/admin/users_groups/users_groups.html:38 msgid "Members" msgstr "成员" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -#, fuzzy msgid "Chosen group members" -msgstr "选择组成员" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 msgid "Remove all elements" @@ -3114,46 +3256,53 @@ msgid "Add all elements" msgstr "添加全部项目" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 -msgid "Group members" -msgstr "拥护者成员" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:109 msgid "No members yet" msgstr "还没有成员" +#: rhodecode/templates/admin/users_groups/users_group_edit.html:117 +msgid "Global Permissions" +msgstr "" + #: rhodecode/templates/admin/users_groups/users_groups.html:5 -#, fuzzy msgid "User groups administration" -msgstr "用户组管理" - -#: rhodecode/templates/admin/users_groups/users_groups.html:47 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_groups.html:55 +#, python-format msgid "Confirm to delete this user group: %s" -msgstr "确认删除该组：%s" +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_groups.html:62 +msgid "There are no user groups yet" +msgstr "" #: rhodecode/templates/base/base.html:42 -msgid "Submit a bug" -msgstr "提交bug" - -#: rhodecode/templates/base/base.html:108 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:52 +msgid "Report a bug" +msgstr "" + +#: rhodecode/templates/base/base.html:121 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 -#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "概况" -#: rhodecode/templates/base/base.html:109 -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/changelog/changelog.html:15 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "修订记录" -#: rhodecode/templates/base/base.html:110 +#: rhodecode/templates/base/base.html:123 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 @@ -3161,53 +3310,44 @@ msgid "Files" msgstr "浏览" -#: rhodecode/templates/base/base.html:112 -#, fuzzy +#: rhodecode/templates/base/base.html:125 msgid "Switch To" -msgstr "切换到" - -#: rhodecode/templates/base/base.html:114 -#: rhodecode/templates/base/base.html:267 +msgstr "" + +#: rhodecode/templates/base/base.html:127 +#: rhodecode/templates/base/base.html:279 msgid "loading..." msgstr "载入中..." -#: rhodecode/templates/base/base.html:118 +#: rhodecode/templates/base/base.html:131 msgid "Options" msgstr "选项" -#: rhodecode/templates/base/base.html:124 +#: rhodecode/templates/base/base.html:137 #: rhodecode/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "比较复刻" -#: rhodecode/templates/base/base.html:126 -#, fuzzy -msgid "Lightweight changelog" -msgstr "使用轻量的控制面板" - -#: rhodecode/templates/base/base.html:127 -#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/base/base.html:139 +#: rhodecode/templates/base/base.html:312 #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:54 msgid "Search" msgstr "搜索" -#: rhodecode/templates/base/base.html:133 -#, fuzzy +#: rhodecode/templates/base/base.html:145 msgid "Lock" -msgstr "锁定" - -#: rhodecode/templates/base/base.html:141 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:153 msgid "Follow" -msgstr "关注者" - -#: rhodecode/templates/base/base.html:142 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:154 msgid "Unfollow" -msgstr "关注者" - -#: rhodecode/templates/base/base.html:145 +msgstr "" + +#: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 @@ -3216,166 +3356,222 @@ msgid "Fork" msgstr "复刻" -#: rhodecode/templates/base/base.html:147 -#, fuzzy +#: rhodecode/templates/base/base.html:159 msgid "Create Pull Request" -msgstr "创建新的拉取请求" - -#: rhodecode/templates/base/base.html:153 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:165 msgid "Show Pull Requests" -msgstr "新建拉取请求" - -#: rhodecode/templates/base/base.html:153 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:165 msgid "Pull Requests" -msgstr "拉取请求" - -#: rhodecode/templates/base/base.html:190 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:202 msgid "Not logged in" -msgstr "最后登录" - -#: rhodecode/templates/base/base.html:197 +msgstr "" + +#: rhodecode/templates/base/base.html:209 msgid "Login to your account" msgstr "登录" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:232 msgid "Forgot password ?" msgstr "忘记密码？" -#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:255 msgid "Log Out" msgstr "退出" -#: rhodecode/templates/base/base.html:262 +#: rhodecode/templates/base/base.html:274 msgid "Switch repository" msgstr "切换版本库" -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/base/base.html:286 msgid "Show recent activity" msgstr "" -#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/base/base.html:287 #: rhodecode/templates/journal/journal.html:4 msgid "Journal" msgstr "日志" -#: rhodecode/templates/base/base.html:286 -#, fuzzy +#: rhodecode/templates/base/base.html:298 +msgid "Show public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:303 +msgid "All public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:305 +msgid "My public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:306 +msgid "My private gists" +msgstr "" + +#: rhodecode/templates/base/base.html:311 msgid "Search in repositories" -msgstr "在所有的版本库中搜索" - -#: rhodecode/templates/base/perms_summary.html:8 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:14 +msgid "Inherit default permissions" +msgstr "继承默认权限" + +#: rhodecode/templates/base/default_perms_box.html:18 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not apply." +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:26 +msgid "Create repositories" +msgstr "创建版本库" + +#: rhodecode/templates/base/default_perms_box.html:30 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:35 +msgid "Create user groups" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:39 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:44 +msgid "Fork repositories" +msgstr "复刻版本库" + +#: rhodecode/templates/base/default_perms_box.html:48 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:11 msgid "No permissions defined yet" -msgstr "还未设置权限" - -#: rhodecode/templates/base/perms_summary.html:15 +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:19 +#: rhodecode/templates/base/perms_summary.html:38 msgid "Permission" msgstr "权限" -#: rhodecode/templates/base/perms_summary.html:16 +#: rhodecode/templates/base/perms_summary.html:20 +#: rhodecode/templates/base/perms_summary.html:39 msgid "Edit Permission" msgstr "编辑权限" -#: rhodecode/templates/base/root.html:43 -#, fuzzy +#: rhodecode/templates/base/root.html:44 msgid "Add another comment" -msgstr "添加新的评论" - -#: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:140 -msgid "Stop following this repository" -msgstr "停止关注该版本库" +msgstr "" #: rhodecode/templates/base/root.html:45 -msgid "Start following this repository" -msgstr "开始关注该版本库" +#: rhodecode/templates/data_table/_dt_elements.html:147 +msgid "Stop following this repository" +msgstr "停止关注该版本库" #: rhodecode/templates/base/root.html:46 +msgid "Start following this repository" +msgstr "开始关注该版本库" + +#: rhodecode/templates/base/root.html:47 msgid "Group" msgstr "组" -#: rhodecode/templates/base/root.html:47 -msgid "members" -msgstr "成员" - #: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:181 -#, fuzzy -msgid "Loading ..." -msgstr "载入中..." +msgid "members" +msgstr "成员" #: rhodecode/templates/base/root.html:49 -#, fuzzy -msgid "Search truncated" -msgstr "搜索被截断" +#: rhodecode/templates/pullrequests/pullrequest.html:203 +msgid "Loading ..." +msgstr "" #: rhodecode/templates/base/root.html:50 -#, fuzzy -msgid "No matching files" -msgstr "没有符合的文件" +msgid "Search truncated" +msgstr "" #: rhodecode/templates/base/root.html:51 -#: rhodecode/templates/changelog/changelog.html:36 +msgid "No matching files" +msgstr "" + +#: rhodecode/templates/base/root.html:52 +#: rhodecode/templates/changelog/changelog.html:45 msgid "Open new pull request" msgstr "新建拉取请求" -#: rhodecode/templates/base/root.html:52 +#: rhodecode/templates/base/root.html:53 msgid "Open new pull request for selected changesets" msgstr "为选择的变更集创建新的拉取请求" -#: rhodecode/templates/base/root.html:53 -#, fuzzy +#: rhodecode/templates/base/root.html:54 msgid "Show selected changesets __S -> __E" -msgstr "显示选定的修订集：__S -> __E" - -#: rhodecode/templates/base/root.html:54 -#, fuzzy -msgid "Show selected changeset __S" -msgstr "显示选定的修订集：__S -> __E" +msgstr "" #: rhodecode/templates/base/root.html:55 -msgid "Selection link" -msgstr "选择链接" +msgid "Show selected changeset __S" +msgstr "" #: rhodecode/templates/base/root.html:56 -#: rhodecode/templates/changeset/diff_block.html:8 -#, fuzzy -msgid "Collapse diff" -msgstr "文件差异" +msgid "Selection link" +msgstr "选择链接" #: rhodecode/templates/base/root.html:57 -#, fuzzy +#: rhodecode/templates/changeset/diff_block.html:8 +msgid "Collapse diff" +msgstr "" + +#: rhodecode/templates/base/root.html:58 msgid "Expand diff" -msgstr "原始diff" +msgstr "" + +#: rhodecode/templates/base/root.html:59 +msgid "Failed to revoke permission" +msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "%s书签" -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:26 +msgid "Compare bookmarks" +msgstr "" + +#: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/changelog/changelog_summary_data.html:8 #: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 msgid "Author" msgstr "作者" -#: rhodecode/templates/bookmarks/bookmarks.html:38 +#: rhodecode/templates/bookmarks/bookmarks.html:52 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/changelog/changelog_summary_data.html:5 #: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "修订" +#: rhodecode/templates/bookmarks/bookmarks.html:54 +#: rhodecode/templates/bookmarks/bookmarks_data.html:10 +#: rhodecode/templates/branches/branches.html:53 +#: rhodecode/templates/branches/branches_data.html:10 +#: rhodecode/templates/tags/tags.html:54 +#: rhodecode/templates/tags/tags_data.html:10 +msgid "Compare" +msgstr "比较显示" + #: rhodecode/templates/branches/branches.html:5 #, python-format msgid "%s Branches" @@ -3385,85 +3581,84 @@ msgid "Compare branches" msgstr "比较分支" -#: rhodecode/templates/branches/branches.html:53 -#: rhodecode/templates/branches/branches_data.html:10 -#: rhodecode/templates/tags/tags.html:54 -#: rhodecode/templates/tags/tags_data.html:10 -msgid "Compare" -msgstr "比较显示" - #: rhodecode/templates/changelog/changelog.html:6 #, python-format msgid "%s Changelog" msgstr "%s修订记录" -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/changelog/changelog.html:19 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "显示%d/%d个版本" -#: rhodecode/templates/changelog/changelog.html:30 +#: rhodecode/templates/changelog/changelog.html:39 msgid "Clear selection" msgstr "清除选择" -#: rhodecode/templates/changelog/changelog.html:33 +#: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 -#, fuzzy, python-format +#, python-format msgid "Compare fork with %s" -msgstr "比较复刻和%s" - -#: rhodecode/templates/changelog/changelog.html:33 +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:42 msgid "Compare fork with parent" msgstr "比较复刻和源版本库" -#: rhodecode/templates/changelog/changelog.html:76 -#: rhodecode/templates/summary/summary.html:404 -#, fuzzy +#: rhodecode/templates/changelog/changelog.html:78 +#: rhodecode/templates/changelog/changelog_summary_data.html:28 +#, python-format +msgid "Click to open associated pull request #%s" +msgstr "点击建立相关的拉取请求 #%s" + +#: rhodecode/templates/changelog/changelog.html:102 +#: rhodecode/templates/summary/summary.html:403 msgid "Show more" -msgstr "显示更多" - -#: rhodecode/templates/changelog/changelog.html:89 +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog_summary_data.html:50 +#: rhodecode/templates/changeset/changeset.html:107 #: rhodecode/templates/changeset/changeset_range.html:86 -#, fuzzy, python-format +#, python-format msgid "Bookmark %s" -msgstr "书签" - -#: rhodecode/templates/changelog/changelog.html:95 -#: rhodecode/templates/changeset/changeset.html:111 +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:121 +#: rhodecode/templates/changelog/changelog_summary_data.html:56 +#: rhodecode/templates/changeset/changeset.html:113 #: rhodecode/templates/changeset/changeset_range.html:92 -#, fuzzy, python-format +#, python-format msgid "Tag %s" -msgstr "标签" - -#: rhodecode/templates/changelog/changelog.html:100 -#: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:80 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog_summary_data.html:61 +#: rhodecode/templates/changeset/changeset.html:117 +#: rhodecode/templates/changeset/changeset_range.html:96 +#, python-format msgid "Branch %s" -msgstr "分支" - -#: rhodecode/templates/changelog/changelog.html:258 +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" msgstr "没有任何变更" #: rhodecode/templates/changelog/changelog_details.html:4 #: rhodecode/templates/changeset/changeset.html:91 -#, fuzzy msgid "Removed" -msgstr "移除" +msgstr "" #: rhodecode/templates/changelog/changelog_details.html:5 #: rhodecode/templates/changeset/changeset.html:92 -#, fuzzy msgid "Changed" -msgstr "修改" +msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 #: rhodecode/templates/changeset/changeset.html:93 -#, fuzzy msgid "Added" -msgstr "添加" +msgstr "" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 @@ -3471,9 +3666,41 @@ #: rhodecode/templates/changeset/changeset.html:95 #: rhodecode/templates/changeset/changeset.html:96 #: rhodecode/templates/changeset/changeset.html:97 -#, fuzzy, python-format +#, python-format msgid "Affected %s files" -msgstr "影响%s文件" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:6 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 +msgid "Commit message" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:7 +msgid "Age" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:9 +msgid "Refs" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:86 +msgid "Add or upload files directly via RhodeCode" +msgstr "通过RhodeCode直接添加或者上传文件" + +#: rhodecode/templates/changelog/changelog_summary_data.html:89 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +msgid "Add new file" +msgstr "新建文件" + +#: rhodecode/templates/changelog/changelog_summary_data.html:95 +msgid "Push new repo" +msgstr "推送新版本库" + +#: rhodecode/templates/changelog/changelog_summary_data.html:103 +msgid "Existing repository?" +msgstr "已有版本库？" #: rhodecode/templates/changeset/changeset.html:6 #, python-format @@ -3495,42 +3722,39 @@ msgstr "修订集状态" #: rhodecode/templates/changeset/changeset.html:67 -#: rhodecode/templates/changeset/diff_block.html:23 -#, fuzzy +#: rhodecode/templates/changeset/diff_block.html:22 msgid "Raw diff" -msgstr "原始diff" +msgstr "" #: rhodecode/templates/changeset/changeset.html:68 -#, fuzzy msgid "Patch diff" -msgstr "原始diff" +msgstr "" #: rhodecode/templates/changeset/changeset.html:69 -#: rhodecode/templates/changeset/diff_block.html:24 -#, fuzzy +#: rhodecode/templates/changeset/diff_block.html:23 msgid "Download diff" -msgstr "下载diff" +msgstr "" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d条评论" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "(%d内嵌)" #: rhodecode/templates/changeset/changeset.html:103 -#: rhodecode/templates/changeset/changeset_range.html:77 +#: rhodecode/templates/changeset/changeset_range.html:82 msgid "merge" msgstr "合并" -#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 #, python-format @@ -3538,7 +3762,7 @@ msgid_plural "%s files changed" msgstr[0] "修改%s个文件" -#: rhodecode/templates/changeset/changeset.html:121 +#: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format @@ -3546,80 +3770,90 @@ msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "修改%s个文件包括%s行插入和%s行删除" -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Showing a huge diff might take some time and resources" msgstr "" -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 -#, fuzzy msgid "Show full diff" -msgstr "显示全部历史记录" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:30 -#, fuzzy, python-format +#, python-format msgid "Status change on pull request #%s" -msgstr "所有拉取请求 %s" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:32 -#, fuzzy, python-format +#, python-format msgid "Comment on pull request #%s" -msgstr "[评论]拉取请求 %s" - -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." msgstr "提交中……" -#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:58 msgid "Commenting on line {1}." msgstr "在{1}行上评论" -#: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:139 +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "评论使用%s语法并支持%s" -#: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:141 -msgid "Use @username inside this text to send notification to this RhodeCode user" +#: rhodecode/templates/changeset/changeset_file_comment.html:61 +#: rhodecode/templates/changeset/changeset_file_comment.html:147 +msgid "" +"Use @username inside this text to send notification to this RhodeCode user" msgstr "在文本中使用 @用户名 以发送通知到该RhodeCode用户" -#: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:161 +#: rhodecode/templates/changeset/changeset_file_comment.html:65 +#: rhodecode/templates/changeset/changeset_file_comment.html:152 +msgid "Preview" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:72 +#: rhodecode/templates/changeset/changeset_file_comment.html:170 +msgid "Comment preview" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:80 +#: rhodecode/templates/changeset/changeset_file_comment.html:177 +#: rhodecode/templates/email_templates/changeset_comment.html:16 +#: rhodecode/templates/email_templates/pull_request_comment.html:16 msgid "Comment" msgstr "评论" -#: rhodecode/templates/changeset/changeset_file_comment.html:75 -#, fuzzy +#: rhodecode/templates/changeset/changeset_file_comment.html:81 msgid "Cancel" -msgstr "修改" - -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." msgstr "必须登录才能评论" -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "Login now" msgstr "现在登陆" -#: rhodecode/templates/changeset/changeset_file_comment.html:86 +#: rhodecode/templates/changeset/changeset_file_comment.html:92 msgid "Hide" msgstr "隐藏" -#: rhodecode/templates/changeset/changeset_file_comment.html:143 -#, fuzzy +#: rhodecode/templates/changeset/changeset_file_comment.html:149 msgid "Change status" -msgstr "改变状态" - -#: rhodecode/templates/changeset/changeset_file_comment.html:163 +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" msgstr "评论并关闭" @@ -3632,21 +3866,19 @@ msgid "Files affected" msgstr "影响文件" -#: rhodecode/templates/changeset/diff_block.html:22 -#, fuzzy +#: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" -msgstr "显示文件的完整差异" - -#: rhodecode/templates/changeset/diff_block.html:30 -#, fuzzy +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:29 msgid "Show inline comments" -msgstr "显示内嵌评论" - -#: rhodecode/templates/changeset/diff_block.html:55 +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:56 +#: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" msgstr "" @@ -3655,19 +3887,17 @@ msgstr "无修订" #: rhodecode/templates/compare/compare_cs.html:32 -#, fuzzy msgid "Ancestor" -msgstr "分支" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Compare" -msgstr "比较显示" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:9 -#, fuzzy msgid "Compare revisions" -msgstr "上一个修订" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:33 #: rhodecode/templates/pullrequests/pullrequest_show.html:106 @@ -3697,9 +3927,9 @@ msgstr "Git版本库" #: rhodecode/templates/data_table/_dt_elements.html:74 -#, fuzzy, python-format +#, python-format msgid "Fork of %s" -msgstr "复刻名称%s" +msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3722,28 +3952,24 @@ msgid "Confirm to delete this repository: %s" msgstr "确认删除版本库：%s" -#: rhodecode/templates/data_table/_dt_elements.html:131 +#: rhodecode/templates/data_table/_dt_elements.html:137 #, python-format msgid "Confirm to delete this user: %s" msgstr "确认删除用户：%s" -#: rhodecode/templates/email_templates/changeset_comment.html:9 -#: rhodecode/templates/email_templates/pull_request_comment.html:15 -msgid "New status" -msgstr "新状态" - -#: rhodecode/templates/email_templates/changeset_comment.html:11 -#: rhodecode/templates/email_templates/pull_request_comment.html:9 -msgid "View this comment here" -msgstr "查看评论" +#: rhodecode/templates/email_templates/changeset_comment.html:4 +#: rhodecode/templates/email_templates/pull_request.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +msgid "URL" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:6 +#, python-format +msgid "%s commented on a %s changeset." +msgstr "" #: rhodecode/templates/email_templates/changeset_comment.html:14 -#, fuzzy -msgid "Repo" -msgstr "我的版本库" - -#: rhodecode/templates/email_templates/changeset_comment.html:16 -msgid "desc" +msgid "The changeset status was changed to" msgstr "" #: rhodecode/templates/email_templates/main.html:8 @@ -3751,9 +3977,9 @@ msgstr "这是一个RhodeCode通知。" #: rhodecode/templates/email_templates/password_reset.html:4 -#, fuzzy, python-format +#, python-format msgid "Hello %s" -msgstr "你好" +msgstr "" #: rhodecode/templates/email_templates/password_reset.html:5 msgid "We received a request to create a new password for your account." @@ -3763,49 +3989,37 @@ msgid "You can generate it by clicking following URL" msgstr "点击下面的链接以重新生成密码：" -#: rhodecode/templates/email_templates/password_reset.html:11 -#, fuzzy -msgid "If you did not request new password please ignore this email." -msgstr "如果你没有要求重置密码，请忽略这封邮件。" - -#: rhodecode/templates/email_templates/pull_request.html:4 -#, python-format -msgid "" -"User %s opened pull request for repository %s and wants you to review " -"changes." -msgstr "用户%s在版本库%s中创建了一个拉取请求需要你检视" - -#: rhodecode/templates/email_templates/pull_request.html:5 -msgid "View this pull request here" -msgstr "查看拉取请求" +#: rhodecode/templates/email_templates/password_reset.html:10 +msgid "Please ignore this email if you did not request a new password ." +msgstr "" #: rhodecode/templates/email_templates/pull_request.html:6 -msgid "title" +#, python-format +msgid "" +"%s opened a pull request for repository %s and wants you to review changes." +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:8 +#: rhodecode/templates/pullrequests/pullrequest.html:34 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +msgid "Title" msgstr "标题" -#: rhodecode/templates/email_templates/pull_request.html:7 -msgid "description" -msgstr "描述" - -#: rhodecode/templates/email_templates/pull_request.html:12 -msgid "revisions for reviewing" -msgstr "待检视修订" - -#: rhodecode/templates/email_templates/pull_request_comment.html:3 -#, fuzzy, python-format -msgid "Pull request #%s for repository %s" -msgstr "用户%s评论了版本库%s的拉取请求%s" - -#: rhodecode/templates/email_templates/pull_request_comment.html:13 -#, fuzzy -msgid "Closing pull request with status" -msgstr "拉取请求状态" - -#: rhodecode/templates/email_templates/registration.html:4 -msgid "A new user have registered in RhodeCode" -msgstr "新用户注册RhodeCode" - -#: rhodecode/templates/email_templates/registration.html:9 +#: rhodecode/templates/email_templates/pull_request_comment.html:6 +#, python-format +msgid "%s commented on pull request \"%s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +msgid "Pull request was closed with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:12 +msgid "Pull request changed status" +msgstr "" + +#: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "查看用户" @@ -3815,9 +4029,9 @@ msgstr "重定向到%s，于%s秒后" #: rhodecode/templates/files/file_diff.html:4 -#, fuzzy, python-format +#, python-format msgid "%s File Diff" -msgstr "%s文件差异" +msgstr "" #: rhodecode/templates/files/file_diff.html:8 msgid "File diff" @@ -3825,33 +4039,24 @@ #: rhodecode/templates/files/files.html:4 #: rhodecode/templates/files/files.html:76 -#, fuzzy, python-format +#, python-format msgid "%s Files" -msgstr "%s文件" +msgstr "" #: rhodecode/templates/files/files.html:30 #: rhodecode/templates/files/files_add.html:31 #: rhodecode/templates/files/files_edit.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -#, fuzzy msgid "Branch" -msgstr "分支" +msgstr "" #: rhodecode/templates/files/files_add.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Files Add" -msgstr "%s文件" +msgstr "" #: rhodecode/templates/files/files_add.html:19 -#, fuzzy msgid "Add file" -msgstr "新建文件" - -#: rhodecode/templates/files/files_add.html:38 -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -msgid "Add new file" -msgstr "新建文件" +msgstr "" #: rhodecode/templates/files/files_add.html:43 msgid "File Name" @@ -3881,42 +4086,30 @@ msgid "use / to separate directories" msgstr "使用 / 目录分隔符" -#: rhodecode/templates/files/files_add.html:75 -#: rhodecode/templates/files/files_edit.html:61 -#: rhodecode/templates/shortlog/shortlog_data.html:6 -#, fuzzy -msgid "Commit message" -msgstr "提交信息" - #: rhodecode/templates/files/files_add.html:79 #: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "提交修改" #: rhodecode/templates/files/files_browser.html:13 -#, fuzzy msgid "View" -msgstr "显示" +msgstr "" #: rhodecode/templates/files/files_browser.html:14 -#, fuzzy msgid "Previous revision" -msgstr "上一个修订" +msgstr "" #: rhodecode/templates/files/files_browser.html:16 -#, fuzzy msgid "Next revision" -msgstr "下一个修订" +msgstr "" #: rhodecode/templates/files/files_browser.html:23 -#, fuzzy msgid "Follow current branch" -msgstr "沿着当前分支" +msgstr "" #: rhodecode/templates/files/files_browser.html:27 -#, fuzzy msgid "Search file list" -msgstr "搜索文件列表" +msgstr "" #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." @@ -3943,38 +4136,27 @@ msgstr "最后提交者" #: rhodecode/templates/files/files_edit.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Files Edit" -msgstr "%s文件" +msgstr "" #: rhodecode/templates/files/files_edit.html:19 -#, fuzzy msgid "Edit file" -msgstr "编辑文件" +msgstr "" #: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -#, fuzzy msgid "Show annotation" -msgstr "显示注释" - -#: rhodecode/templates/files/files_edit.html:48 -#: rhodecode/templates/files/files_source.html:25 -#: rhodecode/templates/files/files_source.html:55 -#, fuzzy -msgid "Show as raw" -msgstr "显示原始文件" +msgstr "" #: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -#, fuzzy msgid "Download as raw" -msgstr "下载原始文件" +msgstr "" #: rhodecode/templates/files/files_edit.html:52 -#, fuzzy msgid "Source" -msgstr "显示源文件" +msgstr "" #: rhodecode/templates/files/files_edit.html:57 msgid "Editing file" @@ -3985,19 +4167,16 @@ msgstr "历史" #: rhodecode/templates/files/files_history_box.html:9 -#, fuzzy msgid "Diff to revision" -msgstr "比较差异" +msgstr "" #: rhodecode/templates/files/files_history_box.html:10 -#, fuzzy msgid "Show at revision" -msgstr "显示修订" +msgstr "" #: rhodecode/templates/files/files_history_box.html:11 -#, fuzzy msgid "Show full history" -msgstr "显示全部历史记录" +msgstr "" #: rhodecode/templates/files/files_history_box.html:16 #, python-format @@ -4010,19 +4189,17 @@ msgstr "加载文件历史记录..." #: rhodecode/templates/files/files_source.html:21 -#, fuzzy msgid "Show source" -msgstr "显示代码" +msgstr "" #: rhodecode/templates/files/files_source.html:29 -#, fuzzy, python-format +#, python-format msgid "Edit on branch:%s" -msgstr "已经删除分支%s" +msgstr "" #: rhodecode/templates/files/files_source.html:31 -#, fuzzy msgid "Edit on branch:?" -msgstr "已经删除分支%s" +msgstr "" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -4094,9 +4271,8 @@ msgstr "完成克隆后检出源代码" #: rhodecode/templates/forks/fork.html:93 -#, fuzzy msgid "Fork this repository" -msgstr "复刻该版本库" +msgstr "" #: rhodecode/templates/forks/forks.html:5 #, python-format @@ -4110,9 +4286,8 @@ msgstr "复刻" #: rhodecode/templates/forks/forks_data.html:17 -#, fuzzy msgid "Forked" -msgstr "已有复刻" +msgstr "" #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" @@ -4161,47 +4336,57 @@ msgid "New pull request" msgstr "新建拉取请求" -#: rhodecode/templates/pullrequests/pullrequest.html:52 -msgid "Detailed compare view" -msgstr "详细比较显示" - -#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:25 +msgid "Create new pull request" +msgstr "创建新的拉取请求" + +#: rhodecode/templates/pullrequests/pullrequest.html:47 +msgid "Write a short description on this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:53 +msgid "Changeset flow" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:60 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +msgid "Origin repository" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:85 +msgid "Send pull request" +msgstr "发送拉取请求" + +#: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "拉取请求检视人员" -#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 msgid "owner" msgstr "所有者" -#: rhodecode/templates/pullrequests/pullrequest.html:77 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." msgstr "为这个拉取请求增加检视人员" -#: rhodecode/templates/pullrequests/pullrequest.html:83 -msgid "Create new pull request" -msgstr "创建新的拉取请求" - -#: rhodecode/templates/pullrequests/pullrequest.html:92 -#: rhodecode/templates/pullrequests/pullrequest_data.html:14 -#: rhodecode/templates/pullrequests/pullrequest_show.html:25 -msgid "Title" -msgstr "标题" - -#: rhodecode/templates/pullrequests/pullrequest.html:109 -msgid "Send pull request" -msgstr "发送拉取请求" +#: rhodecode/templates/pullrequests/pullrequest.html:129 +msgid "Detailed compare view" +msgstr "详细比较显示" + +#: rhodecode/templates/pullrequests/pullrequest.html:150 +msgid "Destination repository" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Pull Request #%s" -msgstr "拉取请求#%s" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:35 -#, fuzzy msgid "Review status" -msgstr "新状态" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" @@ -4218,14 +4403,8 @@ msgstr[0] "%d个检视者" #: rhodecode/templates/pullrequests/pullrequest_show.html:59 -#, fuzzy msgid "Pull request was reviewed by all reviewers" -msgstr "拉取请求已经由所有检视人员检视" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -#, fuzzy -msgid "Origin repository" -msgstr "Git版本库" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:89 msgid "Created on" @@ -4240,24 +4419,21 @@ msgstr "检视者" #: rhodecode/templates/pullrequests/pullrequest_show.html:164 -#, fuzzy msgid "Add or remove reviewer to this pull request." -msgstr "为这个拉取请求增加检视人员" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:168 -#, fuzzy msgid "Save changes" -msgstr "无变更" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Pull Requests" -msgstr "我的拉取请求" +msgstr "" #: rhodecode/templates/search/search.html:6 -#, fuzzy msgid "Search repository" -msgstr "在版本库%s中搜索" +msgstr "" #: rhodecode/templates/search/search.html:8 #: rhodecode/templates/search/search.html:16 @@ -4290,53 +4466,20 @@ msgid "Permission denied" msgstr "权限不足" -#: rhodecode/templates/shortlog/shortlog.html:5 -#, fuzzy, python-format -msgid "%s Lightweight Changelog" -msgstr "使用轻量的控制面板" - -#: rhodecode/templates/shortlog/shortlog.html:11 -#: rhodecode/templates/shortlog/shortlog.html:15 -#, fuzzy -msgid "Lightweight Changelog" -msgstr "使用轻量的控制面板" - -#: rhodecode/templates/shortlog/shortlog_data.html:7 -#, fuzzy -msgid "Age" -msgstr "时间" - -#: rhodecode/templates/shortlog/shortlog_data.html:20 -#, python-format -msgid "Click to open associated pull request #%s" -msgstr "点击建立相关的拉取请求 #%s" - -#: rhodecode/templates/shortlog/shortlog_data.html:75 -msgid "Add or upload files directly via RhodeCode" -msgstr "通过RhodeCode直接添加或者上传文件" - -#: rhodecode/templates/shortlog/shortlog_data.html:84 -msgid "Push new repo" -msgstr "推送新版本库" - -#: rhodecode/templates/shortlog/shortlog_data.html:92 -msgid "Existing repository?" -msgstr "已有版本库？" - #: rhodecode/templates/summary/summary.html:4 #, python-format msgid "%s Summary" msgstr "%s概要" #: rhodecode/templates/summary/summary.html:16 -#, fuzzy, python-format +#, python-format msgid "%s ATOM feed" -msgstr "%s %s订阅" +msgstr "" #: rhodecode/templates/summary/summary.html:17 -#, fuzzy, python-format +#, python-format msgid "%s RSS feed" -msgstr "%s %s订阅" +msgstr "" #: rhodecode/templates/summary/summary.html:62 #, python-format @@ -4353,19 +4496,17 @@ msgstr "不可变ID %s" #: rhodecode/templates/summary/summary.html:88 -#, fuzzy msgid "Public" -msgstr "公共" +msgstr "" #: rhodecode/templates/summary/summary.html:88 #: rhodecode/templates/summary/summary.html:89 msgid "Fork of" msgstr "复刻自" -#: rhodecode/templates/summary/summary.html:96 -#, fuzzy +#: rhodecode/templates/summary/summary.html:97 msgid "Remote clone" -msgstr "远程克隆" +msgstr "" #: rhodecode/templates/summary/summary.html:117 msgid "Contact" @@ -4389,9 +4530,8 @@ #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#: rhodecode/templates/summary/summary.html:232 -msgid "enable" -msgstr "启用" +msgid "Enable" +msgstr "" #: rhodecode/templates/summary/summary.html:159 msgid "Download" @@ -4405,7 +4545,7 @@ msgid "Downloads are disabled for this repository" msgstr "这个版本库的下载已经禁用" -#: rhodecode/templates/summary/summary.html:171 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "zip打包下载" @@ -4418,28 +4558,29 @@ msgstr "包括子版本库" #: rhodecode/templates/summary/summary.html:197 -#, fuzzy msgid "Repository Size" -msgstr "版本库" +msgstr "" #: rhodecode/templates/summary/summary.html:204 #: rhodecode/templates/summary/summary.html:206 -#, fuzzy msgid "Feed" -msgstr "订阅RSS" +msgstr "" #: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "按日期或作者的提交活动" +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "启用" + #: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "已收集的统计：" #: rhodecode/templates/summary/summary.html:256 -#, fuzzy msgid "Latest changes" -msgstr "最后修改" +msgstr "" #: rhodecode/templates/summary/summary.html:258 msgid "Quick start" @@ -4447,51 +4588,47 @@ #: rhodecode/templates/summary/summary.html:272 #, python-format -msgid "Readme file at revision '%s'" -msgstr "修订'%s'中的README" - -#: rhodecode/templates/summary/summary.html:275 -msgid "Permalink to this readme" -msgstr "这个README的永久链接" - -#: rhodecode/templates/summary/summary.html:333 +msgid "Readme file from revision %s" +msgstr "" + +#: rhodecode/templates/summary/summary.html:332 #, python-format msgid "Download %s as %s" msgstr "下载%s为%s包" -#: rhodecode/templates/summary/summary.html:380 +#: rhodecode/templates/summary/summary.html:379 msgid "files" msgstr "文件" -#: rhodecode/templates/summary/summary.html:690 +#: rhodecode/templates/summary/summary.html:689 msgid "commits" msgstr "提交" -#: rhodecode/templates/summary/summary.html:691 +#: rhodecode/templates/summary/summary.html:690 msgid "files added" msgstr "文件已添加" -#: rhodecode/templates/summary/summary.html:692 +#: rhodecode/templates/summary/summary.html:691 msgid "files changed" msgstr "文件已更改" -#: rhodecode/templates/summary/summary.html:693 +#: rhodecode/templates/summary/summary.html:692 msgid "files removed" msgstr "文件已删除" -#: rhodecode/templates/summary/summary.html:695 +#: rhodecode/templates/summary/summary.html:694 msgid "commit" msgstr "提交" +#: rhodecode/templates/summary/summary.html:695 +msgid "file added" +msgstr "文件已添加" + #: rhodecode/templates/summary/summary.html:696 -msgid "file added" -msgstr "文件已添加" +msgid "file changed" +msgstr "文件已更改" #: rhodecode/templates/summary/summary.html:697 -msgid "file changed" -msgstr "文件已更改" - -#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "文件已删除" @@ -4503,4 +4640,3 @@ #: rhodecode/templates/tags/tags.html:26 msgid "Compare tags" msgstr "比较标签" - diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.mo Binary file rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.mo has changed diff -r c9ca7fa55b0d -r 22f925aea8b4 rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Fri Jun 07 19:23:20 2013 +0200 +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Fri Jun 07 19:30:45 2013 +0200 @@ -1,65 +1,64 @@ -# Chinese (Taiwan) translations for RhodeCode. -# Copyright (C) 2011 ORGANIZATION +# Translations template for RhodeCode. +# Copyright (C) 2013 Marcin Kuzminski RhodeCode # This file is distributed under the same license as the RhodeCode project. -# FIRST AUTHOR , 2011. -# +# Translators: +# FIRST AUTHOR , 2011 msgid "" msgstr "" -"Project-Id-Version: RhodeCode 1.2.0\n" -"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2013-04-05 10:17-0700\n" -"PO-Revision-Date: 2012-05-09 22:23+0800\n" -"Last-Translator: Nansen \n" -"Language-Team: zh_TW \n" -"Plural-Forms: nplurals=1; plural=0\n" +"Project-Id-Version: RhodeCode\n" +"Report-Msgid-Bugs-To: marcin@maq.io\n" +"POT-Creation-Date: 2013-06-05 19:55+0200\n" +"PO-Revision-Date: 2013-06-02 13:23+0000\n" +"Last-Translator: marcinkuzminski \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/RhodeCode/language/zh_TW/)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" - -#: rhodecode/controllers/changelog.py:95 -#, fuzzy +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: rhodecode/controllers/changelog.py:149 msgid "All Branches" -msgstr "分支" - -#: rhodecode/controllers/changeset.py:83 +msgstr "" + +#: rhodecode/controllers/changeset.py:84 msgid "Show white space" msgstr "" -#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 +#: rhodecode/controllers/changeset.py:91 rhodecode/controllers/changeset.py:98 msgid "Ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:163 -#, fuzzy, python-format +#: rhodecode/controllers/changeset.py:164 +#, python-format msgid "%s line context" -msgstr "文件內容" - -#: rhodecode/controllers/changeset.py:329 -#: rhodecode/controllers/pullrequests.py:438 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/changeset.py:345 +#: rhodecode/controllers/pullrequests.py:478 +#, python-format msgid "Status change -> %s" -msgstr "最後修改" - -#: rhodecode/controllers/changeset.py:360 +msgstr "" + +#: rhodecode/controllers/changeset.py:376 msgid "" -"Changing status on a changeset associated with a closed pull request is " -"not allowed" +"Changing status on a changeset associated with a closed pull request is not " +"allowed" msgstr "" #: rhodecode/controllers/compare.py:74 -#: rhodecode/controllers/pullrequests.py:167 -#: rhodecode/controllers/shortlog.py:100 -#, fuzzy +#: rhodecode/controllers/pullrequests.py:256 msgid "There are no changesets yet" -msgstr "尚未有任何變更" +msgstr "" #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "首頁" #: rhodecode/controllers/error.py:98 -msgid "The request could not be understood by the server due to malformed syntax." +msgid "" +"The request could not be understood by the server due to malformed syntax." msgstr "" #: rhodecode/controllers/error.py:101 @@ -91,8 +90,8 @@ msgstr "" #: rhodecode/controllers/feed.py:86 -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 @@ -100,129 +99,125 @@ msgid "Changeset was too big and was cut off..." msgstr "" -#: rhodecode/controllers/feed.py:91 -#, fuzzy, python-format +#: rhodecode/controllers/feed.py:90 +#, python-format msgid "%s committed on %s" -msgstr "遞交" - -#: rhodecode/controllers/files.py:88 -#, fuzzy -msgid "Click here to add new file" -msgstr "新增使用者" +msgstr "" #: rhodecode/controllers/files.py:89 -#, fuzzy, python-format +msgid "Click here to add new file" +msgstr "" + +#: rhodecode/controllers/files.py:90 +#, python-format msgid "There are no files yet %s" -msgstr "尚未有任何檔案" - -#: rhodecode/controllers/files.py:267 rhodecode/controllers/files.py:335 +msgstr "" + +#: rhodecode/controllers/files.py:271 rhodecode/controllers/files.py:339 #, python-format msgid "This repository is has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:279 +#: rhodecode/controllers/files.py:283 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:293 -#, fuzzy, python-format +#: rhodecode/controllers/files.py:297 +#, python-format msgid "Edited file %s via RhodeCode" -msgstr "使用 RhodeCode 編輯 %s" - -#: rhodecode/controllers/files.py:309 +msgstr "" + +#: rhodecode/controllers/files.py:313 msgid "No changes" msgstr "沒有修改" -#: rhodecode/controllers/files.py:318 rhodecode/controllers/files.py:388 +#: rhodecode/controllers/files.py:322 rhodecode/controllers/files.py:394 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: rhodecode/controllers/files.py:323 rhodecode/controllers/files.py:394 +#: rhodecode/controllers/files.py:327 rhodecode/controllers/files.py:405 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:347 -#, fuzzy +#: rhodecode/controllers/files.py:351 msgid "Added file via RhodeCode" -msgstr "使用 RhodeCode 編輯 %s" - -#: rhodecode/controllers/files.py:364 -#, fuzzy -msgid "No content" -msgstr "文件內容" +msgstr "" #: rhodecode/controllers/files.py:368 -#, fuzzy -msgid "No filename" -msgstr "檔案名稱" +msgid "No content" +msgstr "" #: rhodecode/controllers/files.py:372 +msgid "No filename" +msgstr "" + +#: rhodecode/controllers/files.py:397 msgid "Location must be relative path and must not contain .. in path" msgstr "" -#: rhodecode/controllers/files.py:420 -#, fuzzy -msgid "Downloads disabled" -msgstr "下載已關閉" - #: rhodecode/controllers/files.py:431 +msgid "Downloads disabled" +msgstr "" + +#: rhodecode/controllers/files.py:442 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: rhodecode/controllers/files.py:433 +#: rhodecode/controllers/files.py:444 msgid "Empty repository" msgstr "空的版本庫" -#: rhodecode/controllers/files.py:435 +#: rhodecode/controllers/files.py:446 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: rhodecode/controllers/files.py:617 +#: rhodecode/controllers/files.py:631 #: rhodecode/templates/changeset/changeset_range.html:9 +#: rhodecode/templates/email_templates/pull_request.html:12 +#: rhodecode/templates/pullrequests/pullrequest.html:124 msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:618 rhodecode/controllers/pullrequests.py:131 -#: rhodecode/controllers/summary.py:247 rhodecode/model/scm.py:606 +#: rhodecode/controllers/files.py:632 +#: rhodecode/controllers/pullrequests.py:149 +#: rhodecode/controllers/summary.py:76 rhodecode/model/scm.py:682 #: rhodecode/templates/switch_to_list.html:3 #: rhodecode/templates/branches/branches.html:10 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:619 rhodecode/controllers/pullrequests.py:132 -#: rhodecode/controllers/summary.py:248 rhodecode/model/scm.py:617 +#: rhodecode/controllers/files.py:633 +#: rhodecode/controllers/pullrequests.py:150 +#: rhodecode/controllers/summary.py:77 rhodecode/model/scm.py:693 #: rhodecode/templates/switch_to_list.html:15 -#: rhodecode/templates/shortlog/shortlog_data.html:10 #: rhodecode/templates/tags/tags.html:10 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:175 -#, fuzzy, python-format +#: rhodecode/controllers/forks.py:176 +#, python-format msgid "Forked repository %s as %s" -msgstr "forked %s 版本庫為 %s" - -#: rhodecode/controllers/forks.py:189 +msgstr "" + +#: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/controllers/journal.py:275 rhodecode/controllers/journal.py:318 -#, fuzzy +#: rhodecode/controllers/journal.py:110 rhodecode/controllers/journal.py:153 msgid "public journal" -msgstr "公開日誌" - -#: rhodecode/controllers/journal.py:279 rhodecode/controllers/journal.py:322 +msgstr "" + +#: rhodecode/controllers/journal.py:114 rhodecode/controllers/journal.py:157 #: rhodecode/templates/journal/journal.html:12 msgid "journal" msgstr "日誌" #: rhodecode/controllers/login.py:138 -#, fuzzy msgid "You have successfully registered into RhodeCode" -msgstr "您已經成功註冊rhodecode" +msgstr "" #: rhodecode/controllers/login.py:159 msgid "Your password reset link was sent" @@ -230,92 +225,120 @@ #: rhodecode/controllers/login.py:179 msgid "" -"Your password reset was successful, new password has been sent to your " -"email" +"Your password reset was successful, new password has been sent to your email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:118 +#: rhodecode/controllers/pullrequests.py:136 #: rhodecode/templates/changeset/changeset.html:10 -#: rhodecode/templates/email_templates/changeset_comment.html:15 +#: rhodecode/templates/email_templates/changeset_comment.html:8 msgid "Changeset" msgstr "" -#: rhodecode/controllers/pullrequests.py:128 +#: rhodecode/controllers/pullrequests.py:146 msgid "Special" msgstr "" -#: rhodecode/controllers/pullrequests.py:129 -#, fuzzy +#: rhodecode/controllers/pullrequests.py:147 msgid "Peer branches" -msgstr "分支" - -#: rhodecode/controllers/pullrequests.py:130 rhodecode/model/scm.py:612 +msgstr "" + +#: rhodecode/controllers/pullrequests.py:148 rhodecode/model/scm.py:688 #: rhodecode/templates/switch_to_list.html:28 #: rhodecode/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:228 +#: rhodecode/controllers/pullrequests.py:321 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:230 -#, fuzzy +#: rhodecode/controllers/pullrequests.py:323 msgid "Error creating pull request" -msgstr "建立使用者 %s" - -#: rhodecode/controllers/pullrequests.py:251 -#, fuzzy +msgstr "" + +#: rhodecode/controllers/pullrequests.py:343 msgid "Successfully opened new pull request" -msgstr "成功刪除使用者" - -#: rhodecode/controllers/pullrequests.py:254 +msgstr "" + +#: rhodecode/controllers/pullrequests.py:346 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:287 -#, fuzzy +#: rhodecode/controllers/pullrequests.py:385 msgid "Successfully deleted pull request" -msgstr "成功刪除使用者" - -#: rhodecode/controllers/pullrequests.py:441 +msgstr "" + +#: rhodecode/controllers/pullrequests.py:481 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:478 -msgid "Closing pull request on other statuses than rejected or approved forbidden" -msgstr "" - -#: rhodecode/controllers/search.py:134 +#: rhodecode/controllers/pullrequests.py:518 +msgid "" +"Closing pull request on other statuses than rejected or approved forbidden" +msgstr "" + +#: rhodecode/controllers/search.py:132 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" -#: rhodecode/controllers/search.py:139 +#: rhodecode/controllers/search.py:137 msgid "There is no index to search in. Please run whoosh indexer" msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" -#: rhodecode/controllers/search.py:143 +#: rhodecode/controllers/search.py:141 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/summary.py:141 +#: rhodecode/controllers/summary.py:182 msgid "No data loaded yet" msgstr "" -#: rhodecode/controllers/summary.py:147 +#: rhodecode/controllers/summary.py:188 #: rhodecode/templates/summary/summary.html:149 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" #: rhodecode/controllers/admin/defaults.py:96 -#, fuzzy msgid "Default settings updated successfully" -msgstr "LDAP設定更新完成" +msgstr "" #: rhodecode/controllers/admin/defaults.py:110 msgid "Error occurred during update of defaults" msgstr "" +#: rhodecode/controllers/admin/gists.py:56 +msgid "forever" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:57 +msgid "5 minutes" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:58 +msgid "1 hour" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:59 +msgid "1 day" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:60 +msgid "1 month" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:62 +msgid "Lifetime" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:127 +msgid "Error occurred during gist creation" +msgstr "" + +#: rhodecode/controllers/admin/gists.py:165 +#, python-format +msgid "Deleted gist %s" +msgstr "" + #: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" @@ -360,35 +383,39 @@ msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:126 +#: rhodecode/controllers/admin/ldap_settings.py:124 msgid "LDAP settings updated successfully" msgstr "LDAP設定更新完成" -#: rhodecode/controllers/admin/ldap_settings.py:130 +#: rhodecode/controllers/admin/ldap_settings.py:128 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "無法啟用LDAP。找不到python-ldap函式庫" -#: rhodecode/controllers/admin/ldap_settings.py:147 +#: rhodecode/controllers/admin/ldap_settings.py:145 msgid "Error occurred during update of ldap settings" msgstr "" +#: rhodecode/controllers/admin/permissions.py:58 +#: rhodecode/controllers/admin/permissions.py:62 +#: rhodecode/controllers/admin/permissions.py:66 +msgid "None" +msgstr "無" + +#: rhodecode/controllers/admin/permissions.py:59 +#: rhodecode/controllers/admin/permissions.py:63 +#: rhodecode/controllers/admin/permissions.py:67 +msgid "Read" +msgstr "讀" + #: rhodecode/controllers/admin/permissions.py:60 #: rhodecode/controllers/admin/permissions.py:64 -msgid "None" -msgstr "無" +#: rhodecode/controllers/admin/permissions.py:68 +msgid "Write" +msgstr "寫" #: rhodecode/controllers/admin/permissions.py:61 #: rhodecode/controllers/admin/permissions.py:65 -msgid "Read" -msgstr "讀" - -#: rhodecode/controllers/admin/permissions.py:62 -#: rhodecode/controllers/admin/permissions.py:66 -msgid "Write" -msgstr "寫" - -#: rhodecode/controllers/admin/permissions.py:63 -#: rhodecode/controllers/admin/permissions.py:67 +#: rhodecode/controllers/admin/permissions.py:69 #: rhodecode/templates/admin/defaults/defaults.html:9 #: rhodecode/templates/admin/ldap/ldap.html:9 #: rhodecode/templates/admin/permissions/permissions.html:9 @@ -409,845 +436,882 @@ #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 -#: rhodecode/templates/base/base.html:292 -#: rhodecode/templates/base/base.html:293 -#: rhodecode/templates/base/base.html:299 -#: rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:317 +#: rhodecode/templates/base/base.html:318 +#: rhodecode/templates/base/base.html:324 +#: rhodecode/templates/base/base.html:325 msgid "Admin" msgstr "管理" -#: rhodecode/controllers/admin/permissions.py:70 -#: rhodecode/controllers/admin/permissions.py:76 -#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:83 +#: rhodecode/controllers/admin/permissions.py:86 +#: rhodecode/controllers/admin/permissions.py:89 +#: rhodecode/controllers/admin/permissions.py:92 msgid "Disabled" msgstr "停用" -#: rhodecode/controllers/admin/permissions.py:72 -#, fuzzy -msgid "Allowed with manual account activation" -msgstr "允許手動啟用帳號" - #: rhodecode/controllers/admin/permissions.py:74 -#, fuzzy +msgid "Allowed with manual account activation" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:76 msgid "Allowed with automatic account activation" -msgstr "允許自動啟用帳號" - -#: rhodecode/controllers/admin/permissions.py:77 +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:79 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1439 rhodecode/model/db.py:1444 +msgid "Manual activation of external account" +msgstr "" + #: rhodecode/controllers/admin/permissions.py:80 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1440 rhodecode/model/db.py:1445 +msgid "Automatic activation of external account" +msgstr "" + +#: rhodecode/controllers/admin/permissions.py:84 +#: rhodecode/controllers/admin/permissions.py:87 +#: rhodecode/controllers/admin/permissions.py:90 +#: rhodecode/controllers/admin/permissions.py:93 msgid "Enabled" msgstr "啟用" -#: rhodecode/controllers/admin/permissions.py:128 +#: rhodecode/controllers/admin/permissions.py:138 msgid "Default permissions updated successfully" msgstr "預設權限更新完成" -#: rhodecode/controllers/admin/permissions.py:142 +#: rhodecode/controllers/admin/permissions.py:152 msgid "Error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:127 +#: rhodecode/controllers/admin/repos.py:128 msgid "--REMOVE FORK--" msgstr "" #: rhodecode/controllers/admin/repos.py:168 -#, fuzzy, python-format +#, python-format msgid "Created repository %s from %s" -msgstr "建立版本庫 %s 到 %s" +msgstr "" #: rhodecode/controllers/admin/repos.py:174 -#, fuzzy, python-format +#, python-format msgid "Created repository %s" -msgstr "建立版本庫 %s" +msgstr "" #: rhodecode/controllers/admin/repos.py:197 -#, fuzzy, python-format +#, python-format msgid "Error creating repository %s" -msgstr "建立版本庫 %s" - -#: rhodecode/controllers/admin/repos.py:266 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:270 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" -#: rhodecode/controllers/admin/repos.py:284 -#, fuzzy, python-format +#: rhodecode/controllers/admin/repos.py:288 +#, python-format msgid "Error occurred during update of repository %s" -msgstr "建立版本庫 %s" - -#: rhodecode/controllers/admin/repos.py:311 -#: rhodecode/controllers/api/api.py:877 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:315 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:314 -#: rhodecode/controllers/api/api.py:879 -#, fuzzy, python-format +#: rhodecode/controllers/admin/repos.py:318 +#, python-format msgid "Deleted %s forks" -msgstr "刪除版本庫 %s" - -#: rhodecode/controllers/admin/repos.py:319 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos.py:323 +#, python-format msgid "Deleted repository %s" -msgstr "刪除版本庫 %s" - -#: rhodecode/controllers/admin/repos.py:322 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:326 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:327 +#: rhodecode/controllers/admin/repos.py:331 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:365 -#, fuzzy +#: rhodecode/controllers/admin/repos.py:345 msgid "Repository permissions updated" -msgstr "版本庫建立" - -#: rhodecode/controllers/admin/repos.py:384 -msgid "An error occurred during deletion of repository user" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:403 -msgid "An error occurred during deletion of repository user groups" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:421 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos_groups.py:332 +#: rhodecode/controllers/admin/users_groups.py:312 +msgid "An error occurred during revoking of permission" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:392 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:438 +#: rhodecode/controllers/admin/repos.py:409 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:458 -#: rhodecode/controllers/admin/repos.py:485 +#: rhodecode/controllers/admin/repos.py:429 +#: rhodecode/controllers/admin/repos.py:456 msgid "An error occurred during unlocking" msgstr "" +#: rhodecode/controllers/admin/repos.py:447 +msgid "Unlocked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:450 +msgid "Locked" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:452 +#, python-format +msgid "Repository has been %s" +msgstr "" + #: rhodecode/controllers/admin/repos.py:476 -#, fuzzy -msgid "Unlocked" -msgstr "解鎖" - -#: rhodecode/controllers/admin/repos.py:479 -#, fuzzy -msgid "Locked" -msgstr "解鎖" - -#: rhodecode/controllers/admin/repos.py:481 -#, fuzzy, python-format -msgid "Repository has been %s" -msgstr "forked %s 版本庫為 %s" - -#: rhodecode/controllers/admin/repos.py:505 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:509 +#: rhodecode/controllers/admin/repos.py:480 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:514 rhodecode/model/validators.py:302 +#: rhodecode/controllers/admin/repos.py:485 rhodecode/model/validators.py:302 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:527 +#: rhodecode/controllers/admin/repos.py:498 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:529 +#: rhodecode/controllers/admin/repos.py:501 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:545 +#: rhodecode/controllers/admin/repos.py:517 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:547 -#, fuzzy, python-format +#: rhodecode/controllers/admin/repos.py:519 +#, python-format msgid "Marked repo %s as fork of %s" -msgstr "建立版本庫 %s 到 %s" - -#: rhodecode/controllers/admin/repos.py:551 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:523 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos.py:590 -#, fuzzy +#: rhodecode/controllers/admin/repos.py:562 msgid "An error occurred during creation of field" -msgstr "建立使用者 %s" - -#: rhodecode/controllers/admin/repos.py:604 +msgstr "" + +#: rhodecode/controllers/admin/repos.py:576 msgid "An error occurred during removal of field" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:145 -#, fuzzy, python-format +#: rhodecode/controllers/admin/repos_groups.py:147 +#, python-format msgid "Created repository group %s" -msgstr "建立版本庫群組 %s" - -#: rhodecode/controllers/admin/repos_groups.py:157 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:159 +#, python-format msgid "Error occurred during creation of repository group %s" -msgstr "建立使用者 %s" - -#: rhodecode/controllers/admin/repos_groups.py:214 -#: rhodecode/controllers/admin/repos_groups.py:286 -msgid "Cannot revoke permission for yourself as admin" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:220 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:217 +#, python-format msgid "Updated repository group %s" -msgstr "更新版本庫群組 %s" - -#: rhodecode/controllers/admin/repos_groups.py:235 +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:232 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:253 +#: rhodecode/controllers/admin/repos_groups.py:250 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:257 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:266 -#, fuzzy, python-format +#: rhodecode/controllers/admin/repos_groups.py:263 +#, python-format msgid "Removed repository group %s" -msgstr "移除版本庫群組 %s" - -#: rhodecode/controllers/admin/repos_groups.py:271 -#, fuzzy, python-format -msgid "Error occurred during deletion of repos group %s" -msgstr "建立使用者 %s" - -#: rhodecode/controllers/admin/repos_groups.py:297 -msgid "An error occurred during deletion of group user" -msgstr "" - -#: rhodecode/controllers/admin/repos_groups.py:318 -#, fuzzy -msgid "An error occurred during deletion of group user groups" -msgstr "建立使用者 %s" - -#: rhodecode/controllers/admin/settings.py:126 +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:268 +#, python-format +msgid "Error occurred during deletion of repository group %s" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:279 +#: rhodecode/controllers/admin/repos_groups.py:314 +#: rhodecode/controllers/admin/users_groups.py:300 +msgid "Cannot revoke permission for yourself as admin" +msgstr "" + +#: rhodecode/controllers/admin/repos_groups.py:294 +msgid "Repository Group permissions updated" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:123 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:135 +#: rhodecode/controllers/admin/settings.py:132 msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: rhodecode/controllers/admin/settings.py:166 +#: rhodecode/controllers/admin/settings.py:163 msgid "Updated application settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:170 -#: rhodecode/controllers/admin/settings.py:301 -#, fuzzy +#: rhodecode/controllers/admin/settings.py:167 +#: rhodecode/controllers/admin/settings.py:304 msgid "Error occurred during updating application settings" -msgstr "更新應用設定" - -#: rhodecode/controllers/admin/settings.py:216 -#, fuzzy +msgstr "" + +#: rhodecode/controllers/admin/settings.py:219 msgid "Updated visualisation settings" -msgstr "更新應用設定" - -#: rhodecode/controllers/admin/settings.py:221 -#, fuzzy +msgstr "" + +#: rhodecode/controllers/admin/settings.py:224 msgid "Error occurred during updating visualisation settings" -msgstr "更新應用設定" - -#: rhodecode/controllers/admin/settings.py:297 -#, fuzzy +msgstr "" + +#: rhodecode/controllers/admin/settings.py:300 msgid "Updated VCS settings" -msgstr "更新 mercurial 設定" - -#: rhodecode/controllers/admin/settings.py:311 +msgstr "" + +#: rhodecode/controllers/admin/settings.py:314 msgid "Added new hook" msgstr "新增hook" -#: rhodecode/controllers/admin/settings.py:323 +#: rhodecode/controllers/admin/settings.py:326 msgid "Updated hooks" msgstr "更新hook" -#: rhodecode/controllers/admin/settings.py:327 +#: rhodecode/controllers/admin/settings.py:330 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:346 +#: rhodecode/controllers/admin/settings.py:349 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:410 +#: rhodecode/controllers/admin/settings.py:413 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:452 +#: rhodecode/controllers/admin/settings.py:455 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:467 +#: rhodecode/controllers/admin/settings.py:470 #: rhodecode/controllers/admin/users.py:198 #, python-format msgid "Error occurred during update of user %s" msgstr "" #: rhodecode/controllers/admin/users.py:130 -#, fuzzy, python-format +#, python-format msgid "Created user %s" -msgstr "建立使用者 %s" +msgstr "" #: rhodecode/controllers/admin/users.py:142 -#, fuzzy, python-format +#, python-format msgid "Error occurred during creation of user %s" -msgstr "建立使用者 %s" +msgstr "" #: rhodecode/controllers/admin/users.py:176 msgid "User updated successfully" msgstr "使用者更新完成" #: rhodecode/controllers/admin/users.py:214 -#, fuzzy msgid "Successfully deleted user" -msgstr "成功刪除使用者" +msgstr "" #: rhodecode/controllers/admin/users.py:219 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:233 +#: rhodecode/controllers/admin/users.py:234 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: rhodecode/controllers/admin/users.py:276 -msgid "Granted 'repository create' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:281 -msgid "Revoked 'repository create' permission to user" -msgstr "" - -#: rhodecode/controllers/admin/users.py:287 -#, fuzzy -msgid "Granted 'repository fork' permission to user" -msgstr "版本庫權限" - -#: rhodecode/controllers/admin/users.py:292 -#, fuzzy -msgid "Revoked 'repository fork' permission to user" -msgstr "版本庫權限" - -#: rhodecode/controllers/admin/users.py:298 -#: rhodecode/controllers/admin/users_groups.py:281 +#: rhodecode/controllers/admin/users.py:293 +#: rhodecode/controllers/admin/users_groups.py:372 +msgid "Updated permissions" +msgstr "" + +#: rhodecode/controllers/admin/users.py:297 +#: rhodecode/controllers/admin/users_groups.py:376 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:312 +#: rhodecode/controllers/admin/users.py:311 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:318 +#: rhodecode/controllers/admin/users.py:317 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:328 -#, fuzzy +#: rhodecode/controllers/admin/users.py:327 msgid "Removed email from user" -msgstr "移除版本庫群組 %s" - -#: rhodecode/controllers/admin/users.py:341 +msgstr "" + +#: rhodecode/controllers/admin/users.py:340 #, python-format msgid "Added ip %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:347 +#: rhodecode/controllers/admin/users.py:346 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/controllers/admin/users.py:359 -#, fuzzy +#: rhodecode/controllers/admin/users.py:358 msgid "Removed ip from user" -msgstr "移除版本庫群組 %s" - -#: rhodecode/controllers/admin/users_groups.py:86 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:162 +#, python-format msgid "Created user group %s" -msgstr "建立使用者群組 %s" - -#: rhodecode/controllers/admin/users_groups.py:97 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:173 +#, python-format msgid "Error occurred during creation of user group %s" -msgstr "建立使用者 %s" - -#: rhodecode/controllers/admin/users_groups.py:166 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:210 +#, python-format msgid "Updated user group %s" -msgstr "更新使用者群組 %s" - -#: rhodecode/controllers/admin/users_groups.py:188 +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:232 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:205 -#, fuzzy +#: rhodecode/controllers/admin/users_groups.py:250 msgid "Successfully deleted user group" -msgstr "成功移除使用者群組" - -#: rhodecode/controllers/admin/users_groups.py:210 +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:255 msgid "An error occurred during deletion of user group" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:259 -#, fuzzy -msgid "Granted 'repository create' permission to user group" -msgstr "版本庫權限" - -#: rhodecode/controllers/admin/users_groups.py:264 -#, fuzzy -msgid "Revoked 'repository create' permission to user group" -msgstr "版本庫權限" - -#: rhodecode/controllers/admin/users_groups.py:270 -#, fuzzy -msgid "Granted 'repository fork' permission to user group" -msgstr "版本庫權限" - -#: rhodecode/controllers/admin/users_groups.py:275 -#, fuzzy -msgid "Revoked 'repository fork' permission to user group" -msgstr "版本庫權限" - -#: rhodecode/lib/auth.py:530 -#, fuzzy, python-format +#: rhodecode/controllers/admin/users_groups.py:274 +msgid "Target group cannot be the same" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:280 +msgid "User Group permissions updated" +msgstr "" + +#: rhodecode/lib/auth.py:544 +#, python-format msgid "IP %s not allowed" -msgstr "追蹤者" - -#: rhodecode/lib/auth.py:579 +msgstr "" + +#: rhodecode/lib/auth.py:593 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: rhodecode/lib/auth.py:620 +#: rhodecode/lib/auth.py:634 msgid "You need to be a signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" #: rhodecode/lib/diffs.py:66 -#, fuzzy msgid "Binary file" -msgstr "二進位檔" +msgstr "" #: rhodecode/lib/diffs.py:82 -msgid "Changeset was too big and was cut off, use diff menu to display this diff" +msgid "" +"Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" #: rhodecode/lib/diffs.py:92 msgid "No changes detected" msgstr "尚未有任何變更" -#: rhodecode/lib/helpers.py:394 -#, python-format -msgid "%a, %d %b %Y %H:%M:%S" -msgstr "" - -#: rhodecode/lib/helpers.py:506 +#: rhodecode/lib/helpers.py:539 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:509 +#: rhodecode/lib/helpers.py:542 msgid "False" msgstr "假" -#: rhodecode/lib/helpers.py:547 -#, fuzzy, python-format +#: rhodecode/lib/helpers.py:580 +#, python-format msgid "Deleted branch: %s" -msgstr "刪除版本庫 %s" - -#: rhodecode/lib/helpers.py:550 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/lib/helpers.py:583 +#, python-format msgid "Created tag: %s" -msgstr "建立使用者 %s" - -#: rhodecode/lib/helpers.py:563 -#, fuzzy +msgstr "" + +#: rhodecode/lib/helpers.py:596 msgid "Changeset not found" -msgstr "修改" - -#: rhodecode/lib/helpers.py:615 +msgstr "" + +#: rhodecode/lib/helpers.py:646 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:621 +#: rhodecode/lib/helpers.py:652 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:641 +#: rhodecode/lib/helpers.py:672 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:642 +#: rhodecode/lib/helpers.py:673 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:643 rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/lib/helpers.py:674 +#: rhodecode/templates/changelog/changelog.html:53 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:667 -#, fuzzy, python-format +#: rhodecode/lib/helpers.py:698 +#, python-format msgid "fork name %s" -msgstr "fork 名稱" - -#: rhodecode/lib/helpers.py:684 +msgstr "" + +#: rhodecode/lib/helpers.py:715 #: rhodecode/templates/pullrequests/pullrequest_show.html:8 #, python-format msgid "Pull request #%s" msgstr "" -#: rhodecode/lib/helpers.py:690 +#: rhodecode/lib/helpers.py:725 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:692 rhodecode/lib/helpers.py:702 +#: rhodecode/lib/helpers.py:727 rhodecode/lib/helpers.py:739 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:694 -#, fuzzy +#: rhodecode/lib/helpers.py:729 msgid "[created] repository as fork" -msgstr "建立版本庫 %s" - -#: rhodecode/lib/helpers.py:696 rhodecode/lib/helpers.py:704 +msgstr "" + +#: rhodecode/lib/helpers.py:731 rhodecode/lib/helpers.py:741 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:698 rhodecode/lib/helpers.py:706 +#: rhodecode/lib/helpers.py:733 rhodecode/lib/helpers.py:743 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:700 +#: rhodecode/lib/helpers.py:735 +msgid "[downloaded] archive from repository" +msgstr "" + +#: rhodecode/lib/helpers.py:737 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:708 -#, fuzzy +#: rhodecode/lib/helpers.py:745 msgid "[created] user" -msgstr "建立使用者 %s" - -#: rhodecode/lib/helpers.py:710 -#, fuzzy +msgstr "" + +#: rhodecode/lib/helpers.py:747 msgid "[updated] user" -msgstr "更新使用者群組 %s" - -#: rhodecode/lib/helpers.py:712 -#, fuzzy +msgstr "" + +#: rhodecode/lib/helpers.py:749 msgid "[created] user group" -msgstr "建立使用者群組 %s" - -#: rhodecode/lib/helpers.py:714 -#, fuzzy +msgstr "" + +#: rhodecode/lib/helpers.py:751 msgid "[updated] user group" -msgstr "更新使用者群組 %s" - -#: rhodecode/lib/helpers.py:716 +msgstr "" + +#: rhodecode/lib/helpers.py:753 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:718 -#, fuzzy +#: rhodecode/lib/helpers.py:755 msgid "[commented] on pull request for" -msgstr "建立使用者 %s" - -#: rhodecode/lib/helpers.py:720 +msgstr "" + +#: rhodecode/lib/helpers.py:757 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:722 +#: rhodecode/lib/helpers.py:759 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:724 +#: rhodecode/lib/helpers.py:761 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:726 +#: rhodecode/lib/helpers.py:763 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:728 +#: rhodecode/lib/helpers.py:765 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:730 +#: rhodecode/lib/helpers.py:767 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:769 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:910 +#: rhodecode/lib/helpers.py:1088 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:914 +#: rhodecode/lib/helpers.py:1092 msgid "No Files" msgstr "沒有檔案" -#: rhodecode/lib/helpers.py:1198 +#: rhodecode/lib/helpers.py:1158 +msgid "new file" +msgstr "" + +#: rhodecode/lib/helpers.py:1161 +msgid "mod" +msgstr "" + +#: rhodecode/lib/helpers.py:1164 +msgid "del" +msgstr "" + +#: rhodecode/lib/helpers.py:1167 +msgid "rename" +msgstr "" + +#: rhodecode/lib/helpers.py:1172 +msgid "chmod" +msgstr "" + +#: rhodecode/lib/helpers.py:1404 #, python-format msgid "" -"%s repository is not mapped to db perhaps it was created or renamed from " -"the filesystem please run the application again in order to rescan " -"repositories" +"%s repository is not mapped to db perhaps it was created or renamed from the" +" filesystem please run the application again in order to rescan repositories" msgstr "" #: rhodecode/lib/unionrepo.py:193 -#, fuzzy msgid "cannot create new union repository" -msgstr "建立版本庫 %s" +msgstr "" + +#: rhodecode/lib/utils2.py:410 +#, python-format +msgid "%d year" +msgid_plural "%d years" +msgstr[0] "" #: rhodecode/lib/utils2.py:411 -#, fuzzy, python-format -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "年" - -#: rhodecode/lib/utils2.py:412 -#, fuzzy, python-format +#, python-format msgid "%d month" msgid_plural "%d months" -msgstr[0] "月" - -#: rhodecode/lib/utils2.py:413 -#, fuzzy, python-format +msgstr[0] "" + +#: rhodecode/lib/utils2.py:412 +#, python-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "日" +msgstr[0] "" + +#: rhodecode/lib/utils2.py:413 +#, python-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" #: rhodecode/lib/utils2.py:414 -#, fuzzy, python-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "時" +#, python-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" #: rhodecode/lib/utils2.py:415 -#, fuzzy, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "分" - -#: rhodecode/lib/utils2.py:416 -#, fuzzy, python-format +#, python-format msgid "%d second" msgid_plural "%d seconds" -msgstr[0] "秒" - -#: rhodecode/lib/utils2.py:432 +msgstr[0] "" + +#: rhodecode/lib/utils2.py:431 #, python-format msgid "in %s" msgstr "" -#: rhodecode/lib/utils2.py:434 -#, fuzzy, python-format +#: rhodecode/lib/utils2.py:433 +#, python-format msgid "%s ago" -msgstr "之前" - -#: rhodecode/lib/utils2.py:436 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/lib/utils2.py:435 +#, python-format msgid "in %s and %s" -msgstr "下載 %s 為 %s" - -#: rhodecode/lib/utils2.py:439 +msgstr "" + +#: rhodecode/lib/utils2.py:438 #, python-format msgid "%s and %s ago" msgstr "" -#: rhodecode/lib/utils2.py:442 +#: rhodecode/lib/utils2.py:441 msgid "just now" msgstr "現在" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1163 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1183 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1289 rhodecode/model/db.py:1388 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1408 rhodecode/model/db.py:1413 msgid "Repository no access" -msgstr "個版本庫" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1164 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1184 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1290 rhodecode/model/db.py:1389 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1409 rhodecode/model/db.py:1414 msgid "Repository read access" -msgstr "這個版本庫已經存在" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1165 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1185 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1291 rhodecode/model/db.py:1390 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1390 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1410 rhodecode/model/db.py:1415 msgid "Repository write access" -msgstr "個版本庫" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1166 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1186 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1292 rhodecode/model/db.py:1391 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1306 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1391 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1411 rhodecode/model/db.py:1416 msgid "Repository admin access" -msgstr "個版本庫" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1168 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1188 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1294 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 msgid "Repositories Group no access" -msgstr "版本庫群組" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1169 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1189 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1295 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1309 msgid "Repositories Group read access" -msgstr "版本庫群組" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1170 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1190 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1296 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1310 msgid "Repositories Group write access" -msgstr "版本庫群組" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1171 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1191 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1297 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1311 msgid "Repositories Group admin access" -msgstr "版本庫群組" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1173 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1193 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1299 rhodecode/model/db.py:1398 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1406 rhodecode/model/db.py:1411 msgid "RhodeCode Administrator" -msgstr "使用者管理員" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1174 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1194 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1300 rhodecode/model/db.py:1399 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1429 rhodecode/model/db.py:1434 msgid "Repository creation disabled" -msgstr "版本庫建立" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1175 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1195 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1301 rhodecode/model/db.py:1400 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1430 rhodecode/model/db.py:1435 msgid "Repository creation enabled" -msgstr "版本庫建立" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1176 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1196 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1302 rhodecode/model/db.py:1401 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1316 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1432 rhodecode/model/db.py:1437 msgid "Repository forking disabled" -msgstr "版本庫建立" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1177 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1197 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1303 rhodecode/model/db.py:1402 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1433 rhodecode/model/db.py:1438 msgid "Repository forking enabled" -msgstr "版本庫建立" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1178 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1198 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1304 rhodecode/model/db.py:1403 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1403 msgid "Register disabled" -msgstr "停用" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1179 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1199 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1305 rhodecode/model/db.py:1404 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1319 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1404 msgid "Register new user with RhodeCode with manual activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1182 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1202 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1308 rhodecode/model/db.py:1407 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1407 msgid "Register new user with RhodeCode with auto activation" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1623 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1643 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1749 rhodecode/model/db.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1934 rhodecode/model/db.py:1939 msgid "Not Reviewed" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1624 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1644 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1750 rhodecode/model/db.py:1839 -#, fuzzy +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1935 rhodecode/model/db.py:1940 msgid "Approved" -msgstr "移除" +msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1625 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1645 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1751 rhodecode/model/db.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1936 rhodecode/model/db.py:1941 msgid "Rejected" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:1626 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:1646 -#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1752 rhodecode/model/db.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:1766 +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1841 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1937 rhodecode/model/db.py:1942 msgid "Under Review" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1270 rhodecode/model/db.py:1275 +msgid "top level" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1413 rhodecode/model/db.py:1418 +msgid "Repository group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1414 rhodecode/model/db.py:1419 +msgid "Repository group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1395 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1415 rhodecode/model/db.py:1420 +msgid "Repository group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:1396 +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1416 rhodecode/model/db.py:1421 +msgid "Repository group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1418 rhodecode/model/db.py:1423 +msgid "User group no access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1419 rhodecode/model/db.py:1424 +msgid "User group read access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1420 rhodecode/model/db.py:1425 +msgid "User group write access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1421 rhodecode/model/db.py:1426 +msgid "User group admin access" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1423 rhodecode/model/db.py:1428 +msgid "Repository Group creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1424 rhodecode/model/db.py:1429 +msgid "Repository Group creation enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1426 rhodecode/model/db.py:1431 +msgid "User Group creation disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1427 rhodecode/model/db.py:1432 +msgid "User Group creation enabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1435 rhodecode/model/db.py:1440 +msgid "Registration disabled" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1436 rhodecode/model/db.py:1441 +msgid "User Registration with manual account activation" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:1437 rhodecode/model/db.py:1442 +msgid "User Registration with automatic account activation" +msgstr "" + #: rhodecode/model/comment.py:75 #, python-format msgid "on line %s" msgstr "" -#: rhodecode/model/comment.py:219 +#: rhodecode/model/comment.py:220 msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1252 -msgid "top level" -msgstr "" - -#: rhodecode/model/db.py:1393 -#, fuzzy -msgid "Repository group no access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1394 -#, fuzzy -msgid "Repository group read access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1395 -#, fuzzy -msgid "Repository group write access" -msgstr "版本庫群組" - -#: rhodecode/model/db.py:1396 -#, fuzzy -msgid "Repository group admin access" -msgstr "版本庫群組" - #: rhodecode/model/forms.py:43 msgid "Please enter a login" msgstr "請登入" @@ -1266,50 +1330,48 @@ msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:224 -#, fuzzy, python-format +#: rhodecode/model/notification.py:228 +#, python-format msgid "%(user)s commented on changeset at %(when)s" -msgstr "建立使用者 %s" - -#: rhodecode/model/notification.py:225 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/model/notification.py:229 +#, python-format msgid "%(user)s sent message at %(when)s" -msgstr "遞交資訊" - -#: rhodecode/model/notification.py:226 +msgstr "" + +#: rhodecode/model/notification.py:230 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "" -#: rhodecode/model/notification.py:227 -#, fuzzy, python-format +#: rhodecode/model/notification.py:231 +#, python-format msgid "%(user)s registered in RhodeCode at %(when)s" -msgstr "您已經成功註冊rhodecode" - -#: rhodecode/model/notification.py:228 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/model/notification.py:232 +#, python-format msgid "%(user)s opened new pull request at %(when)s" -msgstr "建立使用者 %s" - -#: rhodecode/model/notification.py:229 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/model/notification.py:233 +#, python-format msgid "%(user)s commented on pull request at %(when)s" -msgstr "建立使用者 %s" - -#: rhodecode/model/pull_request.py:104 +msgstr "" + +#: rhodecode/model/pull_request.py:98 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s: %(pr_title)s" msgstr "" -#: rhodecode/model/scm.py:598 -#, fuzzy +#: rhodecode/model/scm.py:674 msgid "latest tip" -msgstr "最後登入" +msgstr "" #: rhodecode/model/user.py:232 -#, fuzzy msgid "New user registration" -msgstr "[RhodeCode] 新使用者註冊" +msgstr "" #: rhodecode/model/user.py:257 rhodecode/model/user.py:281 msgid "You can't Edit this user since it's crucial for entire application" @@ -1320,21 +1382,19 @@ msgstr "您無法移除這個使用者，因為他是系統帳號" #: rhodecode/model/user.py:309 -#, fuzzy, python-format +#, python-format msgid "" -"user \"%s\" still owns %s repositories and cannot be removed. Switch " -"owners or remove those repositories. %s" -msgstr "這個使用者擁有 %s 個版本庫所以無法移除，請先變更版本庫擁有者或者刪除版本庫" +"user \"%s\" still owns %s repositories and cannot be removed. Switch owners " +"or remove those repositories. %s" +msgstr "" #: rhodecode/model/user.py:334 -#, fuzzy msgid "Password reset link" -msgstr "您的密碼重設連結已寄出" +msgstr "" #: rhodecode/model/user.py:366 -#, fuzzy msgid "Your new password" -msgstr "新密碼" +msgstr "" #: rhodecode/model/user.py:367 #, python-format @@ -1346,9 +1406,9 @@ msgstr "" #: rhodecode/model/validators.py:85 -#, fuzzy, python-format +#, python-format msgid "Username \"%(username)s\" already exists" -msgstr "使用者名稱已存在" +msgstr "" #: rhodecode/model/validators.py:87 #, python-format @@ -1357,50 +1417,47 @@ #: rhodecode/model/validators.py:89 msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character" -msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with alphanumeric character or underscore" +msgstr "" #: rhodecode/model/validators.py:117 -#, fuzzy, python-format +#, python-format msgid "Username %(username)s is not valid" -msgstr "使用者名稱或群組名稱無效" +msgstr "" #: rhodecode/model/validators.py:136 -#, fuzzy msgid "Invalid user group name" -msgstr "無效的使用者名稱" +msgstr "" #: rhodecode/model/validators.py:137 -#, fuzzy, python-format +#, python-format msgid "User group \"%(usergroup)s\" already exists" -msgstr "這個使用者群組已存在" +msgstr "" #: rhodecode/model/validators.py:139 -#, fuzzy msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" -msgstr "群組名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" +msgstr "" #: rhodecode/model/validators.py:177 msgid "Cannot assign this group as parent" msgstr "" #: rhodecode/model/validators.py:178 -#, fuzzy, python-format +#, python-format msgid "Group \"%(group_name)s\" already exists" -msgstr "使用者名稱已存在" +msgstr "" #: rhodecode/model/validators.py:180 -#, fuzzy, python-format +#, python-format msgid "Repository with name \"%(group_name)s\" already exists" -msgstr "這個版本庫已經存在" +msgstr "" #: rhodecode/model/validators.py:238 -#, fuzzy msgid "Invalid characters (non-ascii) in password" -msgstr "無效的字元在密碼中" +msgstr "" #: rhodecode/model/validators.py:253 msgid "Passwords do not match" @@ -1419,24 +1476,24 @@ msgstr "您的帳號已被停用" #: rhodecode/model/validators.py:316 -#, fuzzy, python-format +#, python-format msgid "Repository name %(repo)s is disallowed" -msgstr "不允許的版本庫名稱" +msgstr "" #: rhodecode/model/validators.py:318 -#, fuzzy, python-format +#, python-format msgid "Repository named %(repo)s already exists" -msgstr "這個版本庫已經存在" +msgstr "" #: rhodecode/model/validators.py:319 -#, fuzzy, python-format +#, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" -msgstr "這個版本庫已存在於群組 \"%s\"" +msgstr "" #: rhodecode/model/validators.py:321 -#, fuzzy, python-format +#, python-format msgid "Repository group with name \"%(repo)s\" already exists" -msgstr "這個版本庫已經存在" +msgstr "" #: rhodecode/model/validators.py:438 msgid "invalid clone url" @@ -1447,67 +1504,67 @@ msgstr "" #: rhodecode/model/validators.py:464 -#, fuzzy msgid "Fork have to be the same type as parent" -msgstr "Fork 必須使用相同的版本庫類型" +msgstr "" #: rhodecode/model/validators.py:479 -#, fuzzy msgid "You don't have permissions to create repository in this group" -msgstr "您沒有權限瀏覽這個頁面" +msgstr "" #: rhodecode/model/validators.py:481 -#, fuzzy msgid "no permission to create repository in root location" -msgstr "您沒有權限瀏覽這個頁面" +msgstr "" #: rhodecode/model/validators.py:518 -#, fuzzy msgid "You don't have permissions to create a group in this location" -msgstr "您沒有權限瀏覽這個頁面" - -#: rhodecode/model/validators.py:557 -#, fuzzy +msgstr "" + +#: rhodecode/model/validators.py:559 msgid "This username or user group name is not valid" -msgstr "使用者名稱或群組名稱無效" - -#: rhodecode/model/validators.py:650 +msgstr "" + +#: rhodecode/model/validators.py:652 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: rhodecode/model/validators.py:665 +#: rhodecode/model/validators.py:667 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: rhodecode/model/validators.py:685 -#, fuzzy, python-format +#: rhodecode/model/validators.py:687 +#, python-format msgid "e-mail \"%(email)s\" does not exist." -msgstr "這個郵件位址不存在" - -#: rhodecode/model/validators.py:722 +msgstr "" + +#: rhodecode/model/validators.py:724 msgid "" -"The LDAP Login attribute of the CN must be specified - this is the name " -"of the attribute that is equivalent to \"username\"" -msgstr "" - -#: rhodecode/model/validators.py:735 +"The LDAP Login attribute of the CN must be specified - this is the name of " +"the attribute that is equivalent to \"username\"" +msgstr "" + +#: rhodecode/model/validators.py:737 #, python-format msgid "Revisions %(revs)s are already part of pull request or have set status" msgstr "" -#: rhodecode/model/validators.py:767 +#: rhodecode/model/validators.py:769 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" -#: rhodecode/model/validators.py:768 +#: rhodecode/model/validators.py:770 #, python-format -msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" -msgstr "" - -#: rhodecode/model/validators.py:800 +msgid "" +"The network size (bits) must be within the range of 0-32 (not %(bits)r)" +msgstr "" + +#: rhodecode/model/validators.py:803 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" +#: rhodecode/model/validators.py:817 +msgid "Filename cannot be inside a directory" +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "儀表板" @@ -1534,50 +1591,47 @@ #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:18 #: rhodecode/templates/admin/repos/repo_add.html:5 -#: rhodecode/templates/admin/repos/repos.html:21 +#: rhodecode/templates/admin/repos/repos.html:22 msgid "Add repository" msgstr "新增版本庫" #: rhodecode/templates/index_base.html:15 #: rhodecode/templates/index_base.html:20 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:31 -#, fuzzy msgid "Add group" -msgstr "編輯版本庫群組" +msgstr "" #: rhodecode/templates/index_base.html:27 -#, fuzzy msgid "Edit group" -msgstr "編輯版本庫群組" +msgstr "" #: rhodecode/templates/index_base.html:27 msgid "You have admin right to this group, and can edit it" msgstr "" #: rhodecode/templates/index_base.html:40 -#: rhodecode/templates/index_base.html:140 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:33 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:38 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:43 #: rhodecode/templates/admin/users_groups/users_group_add.html:32 #: rhodecode/templates/admin/users_groups/users_group_edit.html:33 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 +#: rhodecode/templates/admin/users_groups/users_groups.html:37 msgid "Group name" msgstr "群組名稱" #: rhodecode/templates/index_base.html:41 -#: rhodecode/templates/index_base.html:83 -#: rhodecode/templates/index_base.html:142 -#: rhodecode/templates/index_base.html:180 -#: rhodecode/templates/index_base.html:270 +#: rhodecode/templates/index_base.html:123 #: rhodecode/templates/admin/repos/repo_add_base.html:56 -#: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:73 +#: rhodecode/templates/admin/repos/repo_edit.html:68 +#: rhodecode/templates/admin/repos/repos.html:75 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:42 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:47 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:44 +#: rhodecode/templates/email_templates/changeset_comment.html:9 +#: rhodecode/templates/email_templates/pull_request.html:9 #: rhodecode/templates/forks/fork.html:56 -#: rhodecode/templates/pullrequests/pullrequest.html:101 +#: rhodecode/templates/pullrequests/pullrequest.html:43 +#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:106 msgid "Description" msgstr "描述" @@ -1585,27 +1639,25 @@ #: rhodecode/templates/index_base.html:51 #: rhodecode/templates/admin/permissions/permissions.html:55 #: rhodecode/templates/admin/repos/repo_add_base.html:29 -#: rhodecode/templates/admin/repos/repo_edit.html:49 +#: rhodecode/templates/admin/repos/repo_edit.html:50 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:57 #: rhodecode/templates/forks/fork.html:47 msgid "Repository group" msgstr "版本庫群組" -#: rhodecode/templates/index_base.html:82 -#: rhodecode/templates/index_base.html:178 -#: rhodecode/templates/index_base.html:268 +#: rhodecode/templates/index_base.html:121 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 -#: rhodecode/templates/admin/repos/repos.html:71 +#: rhodecode/templates/admin/repos/repos.html:73 #: rhodecode/templates/admin/users/user_edit_my_account.html:172 -#: rhodecode/templates/base/perms_summary.html:14 -#: rhodecode/templates/bookmarks/bookmarks.html:34 +#: rhodecode/templates/base/perms_summary.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:48 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:47 #: rhodecode/templates/branches/branches_data.html:6 #: rhodecode/templates/files/files_browser.html:47 #: rhodecode/templates/journal/journal.html:193 -#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/journal/journal.html:283 #: rhodecode/templates/summary/summary.html:55 #: rhodecode/templates/summary/summary.html:124 #: rhodecode/templates/tags/tags.html:48 @@ -1613,115 +1665,80 @@ msgid "Name" msgstr "名稱" -#: rhodecode/templates/index_base.html:84 -msgid "Last change" -msgstr "最後修改" - -#: rhodecode/templates/index_base.html:85 -#: rhodecode/templates/index_base.html:183 -#: rhodecode/templates/index_base.html:273 -#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/index_base.html:124 +msgid "Last Change" +msgstr "" + +#: rhodecode/templates/index_base.html:126 +#: rhodecode/templates/admin/repos/repos.html:76 #: rhodecode/templates/admin/users/user_edit_my_account.html:174 #: rhodecode/templates/journal/journal.html:195 -#: rhodecode/templates/journal/journal.html:298 +#: rhodecode/templates/journal/journal.html:285 msgid "Tip" msgstr "" -#: rhodecode/templates/index_base.html:86 -#: rhodecode/templates/index_base.html:185 -#: rhodecode/templates/index_base.html:275 -#: rhodecode/templates/admin/repos/repo_edit.html:121 -#: rhodecode/templates/admin/repos/repos.html:76 +#: rhodecode/templates/index_base.html:128 +#: rhodecode/templates/admin/repos/repo_edit.html:114 +#: rhodecode/templates/admin/repos/repos.html:78 msgid "Owner" msgstr "擁有者" -#: rhodecode/templates/index_base.html:87 -msgid "Atom" -msgstr "" - -#: rhodecode/templates/index_base.html:171 -#: rhodecode/templates/index_base.html:209 -#: rhodecode/templates/index_base.html:296 -#: rhodecode/templates/admin/repos/repos.html:97 -#: rhodecode/templates/admin/users/user_edit_my_account.html:196 +#: rhodecode/templates/index_base.html:136 +#: rhodecode/templates/admin/repos/repos.html:86 +#: rhodecode/templates/admin/users/user_edit_my_account.html:183 #: rhodecode/templates/admin/users/users.html:107 -#: rhodecode/templates/bookmarks/bookmarks.html:58 +#: rhodecode/templates/bookmarks/bookmarks.html:74 #: rhodecode/templates/branches/branches.html:73 -#: rhodecode/templates/journal/journal.html:217 -#: rhodecode/templates/journal/journal.html:320 +#: rhodecode/templates/journal/journal.html:204 +#: rhodecode/templates/journal/journal.html:294 #: rhodecode/templates/tags/tags.html:74 msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:172 -#: rhodecode/templates/index_base.html:210 -#: rhodecode/templates/index_base.html:297 -#: rhodecode/templates/admin/repos/repos.html:98 -#: rhodecode/templates/admin/users/user_edit_my_account.html:197 +#: rhodecode/templates/index_base.html:137 +#: rhodecode/templates/admin/repos/repos.html:87 +#: rhodecode/templates/admin/users/user_edit_my_account.html:184 #: rhodecode/templates/admin/users/users.html:108 -#: rhodecode/templates/bookmarks/bookmarks.html:59 +#: rhodecode/templates/bookmarks/bookmarks.html:75 #: rhodecode/templates/branches/branches.html:74 -#: rhodecode/templates/journal/journal.html:218 -#: rhodecode/templates/journal/journal.html:321 +#: rhodecode/templates/journal/journal.html:205 +#: rhodecode/templates/journal/journal.html:295 #: rhodecode/templates/tags/tags.html:75 msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:181 -#: rhodecode/templates/index_base.html:271 -#, fuzzy -msgid "Last Change" -msgstr "最後修改" - -#: rhodecode/templates/index_base.html:211 -#: rhodecode/templates/admin/repos/repos.html:99 -#: rhodecode/templates/admin/users/user_edit_my_account.html:198 -#: rhodecode/templates/admin/users/users.html:109 -#: rhodecode/templates/bookmarks/bookmarks.html:60 -#: rhodecode/templates/branches/branches.html:75 -#: rhodecode/templates/journal/journal.html:219 -#: rhodecode/templates/journal/journal.html:322 -#: rhodecode/templates/tags/tags.html:76 -msgid "No records found." -msgstr "" - -#: rhodecode/templates/index_base.html:212 -#: rhodecode/templates/index_base.html:299 -#: rhodecode/templates/admin/repos/repos.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:199 +#: rhodecode/templates/index_base.html:138 +msgid "No repositories found." +msgstr "" + +#: rhodecode/templates/index_base.html:139 +#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/admin/users/users.html:110 -#: rhodecode/templates/bookmarks/bookmarks.html:61 +#: rhodecode/templates/bookmarks/bookmarks.html:77 #: rhodecode/templates/branches/branches.html:76 -#: rhodecode/templates/journal/journal.html:220 -#: rhodecode/templates/journal/journal.html:323 +#: rhodecode/templates/journal/journal.html:207 +#: rhodecode/templates/journal/journal.html:297 #: rhodecode/templates/tags/tags.html:77 msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:213 -#: rhodecode/templates/index_base.html:300 -#: rhodecode/templates/admin/repos/repos.html:101 +#: rhodecode/templates/index_base.html:140 +#: rhodecode/templates/admin/repos/repos.html:90 #: rhodecode/templates/admin/users/user_edit_my_account.html:58 -#: rhodecode/templates/admin/users/user_edit_my_account.html:200 +#: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/admin/users/users.html:111 -#: rhodecode/templates/bookmarks/bookmarks.html:62 +#: rhodecode/templates/bookmarks/bookmarks.html:78 #: rhodecode/templates/branches/branches.html:77 -#: rhodecode/templates/journal/journal.html:221 -#: rhodecode/templates/journal/journal.html:324 +#: rhodecode/templates/journal/journal.html:208 +#: rhodecode/templates/journal/journal.html:298 #: rhodecode/templates/tags/tags.html:78 -#, fuzzy msgid "Loading..." -msgstr "載入中..." - -#: rhodecode/templates/index_base.html:298 -#, fuzzy -msgid "No repositories found." -msgstr "版本庫群組" - -#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:227 -#, fuzzy +msgstr "" + +#: rhodecode/templates/login.html:5 rhodecode/templates/base/base.html:239 msgid "Log In" -msgstr "登入" +msgstr "" #: rhodecode/templates/login.html:21 #, python-format @@ -1734,7 +1751,7 @@ #: rhodecode/templates/admin/users/user_edit.html:57 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:31 #: rhodecode/templates/admin/users/users.html:77 -#: rhodecode/templates/base/base.html:203 +#: rhodecode/templates/base/base.html:215 #: rhodecode/templates/summary/summary.html:123 msgid "Username" msgstr "帳號" @@ -1742,14 +1759,13 @@ #: rhodecode/templates/login.html:40 rhodecode/templates/register.html:29 #: rhodecode/templates/admin/ldap/ldap.html:46 #: rhodecode/templates/admin/users/user_add.html:41 -#: rhodecode/templates/base/base.html:212 +#: rhodecode/templates/base/base.html:224 msgid "Password" msgstr "密碼" #: rhodecode/templates/login.html:50 -#, fuzzy msgid "Remember me" -msgstr "成員" +msgstr "" #: rhodecode/templates/login.html:54 msgid "Sign In" @@ -1759,14 +1775,13 @@ msgid "Forgot your password ?" msgstr "忘記您的密碼?" -#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:223 +#: rhodecode/templates/login.html:63 rhodecode/templates/base/base.html:235 msgid "Don't have an account ?" msgstr "沒有帳號?" #: rhodecode/templates/password_reset.html:5 -#, fuzzy msgid "Password Reset" -msgstr "您的密碼重設連結已寄出" +msgstr "" #: rhodecode/templates/password_reset.html:11 msgid "Reset your password to" @@ -1829,7 +1844,7 @@ #: rhodecode/templates/repo_switcher_list.html:10 #: rhodecode/templates/admin/defaults/defaults.html:44 #: rhodecode/templates/admin/repos/repo_add_base.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:85 +#: rhodecode/templates/admin/repos/repo_edit.html:78 #: rhodecode/templates/data_table/_dt_elements.html:61 #: rhodecode/templates/summary/summary.html:77 msgid "Private repository" @@ -1852,27 +1867,24 @@ msgstr "沒有任何標籤" #: rhodecode/templates/switch_to_list.html:35 -#: rhodecode/templates/bookmarks/bookmarks_data.html:32 -#, fuzzy +#: rhodecode/templates/bookmarks/bookmarks_data.html:37 msgid "There are no bookmarks yet" -msgstr "尚未有任何 fork" +msgstr "" #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:13 -#: rhodecode/templates/base/base.html:68 +#: rhodecode/templates/base/base.html:73 msgid "Admin journal" msgstr "管理員日誌" #: rhodecode/templates/admin/admin.html:10 -#, fuzzy msgid "journal filter..." -msgstr "快速過濾..." +msgstr "" #: rhodecode/templates/admin/admin.html:12 #: rhodecode/templates/journal/journal.html:11 -#, fuzzy msgid "filter" -msgstr "檔案" +msgstr "" #: rhodecode/templates/admin/admin.html:13 #: rhodecode/templates/journal/journal.html:12 @@ -1882,13 +1894,13 @@ msgstr[0] "" #: rhodecode/templates/admin/admin_log.html:6 -#: rhodecode/templates/admin/repos/repos.html:77 +#: rhodecode/templates/admin/repos/repos.html:79 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:46 #: rhodecode/templates/admin/users/user_edit_my_account.html:176 #: rhodecode/templates/admin/users/users.html:87 -#: rhodecode/templates/admin/users_groups/users_groups.html:37 +#: rhodecode/templates/admin/users_groups/users_groups.html:40 #: rhodecode/templates/journal/journal.html:197 -#: rhodecode/templates/journal/journal.html:300 +#: rhodecode/templates/journal/journal.html:287 msgid "Action" msgstr "動作" @@ -1898,7 +1910,7 @@ msgstr "版本庫" #: rhodecode/templates/admin/admin_log.html:8 -#: rhodecode/templates/bookmarks/bookmarks.html:35 +#: rhodecode/templates/bookmarks/bookmarks.html:49 #: rhodecode/templates/bookmarks/bookmarks_data.html:7 #: rhodecode/templates/branches/branches.html:48 #: rhodecode/templates/branches/branches_data.html:7 @@ -1917,25 +1929,22 @@ #: rhodecode/templates/admin/defaults/defaults.html:5 #: rhodecode/templates/admin/defaults/defaults.html:25 -#, fuzzy msgid "Repositories defaults" -msgstr "版本庫群組" +msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:11 -#: rhodecode/templates/base/base.html:75 -#, fuzzy +#: rhodecode/templates/base/base.html:80 msgid "Defaults" -msgstr "刪除" +msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:35 #: rhodecode/templates/admin/repos/repo_add_base.html:38 -#: rhodecode/templates/admin/repos/repo_edit.html:58 msgid "Type" msgstr "類型" #: rhodecode/templates/admin/defaults/defaults.html:48 #: rhodecode/templates/admin/repos/repo_add_base.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:89 +#: rhodecode/templates/admin/repos/repo_edit.html:82 #: rhodecode/templates/forks/fork.html:69 msgid "" "Private repositories are only visible to people explicitly added as " @@ -1943,61 +1952,184 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:55 -#: rhodecode/templates/admin/repos/repo_edit.html:94 +#: rhodecode/templates/admin/repos/repo_edit.html:87 msgid "Enable statistics" msgstr "啟用統計" #: rhodecode/templates/admin/defaults/defaults.html:59 -#: rhodecode/templates/admin/repos/repo_edit.html:98 +#: rhodecode/templates/admin/repos/repo_edit.html:91 msgid "Enable statistics window on summary page." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:65 -#: rhodecode/templates/admin/repos/repo_edit.html:103 +#: rhodecode/templates/admin/repos/repo_edit.html:96 msgid "Enable downloads" msgstr "啟用下載" #: rhodecode/templates/admin/defaults/defaults.html:69 -#: rhodecode/templates/admin/repos/repo_edit.html:107 +#: rhodecode/templates/admin/repos/repo_edit.html:100 msgid "Enable download menu on summary page." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:75 -#: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 -#, fuzzy +#: rhodecode/templates/admin/repos/repo_edit.html:105 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 msgid "Enable locking" -msgstr "啟用" +msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:79 -#: rhodecode/templates/admin/repos/repo_edit.html:116 +#: rhodecode/templates/admin/repos/repo_edit.html:109 msgid "Enable lock-by-pulling on repository." msgstr "" #: rhodecode/templates/admin/defaults/defaults.html:84 #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/permissions/permissions.html:92 -#: rhodecode/templates/admin/repos/repo_edit.html:148 -#: rhodecode/templates/admin/repos/repo_edit.html:173 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:80 +#: rhodecode/templates/admin/permissions/permissions.html:122 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:72 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:96 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users/user_edit.html:140 -#: rhodecode/templates/admin/users/user_edit.html:185 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:88 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:143 +#: rhodecode/templates/base/default_perms_box.html:53 msgid "Save" msgstr "儲存" +#: rhodecode/templates/admin/gists/index.html:5 +#: rhodecode/templates/base/base.html:299 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:10 +#, python-format +msgid "Private Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:12 +#, python-format +msgid "Public Gists for user %s" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:14 +msgid "Public Gists" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:31 +#: rhodecode/templates/admin/gists/show.html:24 +#: rhodecode/templates/base/base.html:302 +msgid "Create new gist" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:48 +msgid "Created" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/index.html:53 +#: rhodecode/templates/admin/gists/show.html:43 +#: rhodecode/templates/admin/gists/show.html:45 +msgid "Expires" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:51 +#: rhodecode/templates/admin/gists/show.html:43 +msgid "never" +msgstr "" + +#: rhodecode/templates/admin/gists/index.html:68 +msgid "There are no gists yet" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:5 +#: rhodecode/templates/admin/gists/new.html:16 +msgid "New gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:37 +msgid "Gist description ..." +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:52 +msgid "Create private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:53 +msgid "Create public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/new.html:54 +#: rhodecode/templates/admin/permissions/permissions.html:123 +#: rhodecode/templates/admin/permissions/permissions.html:185 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos/repo_edit.html:167 +#: rhodecode/templates/admin/repos/repo_edit.html:381 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:73 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:97 +#: rhodecode/templates/admin/settings/settings.html:115 +#: rhodecode/templates/admin/settings/settings.html:196 +#: rhodecode/templates/admin/settings/settings.html:288 +#: rhodecode/templates/admin/users/user_edit.html:141 +#: rhodecode/templates/admin/users/user_edit.html:198 +#: rhodecode/templates/admin/users/user_edit.html:246 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:144 +#: rhodecode/templates/base/default_perms_box.html:54 +#: rhodecode/templates/files/files_add.html:80 +#: rhodecode/templates/files/files_edit.html:66 +#: rhodecode/templates/pullrequests/pullrequest.html:86 +msgid "Reset" +msgstr "重設" + +#: rhodecode/templates/admin/gists/show.html:5 +msgid "gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:9 +msgid "Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:36 +msgid "Public gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:38 +msgid "Private gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:54 +#: rhodecode/templates/admin/repos/repo_edit.html:299 +#: rhodecode/templates/changeset/changeset_file_comment.html:40 +msgid "Delete" +msgstr "移除" + +#: rhodecode/templates/admin/gists/show.html:54 +msgid "Confirm to delete this gist" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:63 +#: rhodecode/templates/admin/gists/show.html:84 +#: rhodecode/templates/files/files_edit.html:48 +#: rhodecode/templates/files/files_source.html:25 +#: rhodecode/templates/files/files_source.html:55 +msgid "Show as raw" +msgstr "" + +#: rhodecode/templates/admin/gists/show.html:71 +msgid "created" +msgstr "" + #: rhodecode/templates/admin/ldap/ldap.html:5 msgid "LDAP administration" msgstr "LDAP管理者" #: rhodecode/templates/admin/ldap/ldap.html:11 #: rhodecode/templates/admin/users/users.html:86 -#: rhodecode/templates/base/base.html:74 +#: rhodecode/templates/base/base.html:79 msgid "LDAP" msgstr "" @@ -2075,9 +2207,8 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:30 -#, fuzzy msgid "Comments" -msgstr "遞交" +msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:31 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:8 @@ -2094,27 +2225,27 @@ #: rhodecode/templates/admin/notifications/show_notification.html:5 #: rhodecode/templates/admin/notifications/show_notification.html:11 -#, fuzzy msgid "Show notification" -msgstr "險是註釋" +msgstr "" #: rhodecode/templates/admin/notifications/show_notification.html:9 -#: rhodecode/templates/base/base.html:241 -#, fuzzy +#: rhodecode/templates/base/base.html:253 msgid "Notifications" -msgstr "位置" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:5 msgid "Permissions administration" msgstr "權限管理員" #: rhodecode/templates/admin/permissions/permissions.html:11 +#: rhodecode/templates/admin/repos/repo_edit.html:151 #: rhodecode/templates/admin/repos/repo_edit.html:158 -#: rhodecode/templates/admin/repos/repo_edit.html:165 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:64 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:88 #: rhodecode/templates/admin/users/user_edit.html:150 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/base/base.html:73 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:129 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 +#: rhodecode/templates/base/base.html:78 msgid "Permissions" msgstr "權限" @@ -2129,15 +2260,15 @@ #: rhodecode/templates/admin/permissions/permissions.html:49 msgid "" "All default permissions on each repository will be reset to chosen " -"permission, note that all custom default permission on repositories will " -"be lost" +"permission, note that all custom default permission on repositories will be " +"lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:50 #: rhodecode/templates/admin/permissions/permissions.html:63 -#, fuzzy +#: rhodecode/templates/admin/permissions/permissions.html:77 msgid "Overwrite existing settings" -msgstr "複寫已存在設定" +msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:62 msgid "" @@ -2147,98 +2278,91 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:69 -msgid "Registration" -msgstr "註冊" - -#: rhodecode/templates/admin/permissions/permissions.html:77 +msgid "User group" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:76 +msgid "" +"All default permissions on each user group will be reset to chosen " +"permission, note that all custom default permission on repository groups " +"will be lost" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:83 msgid "Repository creation" msgstr "版本庫建立" -#: rhodecode/templates/admin/permissions/permissions.html:85 -#, fuzzy +#: rhodecode/templates/admin/permissions/permissions.html:91 +msgid "User group creation" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:99 msgid "Repository forking" -msgstr "版本庫建立" - -#: rhodecode/templates/admin/permissions/permissions.html:93 -#: rhodecode/templates/admin/permissions/permissions.html:154 -#: rhodecode/templates/admin/repos/repo_edit.html:149 -#: rhodecode/templates/admin/repos/repo_edit.html:174 -#: rhodecode/templates/admin/repos/repo_edit.html:388 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:81 -#: rhodecode/templates/admin/settings/settings.html:115 -#: rhodecode/templates/admin/settings/settings.html:187 -#: rhodecode/templates/admin/settings/settings.html:278 -#: rhodecode/templates/admin/users/user_edit.html:141 -#: rhodecode/templates/admin/users/user_edit.html:186 -#: rhodecode/templates/admin/users/user_edit.html:235 -#: rhodecode/templates/admin/users/user_edit.html:283 -#: rhodecode/templates/admin/users/user_edit_my_account_form.html:89 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 -#: rhodecode/templates/files/files_add.html:80 -#: rhodecode/templates/files/files_edit.html:66 -#: rhodecode/templates/pullrequests/pullrequest.html:110 -msgid "Reset" -msgstr "重設" - -#: rhodecode/templates/admin/permissions/permissions.html:103 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:107 +msgid "Registration" +msgstr "註冊" + +#: rhodecode/templates/admin/permissions/permissions.html:115 +msgid "External auth account activation" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:133 msgid "Default User Permissions" -msgstr "預設權限" - -#: rhodecode/templates/admin/permissions/permissions.html:113 -#: rhodecode/templates/admin/users/user_edit.html:244 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:144 +#: rhodecode/templates/admin/users/user_edit.html:207 msgid "Allowed IP addresses" -msgstr "郵件位址" - -#: rhodecode/templates/admin/permissions/permissions.html:127 -#: rhodecode/templates/admin/repos/repo_edit.html:347 +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:158 +#: rhodecode/templates/admin/repos/repo_edit.html:340 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 -#: rhodecode/templates/admin/users/user_edit.html:212 -#: rhodecode/templates/admin/users/user_edit.html:257 -#: rhodecode/templates/admin/users_groups/users_groups.html:46 +#: rhodecode/templates/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:220 +#: rhodecode/templates/admin/users_groups/users_groups.html:54 #: rhodecode/templates/data_table/_dt_elements.html:122 -#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:136 msgid "delete" msgstr "刪除" -#: rhodecode/templates/admin/permissions/permissions.html:128 -#: rhodecode/templates/admin/users/user_edit.html:258 -#, fuzzy, python-format +#: rhodecode/templates/admin/permissions/permissions.html:159 +#: rhodecode/templates/admin/users/user_edit.html:221 +#, python-format msgid "Confirm to delete this ip: %s" -msgstr "確認刪除這個使用者" - -#: rhodecode/templates/admin/permissions/permissions.html:134 -#: rhodecode/templates/admin/users/user_edit.html:264 +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:165 +#: rhodecode/templates/admin/users/user_edit.html:227 msgid "All IP addresses are allowed" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.html:145 -#: rhodecode/templates/admin/users/user_edit.html:275 -#, fuzzy +#: rhodecode/templates/admin/permissions/permissions.html:176 +#: rhodecode/templates/admin/users/user_edit.html:238 msgid "New ip address" -msgstr "郵件位址" - -#: rhodecode/templates/admin/permissions/permissions.html:153 +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:184 #: rhodecode/templates/admin/repos/repo_add_base.html:73 -#: rhodecode/templates/admin/repos/repo_edit.html:387 -#: rhodecode/templates/admin/users/user_edit.html:234 -#: rhodecode/templates/admin/users/user_edit.html:282 -#, fuzzy +#: rhodecode/templates/admin/repos/repo_edit.html:380 +#: rhodecode/templates/admin/users/user_edit.html:197 +#: rhodecode/templates/admin/users/user_edit.html:245 msgid "Add" -msgstr "新增" +msgstr "" #: rhodecode/templates/admin/repos/repo_add.html:12 #: rhodecode/templates/admin/repos/repo_add.html:16 -#: rhodecode/templates/base/base.html:69 rhodecode/templates/base/base.html:103 -#: rhodecode/templates/base/base.html:263 +#: rhodecode/templates/base/base.html:74 rhodecode/templates/base/base.html:88 +#: rhodecode/templates/base/base.html:116 +#: rhodecode/templates/base/base.html:275 msgid "Repositories" msgstr "版本庫" #: rhodecode/templates/admin/repos/repo_add.html:19 -#, fuzzy msgid "Add new" -msgstr "新增" +msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:96 @@ -2247,7 +2371,7 @@ msgstr "複製由" #: rhodecode/templates/admin/repos/repo_add_base.html:24 -#: rhodecode/templates/admin/repos/repo_edit.html:44 +#: rhodecode/templates/admin/repos/repo_edit.html:45 msgid "Optional http[s] url from which repository should be cloned." msgstr "" @@ -2257,27 +2381,26 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:42 -#, fuzzy msgid "Type of repository to create." -msgstr "版本庫建立" +msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:47 -#: rhodecode/templates/admin/repos/repo_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:59 #: rhodecode/templates/forks/fork.html:38 -#, fuzzy msgid "Landing revision" -msgstr "下一個修訂" +msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:51 -#: rhodecode/templates/admin/repos/repo_edit.html:70 +#: rhodecode/templates/admin/repos/repo_edit.html:63 #: rhodecode/templates/forks/fork.html:42 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 -#: rhodecode/templates/admin/repos/repo_edit.html:79 +#: rhodecode/templates/admin/repos/repo_edit.html:72 #: rhodecode/templates/forks/fork.html:60 -msgid "Keep it short and to the point. Use a README file for longer descriptions." +msgid "" +"Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:8 @@ -2287,253 +2410,250 @@ #: rhodecode/templates/admin/repos/repo_edit.html:12 #: rhodecode/templates/admin/settings/hooks.html:9 #: rhodecode/templates/admin/settings/settings.html:11 -#: rhodecode/templates/base/base.html:76 rhodecode/templates/base/base.html:121 +#: rhodecode/templates/base/base.html:81 +#: rhodecode/templates/base/base.html:134 #: rhodecode/templates/summary/summary.html:212 msgid "Settings" msgstr "設定" -#: rhodecode/templates/admin/repos/repo_edit.html:40 +#: rhodecode/templates/admin/repos/repo_edit.html:36 +msgid "Non-changeable id" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:41 msgid "Clone uri" msgstr "複製URL" -#: rhodecode/templates/admin/repos/repo_edit.html:53 +#: rhodecode/templates/admin/repos/repo_edit.html:54 msgid "Optional select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:126 -#, fuzzy +#: rhodecode/templates/admin/repos/repo_edit.html:119 msgid "Change owner of this repository." -msgstr "修改於版本庫 %s" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:177 +msgid "Advanced settings" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:180 +msgid "Statistics" +msgstr "統計" #: rhodecode/templates/admin/repos/repo_edit.html:184 -#, fuzzy -msgid "Advanced settings" -msgstr "儲存設定" +msgid "Reset current statistics" +msgstr "重設目前的統計" + +#: rhodecode/templates/admin/repos/repo_edit.html:184 +msgid "Confirm to remove current statistics" +msgstr "確認移除目前的統計" #: rhodecode/templates/admin/repos/repo_edit.html:187 -msgid "Statistics" -msgstr "統計" - -#: rhodecode/templates/admin/repos/repo_edit.html:191 -msgid "Reset current statistics" -msgstr "重設目前的統計" - -#: rhodecode/templates/admin/repos/repo_edit.html:191 -msgid "Confirm to remove current statistics" -msgstr "確認移除目前的統計" - -#: rhodecode/templates/admin/repos/repo_edit.html:194 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:195 +#: rhodecode/templates/admin/repos/repo_edit.html:188 msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:203 +#: rhodecode/templates/admin/repos/repo_edit.html:196 msgid "Remote" msgstr "遠端" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:207 +#: rhodecode/templates/admin/repos/repo_edit.html:200 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:218 +#: rhodecode/templates/admin/repos/repo_edit.html:211 msgid "Cache" msgstr "快取" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:222 +#: rhodecode/templates/admin/repos/repo_edit.html:215 msgid "Confirm to invalidate repository cache" msgstr "確認廢止版本庫快取" -#: rhodecode/templates/admin/repos/repo_edit.html:225 +#: rhodecode/templates/admin/repos/repo_edit.html:218 msgid "" -"Manually invalidate cache for this repository. On first access repository" -" will be cached again" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:230 +"Manually invalidate cache for this repository. On first access repository " +"will be cached again" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 msgid "List of cached values" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:233 +#: rhodecode/templates/admin/repos/repo_edit.html:226 msgid "Prefix" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:234 +#: rhodecode/templates/admin/repos/repo_edit.html:227 msgid "Key" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:235 +#: rhodecode/templates/admin/repos/repo_edit.html:228 #: rhodecode/templates/admin/users/user_add.html:86 #: rhodecode/templates/admin/users/user_edit.html:124 #: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_group_add.html:41 #: rhodecode/templates/admin/users_groups/users_group_edit.html:42 -#: rhodecode/templates/admin/users_groups/users_groups.html:36 +#: rhodecode/templates/admin/users_groups/users_groups.html:39 msgid "Active" msgstr "啟用" -#: rhodecode/templates/admin/repos/repo_edit.html:250 -#: rhodecode/templates/base/base.html:280 -#: rhodecode/templates/base/base.html:281 +#: rhodecode/templates/admin/repos/repo_edit.html:243 +#: rhodecode/templates/base/base.html:292 +#: rhodecode/templates/base/base.html:293 msgid "Public journal" msgstr "公開日誌" -#: rhodecode/templates/admin/repos/repo_edit.html:256 +#: rhodecode/templates/admin/repos/repo_edit.html:249 msgid "Remove from public journal" msgstr "從公開日誌移除" -#: rhodecode/templates/admin/repos/repo_edit.html:258 +#: rhodecode/templates/admin/repos/repo_edit.html:251 msgid "Add to public journal" msgstr "新增至公開日誌" +#: rhodecode/templates/admin/repos/repo_edit.html:256 +msgid "" +"All actions made on this repository will be accessible to everyone in public" +" journal" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit.html:263 -msgid "" -"All actions made on this repository will be accessible to everyone in " -"public journal" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:270 -#, fuzzy msgid "Locking" -msgstr "解鎖" - -#: rhodecode/templates/admin/repos/repo_edit.html:275 +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Unlock locked repo" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:275 -#, fuzzy +#: rhodecode/templates/admin/repos/repo_edit.html:268 msgid "Confirm to unlock repository" -msgstr "確認移除這個版本庫" - -#: rhodecode/templates/admin/repos/repo_edit.html:278 -msgid "lock repo" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:278 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:271 +msgid "Lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:271 msgid "Confirm to lock repository" -msgstr "確認移除這個版本庫" - -#: rhodecode/templates/admin/repos/repo_edit.html:279 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:272 msgid "Repository is not locked" -msgstr "個版本庫" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:277 +msgid "" +"Force locking on repository. Works only when anonymous access is disabled" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:284 -msgid "Force locking on repository. Works only when anonymous access is disabled" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:291 msgid "Set as fork of" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:296 -msgid "set" -msgstr "設定" - -#: rhodecode/templates/admin/repos/repo_edit.html:300 +#: rhodecode/templates/admin/repos/repo_edit.html:289 +msgid "Set" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:293 msgid "Manually set this repository as a fork of another from the list" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:306 -#: rhodecode/templates/changeset/changeset_file_comment.html:41 -msgid "Delete" -msgstr "移除" - -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Remove this repository" msgstr "移除版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:315 +#: rhodecode/templates/admin/repos/repo_edit.html:308 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:317 -#, fuzzy, python-format +#: rhodecode/templates/admin/repos/repo_edit.html:310 +#, python-format msgid "this repository has %s fork" msgid_plural "this repository has %s forks" -msgstr[0] "建立版本庫 %s" - -#: rhodecode/templates/admin/repos/repo_edit.html:318 +msgstr[0] "" + +#: rhodecode/templates/admin/repos/repo_edit.html:311 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:319 -#, fuzzy +#: rhodecode/templates/admin/repos/repo_edit.html:312 msgid "Delete forks" -msgstr "刪除" - -#: rhodecode/templates/admin/repos/repo_edit.html:322 +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:315 msgid "" -"This repository will be renamed in a special way in order to be " -"unaccesible for RhodeCode and VCS systems. If you need to fully delete it" -" from file system please do it manually" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:336 +"This repository will be renamed in a special way in order to be unaccesible " +"for RhodeCode and VCS systems. If you need to fully delete it from file " +"system please do it manually" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:329 msgid "Extra fields" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:348 -#, fuzzy, python-format +#: rhodecode/templates/admin/repos/repo_edit.html:341 +#, python-format msgid "Confirm to delete this field: %s" -msgstr "確認刪除這個使用者" - -#: rhodecode/templates/admin/repos/repo_edit.html:362 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:355 msgid "New field key" -msgstr "新增使用者" - -#: rhodecode/templates/admin/repos/repo_edit.html:370 +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:363 msgid "New field label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:373 +#: rhodecode/templates/admin/repos/repo_edit.html:366 msgid "Enter short label" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:379 -#, fuzzy +#: rhodecode/templates/admin/repos/repo_edit.html:372 msgid "New field description" -msgstr "描述" - -#: rhodecode/templates/admin/repos/repo_edit.html:382 +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:375 msgid "Enter description of a field" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:3 msgid "none" msgstr "無" #: rhodecode/templates/admin/repos/repo_edit_perms.html:4 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:4 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:4 msgid "read" msgstr "讀" #: rhodecode/templates/admin/repos/repo_edit_perms.html:5 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:5 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:5 msgid "write" msgstr "寫" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:6 msgid "admin" msgstr "管理員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:7 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:7 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:7 msgid "member" msgstr "成員" @@ -2545,42 +2665,46 @@ #: rhodecode/templates/admin/repos/repo_edit_perms.html:28 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:20 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:35 -#, fuzzy +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:20 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:35 msgid "default" -msgstr "刪除" +msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 #: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:25 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:55 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:25 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:55 msgid "revoke" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:83 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:80 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 +#: rhodecode/templates/admin/users_groups/user_group_edit_perms.html:81 msgid "Add another member" msgstr "新增另ㄧ位成員" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:100 -msgid "Failed to remove user" -msgstr "移除使用者失敗" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:116 -#, fuzzy -msgid "Failed to remove user group" -msgstr "移除使用者群組失敗" - #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "版本庫管理員" -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:86 -msgid "apply to children" +#: rhodecode/templates/admin/repos/repos.html:88 +#: rhodecode/templates/admin/users/user_edit_my_account.html:185 +#: rhodecode/templates/admin/users/users.html:109 +#: rhodecode/templates/bookmarks/bookmarks.html:76 +#: rhodecode/templates/branches/branches.html:75 +#: rhodecode/templates/journal/journal.html:206 +#: rhodecode/templates/journal/journal.html:296 +#: rhodecode/templates/tags/tags.html:76 +msgid "No records found." msgstr "" #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:87 +msgid "apply to children" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:88 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups" @@ -2600,22 +2724,19 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:5 -#, fuzzy msgid "Add repository group" -msgstr "版本庫群組" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:11 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:16 -#: rhodecode/templates/base/base.html:70 rhodecode/templates/base/base.html:82 -#, fuzzy +#: rhodecode/templates/base/base.html:75 rhodecode/templates/base/base.html:91 msgid "Repository groups" -msgstr "版本庫群組" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:13 -#, fuzzy msgid "Add new repository group" -msgstr "新增版本庫群組" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:51 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:56 @@ -2627,60 +2748,60 @@ msgstr "儲存" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:5 -#, fuzzy msgid "Edit repository group" -msgstr "編輯版本庫群組" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:13 -#, fuzzy, python-format +#, python-format msgid "Edit repository group %s" -msgstr "編輯版本庫群組" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:27 -#, fuzzy msgid "Add child group" -msgstr "新增使用者群組" - -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:76 +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:68 msgid "" -"Enable lock-by-pulling on group. This option will be applied to all other" -" groups and repositories inside" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 -#, fuzzy msgid "Repository groups administration" -msgstr "版本庫群組管理員" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:45 -#, fuzzy msgid "Number of toplevel repositories" -msgstr "版本庫數量" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:64 -#, fuzzy +#: rhodecode/templates/admin/users_groups/users_groups.html:48 +#: rhodecode/templates/changeset/changeset_file_comment.html:73 +#: rhodecode/templates/changeset/changeset_file_comment.html:171 msgid "Edit" -msgstr "編輯" +msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:65 +#: rhodecode/templates/admin/users_groups/users_groups.html:49 #: rhodecode/templates/base/perms_summary.html:29 -#: rhodecode/templates/base/perms_summary.html:48 -#: rhodecode/templates/base/perms_summary.html:50 +#: rhodecode/templates/base/perms_summary.html:60 +#: rhodecode/templates/base/perms_summary.html:62 #: rhodecode/templates/data_table/_dt_elements.html:116 #: rhodecode/templates/data_table/_dt_elements.html:117 +#: rhodecode/templates/data_table/_dt_elements.html:130 +#: rhodecode/templates/data_table/_dt_elements.html:131 msgid "edit" msgstr "編輯" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:70 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" -msgstr[0] "確認移除這個版本庫" +msgstr[0] "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:78 -#, fuzzy msgid "There are no repository groups yet" -msgstr "沒有任何版本庫群組" +msgstr "" #: rhodecode/templates/admin/settings/hooks.html:5 #: rhodecode/templates/admin/settings/settings.html:5 @@ -2708,26 +2829,24 @@ msgstr "重新對映與掃描版本庫" #: rhodecode/templates/admin/settings/settings.html:34 -#, fuzzy msgid "Rescan option" -msgstr "重新掃描選項" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:40 msgid "" -"In case a repository was deleted from filesystem and there are leftovers " -"in the database check this option to scan obsolete data in database and " -"remove it." +"In case a repository was deleted from filesystem and there are leftovers in " +"the database check this option to scan obsolete data in database and remove " +"it." msgstr "如果版本庫已從檔案系統中刪除，但是資料還留在資料庫，請勾選這個項目清理資料庫中舊的資料" #: rhodecode/templates/admin/settings/settings.html:41 -#, fuzzy msgid "Destroy old data" -msgstr "移除舊資料" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:43 msgid "" -"Rescan repositories location for new repositories. Also deletes obsolete " -"if `destroy` flag is checked " +"Rescan repositories location for new repositories. Also deletes obsolete if " +"`destroy` flag is checked " msgstr "" #: rhodecode/templates/admin/settings/settings.html:48 @@ -2739,14 +2858,12 @@ msgstr "Whoosh 索引" #: rhodecode/templates/admin/settings/settings.html:62 -#, fuzzy msgid "Index build option" -msgstr "索引選項" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:67 -#, fuzzy msgid "Build from scratch" -msgstr "重頭建立索引" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:73 msgid "Reindex" @@ -2769,160 +2886,168 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.html:114 -#: rhodecode/templates/admin/settings/settings.html:186 -#: rhodecode/templates/admin/settings/settings.html:277 +#: rhodecode/templates/admin/settings/settings.html:195 +#: rhodecode/templates/admin/settings/settings.html:287 msgid "Save settings" msgstr "儲存設定" #: rhodecode/templates/admin/settings/settings.html:121 -#, fuzzy msgid "Visualisation settings" -msgstr "全域設定" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:129 -#, fuzzy msgid "General" -msgstr "啟用" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:134 -msgid "Use lightweight dashboard" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:140 -#, fuzzy msgid "Use repository extra fields" -msgstr "個版本庫" - -#: rhodecode/templates/admin/settings/settings.html:147 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:136 +msgid "Allows storing additional customized fields per repository." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:139 +msgid "Show RhodeCode version" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 +msgid "Shows or hides displayed version of RhodeCode in the footer" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:146 +msgid "Dashboard items" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:150 +msgid "" +"Number of items displayed in lightweight dashboard before pagination is " +"shown." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:155 msgid "Icons" -msgstr "選項" - -#: rhodecode/templates/admin/settings/settings.html:152 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:160 msgid "Show public repo icon on repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:156 -#, fuzzy +#: rhodecode/templates/admin/settings/settings.html:164 msgid "Show private repo icon on repositories" -msgstr "私有版本庫" - -#: rhodecode/templates/admin/settings/settings.html:163 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:166 +msgid "Show public/private icons next to repositories names" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:172 msgid "Meta-Tagging" -msgstr "設定" - -#: rhodecode/templates/admin/settings/settings.html:168 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:177 msgid "Stylify recognised metatags:" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:195 -#, fuzzy -msgid "VCS settings" -msgstr "設定" - #: rhodecode/templates/admin/settings/settings.html:204 +msgid "VCS settings" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:213 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:209 -#, fuzzy +#: rhodecode/templates/admin/settings/settings.html:218 msgid "Require SSL for vcs operations" -msgstr "推送時要求使用SSL" - -#: rhodecode/templates/admin/settings/settings.html:211 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:220 msgid "" -"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " -"will return HTTP Error 406: Not Acceptable" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:217 -msgid "Hooks" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:222 -msgid "Update repository after push (hg update)" -msgstr "push後更新版本庫 (hg update)" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will" +" return HTTP Error 406: Not Acceptable" +msgstr "" #: rhodecode/templates/admin/settings/settings.html:226 +msgid "Hooks" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:231 +msgid "Update repository after push (hg update)" +msgstr "push後更新版本庫 (hg update)" + +#: rhodecode/templates/admin/settings/settings.html:235 msgid "Show repository size after push" msgstr "push 後顯示版本庫大小" -#: rhodecode/templates/admin/settings/settings.html:230 +#: rhodecode/templates/admin/settings/settings.html:239 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: rhodecode/templates/admin/settings/settings.html:234 +#: rhodecode/templates/admin/settings/settings.html:243 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: rhodecode/templates/admin/settings/settings.html:238 -#, fuzzy +#: rhodecode/templates/admin/settings/settings.html:247 msgid "Advanced setup" -msgstr "進階設定" - -#: rhodecode/templates/admin/settings/settings.html:243 -#, fuzzy -msgid "Mercurial Extensions" -msgstr "Mercurial 版本庫" - -#: rhodecode/templates/admin/settings/settings.html:248 -msgid "Enable largefiles extension" msgstr "" #: rhodecode/templates/admin/settings/settings.html:252 +msgid "Mercurial Extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:257 +msgid "Enable largefiles extension" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:261 msgid "Enable hgsubversion extension" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:254 +#: rhodecode/templates/admin/settings/settings.html:263 msgid "" "Requires hgsubversion library installed. Allows cloning from svn remote " "locations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:264 +#: rhodecode/templates/admin/settings/settings.html:274 msgid "Repositories location" msgstr "版本庫路徑" -#: rhodecode/templates/admin/settings/settings.html:269 +#: rhodecode/templates/admin/settings/settings.html:279 msgid "" -"This a crucial application setting. If you are really sure you need to " -"change this, you must restart application in order to make this setting " -"take effect. Click this label to unlock." -msgstr "這是一個關鍵的設定，如果您確定要修改這個設定，請重新啟動應用程式以套用設定" - -#: rhodecode/templates/admin/settings/settings.html:270 -#: rhodecode/templates/base/base.html:131 -#, fuzzy +"Click to unlock. You must restart RhodeCode in order to make this setting " +"take effect." +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:280 +#: rhodecode/templates/base/base.html:143 msgid "Unlock" -msgstr "解鎖" - -#: rhodecode/templates/admin/settings/settings.html:272 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:282 msgid "" -"Location where repositories are stored. After changing this value a " -"restart, and rescan is required" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:292 +"Location where repositories are stored. After changing this value a restart," +" and rescan is required" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:303 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:300 -#, fuzzy +#: rhodecode/templates/admin/settings/settings.html:311 msgid "Email to" -msgstr "電子郵件" - -#: rhodecode/templates/admin/settings/settings.html:308 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:319 msgid "Send" -msgstr "秒" - -#: rhodecode/templates/admin/settings/settings.html:314 +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:325 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:317 -#: rhodecode/templates/changelog/changelog.html:42 +#: rhodecode/templates/admin/settings/settings.html:328 +#: rhodecode/templates/changelog/changelog.html:51 msgid "Show" msgstr "顯示" @@ -2932,20 +3057,18 @@ #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/base/base.html:71 +#: rhodecode/templates/base/base.html:76 msgid "Users" msgstr "使用者" #: rhodecode/templates/admin/users/user_add.html:12 #: rhodecode/templates/admin/users/users.html:23 -#, fuzzy msgid "Add new user" -msgstr "新增使用者" +msgstr "" #: rhodecode/templates/admin/users/user_add.html:50 -#, fuzzy msgid "Password confirmation" -msgstr "密碼不相符" +msgstr "" #: rhodecode/templates/admin/users/user_edit.html:5 msgid "Edit user" @@ -2953,9 +3076,9 @@ #: rhodecode/templates/admin/users/user_edit.html:13 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 -#, fuzzy, python-format +#, python-format msgid "Edit %s" -msgstr "編輯" +msgstr "" #: rhodecode/templates/admin/users/user_edit.html:34 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 @@ -2991,48 +3114,21 @@ msgid "New password confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:158 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:108 -#, fuzzy -msgid "Inherit default permissions" -msgstr "預設權限" - #: rhodecode/templates/admin/users/user_edit.html:163 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 +msgid "Email addresses" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:176 #, python-format -msgid "" -"Select to inherit permissions from %s settings. With this selected below " -"options does not have any action" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit.html:169 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 -msgid "Create repositories" -msgstr "建立版本庫" - -#: rhodecode/templates/admin/users/user_edit.html:177 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 -#, fuzzy -msgid "Fork repositories" -msgstr "個版本庫" - -#: rhodecode/templates/admin/users/user_edit.html:200 -#, fuzzy -msgid "Email addresses" -msgstr "郵件位址" - -#: rhodecode/templates/admin/users/user_edit.html:213 -#, fuzzy, python-format msgid "Confirm to delete this email: %s" -msgstr "確認刪除這個使用者" - -#: rhodecode/templates/admin/users/user_edit.html:227 -#, fuzzy +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:190 msgid "New email address" -msgstr "郵件位址" +msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:5 -#: rhodecode/templates/base/base.html:242 +#: rhodecode/templates/base/base.html:254 msgid "My account" msgstr "我的帳號" @@ -3041,26 +3137,22 @@ msgstr "我的帳號" #: rhodecode/templates/admin/users/user_edit_my_account.html:35 -#, fuzzy msgid "My permissions" -msgstr "權限" +msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:38 #: rhodecode/templates/journal/journal.html:54 -#, fuzzy msgid "My repos" -msgstr "空的版本庫" +msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account.html:41 -#, fuzzy msgid "My pull requests" -msgstr "建立使用者 %s" +msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:4 -#, fuzzy msgid "Show closed pull requests" -msgstr "建立使用者 %s" +msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:6 msgid "Opened by me" @@ -3073,29 +3165,27 @@ #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:17 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:45 -#: rhodecode/templates/pullrequests/pullrequest_data.html:7 +#: rhodecode/templates/pullrequests/pullrequest_data.html:11 #: rhodecode/templates/pullrequests/pullrequest_show.html:27 #: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Closed" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:23 -#, fuzzy msgid "Confirm to delete this pull request" -msgstr "確認移除這個版本庫" +msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:30 #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:51 -#, fuzzy msgid "Nothing here yet" -msgstr "尚未有任何變更" +msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:34 msgid "I participate in" msgstr "" #: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:42 -#: rhodecode/templates/pullrequests/pullrequest_data.html:11 +#: rhodecode/templates/pullrequests/pullrequest_data.html:8 #, python-format msgid "Pull request #%s opened by %s on %s" msgstr "" @@ -3109,57 +3199,48 @@ msgstr "使用者" #: rhodecode/templates/admin/users/users.html:80 -#, fuzzy msgid "Firstname" -msgstr "名" +msgstr "" #: rhodecode/templates/admin/users/users.html:81 -#, fuzzy msgid "Lastname" -msgstr "姓" +msgstr "" #: rhodecode/templates/admin/users/users.html:82 -#, fuzzy msgid "Last login" -msgstr "最後登入" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:5 -#, fuzzy msgid "Add user group" -msgstr "新增使用者群組" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:10 #: rhodecode/templates/admin/users_groups/users_groups.html:11 -#: rhodecode/templates/base/base.html:72 -#, fuzzy +#: rhodecode/templates/base/base.html:77 rhodecode/templates/base/base.html:94 msgid "User groups" -msgstr "使用者群組" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:12 -#: rhodecode/templates/admin/users_groups/users_groups.html:25 -#, fuzzy +#: rhodecode/templates/admin/users_groups/users_groups.html:26 msgid "Add new user group" -msgstr "新增使用者群組" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:5 -#, fuzzy msgid "Edit user group" -msgstr "編輯使用者群組" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:11 -#, fuzzy msgid "UserGroups" -msgstr "使用者群組" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:50 -#: rhodecode/templates/admin/users_groups/users_groups.html:35 +#: rhodecode/templates/admin/users_groups/users_groups.html:38 msgid "Members" msgstr "成員" #: rhodecode/templates/admin/users_groups/users_group_edit.html:58 -#, fuzzy msgid "Chosen group members" -msgstr "選擇群組成員" +msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 msgid "Remove all elements" @@ -3173,48 +3254,53 @@ msgid "Add all elements" msgstr "新增索有元素" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:150 -#, fuzzy -msgid "Group members" -msgstr "選擇群組成員" - -#: rhodecode/templates/admin/users_groups/users_group_edit.html:167 -#, fuzzy +#: rhodecode/templates/admin/users_groups/users_group_edit.html:109 msgid "No members yet" -msgstr "成員" +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_group_edit.html:117 +msgid "Global Permissions" +msgstr "" #: rhodecode/templates/admin/users_groups/users_groups.html:5 -#, fuzzy msgid "User groups administration" -msgstr "使用者群組管理員" - -#: rhodecode/templates/admin/users_groups/users_groups.html:47 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_groups.html:55 +#, python-format msgid "Confirm to delete this user group: %s" -msgstr "確認刪除這個群組" +msgstr "" + +#: rhodecode/templates/admin/users_groups/users_groups.html:62 +msgid "There are no user groups yet" +msgstr "" #: rhodecode/templates/base/base.html:42 -msgid "Submit a bug" -msgstr "回報錯誤" - -#: rhodecode/templates/base/base.html:108 +#, python-format +msgid "Server instance: %s" +msgstr "" + +#: rhodecode/templates/base/base.html:52 +msgid "Report a bug" +msgstr "" + +#: rhodecode/templates/base/base.html:121 #: rhodecode/templates/data_table/_dt_elements.html:9 #: rhodecode/templates/data_table/_dt_elements.html:11 #: rhodecode/templates/data_table/_dt_elements.html:13 -#: rhodecode/templates/pullrequests/pullrequest_show.html:81 #: rhodecode/templates/summary/summary.html:8 msgid "Summary" msgstr "概況" -#: rhodecode/templates/base/base.html:109 -#: rhodecode/templates/changelog/changelog.html:11 +#: rhodecode/templates/base/base.html:122 +#: rhodecode/templates/changelog/changelog.html:15 #: rhodecode/templates/data_table/_dt_elements.html:17 #: rhodecode/templates/data_table/_dt_elements.html:19 #: rhodecode/templates/data_table/_dt_elements.html:21 msgid "Changelog" msgstr "修改紀錄" -#: rhodecode/templates/base/base.html:110 +#: rhodecode/templates/base/base.html:123 #: rhodecode/templates/data_table/_dt_elements.html:25 #: rhodecode/templates/data_table/_dt_elements.html:27 #: rhodecode/templates/data_table/_dt_elements.html:29 @@ -3222,52 +3308,44 @@ msgid "Files" msgstr "檔案" -#: rhodecode/templates/base/base.html:112 -#, fuzzy +#: rhodecode/templates/base/base.html:125 msgid "Switch To" -msgstr "切換至" - -#: rhodecode/templates/base/base.html:114 -#: rhodecode/templates/base/base.html:267 -msgid "loading..." -msgstr "載入中..." - -#: rhodecode/templates/base/base.html:118 -msgid "Options" -msgstr "選項" - -#: rhodecode/templates/base/base.html:124 -#: rhodecode/templates/forks/forks_data.html:21 -msgid "Compare fork" -msgstr "" - -#: rhodecode/templates/base/base.html:126 -msgid "Lightweight changelog" msgstr "" #: rhodecode/templates/base/base.html:127 -#: rhodecode/templates/base/base.html:287 +#: rhodecode/templates/base/base.html:279 +msgid "loading..." +msgstr "載入中..." + +#: rhodecode/templates/base/base.html:131 +msgid "Options" +msgstr "選項" + +#: rhodecode/templates/base/base.html:137 +#: rhodecode/templates/forks/forks_data.html:21 +msgid "Compare fork" +msgstr "" + +#: rhodecode/templates/base/base.html:139 +#: rhodecode/templates/base/base.html:312 #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:54 msgid "Search" msgstr "搜尋" -#: rhodecode/templates/base/base.html:133 -#, fuzzy +#: rhodecode/templates/base/base.html:145 msgid "Lock" -msgstr "解鎖" - -#: rhodecode/templates/base/base.html:141 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:153 msgid "Follow" -msgstr "追蹤者" - -#: rhodecode/templates/base/base.html:142 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:154 msgid "Unfollow" -msgstr "追蹤者" - -#: rhodecode/templates/base/base.html:145 +msgstr "" + +#: rhodecode/templates/base/base.html:157 #: rhodecode/templates/data_table/_dt_elements.html:33 #: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/data_table/_dt_elements.html:37 @@ -3276,258 +3354,309 @@ msgid "Fork" msgstr "分支" -#: rhodecode/templates/base/base.html:147 -#, fuzzy +#: rhodecode/templates/base/base.html:159 msgid "Create Pull Request" -msgstr "建立使用者 %s" - -#: rhodecode/templates/base/base.html:153 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:165 msgid "Show Pull Requests" -msgstr "建立使用者 %s" - -#: rhodecode/templates/base/base.html:153 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:165 msgid "Pull Requests" -msgstr "建立使用者 %s" - -#: rhodecode/templates/base/base.html:190 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/base.html:202 msgid "Not logged in" -msgstr "最後登入" - -#: rhodecode/templates/base/base.html:197 +msgstr "" + +#: rhodecode/templates/base/base.html:209 msgid "Login to your account" msgstr "" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:232 msgid "Forgot password ?" msgstr "忘記密碼?" -#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:255 msgid "Log Out" msgstr "登出" -#: rhodecode/templates/base/base.html:262 +#: rhodecode/templates/base/base.html:274 msgid "Switch repository" msgstr "切換版本庫" -#: rhodecode/templates/base/base.html:274 +#: rhodecode/templates/base/base.html:286 msgid "Show recent activity" msgstr "" -#: rhodecode/templates/base/base.html:275 +#: rhodecode/templates/base/base.html:287 #: rhodecode/templates/journal/journal.html:4 msgid "Journal" msgstr "日誌" -#: rhodecode/templates/base/base.html:286 -#, fuzzy +#: rhodecode/templates/base/base.html:298 +msgid "Show public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:303 +msgid "All public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:305 +msgid "My public gists" +msgstr "" + +#: rhodecode/templates/base/base.html:306 +msgid "My private gists" +msgstr "" + +#: rhodecode/templates/base/base.html:311 msgid "Search in repositories" -msgstr "於所有的版本庫" - -#: rhodecode/templates/base/perms_summary.html:8 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:14 +msgid "Inherit default permissions" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:18 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not apply." +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:26 +msgid "Create repositories" +msgstr "建立版本庫" + +#: rhodecode/templates/base/default_perms_box.html:30 +msgid "Select this option to allow repository creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:35 +msgid "Create user groups" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:39 +msgid "Select this option to allow user group creation for this user" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:44 +msgid "Fork repositories" +msgstr "" + +#: rhodecode/templates/base/default_perms_box.html:48 +msgid "Select this option to allow repository forking for this user" +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:11 msgid "No permissions defined yet" -msgstr "權限" - -#: rhodecode/templates/base/perms_summary.html:15 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:19 +#: rhodecode/templates/base/perms_summary.html:38 msgid "Permission" -msgstr "權限" - -#: rhodecode/templates/base/perms_summary.html:16 -#, fuzzy +msgstr "" + +#: rhodecode/templates/base/perms_summary.html:20 +#: rhodecode/templates/base/perms_summary.html:39 msgid "Edit Permission" -msgstr "版本庫權限" - -#: rhodecode/templates/base/root.html:43 -#, fuzzy -msgid "Add another comment" -msgstr "新增另ㄧ位成員" +msgstr "" #: rhodecode/templates/base/root.html:44 -#: rhodecode/templates/data_table/_dt_elements.html:140 -msgid "Stop following this repository" -msgstr "停止追蹤這個版本庫" +msgid "Add another comment" +msgstr "" #: rhodecode/templates/base/root.html:45 +#: rhodecode/templates/data_table/_dt_elements.html:147 +msgid "Stop following this repository" +msgstr "停止追蹤這個版本庫" + +#: rhodecode/templates/base/root.html:46 msgid "Start following this repository" msgstr "開始追蹤這個版本庫" -#: rhodecode/templates/base/root.html:46 +#: rhodecode/templates/base/root.html:47 msgid "Group" msgstr "群組" -#: rhodecode/templates/base/root.html:47 +#: rhodecode/templates/base/root.html:48 msgid "members" msgstr "成員" -#: rhodecode/templates/base/root.html:48 -#: rhodecode/templates/pullrequests/pullrequest.html:181 -#, fuzzy +#: rhodecode/templates/base/root.html:49 +#: rhodecode/templates/pullrequests/pullrequest.html:203 msgid "Loading ..." -msgstr "載入中..." - -#: rhodecode/templates/base/root.html:49 -msgid "Search truncated" msgstr "" #: rhodecode/templates/base/root.html:50 -#, fuzzy -msgid "No matching files" -msgstr "無符合的檔案" +msgid "Search truncated" +msgstr "" #: rhodecode/templates/base/root.html:51 -#: rhodecode/templates/changelog/changelog.html:36 -msgid "Open new pull request" +msgid "No matching files" msgstr "" #: rhodecode/templates/base/root.html:52 -msgid "Open new pull request for selected changesets" +#: rhodecode/templates/changelog/changelog.html:45 +msgid "Open new pull request" msgstr "" #: rhodecode/templates/base/root.html:53 -msgid "Show selected changesets __S -> __E" +msgid "Open new pull request for selected changesets" msgstr "" #: rhodecode/templates/base/root.html:54 -#, fuzzy -msgid "Show selected changeset __S" -msgstr "尚未有任何變更" +msgid "Show selected changesets __S -> __E" +msgstr "" #: rhodecode/templates/base/root.html:55 -msgid "Selection link" +msgid "Show selected changeset __S" msgstr "" #: rhodecode/templates/base/root.html:56 -#: rhodecode/templates/changeset/diff_block.html:8 -#, fuzzy -msgid "Collapse diff" -msgstr "檔案差異" +msgid "Selection link" +msgstr "" #: rhodecode/templates/base/root.html:57 -#, fuzzy +#: rhodecode/templates/changeset/diff_block.html:8 +msgid "Collapse diff" +msgstr "" + +#: rhodecode/templates/base/root.html:58 msgid "Expand diff" -msgstr "原始差異" +msgstr "" + +#: rhodecode/templates/base/root.html:59 +msgid "Failed to revoke permission" +msgstr "" #: rhodecode/templates/bookmarks/bookmarks.html:5 #, python-format msgid "%s Bookmarks" msgstr "" -#: rhodecode/templates/bookmarks/bookmarks.html:37 +#: rhodecode/templates/bookmarks/bookmarks.html:26 +msgid "Compare bookmarks" +msgstr "" + +#: rhodecode/templates/bookmarks/bookmarks.html:51 #: rhodecode/templates/bookmarks/bookmarks_data.html:8 #: rhodecode/templates/branches/branches.html:50 #: rhodecode/templates/branches/branches_data.html:8 -#: rhodecode/templates/shortlog/shortlog_data.html:8 +#: rhodecode/templates/changelog/changelog_summary_data.html:8 #: rhodecode/templates/tags/tags.html:51 #: rhodecode/templates/tags/tags_data.html:8 -#, fuzzy msgid "Author" -msgstr "作者" - -#: rhodecode/templates/bookmarks/bookmarks.html:38 +msgstr "" + +#: rhodecode/templates/bookmarks/bookmarks.html:52 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:51 #: rhodecode/templates/branches/branches_data.html:9 -#: rhodecode/templates/shortlog/shortlog_data.html:5 +#: rhodecode/templates/changelog/changelog_summary_data.html:5 #: rhodecode/templates/tags/tags.html:52 #: rhodecode/templates/tags/tags_data.html:9 msgid "Revision" msgstr "修訂" -#: rhodecode/templates/branches/branches.html:5 -#, fuzzy, python-format -msgid "%s Branches" -msgstr "分支" - -#: rhodecode/templates/branches/branches.html:26 -#, fuzzy -msgid "Compare branches" -msgstr "分支" - +#: rhodecode/templates/bookmarks/bookmarks.html:54 +#: rhodecode/templates/bookmarks/bookmarks_data.html:10 #: rhodecode/templates/branches/branches.html:53 #: rhodecode/templates/branches/branches_data.html:10 #: rhodecode/templates/tags/tags.html:54 #: rhodecode/templates/tags/tags_data.html:10 -#, fuzzy msgid "Compare" -msgstr "比較顯示" +msgstr "" + +#: rhodecode/templates/branches/branches.html:5 +#, python-format +msgid "%s Branches" +msgstr "" + +#: rhodecode/templates/branches/branches.html:26 +msgid "Compare branches" +msgstr "" #: rhodecode/templates/changelog/changelog.html:6 -#, fuzzy, python-format +#, python-format msgid "%s Changelog" -msgstr "修改紀錄" - -#: rhodecode/templates/changelog/changelog.html:11 +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:19 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "" -#: rhodecode/templates/changelog/changelog.html:30 -#, fuzzy +#: rhodecode/templates/changelog/changelog.html:39 msgid "Clear selection" -msgstr "搜尋選項" - -#: rhodecode/templates/changelog/changelog.html:33 +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:42 #: rhodecode/templates/forks/forks_data.html:19 -#, fuzzy, python-format +#, python-format msgid "Compare fork with %s" -msgstr "比較顯示" - -#: rhodecode/templates/changelog/changelog.html:33 +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:42 msgid "Compare fork with parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:76 -#: rhodecode/templates/summary/summary.html:404 -#, fuzzy +#: rhodecode/templates/changelog/changelog.html:78 +#: rhodecode/templates/changelog/changelog_summary_data.html:28 +#, python-format +msgid "Click to open associated pull request #%s" +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:102 +#: rhodecode/templates/summary/summary.html:403 msgid "Show more" -msgstr "顯示更多" - -#: rhodecode/templates/changelog/changelog.html:89 +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:115 +#: rhodecode/templates/changelog/changelog_summary_data.html:50 +#: rhodecode/templates/changeset/changeset.html:107 #: rhodecode/templates/changeset/changeset_range.html:86 #, python-format msgid "Bookmark %s" msgstr "" -#: rhodecode/templates/changelog/changelog.html:95 -#: rhodecode/templates/changeset/changeset.html:111 +#: rhodecode/templates/changelog/changelog.html:121 +#: rhodecode/templates/changelog/changelog_summary_data.html:56 +#: rhodecode/templates/changeset/changeset.html:113 #: rhodecode/templates/changeset/changeset_range.html:92 -#, fuzzy, python-format +#, python-format msgid "Tag %s" -msgstr "標籤" - -#: rhodecode/templates/changelog/changelog.html:100 -#: rhodecode/templates/changeset/changeset.html:106 -#: rhodecode/templates/changeset/changeset_range.html:80 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog_summary_data.html:61 +#: rhodecode/templates/changeset/changeset.html:117 +#: rhodecode/templates/changeset/changeset_range.html:96 +#, python-format msgid "Branch %s" -msgstr "分支" - -#: rhodecode/templates/changelog/changelog.html:258 +msgstr "" + +#: rhodecode/templates/changelog/changelog.html:286 msgid "There are no changes yet" msgstr "尚未有任何變更" #: rhodecode/templates/changelog/changelog_details.html:4 #: rhodecode/templates/changeset/changeset.html:91 -#, fuzzy msgid "Removed" -msgstr "移除" +msgstr "" #: rhodecode/templates/changelog/changelog_details.html:5 #: rhodecode/templates/changeset/changeset.html:92 -#, fuzzy msgid "Changed" -msgstr "修改" +msgstr "" #: rhodecode/templates/changelog/changelog_details.html:6 #: rhodecode/templates/changeset/changeset.html:93 -#, fuzzy msgid "Added" -msgstr "新增" +msgstr "" #: rhodecode/templates/changelog/changelog_details.html:8 #: rhodecode/templates/changelog/changelog_details.html:9 @@ -3535,14 +3664,46 @@ #: rhodecode/templates/changeset/changeset.html:95 #: rhodecode/templates/changeset/changeset.html:96 #: rhodecode/templates/changeset/changeset.html:97 -#, fuzzy, python-format +#, python-format msgid "Affected %s files" -msgstr "檔案" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:6 +#: rhodecode/templates/files/files_add.html:75 +#: rhodecode/templates/files/files_edit.html:61 +msgid "Commit message" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:7 +msgid "Age" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:9 +msgid "Refs" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:86 +msgid "Add or upload files directly via RhodeCode" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:89 +#: rhodecode/templates/files/files_add.html:38 +#: rhodecode/templates/files/files_browser.html:31 +msgid "Add new file" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:95 +msgid "Push new repo" +msgstr "" + +#: rhodecode/templates/changelog/changelog_summary_data.html:103 +msgid "Existing repository?" +msgstr "" #: rhodecode/templates/changeset/changeset.html:6 -#, fuzzy, python-format +#, python-format msgid "%s Changeset" -msgstr "沒有修改" +msgstr "" #: rhodecode/templates/changeset/changeset.html:39 msgid "No parents" @@ -3555,55 +3716,51 @@ #: rhodecode/templates/changeset/changeset.html:62 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:44 -#, fuzzy msgid "Changeset status" -msgstr "變更" +msgstr "" #: rhodecode/templates/changeset/changeset.html:67 -#: rhodecode/templates/changeset/diff_block.html:23 -#, fuzzy +#: rhodecode/templates/changeset/diff_block.html:22 msgid "Raw diff" -msgstr "原始差異" +msgstr "" #: rhodecode/templates/changeset/changeset.html:68 -#, fuzzy msgid "Patch diff" -msgstr "原始差異" +msgstr "" #: rhodecode/templates/changeset/changeset.html:69 -#: rhodecode/templates/changeset/diff_block.html:24 -#, fuzzy +#: rhodecode/templates/changeset/diff_block.html:23 msgid "Download diff" -msgstr "下載差異" +msgstr "" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 -#, fuzzy, python-format +#: rhodecode/templates/changeset/changeset_file_comment.html:103 +#, python-format msgid "%d comment" msgid_plural "%d comments" -msgstr[0] "遞交" +msgstr[0] "" #: rhodecode/templates/changeset/changeset.html:73 -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:103 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" msgstr[0] "" #: rhodecode/templates/changeset/changeset.html:103 -#: rhodecode/templates/changeset/changeset_range.html:77 +#: rhodecode/templates/changeset/changeset_range.html:82 msgid "merge" msgstr "合併" -#: rhodecode/templates/changeset/changeset.html:119 +#: rhodecode/templates/changeset/changeset.html:126 #: rhodecode/templates/compare/compare_diff.html:40 #: rhodecode/templates/pullrequests/pullrequest_show.html:113 -#, fuzzy, python-format +#, python-format msgid "%s file changed" msgid_plural "%s files changed" -msgstr[0] "檔案修改" - -#: rhodecode/templates/changeset/changeset.html:121 +msgstr[0] "" + +#: rhodecode/templates/changeset/changeset.html:128 #: rhodecode/templates/compare/compare_diff.html:42 #: rhodecode/templates/pullrequests/pullrequest_show.html:115 #, python-format @@ -3611,143 +3768,146 @@ msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "" -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 msgid "Showing a huge diff might take some time and resources" msgstr "" -#: rhodecode/templates/changeset/changeset.html:134 -#: rhodecode/templates/changeset/changeset.html:146 +#: rhodecode/templates/changeset/changeset.html:141 +#: rhodecode/templates/changeset/changeset.html:153 #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 #: rhodecode/templates/pullrequests/pullrequest_show.html:131 #: rhodecode/templates/pullrequests/pullrequest_show.html:195 -#, fuzzy msgid "Show full diff" -msgstr "載入檔案列表..." +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:30 -#, fuzzy, python-format +#, python-format msgid "Status change on pull request #%s" -msgstr "建立使用者 %s" +msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:32 -#, fuzzy, python-format +#, python-format msgid "Comment on pull request #%s" -msgstr "建立使用者 %s" - -#: rhodecode/templates/changeset/changeset_file_comment.html:57 +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:55 msgid "Submitting..." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:60 +#: rhodecode/templates/changeset/changeset_file_comment.html:58 msgid "Commenting on line {1}." msgstr "" +#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:145 +#, python-format +msgid "Comments parsed using %s syntax with %s support." +msgstr "" + #: rhodecode/templates/changeset/changeset_file_comment.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:139 -#, python-format -msgid "Comments parsed using %s syntax with %s support." -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:63 -#: rhodecode/templates/changeset/changeset_file_comment.html:141 -msgid "Use @username inside this text to send notification to this RhodeCode user" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:161 -#, fuzzy +#: rhodecode/templates/changeset/changeset_file_comment.html:147 +msgid "" +"Use @username inside this text to send notification to this RhodeCode user" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:65 +#: rhodecode/templates/changeset/changeset_file_comment.html:152 +msgid "Preview" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:72 +#: rhodecode/templates/changeset/changeset_file_comment.html:170 +msgid "Comment preview" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:80 +#: rhodecode/templates/changeset/changeset_file_comment.html:177 +#: rhodecode/templates/email_templates/changeset_comment.html:16 +#: rhodecode/templates/email_templates/pull_request_comment.html:16 msgid "Comment" -msgstr "遞交" - -#: rhodecode/templates/changeset/changeset_file_comment.html:75 -#, fuzzy +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:81 msgid "Cancel" -msgstr "修改" - -#: rhodecode/templates/changeset/changeset_file_comment.html:82 -#, fuzzy +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "You need to be logged in to comment." -msgstr "您必須登入後才能瀏覽這個頁面" - -#: rhodecode/templates/changeset/changeset_file_comment.html:82 +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:88 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:86 +#: rhodecode/templates/changeset/changeset_file_comment.html:92 msgid "Hide" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:143 -#, fuzzy +#: rhodecode/templates/changeset/changeset_file_comment.html:149 msgid "Change status" -msgstr "變更" - -#: rhodecode/templates/changeset/changeset_file_comment.html:163 +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.html:179 msgid "Comment and close" msgstr "" #: rhodecode/templates/changeset/changeset_range.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Changesets" -msgstr "變更" +msgstr "" #: rhodecode/templates/changeset/changeset_range.html:52 msgid "Files affected" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:22 +#: rhodecode/templates/changeset/diff_block.html:21 msgid "Show full diff for this file" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:30 -#, fuzzy +#: rhodecode/templates/changeset/diff_block.html:29 msgid "Show inline comments" -msgstr "文件內容" - -#: rhodecode/templates/changeset/diff_block.html:55 +msgstr "" + +#: rhodecode/templates/changeset/diff_block.html:53 msgid "Show file at latest version in this repo" msgstr "" -#: rhodecode/templates/changeset/diff_block.html:56 +#: rhodecode/templates/changeset/diff_block.html:54 msgid "Show file at initial version in this repo" msgstr "" #: rhodecode/templates/compare/compare_cs.html:4 -#, fuzzy msgid "No changesets" -msgstr "尚未有任何變更" +msgstr "" #: rhodecode/templates/compare/compare_cs.html:32 -#, fuzzy msgid "Ancestor" -msgstr "分支" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Compare" -msgstr "比較顯示" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:9 -#, fuzzy msgid "Compare revisions" -msgstr "前一個修訂" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:33 #: rhodecode/templates/pullrequests/pullrequest_show.html:106 -#, fuzzy, python-format +#, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" -msgstr[0] "文件內容" +msgstr[0] "" #: rhodecode/templates/compare/compare_diff.html:48 #: rhodecode/templates/pullrequests/pullrequest_show.html:121 -#, fuzzy msgid "No files" -msgstr "檔案" +msgstr "" #: rhodecode/templates/compare/compare_diff.html:58 #: rhodecode/templates/compare/compare_diff.html:69 @@ -3765,9 +3925,9 @@ msgstr "Git 版本庫" #: rhodecode/templates/data_table/_dt_elements.html:74 -#, fuzzy, python-format +#, python-format msgid "Fork of %s" -msgstr "fork 名稱" +msgstr "" #: rhodecode/templates/data_table/_dt_elements.html:88 msgid "No changesets yet" @@ -3786,33 +3946,28 @@ msgstr "訂閱 %s atom" #: rhodecode/templates/data_table/_dt_elements.html:122 -#, fuzzy, python-format +#, python-format msgid "Confirm to delete this repository: %s" -msgstr "確認移除這個版本庫" - -#: rhodecode/templates/data_table/_dt_elements.html:131 -#, fuzzy, python-format +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.html:137 +#, python-format msgid "Confirm to delete this user: %s" -msgstr "確認刪除這個使用者" - -#: rhodecode/templates/email_templates/changeset_comment.html:9 -#: rhodecode/templates/email_templates/pull_request_comment.html:15 -#, fuzzy -msgid "New status" -msgstr "變更" - -#: rhodecode/templates/email_templates/changeset_comment.html:11 -#: rhodecode/templates/email_templates/pull_request_comment.html:9 -msgid "View this comment here" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:4 +#: rhodecode/templates/email_templates/pull_request.html:4 +#: rhodecode/templates/email_templates/pull_request_comment.html:4 +msgid "URL" +msgstr "" + +#: rhodecode/templates/email_templates/changeset_comment.html:6 +#, python-format +msgid "%s commented on a %s changeset." msgstr "" #: rhodecode/templates/email_templates/changeset_comment.html:14 -#, fuzzy -msgid "Repo" -msgstr "空的版本庫" - -#: rhodecode/templates/email_templates/changeset_comment.html:16 -msgid "desc" +msgid "The changeset status was changed to" msgstr "" #: rhodecode/templates/email_templates/main.html:8 @@ -3832,52 +3987,37 @@ msgid "You can generate it by clicking following URL" msgstr "" -#: rhodecode/templates/email_templates/password_reset.html:11 -msgid "If you did not request new password please ignore this email." -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:4 -#, python-format -msgid "" -"User %s opened pull request for repository %s and wants you to review " -"changes." -msgstr "" - -#: rhodecode/templates/email_templates/pull_request.html:5 -#, fuzzy -msgid "View this pull request here" -msgstr "確認移除這個版本庫" +#: rhodecode/templates/email_templates/password_reset.html:10 +msgid "Please ignore this email if you did not request a new password ." +msgstr "" #: rhodecode/templates/email_templates/pull_request.html:6 -#, fuzzy -msgid "title" -msgstr "寫" - -#: rhodecode/templates/email_templates/pull_request.html:7 -#, fuzzy -msgid "description" -msgstr "描述" - -#: rhodecode/templates/email_templates/pull_request.html:12 -msgid "revisions for reviewing" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.html:3 -#, fuzzy, python-format -msgid "Pull request #%s for repository %s" -msgstr "建立使用者 %s" - -#: rhodecode/templates/email_templates/pull_request_comment.html:13 -#, fuzzy -msgid "Closing pull request with status" -msgstr "建立使用者 %s" - -#: rhodecode/templates/email_templates/registration.html:4 -#, fuzzy -msgid "A new user have registered in RhodeCode" -msgstr "您已經成功註冊rhodecode" - -#: rhodecode/templates/email_templates/registration.html:9 +#, python-format +msgid "" +"%s opened a pull request for repository %s and wants you to review changes." +msgstr "" + +#: rhodecode/templates/email_templates/pull_request.html:8 +#: rhodecode/templates/pullrequests/pullrequest.html:34 +#: rhodecode/templates/pullrequests/pullrequest_data.html:14 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +msgid "Title" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:6 +#, python-format +msgid "%s commented on pull request \"%s\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:10 +msgid "Pull request was closed with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.html:12 +msgid "Pull request changed status" +msgstr "" + +#: rhodecode/templates/email_templates/registration.html:6 msgid "View this user here" msgstr "" @@ -3887,9 +4027,9 @@ msgstr "" #: rhodecode/templates/files/file_diff.html:4 -#, fuzzy, python-format +#, python-format msgid "%s File Diff" -msgstr "檔案差異" +msgstr "" #: rhodecode/templates/files/file_diff.html:8 msgid "File diff" @@ -3897,56 +4037,42 @@ #: rhodecode/templates/files/files.html:4 #: rhodecode/templates/files/files.html:76 -#, fuzzy, python-format +#, python-format msgid "%s Files" -msgstr "檔案" +msgstr "" #: rhodecode/templates/files/files.html:30 #: rhodecode/templates/files/files_add.html:31 #: rhodecode/templates/files/files_edit.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:9 -#, fuzzy msgid "Branch" -msgstr "分支" +msgstr "" #: rhodecode/templates/files/files_add.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Files Add" -msgstr "檔案" +msgstr "" #: rhodecode/templates/files/files_add.html:19 -#, fuzzy msgid "Add file" -msgstr "編輯檔案" - -#: rhodecode/templates/files/files_add.html:38 -#: rhodecode/templates/files/files_browser.html:31 -#: rhodecode/templates/shortlog/shortlog_data.html:78 -#, fuzzy -msgid "Add new file" -msgstr "新增使用者" +msgstr "" #: rhodecode/templates/files/files_add.html:43 -#, fuzzy msgid "File Name" -msgstr "檔案名稱" +msgstr "" #: rhodecode/templates/files/files_add.html:47 #: rhodecode/templates/files/files_add.html:56 -#, fuzzy msgid "or" -msgstr "時" +msgstr "" #: rhodecode/templates/files/files_add.html:47 #: rhodecode/templates/files/files_add.html:52 -#, fuzzy msgid "Upload file" -msgstr "編輯檔案" +msgstr "" #: rhodecode/templates/files/files_add.html:56 -#, fuzzy msgid "Create new file" -msgstr "建立使用者 %s" +msgstr "" #: rhodecode/templates/files/files_add.html:61 #: rhodecode/templates/files/files_edit.html:37 @@ -3958,41 +4084,30 @@ msgid "use / to separate directories" msgstr "" -#: rhodecode/templates/files/files_add.html:75 -#: rhodecode/templates/files/files_edit.html:61 -#: rhodecode/templates/shortlog/shortlog_data.html:6 -#, fuzzy -msgid "Commit message" -msgstr "遞交資訊" - #: rhodecode/templates/files/files_add.html:79 #: rhodecode/templates/files/files_edit.html:65 msgid "Commit changes" msgstr "遞交修改" #: rhodecode/templates/files/files_browser.html:13 -#, fuzzy msgid "View" -msgstr "顯示" +msgstr "" #: rhodecode/templates/files/files_browser.html:14 -#, fuzzy msgid "Previous revision" -msgstr "前一個修訂" +msgstr "" #: rhodecode/templates/files/files_browser.html:16 -#, fuzzy msgid "Next revision" -msgstr "下一個修訂" +msgstr "" #: rhodecode/templates/files/files_browser.html:23 msgid "Follow current branch" msgstr "" #: rhodecode/templates/files/files_browser.html:27 -#, fuzzy msgid "Search file list" -msgstr "搜尋檔案列表" +msgstr "" #: rhodecode/templates/files/files_browser.html:35 msgid "Loading file list..." @@ -4007,9 +4122,8 @@ msgstr "" #: rhodecode/templates/files/files_browser.html:50 -#, fuzzy msgid "Last Revision" -msgstr "下一個修訂" +msgstr "" #: rhodecode/templates/files/files_browser.html:51 msgid "Last modified" @@ -4020,88 +4134,70 @@ msgstr "最後的遞交者" #: rhodecode/templates/files/files_edit.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Files Edit" -msgstr "檔案" +msgstr "" #: rhodecode/templates/files/files_edit.html:19 -#, fuzzy msgid "Edit file" -msgstr "編輯檔案" +msgstr "" #: rhodecode/templates/files/files_edit.html:47 #: rhodecode/templates/files/files_source.html:23 -#, fuzzy msgid "Show annotation" -msgstr "險是註釋" - -#: rhodecode/templates/files/files_edit.html:48 -#: rhodecode/templates/files/files_source.html:25 -#: rhodecode/templates/files/files_source.html:55 -#, fuzzy -msgid "Show as raw" -msgstr "顯示原始文件" +msgstr "" #: rhodecode/templates/files/files_edit.html:49 #: rhodecode/templates/files/files_source.html:26 -#, fuzzy msgid "Download as raw" -msgstr "下載原始文件" +msgstr "" #: rhodecode/templates/files/files_edit.html:52 -#, fuzzy msgid "Source" -msgstr "顯示原始碼" +msgstr "" #: rhodecode/templates/files/files_edit.html:57 -#, fuzzy msgid "Editing file" -msgstr "編輯檔案" +msgstr "" #: rhodecode/templates/files/files_history_box.html:2 msgid "History" msgstr "歷史" #: rhodecode/templates/files/files_history_box.html:9 -#, fuzzy msgid "Diff to revision" -msgstr "下一個修訂" +msgstr "" #: rhodecode/templates/files/files_history_box.html:10 -#, fuzzy msgid "Show at revision" -msgstr "下一個修訂" +msgstr "" #: rhodecode/templates/files/files_history_box.html:11 -#, fuzzy msgid "Show full history" -msgstr "載入檔案列表..." +msgstr "" #: rhodecode/templates/files/files_history_box.html:16 -#, fuzzy, python-format +#, python-format msgid "%s author" msgid_plural "%s authors" -msgstr[0] "作者" +msgstr[0] "" #: rhodecode/templates/files/files_source.html:6 -#, fuzzy msgid "Load file history" -msgstr "載入檔案列表..." +msgstr "" #: rhodecode/templates/files/files_source.html:21 -#, fuzzy msgid "Show source" -msgstr "顯示原始碼" +msgstr "" #: rhodecode/templates/files/files_source.html:29 -#, fuzzy, python-format +#, python-format msgid "Edit on branch:%s" -msgstr "刪除版本庫 %s" +msgstr "" #: rhodecode/templates/files/files_source.html:31 -#, fuzzy msgid "Edit on branch:?" -msgstr "刪除版本庫 %s" +msgstr "" #: rhodecode/templates/files/files_source.html:31 msgid "Editing files allowed only when on branch head revision" @@ -4117,9 +4213,8 @@ msgstr "顯示的檔案太大" #: rhodecode/templates/files/files_ypjax.html:5 -#, fuzzy msgid "annotation" -msgstr "險是註釋" +msgstr "" #: rhodecode/templates/files/files_ypjax.html:15 msgid "Go back" @@ -4130,9 +4225,9 @@ msgstr "" #: rhodecode/templates/followers/followers.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Followers" -msgstr "追蹤者" +msgstr "" #: rhodecode/templates/followers/followers.html:9 #: rhodecode/templates/summary/summary.html:183 @@ -4141,14 +4236,13 @@ msgstr "追蹤者" #: rhodecode/templates/followers/followers_data.html:12 -#, fuzzy msgid "Started following -" -msgstr "開始追蹤" +msgstr "" #: rhodecode/templates/forks/fork.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Fork" -msgstr "分支" +msgstr "" #: rhodecode/templates/forks/fork.html:28 msgid "Fork name" @@ -4159,9 +4253,8 @@ msgstr "私有" #: rhodecode/templates/forks/fork.html:74 -#, fuzzy msgid "Copy permissions" -msgstr "權限" +msgstr "" #: rhodecode/templates/forks/fork.html:78 msgid "Copy permissions from forked repository" @@ -4176,14 +4269,13 @@ msgstr "" #: rhodecode/templates/forks/fork.html:93 -#, fuzzy msgid "Fork this repository" -msgstr "fork 這個版本庫" +msgstr "" #: rhodecode/templates/forks/forks.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Forks" -msgstr "分支" +msgstr "" #: rhodecode/templates/forks/forks.html:9 #: rhodecode/templates/summary/summary.html:189 @@ -4192,23 +4284,20 @@ msgstr "" #: rhodecode/templates/forks/forks_data.html:17 -#, fuzzy msgid "Forked" -msgstr "已建立分支" +msgstr "" #: rhodecode/templates/forks/forks_data.html:42 msgid "There are no forks yet" msgstr "尚未有任何 fork" #: rhodecode/templates/journal/journal.html:21 -#, fuzzy msgid "ATOM journal feed" -msgstr "%s 公開日誌 %s feed" +msgstr "" #: rhodecode/templates/journal/journal.html:22 -#, fuzzy msgid "RSS journal feed" -msgstr "%s 公開日誌 %s feed" +msgstr "" #: rhodecode/templates/journal/journal.html:32 msgid "Refresh" @@ -4220,9 +4309,8 @@ msgstr "" #: rhodecode/templates/journal/journal.html:51 -#, fuzzy msgid "Watched" -msgstr "快取" +msgstr "" #: rhodecode/templates/journal/journal_data.html:55 msgid "No entries yet" @@ -4234,65 +4322,69 @@ msgstr "開放日誌" #: rhodecode/templates/journal/public_journal.html:13 -#, fuzzy msgid "ATOM public journal feed" -msgstr "%s 公開日誌 %s feed" +msgstr "" #: rhodecode/templates/journal/public_journal.html:14 -#, fuzzy msgid "RSS public journal feed" -msgstr "%s 公開日誌 %s feed" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:4 #: rhodecode/templates/pullrequests/pullrequest.html:8 msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:52 -#, fuzzy -msgid "Detailed compare view" -msgstr "比較顯示" - -#: rhodecode/templates/pullrequests/pullrequest.html:56 +#: rhodecode/templates/pullrequests/pullrequest.html:25 +msgid "Create new pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:47 +msgid "Write a short description on this pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:53 +msgid "Changeset flow" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:60 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 +msgid "Origin repository" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:85 +msgid "Send pull request" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:94 #: rhodecode/templates/pullrequests/pullrequest_show.html:137 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:65 +#: rhodecode/templates/pullrequests/pullrequest.html:103 #: rhodecode/templates/pullrequests/pullrequest_show.html:149 -#, fuzzy msgid "owner" -msgstr "擁有者" - -#: rhodecode/templates/pullrequests/pullrequest.html:77 +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:83 -#, fuzzy -msgid "Create new pull request" -msgstr "建立使用者 %s" - -#: rhodecode/templates/pullrequests/pullrequest.html:92 -#: rhodecode/templates/pullrequests/pullrequest_data.html:14 -#: rhodecode/templates/pullrequests/pullrequest_show.html:25 -#, fuzzy -msgid "Title" -msgstr "寫" - -#: rhodecode/templates/pullrequests/pullrequest.html:109 -msgid "Send pull request" +#: rhodecode/templates/pullrequests/pullrequest.html:129 +msgid "Detailed compare view" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:150 +msgid "Destination repository" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Pull Request #%s" -msgstr "建立使用者 %s" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:35 -#, fuzzy msgid "Review status" -msgstr "變更" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:40 msgid "Pull request status" @@ -4312,51 +4404,39 @@ msgid "Pull request was reviewed by all reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:65 -#, fuzzy -msgid "Origin repository" -msgstr "Git 版本庫" - #: rhodecode/templates/pullrequests/pullrequest_show.html:89 -#, fuzzy msgid "Created on" -msgstr "建立使用者 %s" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:102 -#, fuzzy msgid "Compare view" -msgstr "比較顯示" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:149 -#, fuzzy msgid "reviewer" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:164 -#, fuzzy msgid "Add or remove reviewer to this pull request." -msgstr "確認移除這個版本庫" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.html:168 -#, fuzzy msgid "Save changes" -msgstr "沒有修改" +msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 -#, fuzzy, python-format +#, python-format msgid "%s Pull Requests" -msgstr "建立使用者 %s" +msgstr "" #: rhodecode/templates/search/search.html:6 -#, fuzzy msgid "Search repository" -msgstr "於版本庫:" +msgstr "" #: rhodecode/templates/search/search.html:8 #: rhodecode/templates/search/search.html:16 -#, fuzzy msgid "Search in all repositories" -msgstr "於所有的版本庫" +msgstr "" #: rhodecode/templates/search/search.html:50 msgid "Search term" @@ -4371,9 +4451,8 @@ msgstr "文件內容" #: rhodecode/templates/search/search.html:66 -#, fuzzy msgid "Commit messages" -msgstr "遞交資訊" +msgstr "" #: rhodecode/templates/search/search.html:67 msgid "File names" @@ -4385,83 +4464,47 @@ msgid "Permission denied" msgstr "權限不足" -#: rhodecode/templates/shortlog/shortlog.html:5 -#, fuzzy, python-format -msgid "%s Lightweight Changelog" -msgstr "檔案修改" - -#: rhodecode/templates/shortlog/shortlog.html:11 -#: rhodecode/templates/shortlog/shortlog.html:15 -msgid "Lightweight Changelog" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:7 -#, fuzzy -msgid "Age" -msgstr "標籤" - -#: rhodecode/templates/shortlog/shortlog_data.html:20 +#: rhodecode/templates/summary/summary.html:4 #, python-format -msgid "Click to open associated pull request #%s" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:75 -msgid "Add or upload files directly via RhodeCode" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:84 -msgid "Push new repo" -msgstr "" - -#: rhodecode/templates/shortlog/shortlog_data.html:92 -#, fuzzy -msgid "Existing repository?" -msgstr "Git 版本庫" - -#: rhodecode/templates/summary/summary.html:4 -#, fuzzy, python-format msgid "%s Summary" -msgstr "概況" +msgstr "" #: rhodecode/templates/summary/summary.html:16 -#, fuzzy, python-format +#, python-format msgid "%s ATOM feed" -msgstr "訂閱 %s atom" +msgstr "" #: rhodecode/templates/summary/summary.html:17 -#, fuzzy, python-format +#, python-format msgid "%s RSS feed" -msgstr "訂閱 %s rss" +msgstr "" #: rhodecode/templates/summary/summary.html:62 -#, fuzzy, python-format +#, python-format msgid "Repository locked by %s" -msgstr "個版本庫" +msgstr "" #: rhodecode/templates/summary/summary.html:64 -#, fuzzy msgid "Repository unlocked" -msgstr "個版本庫" +msgstr "" #: rhodecode/templates/summary/summary.html:83 -#, fuzzy, python-format +#, python-format msgid "Non changable ID %s" -msgstr "沒有修改" +msgstr "" #: rhodecode/templates/summary/summary.html:88 -#, fuzzy msgid "Public" -msgstr "公開" +msgstr "" #: rhodecode/templates/summary/summary.html:88 #: rhodecode/templates/summary/summary.html:89 msgid "Fork of" msgstr "" -#: rhodecode/templates/summary/summary.html:96 -#, fuzzy +#: rhodecode/templates/summary/summary.html:97 msgid "Remote clone" -msgstr "遠端複製" +msgstr "" #: rhodecode/templates/summary/summary.html:117 msgid "Contact" @@ -4472,24 +4515,21 @@ msgstr "複製連結" #: rhodecode/templates/summary/summary.html:136 -#, fuzzy msgid "Show by Name" -msgstr "顯示更多" +msgstr "" #: rhodecode/templates/summary/summary.html:137 msgid "Show by ID" msgstr "" #: rhodecode/templates/summary/summary.html:143 -#, fuzzy msgid "Trending files" -msgstr "編輯檔案" +msgstr "" #: rhodecode/templates/summary/summary.html:151 #: rhodecode/templates/summary/summary.html:167 -#: rhodecode/templates/summary/summary.html:232 -msgid "enable" -msgstr "啟用" +msgid "Enable" +msgstr "" #: rhodecode/templates/summary/summary.html:159 msgid "Download" @@ -4503,10 +4543,9 @@ msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: rhodecode/templates/summary/summary.html:171 -#, fuzzy +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" -msgstr "下載原始文件" +msgstr "" #: rhodecode/templates/summary/summary.html:174 msgid "Check this to download archive with subrepos" @@ -4517,91 +4556,85 @@ msgstr "" #: rhodecode/templates/summary/summary.html:197 -#, fuzzy msgid "Repository Size" -msgstr "個版本庫" +msgstr "" #: rhodecode/templates/summary/summary.html:204 #: rhodecode/templates/summary/summary.html:206 -#, fuzzy msgid "Feed" -msgstr "已建立分支" +msgstr "" #: rhodecode/templates/summary/summary.html:224 msgid "Commit activity by day / author" msgstr "" +#: rhodecode/templates/summary/summary.html:232 +msgid "enable" +msgstr "啟用" + #: rhodecode/templates/summary/summary.html:235 msgid "Stats gathered: " msgstr "" #: rhodecode/templates/summary/summary.html:256 -#, fuzzy msgid "Latest changes" -msgstr "最後修改" +msgstr "" #: rhodecode/templates/summary/summary.html:258 -#, fuzzy msgid "Quick start" -msgstr "快速過濾..." +msgstr "" #: rhodecode/templates/summary/summary.html:272 #, python-format -msgid "Readme file at revision '%s'" -msgstr "" - -#: rhodecode/templates/summary/summary.html:275 -msgid "Permalink to this readme" -msgstr "" - -#: rhodecode/templates/summary/summary.html:333 +msgid "Readme file from revision %s" +msgstr "" + +#: rhodecode/templates/summary/summary.html:332 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: rhodecode/templates/summary/summary.html:380 +#: rhodecode/templates/summary/summary.html:379 msgid "files" msgstr "檔案" -#: rhodecode/templates/summary/summary.html:690 +#: rhodecode/templates/summary/summary.html:689 msgid "commits" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:691 +#: rhodecode/templates/summary/summary.html:690 msgid "files added" msgstr "多個檔案新增" -#: rhodecode/templates/summary/summary.html:692 +#: rhodecode/templates/summary/summary.html:691 msgid "files changed" msgstr "多個檔案修改" -#: rhodecode/templates/summary/summary.html:693 +#: rhodecode/templates/summary/summary.html:692 msgid "files removed" msgstr "移除多個檔案" -#: rhodecode/templates/summary/summary.html:695 +#: rhodecode/templates/summary/summary.html:694 msgid "commit" msgstr "遞交" +#: rhodecode/templates/summary/summary.html:695 +msgid "file added" +msgstr "檔案新增" + #: rhodecode/templates/summary/summary.html:696 -msgid "file added" -msgstr "檔案新增" +msgid "file changed" +msgstr "檔案修改" #: rhodecode/templates/summary/summary.html:697 -msgid "file changed" -msgstr "檔案修改" - -#: rhodecode/templates/summary/summary.html:698 msgid "file removed" msgstr "移除檔案" #: rhodecode/templates/tags/tags.html:5 -#, fuzzy, python-format +#, python-format msgid "%s Tags" -msgstr "之前" +msgstr "" #: rhodecode/templates/tags/tags.html:26 -#, fuzzy msgid "Compare tags" -msgstr "比較顯示" - +msgstr ""