go-gitea · lunny · Dec 21, 2016 · Dec 21, 2016 · lunny · Dec 21, 2016
diff --git a/cmd/admin.go b/cmd/admin.go
@@ -1,4 +1,5 @@
 // Copyright 2016 The Gogs Authors. All rights reserved.
+// Copyright 2016 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
@@ -18,7 +19,7 @@ var (
  CmdAdmin = cli.Command{
  Name: "admin",
  Usage: "Preform admin operations on command line",
- Description: `Allow using internal logic of Gogs without hacking into the source code
+ Description: `Allow using internal logic of Gitea without hacking into the source code
 to make automatic initialization process more smoothly`,
  Subcommands: []cli.Command{
  subcmdCreateUser,

diff --git a/cmd/cert.go b/cmd/cert.go
@@ -137,7 +137,7 @@ func runCert(ctx *cli.Context) error {
  SerialNumber: serialNumber,
  Subject: pkix.Name{
  Organization: []string{"Acme Co"},
- CommonName: "Gogs",
+ CommonName: "Gitea",
  },
  NotBefore: notBefore,
  NotAfter: notAfter,

diff --git a/cmd/dump.go b/cmd/dump.go
@@ -1,4 +1,5 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2016 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
@@ -21,9 +22,9 @@ import (
 // CmdDump represents the available dump sub-command.
 var CmdDump = cli.Command{
  Name: "dump",
- Usage: "Dump Gogs files and database",
+ Usage: "Dump Gitea files and database",
  Description: `Dump compresses all related files and database into zip file.
-It can be used for backup and capture Gogs server image to send to maintainer`,
+It can be used for backup and capture Gitea server image to send to maintainer`,
  Action: runDump,
  Flags: []cli.Flag{
  cli.StringFlag{
@@ -55,14 +56,14 @@ func runDump(ctx *cli.Context) error {
  if _, err := os.Stat(tmpDir); os.IsNotExist(err) {
  log.Fatalf("Path does not exist: %s", tmpDir)
  }
- TmpWorkDir, err := ioutil.TempDir(tmpDir, "gogs-dump-")
+ TmpWorkDir, err := ioutil.TempDir(tmpDir, "gitea-dump-")
  if err != nil {
  log.Fatalf("Fail to create tmp work directory: %v", err)
  }
  log.Printf("Creating tmp work dir: %s", TmpWorkDir)
 
- reposDump := path.Join(TmpWorkDir, "gogs-repo.zip")
- dbDump := path.Join(TmpWorkDir, "gogs-db.sql")
+ reposDump := path.Join(TmpWorkDir, "gitea-repo.zip")
+ dbDump := path.Join(TmpWorkDir, "gitea-db.sql")
 
  log.Printf("Dumping local repositories...%s", setting.RepoRootPath)
  zip.Verbose = ctx.Bool("verbose")
@@ -75,18 +76,18 @@ func runDump(ctx *cli.Context) error {
  log.Fatalf("Fail to dump database: %v", err)
  }
 
- fileName := fmt.Sprintf("gogs-dump-%d.zip", time.Now().Unix())
+ fileName := fmt.Sprintf("gitea-dump-%d.zip", time.Now().Unix())
  log.Printf("Packing dump files...")
  z, err := zip.Create(fileName)
  if err != nil {
  log.Fatalf("Fail to create %s: %v", fileName, err)
  }
 
- if err := z.AddFile("gogs-repo.zip", reposDump); err != nil {
- log.Fatalf("Fail to include gogs-repo.zip: %v", err)
+ if err := z.AddFile("gitea-repo.zip", reposDump); err != nil {
+ log.Fatalf("Fail to include gitea-repo.zip: %v", err)
  }
- if err := z.AddFile("gogs-db.sql", dbDump); err != nil {
- log.Fatalf("Fail to include gogs-db.sql: %v", err)
+ if err := z.AddFile("gitea-db.sql", dbDump); err != nil {
+ log.Fatalf("Fail to include gitea-db.sql: %v", err)
  }
  customDir, err := os.Stat(setting.CustomPath)
  if err == nil && customDir.IsDir() {

diff --git a/cmd/serve.go b/cmd/serve.go
@@ -1,4 +1,5 @@
 // Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2016 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
@@ -76,7 +77,7 @@ var (
 )
 
 func fail(userMessage, logMessage string, args ...interface{}) {
- fmt.Fprintln(os.Stderr, "Gogs:", userMessage)
+ fmt.Fprintln(os.Stderr, "Gitea:", userMessage)
 
  if len(logMessage) > 0 {
  if !setting.ProdMode {
@@ -144,7 +145,7 @@ func runServ(c *cli.Context) error {
  setup("serv.log")
 
  if setting.SSH.Disabled {
- println("Gogs: SSH has been disabled")
+ println("Gitea: SSH has been disabled")
  return nil
  }
 
@@ -154,8 +155,8 @@ func runServ(c *cli.Context) error {
 
  cmd := os.Getenv("SSH_ORIGINAL_COMMAND")
  if len(cmd) == 0 {
- println("Hi there, You've successfully authenticated, but Gogs does not provide shell access.")
- println("If this is unexpected, please log in with password and setup Gogs under another user.")
+ println("Hi there, You've successfully authenticated, but Gitea does not provide shell access.")
+ println("If this is unexpected, please log in with password and setup Gitea under another user.")
  return nil
  }
 

diff --git a/cmd/web.go b/cmd/web.go
@@ -44,8 +44,8 @@ import (
 // CmdWeb represents the available web sub-command.
 var CmdWeb = cli.Command{
  Name: "web",
- Usage: "Start Gogs web server",
- Description: `Gogs web server is the only thing you need to run,
+ Usage: "Start Gitea web server",
+ Description: `Gitea web server is the only thing you need to run,
 and it takes care of all the other things for you`,
  Action: runWeb,
  Flags: []cli.Flag{

diff --git a/conf/locale/locale_bg-BG.ini b/conf/locale/locale_bg-BG.ini
@@ -110,7 +110,7 @@ admin_name=Потребителско име
 admin_password=Парола
 confirm_password=Потвърждение на паролата
 admin_email=Ел. поща
-install_gogs=Инсталирай Gitea
+install_btn_confirm=Инсталирай Gitea
 test_git_failed=Неуспешно тестването на "git" команда: %v
 sqlite3_not_available=Вашата версия не поддържа SQLite3, моля, изтеглете официалната двоична версия от %s, а не gobuild версията.
 invalid_db_setting=Настройките на базата данни са некоректни: %v

diff --git a/conf/locale/locale_cs-CZ.ini b/conf/locale/locale_cs-CZ.ini
@@ -110,7 +110,7 @@ admin_name=Uživatelské jméno
 admin_password=Heslo
 confirm_password=Potvrdit heslo
 admin_email=E-mailová adresa správce
-install_gogs=Nainstalovat Gitea
+install_btn_confirm=Nainstalovat Gitea
 test_git_failed=Chyba při testu příkazu 'git': %v
 sqlite3_not_available=Vaše verze vydání Gitea nepodporuje SQLite3, prosíme stáhněte si oficiální binární balíček z %s, ne gobuild verzi.
 invalid_db_setting=Nastavení databáze není správné: %v

diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini
@@ -110,7 +110,7 @@ admin_name=Benutzername
 admin_password=Passwort
 confirm_password=Passwort bestätigen
 admin_email=Administrator E-Mail
-install_gogs=Gitea installieren
+install_btn_confirm=Gitea installieren
 test_git_failed=Fehler beim Test des 'git' Kommandos: %v
 sqlite3_not_available=Ihre Gitea-Version unterstützt SQLite3 nicht. Bitte laden Sie die offizielle binäre Version von %s herunter, NICHT die gobuild-Version.
 invalid_db_setting=Datenbankeinstellungen sind nicht korrekt: %v

diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini
@@ -110,7 +110,7 @@ admin_name = Username
 admin_password = Password
 confirm_password = Confirm Password
 admin_email = Admin Email
-install_gogs = Install Gitea
+install_btn_confirm = Install Gitea
 test_git_failed = Fail to test 'git' command: %v
 sqlite3_not_available = Your release version does not support SQLite3, please download the official binary version from %s, NOT the gobuild version.
 invalid_db_setting = Database setting is not correct: %v

diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini
@@ -110,7 +110,7 @@ admin_name=Nombre de usuario
 admin_password=Contraseña
 confirm_password=Confirmar Contraseña
 admin_email=Correo electrónico del administrador
-install_gogs=Instalar Gitea
+install_btn_confirm=Instalar Gitea
 test_git_failed=Fallo al probar el comando 'git': %v
 sqlite3_not_available=Tu versión no soporta SQLite3, por favor descarga el binario oficial desde %s, NO la versión de gobuild.
 invalid_db_setting=La configuración de la base de datos no es correcta: %v

diff --git a/conf/locale/locale_fi-FI.ini b/conf/locale/locale_fi-FI.ini
@@ -110,7 +110,7 @@ admin_name=Käyttäjätunnus
 admin_password=Salasana
 confirm_password=Varmista salasana
 admin_email=Ylläpito sähköposti
-install_gogs=Asenna Gitea
+install_btn_confirm=Asenna Gitea
 test_git_failed=Epäonnistui testata 'git' komentoa: %v
 sqlite3_not_available=Julkaisu versiosi ei tue SQLite3, ole hyvä ja lataa virallinen binääri versio osoitteesta %s, EI gobuild versiota.
 invalid_db_setting=Tietokanta asetus ei ole oikea: %v

diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini
@@ -110,7 +110,7 @@ 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 Gitea
+install_btn_confirm=Installer Gitea
 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

diff --git a/conf/locale/locale_it-IT.ini b/conf/locale/locale_it-IT.ini
@@ -110,7 +110,7 @@ admin_name=Nome utente
 admin_password=Password
 confirm_password=Conferma Password
 admin_email=E-mail dell'Admin
-install_gogs=Installare Gitea
+install_btn_confirm=Installare Gitea
 test_git_failed=Fallito il test del comando git: %v
 sqlite3_not_available=Questa versione non supporta SQLite3, si prega di scaricare la versione binaria ufficiale da %s, NON la versione gobuild.
 invalid_db_setting=La configurazione del database non è corretta: %v

diff --git a/conf/locale/locale_ja-JP.ini b/conf/locale/locale_ja-JP.ini
@@ -110,7 +110,7 @@ admin_name=ユーザ名
 admin_password=パスワード
 confirm_password=パスワード確認
 admin_email=管理者の電子メール
-install_gogs=Gitea をインストール
+install_btn_confirm=Gitea をインストール
 test_git_failed='Git' コマンドテストに失敗: %v
 sqlite3_not_available=このリリース バージョンは SQLite3 をサポートしていません。gobuild バージョンではない、公式のバイナリ バージョンを %s からダウンロードしてください。
 invalid_db_setting=データベースの設定が正しくありません: %v

diff --git a/conf/locale/locale_lv-LV.ini b/conf/locale/locale_lv-LV.ini
@@ -110,7 +110,7 @@ admin_name=Lietotājvārds
 admin_password=Parole
 confirm_password=Apstipriniet paroli
 admin_email=Administratora e-pasts
-install_gogs=Instalēt Gitea
+install_btn_confirm=Instalēt Gitea
 test_git_failed=Kļūda pārbaudot 'git' komandu: %v
 sqlite3_not_available=Jūsu versija neatbalsta SQLite3, lūdzu lejupielādējiet oficiālo bināro versiju no %s, NEVIS gobuild versiju.
 invalid_db_setting=Datu bāzes iestatījums nav pareizs: %v

diff --git a/conf/locale/locale_nl-NL.ini b/conf/locale/locale_nl-NL.ini
@@ -110,7 +110,7 @@ admin_name=Gebruikersnaam
 admin_password=Wachtwoord
 confirm_password=Verifieer wachtwoord
 admin_email=Beheerder E-mail
-install_gogs=Installeer Gitea
+install_btn_confirm=Installeer Gitea
 test_git_failed=Git test niet gelukt: 'git' commando %v
 sqlite3_not_available=Uw versie biedt geen ondersteuning voor SQLite3, download de officiële binaire versie van %s, niet de gobuild versie.
 invalid_db_setting=Uw database instellingen zijn niet correct: %v

diff --git a/conf/locale/locale_pl-PL.ini b/conf/locale/locale_pl-PL.ini
@@ -110,7 +110,7 @@ admin_name=Nazwa Użytkownika
 admin_password=Hasło
 confirm_password=Potwierdź hasło
 admin_email=E-mail administratora
-install_gogs=Zainstaluj Gitea
+install_btn_confirm=Zainstaluj Gitea
 test_git_failed=Nie udało się przetestować polecenia "git": %v
 sqlite3_not_available=Twoje wydanie nie obsługuje SQLite3, proszę pobrać oficjalne wydanie z %s, a NIE wersję z gobuild.
 invalid_db_setting=Ustawienia bazy danych nie są poprawne: %v

diff --git a/conf/locale/locale_pt-BR.ini b/conf/locale/locale_pt-BR.ini
@@ -110,7 +110,7 @@ admin_name=Nome de usuário
 admin_password=Senha
 confirm_password=Confirmar senha
 admin_email=E-mail do administrador
-install_gogs=Instalar Gitea
+install_btn_confirm=Instalar Gitea
 test_git_failed=Falha ao testar o comando 'git': %v
 sqlite3_not_available=Sua versão não suporta SQLite3, por favor faça o download da versão binária oficial em %s, NÃO da versão gobuild.
 invalid_db_setting=Configuração do banco de dados não está correta: %v
@@ -1197,4 +1197,3 @@ default_message=Arraste e solte arquivos aqui, ou clique para selecioná-los.
 invalid_input_type=Você não pode enviar arquivos deste tipo.
 file_too_big=O tamanho do arquivo ({{filesize}} MB) excede o limite máximo ({{maxFilesize}} MB).
 remove_file=Remover
-
diff --git a/conf/locale/locale_ru-RU.ini b/conf/locale/locale_ru-RU.ini
@@ -110,7 +110,7 @@ admin_name=Имя пользователя
 admin_password=Пароль
 confirm_password=Подтвердить пароль
 admin_email=Электронная почта администратора
-install_gogs=Установить Gitea
+install_btn_confirm=Установить Gitea
 test_git_failed=Не удалось проверить 'git' команду: %v
 sqlite3_not_available=Ваша версия не поддерживает SQLite3, пожалуйста скачайте официальную бинарную версию от %s, а не версию gobuild.
 invalid_db_setting=Настройки базы данных не правильные: %v

diff --git a/conf/locale/locale_sr-SP.ini b/conf/locale/locale_sr-SP.ini
@@ -110,7 +110,7 @@ admin_name=Корисничко име
 admin_password=Лозинка
 confirm_password=Потврдите лозинку
 admin_email=Адреса е-поште адмниистратора
-install_gogs=Успостави Gitea
+install_btn_confirm=Успостави Gitea
 test_git_failed=Команда 'git' није успела: %v
 sqlite3_not_available=Ваша верзија не подржава SQLite3, молимо вас преузмите званичну бинарну верзију од %s, а не верзију gobuild.
 invalid_db_setting=Подешавања базе података су неправилна: %v

diff --git a/conf/locale/locale_sv-SE.ini b/conf/locale/locale_sv-SE.ini
@@ -110,7 +110,7 @@ admin_name=Användarnamn
 admin_password=Lösenord
 confirm_password=Bekräfta lösenord
 admin_email=Administratörs Epost
-install_gogs=Installera Gogs
+install_btn_confirm=Installera Gogs
 test_git_failed=Misslyckades att testa 'git' kommando: %v
 sqlite3_not_available=Din release stödjer ej SQLite3, ladda vänligen ner den officiella binären via %s, inte gobuild varianten.
 invalid_db_setting=Databas inställningen är inkorrekt: %v

diff --git a/conf/locale/locale_tr-TR.ini b/conf/locale/locale_tr-TR.ini
@@ -110,7 +110,7 @@ admin_name=Kullanıcı Adı
 admin_password=Parola
 confirm_password=Parolayı Doğrula
 admin_email=Yönetici E-Postası
-install_gogs=Gogs'u Kur
+install_btn_confirm=Gogs'u Kur
 test_git_failed='git' komut testi başarısız: %v
 sqlite3_not_available=Yayın sürümünüz SQLite3'ü desteklemiyor, lütfen %s'den resmi sürümü (gobuild sürümünü DEĞİL) indirin.
 invalid_db_setting=Veritabanı ayarları geçersiz: %v

diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
@@ -110,7 +110,7 @@ admin_name=管理员用户名
 admin_password=管理员密码
 confirm_password=确认密码
 admin_email=管理员邮箱
-install_gogs=立即安装
+install_btn_confirm=立即安装
 test_git_failed=无法识别 'git' 命令：%v
 sqlite3_not_available=您所使用的发行版不支持 SQLite3，请从 %s 下载官方构建版，而不是 gobuild 版本。
 invalid_db_setting=数据库设置不正确：%v

diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini
@@ -110,7 +110,7 @@ admin_name=管理員用戶名
 admin_password=管理員密碼
 confirm_password=確認密碼
 admin_email=管理員郵箱
-install_gogs=立即安裝
+install_btn_confirm=立即安裝
 test_git_failed=無法識別 'git' 命令：%v
 sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s 下載官方構建版，而不是 gobuild 版本。
 invalid_db_setting=數據庫設置不正確：%v

diff --git a/conf/locale/locale_zh-TW.ini b/conf/locale/locale_zh-TW.ini
@@ -110,7 +110,7 @@ admin_name=管理員用戶名
 admin_password=管理員密碼
 confirm_password=確認密碼
 admin_email=管理員郵箱
-install_gogs=立即安裝
+install_btn_confirm=立即安裝
 test_git_failed=無法識別 'git' 命令：%v
 sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s 下載官方構建版，而不是 gobuild 版本。
 invalid_db_setting=數據庫設置不正確：%v

diff --git a/main.go b/main.go
@@ -1,5 +1,5 @@
-// Copyright 2016 The Gitea Authors. All rights reserved.
 // Copyright 2014 The Gogs Authors. All rights reserved.
+// Copyright 2016 The Gitea Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 

diff --git a/modules/bindata/bindata.go b/modules/bindata/bindata.go
diff --git a/templates/install.tmpl b/templates/install.tmpl
@@ -234,7 +234,7 @@
  <div class="ui divider"></div>
  <div class="inline field">
  <label></label>
- <button class="ui primary button">{{.i18n.Tr "install.install_gogs"}}</button>
+ <button class="ui primary button">{{.i18n.Tr "install.install_btn_confirm"}}</button>
  </div>
  </form>
  </div>