aboutsummaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
Diffstat (limited to 'options')
-rw-r--r--options/locale/locale_cs-CZ.ini2
-rw-r--r--options/locale/locale_de-DE.ini3
-rw-r--r--options/locale/locale_es-ES.ini3
-rw-r--r--options/locale/locale_fa-IR.ini2
-rw-r--r--options/locale/locale_fr-FR.ini1
-rw-r--r--options/locale/locale_it-IT.ini2
-rw-r--r--options/locale/locale_ja-JP.ini3
-rw-r--r--options/locale/locale_lv-LV.ini3
-rw-r--r--options/locale/locale_nl-NL.ini2
-rw-r--r--options/locale/locale_pl-PL.ini2
-rw-r--r--options/locale/locale_pt-PT.ini3
-rw-r--r--options/locale/locale_ru-RU.ini3
-rw-r--r--options/locale/locale_sv-SE.ini1
-rw-r--r--options/locale/locale_tr-TR.ini3
-rw-r--r--options/locale/locale_uk-UA.ini2
-rw-r--r--options/locale/locale_zh-CN.ini3
-rw-r--r--options/locale/locale_zh-TW.ini3
17 files changed, 0 insertions, 41 deletions
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
index f5398d4125..d58e7e737a 100644
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@@ -1096,7 +1096,6 @@ issues.context.edit=Upravit
issues.context.delete=Smazat
issues.no_content=Není zde žádný obsah.
issues.close_issue=Zavřít
-issues.pull_merged_at=`sloučil(a) revizi <a href="%[1]s">%[2]s</a> do <b>%[3]s</b> %[4]s`
issues.close_comment_issue=Okomentovat a zavřít
issues.reopen_issue=Znovuotevřít
issues.reopen_comment_issue=Okomentovat a znovuotevřít
@@ -1187,7 +1186,6 @@ issues.error_modifying_due_date=Změna termínu dokončení selhala.
issues.error_removing_due_date=Odstranění termínu dokončení selhalo.
issues.push_commit_1=přidal(a) %d revizi %s
issues.push_commits_n=přidal(a) %d revize %s
-issues.force_push_codes=`vynucené nahrání %[1]s z <a href="%[3]s">%[2]s</a> do <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=rrrr-mm-dd
issues.due_date_form_add=Přidat termín dokončení
issues.due_date_form_edit=Upravit
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
index 5ba4ee0904..95e6f2dd7c 100644
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@@ -1112,8 +1112,6 @@ issues.context.edit=Bearbeiten
issues.context.delete=Löschen
issues.no_content=Hier gibt es bis jetzt noch keinen Inhalt.
issues.close_issue=Schließen
-issues.pull_merged_at=`hat den Commit <a href="%[1]s">%[2]s</a> in <b>%[3]s</b> %[4]s gemergt`
-issues.manually_pull_merged_at=`hat %[4]s den Commit <a href="%[1]s">%[2]s</a> manuell in <b>%[3]s</b> gemergt`
issues.close_comment_issue=Kommentieren und schließen
issues.reopen_issue=Wieder öffnen
issues.reopen_comment_issue=Kommentieren und wieder öffnen
@@ -1207,7 +1205,6 @@ issues.error_modifying_due_date=Fehler beim Ändern des Fälligkeitsdatums.
issues.error_removing_due_date=Fehler beim Entfernen des Fälligkeitsdatums.
issues.push_commit_1=hat %d Commit %s hinzugefügt
issues.push_commits_n=hat %d Commits %s hinzugefügt
-issues.force_push_codes=`force-pushte %[1]s von <a href="%[3]s">%[2]s</a> auf <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=JJJJ-MM-TT
issues.due_date_form_add=Fälligkeitsdatum hinzufügen
issues.due_date_form_edit=Bearbeiten
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index 9575ec0798..324f6e6d94 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -1112,8 +1112,6 @@ issues.context.edit=Editar
issues.context.delete=Eliminar
issues.no_content=Aún no existe contenido.
issues.close_issue=Cerrar
-issues.pull_merged_at=`fusionado commit <a href="%[1]s">%[2]s</a> en <b>%[3]s</b> %[4]s`
-issues.manually_pull_merged_at=`fusionado manualmente commit <a href="%[1]s">%[2]s</a> en <b>%[3]s</b> %[4]s`
issues.close_comment_issue=Comentar y cerrar
issues.reopen_issue=Reabrir
issues.reopen_comment_issue=Comentar y reabrir
@@ -1207,7 +1205,6 @@ issues.error_modifying_due_date=Fallo al modificar la fecha de vencimiento.
issues.error_removing_due_date=Fallo al eliminar la fecha de vencimiento.
issues.push_commit_1=añadido %d commit %s
issues.push_commits_n=añadido %d commits %s
-issues.force_push_codes=`hizo push forzado %[1]s de <a href="%[3]s">%[2]s</a> a <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=aaaa-mm-dd
issues.due_date_form_add=Añadir fecha de vencimiento
issues.due_date_form_edit=Editar
diff --git a/options/locale/locale_fa-IR.ini b/options/locale/locale_fa-IR.ini
index 0f9becd964..c5c36ea86c 100644
--- a/options/locale/locale_fa-IR.ini
+++ b/options/locale/locale_fa-IR.ini
@@ -960,7 +960,6 @@ issues.context.edit=ویرایش
issues.context.delete=حذف
issues.no_content=هنوز محتوایی ایجاد نشده.
issues.close_issue=ببند
-issues.pull_merged_at=`انجام ادغام تغییرات <a href="%[1]s">%[2]s</a> داخل <b>%[3]s</b> %[4]s`
issues.close_comment_issue=ثبت دیدگاه و بستن
issues.reopen_issue=بازگشایی
issues.reopen_comment_issue=ثبت دیدگاه و بازگشایی
@@ -1046,7 +1045,6 @@ issues.error_modifying_due_date=تغییر موعد مقرر با شکست مو
issues.error_removing_due_date=حذف موعد مقرر با شکست مواجه شد.
issues.push_commit_1=%d اعمال تغییر اضافه شده است %s
issues.push_commits_n=%d اعمال تغییرات اضافه شده است %s
-issues.force_push_codes=`ارسال به سرور اجباری %[1] از <a href="%[3]s">%[2]s</a> به<a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=yyyy-mm-dd
issues.due_date_form_add=افزودن موعد مقرر
issues.due_date_form_edit=ویرایش
diff --git a/options/locale/locale_fr-FR.ini b/options/locale/locale_fr-FR.ini
index ee2be17d53..c11970206a 100644
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@@ -1039,7 +1039,6 @@ issues.context.edit=Éditer
issues.context.delete=Supprimer
issues.no_content=Il n'existe pas encore de contenu.
issues.close_issue=Fermer
-issues.pull_merged_at=`commit de fusion <a href="%[1]s">%[2]s</a> dans <b>%[3]s</b> %[4]s`
issues.close_comment_issue=Commenter et Fermer
issues.reopen_issue=Réouvrir
issues.reopen_comment_issue=Commenter et Réouvrir
diff --git a/options/locale/locale_it-IT.ini b/options/locale/locale_it-IT.ini
index 63b3b3c240..8d9d78e872 100644
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@@ -1053,7 +1053,6 @@ issues.context.edit=Modifica
issues.context.delete=Elimina
issues.no_content=Non ci sono ancora contenuti.
issues.close_issue=Chiudi
-issues.pull_merged_at=`merged commit <a href="%[1]s">%[2]s</a> in <b>%[3]s</b> %[4]s`
issues.close_comment_issue=Commenta e Chiudi
issues.reopen_issue=Riapri
issues.reopen_comment_issue=Commenta e Riapri
@@ -1140,7 +1139,6 @@ issues.error_modifying_due_date=Impossibile modificare la data di scadenza.
issues.error_removing_due_date=Impossibile rimuovere la data di scadenza.
issues.push_commit_1=aggiunto %d commit %s
issues.push_commits_n=aggiunto %d commit %s
-issues.force_push_codes=`force-pushed %[1]s da <a href="%[3]s">%[2]s</a> a <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=yyyy-mm-dd
issues.due_date_form_add=Aggiungi data di scadenza
issues.due_date_form_edit=Modifica
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
index a17aac68a6..a6ea53bf3f 100644
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@@ -1112,8 +1112,6 @@ issues.context.edit=編集
issues.context.delete=削除
issues.no_content=まだ内容がありません
issues.close_issue=クローズする
-issues.pull_merged_at=`がコミット <a href="%[1]s">%[2]s</a> を <b>%[3]s</b> にマージ %[4]s`
-issues.manually_pull_merged_at=`がコミット <a href="%[1]s">%[2]s</a> を <b>%[3]s</b> に手動マージ %[4]s`
issues.close_comment_issue=コメントしてクローズ
issues.reopen_issue=再オープンする
issues.reopen_comment_issue=コメントして再オープン
@@ -1207,7 +1205,6 @@ issues.error_modifying_due_date=期日を変更できませんでした。
issues.error_removing_due_date=期日を削除できませんでした。
issues.push_commit_1=が %d コミット追加 %s
issues.push_commits_n=が %d コミット追加 %s
-issues.force_push_codes=`が %[1]s を <a href="%[3]s">%[2]s</a> から <a href="%[5]s">%[4]s</a> に強制プッシュ %[6]s`
issues.due_date_form=yyyy-mm-dd
issues.due_date_form_add=期日の追加
issues.due_date_form_edit=変更
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
index 4dfe6915de..718e29f18d 100644
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@@ -1105,8 +1105,6 @@ issues.context.edit=Labot
issues.context.delete=Dzēst
issues.no_content=Vēl nav satura.
issues.close_issue=Aizvērt
-issues.pull_merged_at=`sapludināja revīziju <a href="%[1]s">%[2]s</a> atzarā <b>%[3]s</b> %[4]s`
-issues.manually_pull_merged_at=`manuāli sapludināja revīziju <a href="%[1]s">%[2]s</a> atzarā <b>%[3]s</b> %[4]s`
issues.close_comment_issue=Komentēt un aizvērt
issues.reopen_issue=Atvērt atkārtoti
issues.reopen_comment_issue=Komentēt un atvērt atkārtoti
@@ -1200,7 +1198,6 @@ issues.error_modifying_due_date=Neizdevās izmainīt izpildes termiņu.
issues.error_removing_due_date=Neizdevās noņemt izpildes termiņu.
issues.push_commit_1=iesūtīja %d revīziju %s
issues.push_commits_n=iesūtīja %d revīzijas %s
-issues.force_push_codes=`veica piespiedu izmaiņu nosūtīšanu atzaram %[1]s no <a href="%[3]s">%[2]s</a> uz <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=yyyy-mm-dd
issues.due_date_form_add=Pievienot izpildes termiņu
issues.due_date_form_edit=Labot
diff --git a/options/locale/locale_nl-NL.ini b/options/locale/locale_nl-NL.ini
index 7773e73ec6..df3d46d062 100644
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@@ -1043,7 +1043,6 @@ issues.context.edit=Bewerken
issues.context.delete=Verwijder
issues.no_content=Er is nog geen inhoud.
issues.close_issue=Sluit
-issues.pull_merged_at=`heeft commit <a href="%[1]s">%[2]s</a> samengevoegd in <b>%[3]s</b> %[4]s`
issues.close_comment_issue=Reageer en sluit
issues.reopen_issue=Heropen
issues.reopen_comment_issue=Heropen en geef commentaar
@@ -1130,7 +1129,6 @@ issues.error_modifying_due_date=Deadline aanpassen mislukt.
issues.error_removing_due_date=Deadline verwijderen mislukt.
issues.push_commit_1=toegevoegd %d commit %s
issues.push_commits_n=toegevoegd %d commits %s
-issues.force_push_codes=`geforceerd-pushed %[1]s van <a href="%[3]s">%[2]s</a> naar <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=jjjj-mm-dd
issues.due_date_form_add=Vervaldatum toevoegen
issues.due_date_form_edit=Bewerk
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
index 5dc5c659a3..ae3c5595f4 100644
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@@ -982,7 +982,6 @@ issues.context.edit=Edytuj
issues.context.delete=Usuń
issues.no_content=Nie ma jeszcze treści.
issues.close_issue=Zamknij
-issues.pull_merged_at=`scalił(-a) commit <a href="%[1]s">%[2]s</a> do <b>%[3]s</b> %[4]s`
issues.close_comment_issue=Skomentuj i zamknij
issues.reopen_issue=Otwórz ponownie
issues.reopen_comment_issue=Skomentuj i otwórz ponownie
@@ -1068,7 +1067,6 @@ issues.error_modifying_due_date=Nie udało się zmodyfikować terminu realizacji
issues.error_removing_due_date=Nie udało się usunąć terminu realizacji.
issues.push_commit_1=dodał(-a) %d commit %s
issues.push_commits_n=dodał(-a) %d commity(-ów) %s
-issues.force_push_codes=`przymusowo wypchnął %[1]s z <a href="%[3]s">%[2]s</a> do <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=yyyy-mm-dd
issues.due_date_form_add=Dodaj termin realizacji
issues.due_date_form_edit=Edytuj
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
index da4af2cf5c..63a74036d3 100644
--- a/options/locale/locale_pt-PT.ini
+++ b/options/locale/locale_pt-PT.ini
@@ -1108,8 +1108,6 @@ issues.context.edit=Editar
issues.context.delete=Eliminar
issues.no_content=Ainda não há conteúdo.
issues.close_issue=Fechar
-issues.pull_merged_at=`cometimento <a href="%[1]s">%[2]s</a> integrado em <b>%[3]s</b> %[4]s`
-issues.manually_pull_merged_at=`integrou o cometimento <a href="%[1]s"> [2] </a> em <b> [3] </b> [4] manualmente`
issues.close_comment_issue=Comentar e fechar
issues.reopen_issue=Reabrir
issues.reopen_comment_issue=Comentar e reabrir
@@ -1203,7 +1201,6 @@ issues.error_modifying_due_date=Falha ao modificar a data limite.
issues.error_removing_due_date=Falha ao remover a data limite.
issues.push_commit_1=adicionou %d cometimento %s
issues.push_commits_n=adicionou %d cometimentos %s
-issues.force_push_codes=`forçou o envio de %[1]s de <a href="%[3]s">%[2]s</a> para <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=yyyy-mm-dd
issues.due_date_form_add=Adicionar data limite
issues.due_date_form_edit=Editar
diff --git a/options/locale/locale_ru-RU.ini b/options/locale/locale_ru-RU.ini
index 75129a9389..8a3b34d0a9 100644
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@@ -1107,8 +1107,6 @@ issues.context.edit=Редактировать
issues.context.delete=Удалить
issues.no_content=Пока нет содержимого.
issues.close_issue=Закрыть
-issues.pull_merged_at=`Объединил коммит <a href="%[1]s">%[2]s</a> на <b>%[3]s</b> %[4]s`
-issues.manually_pull_merged_at=`Объединил коммит <a href="%[1]s">%[2]s</a> с <b>%[3]s</b> %[4]s вручную`
issues.close_comment_issue=Прокомментировать и закрыть
issues.reopen_issue=Открыть снова
issues.reopen_comment_issue=Прокомментировать и открыть снова
@@ -1202,7 +1200,6 @@ issues.error_modifying_due_date=Не удалось изменить срок в
issues.error_removing_due_date=Не удалось убрать срок выполнения.
issues.push_commit_1=добавил(а) %d коммит %s
issues.push_commits_n=добавил(а) %d коммитов %s
-issues.force_push_codes=`Принудительный push %[1]s ветки из <a href="%[3]s">%[2]s</a> to <a href="%[5]s">%[4]s</a>. %[6]s`
issues.due_date_form=гггг-мм-дд
issues.due_date_form_add=Добавить срок выполнения
issues.due_date_form_edit=Редактировать
diff --git a/options/locale/locale_sv-SE.ini b/options/locale/locale_sv-SE.ini
index 976b7a8fcc..9f3c1b2339 100644
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@@ -1004,7 +1004,6 @@ issues.context.edit=Redigera
issues.context.delete=Ta bort
issues.no_content=Det finns inget innehåll än.
issues.close_issue=Stäng
-issues.pull_merged_at=`sammanfogade commit <a href="%[1]s">%[2]s</a> in i <b>%[3]s</b> %[4]s`
issues.close_comment_issue=Kommentera och stäng
issues.reopen_issue=Återöppna
issues.reopen_comment_issue=Kommentera och återöppna
diff --git a/options/locale/locale_tr-TR.ini b/options/locale/locale_tr-TR.ini
index e2c6f44d34..c694786a4a 100644
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@@ -1107,8 +1107,6 @@ issues.context.edit=Düzenle
issues.context.delete=Sil
issues.no_content=Henüz bir içerik yok.
issues.close_issue=Kapat
-issues.pull_merged_at=`<a href="%[1]s">%[2]s</a> işlemesini <b>%[3]s</b> ile %[4]s birleştirdi`
-issues.manually_pull_merged_at=`<a href="%[1]s">%[2]s</a> işlemesini <b>%[3]s</b> %[4]s elle birleştirdi`
issues.close_comment_issue=Yorum Yap ve Kapat
issues.reopen_issue=Yeniden aç
issues.reopen_comment_issue=Yorum Yap ve Yeniden Aç
@@ -1202,7 +1200,6 @@ issues.error_modifying_due_date=Bitiş tarihi değiştirilemedi.
issues.error_removing_due_date=Bitiş tarihi silinemedi.
issues.push_commit_1=%d işlemeyi %s ekledi
issues.push_commits_n=%d işlemeyi %s ekledi
-issues.force_push_codes=`%[1]s <a href="%[3]s">%[2]s</a> konumundan <a href="%[5]s">%[4]s</a> %[6]s konumuna zorla güncellendi`
issues.due_date_form=yyyy-aa-gg
issues.due_date_form_add=Bitiş tarihi ekle
issues.due_date_form_edit=Düzenle
diff --git a/options/locale/locale_uk-UA.ini b/options/locale/locale_uk-UA.ini
index 5dfc0ec274..8ce7956134 100644
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@@ -988,7 +988,6 @@ issues.context.edit=Редагувати
issues.context.delete=Видалити
issues.no_content=Тут ще немає жодного змісту.
issues.close_issue=Закрити
-issues.pull_merged_at=`злив коміт <a href="%[1]s">%[2]s</a> в <b>%[3]s</b> %[4]s`
issues.close_comment_issue=Прокоментувати і закрити
issues.reopen_issue=Відкрити знову
issues.reopen_comment_issue=Прокоментувати та відкрити знову
@@ -1074,7 +1073,6 @@ issues.error_modifying_due_date=Не вдалося змінити дату за
issues.error_removing_due_date=Не вдалося видалити дату завершення.
issues.push_commit_1=додав %d коміт %s
issues.push_commits_n=додав %d коміти(-ів) %s
-issues.force_push_codes=`виконав force-push %[1]s з <a href="%[3]s">%[2]s</a> на <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=рррр-мм-дд
issues.due_date_form_add=Додати дату завершення
issues.due_date_form_edit=Редагувати
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 9c9bd57d7c..67d2373e10 100644
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -1112,8 +1112,6 @@ issues.context.edit=编辑
issues.context.delete=刪除
issues.no_content=这个人很懒,什么都没留下。
issues.close_issue=关闭
-issues.pull_merged_at=`已于 %[4]s 合并提交 <a href="%[1]s">%[2]s</a> 到 <b>%[3]s</b> 分支`
-issues.manually_pull_merged_at=`手动将提交 <a href="%[1]s">%[2]s</a>合并入 <b>[3]s</b> %[4]s`
issues.close_comment_issue=评论并关闭
issues.reopen_issue=重新开启
issues.reopen_comment_issue=评论并重新开启
@@ -1207,7 +1205,6 @@ issues.error_modifying_due_date=未能修改到期时间。
issues.error_removing_due_date=未能删除到期时间。
issues.push_commit_1=于 %[2]s 推送了 %[1]d 个提交
issues.push_commits_n=于 %[2]s 推送了 %[1]d 个提交
-issues.force_push_codes=`%[6]s 强制从 <a href="%[3]s">%[2]s</a> 推送 %[1]s 到 <a href="%[5]s">%[4]s</a>`
issues.due_date_form=yyyy年mm月dd日
issues.due_date_form_add=添加到期时间
issues.due_date_form_edit=编辑
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
index 84315baf0c..8ca70ab60b 100644
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@@ -1121,8 +1121,6 @@ issues.context.edit=編輯
issues.context.delete=刪除
issues.no_content=尚未有任何內容
issues.close_issue=關閉
-issues.pull_merged_at=`合併了提交 <a href="%[1]s">%[2]s</a> 至 <b>%[3]s</b> %[4]s`
-issues.manually_pull_merged_at=`手動合併了提交 <a href="%[1]s">%[2]s</a> 進 <b>%[3]s</b> %[4]s`
issues.close_comment_issue=留言並關閉
issues.reopen_issue=重新開放
issues.reopen_comment_issue=留言並重新開放
@@ -1216,7 +1214,6 @@ issues.error_modifying_due_date=無法修改截止日期。
issues.error_removing_due_date=無法移除截止日期。
issues.push_commit_1=加入了 %d 個提交 %s
issues.push_commits_n=加入了 %d 個提交 %s
-issues.force_push_codes=`強制推送了 %[1]s 自 <a href="%[3]s">%[2]s</a> 至 <a href="%[5]s">%[4]s</a> %[6]s`
issues.due_date_form=yyyy年mm月dd日
issues.due_date_form_add=新增截止日期
issues.due_date_form_edit=編輯