From 7b59d40f08b52ba101626793bc5aed2fd54ef15f Mon Sep 17 00:00:00 2001 From: Dmitry Yu Okunev Date: Sun, 5 Apr 2015 11:48:32 +0300 Subject: [PATCH 1/2] Fixed a typo: .ssh/autorized_key -> .ssh/authorized_key Signed-off-by: Dmitry Yu Okunev --- conf/locale/locale_de-DE.ini | 2 +- conf/locale/locale_en-US.ini | 2 +- conf/locale/locale_fr-FR.ini | 2 +- conf/locale/locale_ja-JP.ini | 2 +- conf/locale/locale_pl-PL.ini | 2 +- conf/locale/locale_pt-BR.ini | 2 +- conf/locale/locale_ru-RU.ini | 2 +- conf/locale/locale_zh-CN.ini | 2 +- conf/locale/locale_zh-HK.ini | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini index 228817ee2..460fd16f4 100755 --- a/conf/locale/locale_de-DE.ini +++ b/conf/locale/locale_de-DE.ini @@ -514,7 +514,7 @@ dashboard.delete_repo_archives=Alle Repository-Archive löschen dashboard.delete_repo_archives_success=Alle Repositoriy-Archive wurden gelöscht. dashboard.git_gc_repos=Führe Garbage Collection auf Repositories aus dashboard.git_gc_repos_success=Garbage Collection wurde auf allen Repositories erfolgreich ausgeführt. -dashboard.resync_all_sshkeys=Überschreibe '.ssh/autorized_key' Datei (Warnung: Keys, die nicht zu Gogs gehören werden verloren gehen) +dashboard.resync_all_sshkeys=Überschreibe '.ssh/authorized_key' Datei (Warnung: Keys, die nicht zu Gogs gehören werden verloren gehen) dashboard.resync_all_sshkeys_success=Alle öffentlichen Keys sind erfolgreich neu geschrieben worden. dashboard.resync_all_update_hooks=Überschreibe alle Hooks der Repositories (benötigt, wenn sich der Pfad in der Konfiguration ändert) dashboard.resync_all_update_hooks_success=Die Hooks aller Repositories sind erfolgreich neu geschrieben worden. diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index f5f56f573..20352e0f4 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -522,7 +522,7 @@ dashboard.delete_repo_archives = Delete all repositories archives dashboard.delete_repo_archives_success = All repositories archives have been deleted successfully. dashboard.git_gc_repos = Do garbage collection on repositories dashboard.git_gc_repos_success = All repositories have done garbage collection successfully. -dashboard.resync_all_sshkeys = Rewrite '.ssh/autorized_key' file (caution: non-Gogs keys will be lost) +dashboard.resync_all_sshkeys = Rewrite '.ssh/authorized_key' file (caution: non-Gogs keys will be lost) dashboard.resync_all_sshkeys_success = All public keys have been rewritten successfully. dashboard.resync_all_update_hooks = Rewrite all update hook of repositories (needed when custom config path is changed) dashboard.resync_all_update_hooks_success = All repositories' update hook have been rewritten successfully. diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini index b388884d3..a7d256603 100755 --- a/conf/locale/locale_fr-FR.ini +++ b/conf/locale/locale_fr-FR.ini @@ -514,7 +514,7 @@ dashboard.delete_repo_archives=Supprimer toutes les archives de référentiels dashboard.delete_repo_archives_success=Toutes les archives de référentiels ont été supprimés avec succès. dashboard.git_gc_repos=Collecter les déchets des référentiels dashboard.git_gc_repos_success=Tous les référentiels ont effectué la collecte avec succès. -dashboard.resync_all_sshkeys=Ré-écrire le fichier '.ssh/autorized_key' (attention : les clés hors-Gogs vont être perdues) +dashboard.resync_all_sshkeys=Ré-écrire le fichier '.ssh/authorized_key' (attention : les clés hors-Gogs vont être perdues) dashboard.resync_all_sshkeys_success=Toutes les clés publiques ont été ré-écrites avec succès. dashboard.resync_all_update_hooks=Ré-écrire tous les hooks de mises à jour des dépôts (requis quand le chemin de la configuration personnalisé est modifié) dashboard.resync_all_update_hooks_success=Tous les hooks de mises à jour des dépôts ont été ré-écris avec succès. diff --git a/conf/locale/locale_ja-JP.ini b/conf/locale/locale_ja-JP.ini index ecea91c87..4f1b923fb 100755 --- a/conf/locale/locale_ja-JP.ini +++ b/conf/locale/locale_ja-JP.ini @@ -514,7 +514,7 @@ dashboard.delete_repo_archives=リポジトリのすべてのアーカイブを dashboard.delete_repo_archives_success=リポジトリのすべてのアーカイブが正常に削除されました。 dashboard.git_gc_repos=リポジトリでのガベージコレクションを実行します。 dashboard.git_gc_repos_success=すべてのリポジトリは正常にガベージ コレクションを行いました。 -dashboard.resync_all_sshkeys='.ssh/ autorized_key' ファイルを再生成します。（警告：Gogsキー以外は失われます） +dashboard.resync_all_sshkeys='.ssh/authorized_key' ファイルを再生成します。（警告：Gogsキー以外は失われます） dashboard.resync_all_sshkeys_success=すべての公開鍵が正常に書き換えられました。 dashboard.resync_all_update_hooks=リポジトリの update フックをすべて再更新する（カスタムの設定パスが変更されたときに必要） dashboard.resync_all_update_hooks_success=リポジトリの update フックがすべて正常に再更新されました。 diff --git a/conf/locale/locale_pl-PL.ini b/conf/locale/locale_pl-PL.ini index 0b93713c8..58d2785ce 100755 --- a/conf/locale/locale_pl-PL.ini +++ b/conf/locale/locale_pl-PL.ini @@ -514,7 +514,7 @@ dashboard.delete_repo_archives=Usuń wszystkie archiwa repozytoriów dashboard.delete_repo_archives_success=Pomyślnie usunięto wszystkie archiwa repozytoriów. dashboard.git_gc_repos=Usuń śmieci z repozytoriów dashboard.git_gc_repos_success=All repositories have done garbage collection successfully. -dashboard.resync_all_sshkeys=Przeładuj klucze publiczne w pliku '.ssh/autorized_key' (uwaga: klucze poza Gogs zostaną usunięte) +dashboard.resync_all_sshkeys=Przeładuj klucze publiczne w pliku '.ssh/authorized_key' (uwaga: klucze poza Gogs zostaną usunięte) dashboard.resync_all_sshkeys_success=Przeładowanie kluczy publicznych zakończyło się sukcesem. dashboard.resync_all_update_hooks=Rewrite all update hook of repositories (needed when custom config path is changed) dashboard.resync_all_update_hooks_success=All repositories' update hook have been rewritten successfully. diff --git a/conf/locale/locale_pt-BR.ini b/conf/locale/locale_pt-BR.ini index c0c1f3719..711b473fa 100755 --- a/conf/locale/locale_pt-BR.ini +++ b/conf/locale/locale_pt-BR.ini @@ -514,7 +514,7 @@ dashboard.delete_repo_archives=Excluir todos os arquivos dos repositórios dashboard.delete_repo_archives_success=Todos os arquivos dos repositórios foram excluídos com sucesso. dashboard.git_gc_repos=Fazer coleta de lixo nos repositórios dashboard.git_gc_repos_success=Em todos repositórios, a coleta de lixo foi realizada com sucesso. -dashboard.resync_all_sshkeys=Reescrever o arquivo '.ssh/autorized_key' (atenção: chaves que não sejam do Gogs serão perdidas) +dashboard.resync_all_sshkeys=Reescrever o arquivo '.ssh/authorized_key' (atenção: chaves que não sejam do Gogs serão perdidas) dashboard.resync_all_sshkeys_success=Todas as chaves públicas foram reescritas com sucesso. dashboard.resync_all_update_hooks=Reescrever todos os hooks de atualização dos repositórios (necessário quando o caminho de configuração customizado é alterado) dashboard.resync_all_update_hooks_success=Os hooks de atualização de todos os repositórios foram reescritos com sucesso. diff --git a/conf/locale/locale_ru-RU.ini b/conf/locale/locale_ru-RU.ini index 3517ae864..e20a0afa0 100755 --- a/conf/locale/locale_ru-RU.ini +++ b/conf/locale/locale_ru-RU.ini @@ -514,7 +514,7 @@ dashboard.delete_repo_archives=Удаление всех архивов репо dashboard.delete_repo_archives_success=Все архивы репозиториев были успешно удалены. dashboard.git_gc_repos=Выполнить сборку мусора на репозиториях dashboard.git_gc_repos_success=Сборка мусора на всех репозиториях успешно выполнена. -dashboard.resync_all_sshkeys=Переписать файл «.ssh/autorized_key» (осторожно: не Gogs ключи будут утеряны) +dashboard.resync_all_sshkeys=Переписать файл «.ssh/authorized_key» (осторожно: не Gogs ключи будут утеряны) dashboard.resync_all_sshkeys_success=Были успешно переписаны все открытые ключи. dashboard.resync_all_update_hooks=Rewrite all update hook of repositories (needed when custom config path is changed) dashboard.resync_all_update_hooks_success=All repositories' update hook have been rewritten successfully. diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 0e418e254..efbc58cc6 100755 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -514,7 +514,7 @@ dashboard.delete_repo_archives=删除所有仓库存档 dashboard.delete_repo_archives_success=所有仓库存档清除成功！ dashboard.git_gc_repos=对仓库进行垃圾回收 dashboard.git_gc_repos_success=所有仓库垃圾回收成功！ -dashboard.resync_all_sshkeys=重新生成 '.ssh/autorized_key' 文件（警告：不是 Gogs 的密钥也会被删除） +dashboard.resync_all_sshkeys=重新生成 '.ssh/authorized_key' 文件（警告：不是 Gogs 的密钥也会被删除） dashboard.resync_all_sshkeys_success=所有公钥重新生成成功！ dashboard.resync_all_update_hooks=重新生成所有仓库的 Update 钩子（用于自定义配置文件被修改） dashboard.resync_all_update_hooks_success=所有仓库的 Update 钩子重新生成成功！ diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini index 407ae9b95..0bc12f92d 100755 --- a/conf/locale/locale_zh-HK.ini +++ b/conf/locale/locale_zh-HK.ini @@ -514,7 +514,7 @@ dashboard.delete_repo_archives=刪除所有倉庫存檔 dashboard.delete_repo_archives_success=所有倉庫存檔清除成功！ dashboard.git_gc_repos=對倉庫進行垃圾回收 dashboard.git_gc_repos_success=所有倉庫的垃圾回收已成功完成！ -dashboard.resync_all_sshkeys=重新生成 '.ssh/autorized_key' 文件（警告：不是 Gogs 的密鑰也會被刪除） +dashboard.resync_all_sshkeys=重新生成 '.ssh/authorized_key' 文件（警告：不是 Gogs 的密鑰也會被刪除） dashboard.resync_all_sshkeys_success=所有公鑰重新生成成功！ dashboard.resync_all_update_hooks=重新生成所有倉庫的 Update 鈎子（用於被修改的自定義配置文件） dashboard.resync_all_update_hooks_success=已成功重新生成所有倉庫的 Update 鈎子！ From 5300a63d0f515902b62b9e72cc71515415504315 Mon Sep 17 00:00:00 2001 From: Scarsz Date: Wed, 22 Apr 2015 05:50:27 -0700 Subject: [PATCH 2/2] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ac8675593..a87d58d31 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Gogs (Go Git Service) is a painless self-hosted Git service. - Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) has been reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site. - The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch. -- You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) before you start filing an issue or making a Pull Request, and **MUST** discuss with us on [Gitter](https://gitter.im/gogits/gogs) for UI changes and feature Pull Reuqests, otherwise it's high possibilities that we are not going to merge it. +- You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) before you start filing an issue or making a Pull Request, and **MUST** discuss with us on [Gitter](https://gitter.im/gogits/gogs) for UI changes and feature Pull Requests, otherwise it's high possibilities that we are not going to merge it. - If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks! #### Other language version