summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2016-01-25 02:33:52 -0500
committerUnknwon <u@gogs.io>2016-01-25 02:33:52 -0500
commit38efa72146eb8caeed0140f36a8e322c1426fda1 (patch)
tree2090ef3eeb5ae8799012a94dd31eae8ac9d0204e /conf
parent4ae7e64e2a99d677d6a30ff8e7ab4b846f73093c (diff)
downloadgitea-38efa72146eb8caeed0140f36a8e322c1426fda1.tar.gz
gitea-38efa72146eb8caeed0140f36a8e322c1426fda1.zip
Update locales
Diffstat (limited to 'conf')
-rwxr-xr-xconf/locale/locale_bg-BG.ini8
-rwxr-xr-xconf/locale/locale_de-DE.ini4
-rwxr-xr-xconf/locale/locale_es-ES.ini8
-rwxr-xr-xconf/locale/locale_fr-FR.ini46
-rwxr-xr-xconf/locale/locale_it-IT.ini82
-rwxr-xr-xconf/locale/locale_lv-LV.ini8
-rwxr-xr-xconf/locale/locale_ru-RU.ini14
-rwxr-xr-xconf/locale/locale_zh-HK.ini2
8 files changed, 86 insertions, 86 deletions
diff --git a/conf/locale/locale_bg-BG.ini b/conf/locale/locale_bg-BG.ini
index ad4b6fc26c..8da3200f6e 100755
--- a/conf/locale/locale_bg-BG.ini
+++ b/conf/locale/locale_bg-BG.ini
@@ -232,8 +232,8 @@ activity=Публична дейност
followers=Последователи
starred=Харесано
following=Следване
-follow=Follow
-unfollow=Unfollow
+follow=Следване
+unfollow=Не следвай
form.name_reserved=Потребителското име '%s' е запазено.
form.name_pattern_not_allowed=Потребителското име '%s' не е допустимо.
@@ -668,8 +668,8 @@ diff.parent=родител
diff.commit=ревизия
diff.data_not_available=Няма данни за разлики.
diff.show_diff_stats=Покажи статистика за разликите
-diff.show_split_view=Split View
-diff.show_unified_view=Unified View
+diff.show_split_view=Разделен изглед
+diff.show_unified_view=Обединен изглед
diff.stats_desc=променени са <strong>%d файла</strong>, в които са <strong>добавени %d</strong> реда и са <strong>изтрити %d</strong> реда
diff.bin=BIN
diff.view_file=Целия файл
diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini
index e602f05b66..41b60848ad 100755
--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
@@ -400,11 +400,11 @@ repo_is_empty=Das Repository ist leer, bitte komm später wieder!
code=Code
branch=Branch
tree=Struktur
-filter_branch_and_tag=Nach Zweig oder Tag filtern
+filter_branch_and_tag=Nach Branch oder Tag filtern
branches=Branches
tags=Tags
issues=Issues
-pulls=Pull-Anforderung
+pulls=Pull-Request
labels=Label
milestones=Meilensteine
commits=Commits
diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini
index ed59fef275..d7dd860411 100755
--- a/conf/locale/locale_es-ES.ini
+++ b/conf/locale/locale_es-ES.ini
@@ -232,8 +232,8 @@ activity=Actividad pública
followers=Seguidores
starred=Destacados
following=Siguiendo
-follow=Follow
-unfollow=Unfollow
+follow=Seguir
+unfollow=Dejar de seguir
form.name_reserved=El usuario '%s' está reservado.
form.name_pattern_not_allowed=El patrón de nombre de usuario '%s' no está permitido.
@@ -668,8 +668,8 @@ diff.parent=padre
diff.commit=commit
diff.data_not_available=Los datos del Diff no están disponibles.
diff.show_diff_stats=Mostrar Estadísticas de Diff
-diff.show_split_view=Split View
-diff.show_unified_view=Unified View
+diff.show_split_view=Dividir vista
+diff.show_unified_view=Unificar vista
diff.stats_desc=Se han <strong>modificado %d ficheros</strong> con <strong>%d adiciones</strong> y <strong>%d borrados</strong>
diff.bin=BIN
diff.view_file=Ver Fichero
diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini
index 4fe56b62b6..82e3319879 100755
--- a/conf/locale/locale_fr-FR.ini
+++ b/conf/locale/locale_fr-FR.ini
@@ -6,9 +6,9 @@ explore=Explorer
help=Aide
sign_in=Connexion
sign_out=Déconnexion
-sign_up=Créer un compte
-register=Inscription
-website=Site Web
+sign_up=Inscription
+register=S'inscrire
+website=Site web
version=Version
page=Page
template=Modèle
@@ -27,7 +27,7 @@ repository=Dépôt
organization=Organisation
mirror=Miroir
new_repo=Nouveau Dépôt
-new_migrate=Nouvelle Migration
+new_migrate=Nouvelle migration
new_mirror=Nouveau miroir
new_fork=Nouveau Fork
new_org=Nouvelle Organisation
@@ -60,8 +60,8 @@ db_title=Paramètres de la base de données
db_type=Type de base de données
host=Hôte
user=Utilisateur
-password=Mot De Passe
-db_name=Nom de la Base de Données
+password=Mot de passe
+db_name=Nom de base de données
db_helper=Veuillez utiliser le moteur INNODB avec le jeu de caractères utf8_general_ci pour MySQL.
ssl_mode=Mode SSL
path=Chemin
@@ -77,11 +77,11 @@ app_name_helper=Inscrivez fièrement le nom de votre organisation ici !
repo_path=Emplacement Racine du Dépôt
repo_path_helper=Tous les dépôts Git distants seront sauvegardés ici.
run_user=Entrer un Utilisateur
-run_user_helper=L'utilisateur doit avoir accès à la racine du dépôt et exécuter Gogs.
+run_user_helper=L'utilisateur doit avoir accès à la racine des dépôts et exécuter Gogs.
domain=Domaine
domain_helper=Cela affecte les doublons d'URL SSH.
ssh_port=Port SSH
-ssh_port_helper=C'est le numéro de port qui est utilisé par votre serveur SSH, le laisser vide pour désactiver la fonctionnalité.
+ssh_port_helper=Numéro de port utilisé par votre serveur SSH, le laisser vide pour désactiver la fonctionnalité.
http_port=Port HTTP
http_port_helper=Numéro de port que l'application écoutera.
app_url=URL de l'Application
@@ -92,10 +92,10 @@ email_title=Paramètres du Service de Messagerie
smtp_host=Hôte SMTP
smtp_from=Provenant de
smtp_from_helper=Adresse de l'expéditeur, RFC 5322. Soit une adresse courriel simple, soit au format "Nom" <email@example.com>.
-mailer_user=E-mail de l'Expéditeur
+mailer_user=E-mail de l'expéditeur
mailer_password=Mot de passe de l'expéditeur
-register_confirm=Activer la Confirmation d'Enregistrement
-mail_notify=Activer la Notification des Mails reçus
+register_confirm=Activer la confirmation de l'inscription
+mail_notify=Activer la notification par e-mail
server_service_title=Paramètres du serveur et des autres services
offline_mode=Activer le mode hors connexion
offline_mode_popup=Désactiver le CDN, même en production. Toutes les ressources seront distribuées en local.
@@ -108,13 +108,13 @@ enable_captcha_popup=Demande la validation Captcha pour l'auto-enregistrement de
require_sign_in_view=Demander une connexion pour afficher des pages
require_sign_in_view_popup=Seules les personnes connectées peuvent voir les pages. Les visiteurs anonymes ne pourront voir que les pages de connexion/enregistrement.
admin_setting_desc=Vous n'avez pas besoin de créer un compte administrateur. L'utilisateur ayant l'ID = 1 aura automatiquement accès à l'administration.
-admin_title=Paramètres du Compte Administrateur
-admin_name=Nom d'Utilisateur
-admin_password=Mot de Passe
-confirm_password=Confirmez le Mot de Passe
+admin_title=Paramètres du compte administrateur
+admin_name=Nom d'utilisateur
+admin_password=Mot de passe
+confirm_password=Confirmez le mot de passe
admin_email=E-mail de l'administrateur
install_gogs=Installer Gogs
-test_git_failed=Tentative de commande "git" échouée : %v
+test_git_failed=Le test de la commande "git" a échoué : %v
sqlite3_not_available=Votre version publiée ne prend pas en charge SQLite3. Veuillez télécharger la version binaire officielle à cette adresse %s.
invalid_db_setting=Paramètres de base de données incorrects : %v
invalid_repo_path=Chemin vers la racine du dépôt invalide : %v
@@ -144,7 +144,7 @@ register_hepler_msg=Déjà enregistré ? Connectez-vous !
social_register_hepler_msg=Possesseur d'un compte ? Associez-le !
disable_register_prompt=Désolé, les enregistrements ont été désactivés. Veuillez contacter l'administrateur du site.
disable_register_mail=Désolé, la Confirmation par Mail des Enregistrements a été désactivée.
-remember_me=Se souvenir de Moi
+remember_me=Se souvenir de moi
forgot_password=Mot de Passe oublié
forget_password=Mot de Passe oublié ?
sign_up_now=Pas de compte ? Créer maintenant.
@@ -309,7 +309,7 @@ add_on=Ajouté le
last_used=Dernière utilisation le
no_activity=Aucune activité récente
key_state_desc=Cette clé a été utilisée durant les 7 derniers jours
-token_state_desc=Cette clé a été utilisée durant les 7 derniers jours
+token_state_desc=Ce jeton a été utilisé durant les 7 derniers jours
manage_social=Gérer les réseaux sociaux associés
social_desc=Ceci est la liste des comptes de réseaux sociaux associés. Supprimez ceux que vous ne reconnaissez pas.
@@ -328,8 +328,8 @@ access_token_deletion=Suppression du jeton d'accès
access_token_deletion_desc=Supprimer ce jeton d'accès supprimera tous les accès de l'application. Voulez-vous continuer ?
delete_token_success=Le jeton d'accèsa été supprimé avec succès ! N'oubliez pas de mettre à jour vos applications.
-delete_account=Supprimer le Compte
-delete_prompt=Votre compte sera supprimé définitivement et cette opération est <strong>IRRÉVERSIBLE</strong> !
+delete_account=Supprimer votre compte
+delete_prompt=Votre compte sera définitivement supprimé et cette opération est <strong>irréversible</strong> !
confirm_delete_account=Confirmer la suppression
delete_account_title=Suppression de compte
delete_account_desc=Ce compte sera supprimé définitivement. Voulez-vous continuer ?
@@ -457,8 +457,8 @@ issues.filter_sort.latest=Plus récent
issues.filter_sort.oldest=Plus ancien/ne
issues.filter_sort.recentupdate=Mis à jour récemment
issues.filter_sort.leastupdate=Moins récemment mis à jour
-issues.filter_sort.mostcomment=Plus commentés
-issues.filter_sort.leastcomment=Moins commenté
+issues.filter_sort.mostcomment=Les plus commentés
+issues.filter_sort.leastcomment=Les moins commentés
issues.opened_by=Ouvrir %[1]s by <a href="%[2]s">%[3]s</a>
issues.opened_by_fake=ouvert %[1]s par %[2]s
issues.previous=Page Précédente
@@ -554,7 +554,7 @@ wiki.filter_page=Filtrer la page
wiki.new_page=Créer une nouvelle page
wiki.default_commit_message=Écrire une note concernant cette mise à jour (optionnel).
wiki.save_page=Enregistrer la page
-wiki.last_commit_info=%s modifier cette page %s
+wiki.last_commit_info=%s a édité cette page %s
wiki.edit_page_button=Modifier
wiki.new_page_button=Nouvelle Page
wiki.page_already_exists=Une page de wiki avec le même nom existe déjà.
diff --git a/conf/locale/locale_it-IT.ini b/conf/locale/locale_it-IT.ini
index 199c662959..e656f2005d 100755
--- a/conf/locale/locale_it-IT.ini
+++ b/conf/locale/locale_it-IT.ini
@@ -28,18 +28,18 @@ organization=Organizzazione
mirror=Mirror
new_repo=Nuovo Repository
new_migrate=Nuova Migrazione
-new_mirror=New Mirror
+new_mirror=Nuovo Mirror
new_fork=Nuovo Fork Repository
new_org=Nuova organizzazione
manage_org=Gestisci le organizzazioni
admin_panel=Pannello di amministrazione
account_settings=Impostazioni dell'account
settings=Impostazioni
-your_profile=Profilo
+your_profile=Il tuo profilo
your_settings=Impostazioni
news_feed=Notizie
-pull_requests=Pull Requests
+pull_requests=Pull Request
issues=Problemi
cancel=Annulla
@@ -469,21 +469,21 @@ issues.num_comments=%d commenti
issues.commented_at=`commented <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.no_content=There is no content yet.
issues.close_issue=Chiudi
-issues.close_comment_issue=Comment and close
-issues.reopen_issue=Reopen
-issues.reopen_comment_issue=Comment and reopen
+issues.close_comment_issue=Commenta e chiudi
+issues.reopen_issue=Riapri
+issues.reopen_comment_issue=Commenta e riapri
issues.create_comment=Commento
issues.closed_at=`closed <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.reopened_at=`reopened <a id="%[1]s" href="#%[1]s">%[2]s</a>`
issues.commit_ref_at=`referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.poster=Poster
+issues.poster=Autore
issues.admin=Amministratore
issues.owner=Proprietario
issues.sign_up_for_free=Registrati gratuitamente
issues.sign_in_require_desc=to join this conversation. Already have an account? <a href="%s">Sign in to comment</a>
-issues.edit=Edit
+issues.edit=Modifica
issues.cancel=Cancel
-issues.save=Save
+issues.save=Salva
issues.label_title=Nome etichetta
issues.label_color=Colore etichetta
issues.label_count=%d etichette
@@ -495,33 +495,33 @@ issues.label_deletion=Elimina Etichetta
issues.label_deletion_desc=Eliminare l'etichetta rimuovera le sue informazioni in tutti i problemi correlati. Vuoi continuare?
issues.label_deletion_success=Etichetta eliminata con successo!
-pulls.new=New Pull Request
-pulls.compare_changes=Compare Changes
-pulls.compare_changes_desc=Compare two branches and make a pull request for changes.
+pulls.new=Nuova Pull Request
+pulls.compare_changes=Confronta le modifiche
+pulls.compare_changes_desc=Confronta due branch e fai una pull request per le modifiche.
pulls.compare_base=base
-pulls.compare_compare=compare
+pulls.compare_compare=confronta
pulls.filter_branch=Filter branch
-pulls.no_results=No results found.
+pulls.no_results=Nessun risultato trovato.
pulls.nothing_to_compare=There is nothing to compare because base and head branches are even.
pulls.has_pull_request=`There is already a pull request between these two targets: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
pulls.create=Crea Pull Request
pulls.title_desc=wants to merge %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code>
pulls.merged_title_desc=merged %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code> %[4]s
-pulls.tab_conversation=Conversation
+pulls.tab_conversation=Conversazione
pulls.tab_commits=Commits
-pulls.tab_files=Files changed
-pulls.reopen_to_merge=Please reopen this pull request to perform merge operation.
+pulls.tab_files=File modificati
+pulls.reopen_to_merge=Riapri questa pull request per effettuare il merge.
pulls.merged=Merged
pulls.has_merged=This pull request has been merged successfully!
pulls.data_broken=Data of this pull request has been broken due to deletion of fork information.
pulls.is_checking=The conflict checking is still in progress, please refresh page in few moments.
pulls.can_auto_merge_desc=This pull request can be merged automatically.
pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
-pulls.cannot_auto_merge_helper=Please merge manually in order to resolve the conflicts.
+pulls.cannot_auto_merge_helper=Effettua il merge manualmente per risolvere i conflitti.
pulls.merge_pull_request=Unisci Pull Request
pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
-milestones.new=New Milestone
+milestones.new=Nuova Milestone
milestones.open_tab=%d Open
milestones.close_tab=%d Closed
milestones.closed=Closed %s
@@ -529,10 +529,10 @@ milestones.no_due_date=No due date
milestones.open=Open
milestones.close=Close
milestones.new_subheader=Create milestones to organize your issues.
-milestones.create=Create Milestone
-milestones.title=Title
-milestones.desc=Description
-milestones.due_date=Due Date (optional)
+milestones.create=Crea Milestone
+milestones.title=Titolo
+milestones.desc=Descrizione
+milestones.due_date=Data di scadenza (opzionale)
milestones.clear=Clear
milestones.invalid_due_date_format=Il formato della data di scadenza non è valido, deve essere 'yyyy-mm-dd'.
milestones.create_success=La Milestone '%s' è stata creata con successo!
@@ -588,13 +588,13 @@ settings.delete=Elimina questo repository
settings.delete_desc=Una volta che hai cancellato il repository, non puoi tornare indietro. Si prega di fare attenzione.
settings.transfer_notices_1=- You will lose access if new owner is a individual user.
settings.transfer_notices_2=- You will conserve access if new owner is an organization and if you're one of the owners.
-settings.transfer_form_title=Please enter following information to confirm your operation:
-settings.delete_notices_1=- This operation <strong>CANNOT</strong> be undone.
-settings.delete_notices_2=- This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators.
-settings.delete_notices_fork_1=- If this repository is public, all forks will be became independent after deletion.
-settings.delete_notices_fork_2=- If this repository is private, all forks will be removed at the same time.
+settings.transfer_form_title=Per favore inserisci le informazioni seguenti per confermare l'operazione:
+settings.delete_notices_1=-Questa operazione <strong>NON PUÒ</strong> essere annullata.
+settings.delete_notices_2=-Questa operazione eliminerà definitivamente il tutto il contenuto del repository, inclusi i dati di Git, incidenti, commenti e accessi dei collaboratori.
+settings.delete_notices_fork_1=-Se questo repository è pubblico, tutti i fork diventeranno indipendenti dopo la sua cancellazione.
+settings.delete_notices_fork_2=-Se questo repository è privato, tutti fork verranno rimossi assieme ad esso.
settings.delete_notices_fork_3=- If you want to keep all forks after deletion, please change visibility of this repository to public first.
-settings.deletion_success=Repository has been deleted successfully!
+settings.deletion_success=Il repository è stato eliminato con successo!
settings.update_settings_success=Le opzioni repository sono state aggiornate con successo.
settings.transfer_owner=Nuovo Proprietario
settings.make_transfer=Trasferisci
@@ -603,11 +603,11 @@ settings.confirm_delete=Conferma eliminazione
settings.add_collaborator=Aggiungi nuovo collaboratore
settings.add_collaborator_success=Il nuovo collaboratore è stato aggiunto.
settings.remove_collaborator_success=Il collaboratore è stato rimosso.
-settings.search_user_placeholder=Search user...
+settings.search_user_placeholder=Cerca utente...
settings.user_is_org_member=L'utente è un membro dell'organizzazione che non può essere aggiunto come collaboratore.
settings.add_webhook=Aggiungi Webhook
settings.hooks_desc=I Webhooks sono molto simili a un basilare evento trigger HTTP POST. Ogni volta che qualcosa si verifica in Gogs, tratteremo la notifica all'host di destinazione specificato. Ulteriori informazioni in questa <a target="_blank" href="%s">Guida ai Webhooks</a>.
-settings.webhook_deletion=Delete Webhook
+settings.webhook_deletion=Elimina Webhook
settings.webhook_deletion_desc=Delete this webhook will remove its information and all delivery history. Do you want to continue?
settings.webhook_deletion_success=Webhook has been deleted successfully!
settings.webhook.test_delivery=Test Delivery
@@ -628,7 +628,7 @@ settings.payload_url=Payload URL
settings.content_type=Content Type
settings.secret=Secret
settings.slack_username=Username
-settings.slack_icon_url=Icon URL
+settings.slack_icon_url=URL icona
settings.slack_color=Color
settings.event_desc=Quali eventi dovrebbero innescare questo webhook?
settings.event_push_only=Solo l'evento <code>push</code>.
@@ -703,7 +703,7 @@ release.deletion=Release Deletion
release.deletion_desc=Deleting this release will delete the corresponding Git tag. Do you want to continue?
release.deletion_success=Release has been deleted successfully!
release.tag_name_already_exist=Un rilascio con questo tag esiste già.
-release.downloads=Downloads
+release.downloads=Download
[org]
org_name_holder=Nome dell'Organizzazione
@@ -754,7 +754,7 @@ members.owner=Proprietario
members.member=Membro
members.remove=Rimuovere
members.leave=Abbandona
-members.invite_desc=Add a new member to %s:
+members.invite_desc=Aggiungi un nuovo membro a %s:
members.invite_now=Invita ora
teams.join=Iscriviti
@@ -795,7 +795,7 @@ notices=Avvisi di sistema
monitor=Monitoraggio
first_page=First
last_page=Last
-total=Total: %d
+total=Totale: %d
dashboard.statistic=Statistiche
dashboard.operations=Operazioni
@@ -857,7 +857,7 @@ users.admin=Amministratore
users.repos=Repo
users.created=Creato
users.send_register_notify=Send Registration Notification To User
-users.new_success=New account '%s' has been created successfully.
+users.new_success=Il nuovo account '%s' è stato creato correttamente.
users.edit=Modifica
users.auth_source=Authentication Source
users.local=Locale
@@ -870,12 +870,12 @@ users.max_repo_creation_desc=(Set -1 to use global default limit)
users.is_activated=Questo account è attivato
users.is_admin=Questo account ha permessi di amministratore
users.allow_git_hook=Questo account ha il permesso di creare hooks di Git
-users.allow_import_local=This account has permissions to import local repositories
+users.allow_import_local=Questo account dispone delle autorizzazioni per importare repository locali
users.update_profile=Aggiornare Profilo Account
users.delete_account=Elimina Questo Account
users.still_own_repo=Questo account possiede ancora almeno un repository, devi prima cancellarli o trasferirli.
users.still_has_org=Questo account appartiene ancora ad almeno un'organizzazione, è necessario prima abbandonarle o eliminale.
-users.deletion_success=Account has been deleted successfully!
+users.deletion_success=Account eliminato correttamente!
orgs.org_manage_panel=Pannello Gestione Organizzazioni
orgs.name=Nome
@@ -920,7 +920,7 @@ auths.smtpport=Porta SMTP
auths.allowed_domains=Allowed Domains
auths.allowed_domains_helper=Leave it empty to not restrict any domains. Multiple domains should be separated by comma ','.
auths.enable_tls=Abilitare Crittografia TLS
-auths.skip_tls_verify=Skip TLS Verify
+auths.skip_tls_verify=Salta verifica TLS
auths.pam_service_name=Nome del Servizio PAM
auths.enable_auto_register=Abilitare Registrazione Automatica
auths.tips=Consigli
@@ -965,7 +965,7 @@ config.require_sign_in_view=Richiesto Accesso per Vedere
config.enable_cache_avatar=Abilitare Cache dell'Avatar
config.mail_notify=Email di Notifica
config.disable_key_size_check=Disable Minimum Key Size Check
-config.enable_captcha=Enable Captcha
+config.enable_captcha=Abilita Captcha
config.active_code_lives=Attiva Vita del Codice
config.reset_password_code_lives=Reimpostare Password della Vita del Codice
config.webhook_config=Configurazione Webhook
@@ -1026,7 +1026,7 @@ notices.delete_success=System notices have been deleted successfully.
[action]
create_repo=ha creato il repository <a href="%s">%s</a>
-rename_repo=renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a>
+rename_repo=repository rinominato da <code>%[1]s</code> a <a href="%[2]s">[3]s</a>
commit_repo=ha pushato nel <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a>
create_issue=`ha aperto il problema <a href="%s/issues/%s">%s#%[2]s</a>`
create_pull_request=`creata pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
diff --git a/conf/locale/locale_lv-LV.ini b/conf/locale/locale_lv-LV.ini
index 6ae7d9dc55..3eeed70a1f 100755
--- a/conf/locale/locale_lv-LV.ini
+++ b/conf/locale/locale_lv-LV.ini
@@ -232,8 +232,8 @@ activity=Publiskā aktivitāte
followers=Sekotāji
starred=Atzīmēti ar zvaigznīti
following=Seko
-follow=Follow
-unfollow=Unfollow
+follow=Sekot
+unfollow=Nesekot
form.name_reserved=Lietotāja vārds '%s' jau ir aizņemts.
form.name_pattern_not_allowed=Lietotāja vārds '%s' nav atļauts.
@@ -668,8 +668,8 @@ diff.parent=vecāks
diff.commit=revīzija
diff.data_not_available=Salīdzināšanas dati nav pieejami.
diff.show_diff_stats=Rādīt salīdzināšanas statistiku
-diff.show_split_view=Split View
-diff.show_unified_view=Unified View
+diff.show_split_view=Dalītais skats
+diff.show_unified_view=Apvienotais skats
diff.stats_desc=<strong>%d mainītis faili</strong> ar <strong>%d papildinājumiem</strong> un <strong>%d dzēšanām</strong>
diff.bin=BIN
diff.view_file=Parādīt failu
diff --git a/conf/locale/locale_ru-RU.ini b/conf/locale/locale_ru-RU.ini
index 2f1a5302c6..073565258a 100755
--- a/conf/locale/locale_ru-RU.ini
+++ b/conf/locale/locale_ru-RU.ini
@@ -404,7 +404,7 @@ filter_branch_and_tag=Фильтр по ветке или тегу
branches=Ветки
tags=Метки
issues=Обсуждения
-pulls=Пулл реквесты
+pulls=Запросы на слияние
labels=Метки
milestones=Этапы
commits=Коммиты
@@ -495,16 +495,16 @@ issues.label_deletion=Удаление метки
issues.label_deletion_desc=Удаление ярлыка затронет все связанные задачи. Продолжить?
issues.label_deletion_success=Метка была удалена успешно!
-pulls.new=Новый пул реквест
+pulls.new=Новый запрос на слияние
pulls.compare_changes=Сравнить изменения
-pulls.compare_changes_desc=Сравнить две ветки и создать пулл реквест для изменений.
+pulls.compare_changes_desc=Сравнить две ветки и создать запрос на слияние для изменений.
pulls.compare_base=родительская ветка
pulls.compare_compare=сравнить
pulls.filter_branch=Фильтр по ветке
pulls.no_results=Результатов не найдено.
pulls.nothing_to_compare=Нечего сравнивать, родительская и текущая ветка одинаковые.
pulls.has_pull_request=`Уже существует пулл-реквест между двумя целями <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
-pulls.create=Создать пулл-реквест
+pulls.create=Создать запрос на слияние
pulls.title_desc=хочет смерджить %[1]d коммит(ов) из <code>%[2]s</code> в <code>%[3]s</code>
pulls.merged_title_desc=слито %[1]d коммит(ов) из <code>%[2]s</code> в <code>%[3]s</code> %[4]s
pulls.tab_conversation=Обсуждение
@@ -512,14 +512,14 @@ pulls.tab_commits=Коммиты
pulls.tab_files=Измененные файлы
pulls.reopen_to_merge=Пожалуйста снова откройте этот запрос для слияния.
pulls.merged=Слито
-pulls.has_merged=Слияние этого пулл-реквеста успешно завершено!
+pulls.has_merged=Слияние этого запроса успешно завершено!
pulls.data_broken=Содержимое этого пулл-реквеста было нарушено, вследствии удаления или клонирования информации.
pulls.is_checking=Продолжается проверка конфликтов, пожалуйста обновите страницу несколько позже.
pulls.can_auto_merge_desc=Этот запрос на слияние может быть объединён автоматически.
pulls.cannot_auto_merge_desc=Этот запрос на слияние не может быть объединён автоматически.
pulls.cannot_auto_merge_helper=Пожалуйста, совершите слияние вручную для урегулирования конфликтов.
pulls.merge_pull_request=Слить пулл-реквест
-pulls.open_unmerged_pull_exists=`Вы не можете произвести операцию переоткрытия, потому что уже существует пулл-реквест (#%d) из этого же репозитория, с такими же параметрами слияния, который ожидает слияния.`
+pulls.open_unmerged_pull_exists=`Вы не можете снова открыть, поскольку уже существует запрос на слияние (#%d) из того же репозитория с той же информацией о слиянии и ожидающий слияния. `
milestones.new=Новая контрольная точка
milestones.open_tab=%d открыты
@@ -579,7 +579,7 @@ settings.issues_desc=Включить встроенную, легковесну
settings.use_external_issue_tracker=Использовать внешнюю систему отслеживания ошибок
settings.tracker_url_format=Внешний формат ссылки системы отслеживания ошибок.
settings.tracker_url_format_desc=Вы можете использовать шаблон <code>{user} {repo} {index}</code> для имени пользователя, репозитория и номера задачи.
-settings.pulls_desc=Включить публичные пулл-реквесты
+settings.pulls_desc=Включить публичные запросы на слияние
settings.danger_zone=Опасная зона
settings.transfer=Передать права собственности
settings.transfer_desc=Передать репозиторий другому пользователю или организации где у вас есть права администратора.
diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini
index 438c6f9523..255ac015a1 100755
--- a/conf/locale/locale_zh-HK.ini
+++ b/conf/locale/locale_zh-HK.ini
@@ -573,7 +573,7 @@ settings.change_reponame_prompt=該操作將會影響到所有與該倉庫有關
settings.advanced_settings=高級設置
settings.wiki_desc=啟用 Wiki 以允許用戶協作文檔
settings.use_external_wiki=使用外部 wiki
-settings.external_wiki_url=External Wiki URL
+settings.external_wiki_url=外部 Wiki 連結
settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
settings.issues_desc=啟用內置的輕量級問題管理系統
settings.use_external_issue_tracker=使用外部的問題管理系統