attachment: move repositories encodings setting to the general tab and update the label (#2371)

git-svn-id: https://svn.redmine.org/redmine/trunk@7869 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/settings/_general.html.erb

@@ -30,6 +30,9 @@
 
 <p><%= setting_text_field :diff_max_lines_displayed, :size => 6 %></p>
 
+<p><%= setting_text_field :repositories_encodings, :size => 60 %><br />
+<em><%= l(:text_comma_separated) %></em></p>
+
 <%= call_hook(:view_settings_general_form) %>
 </div>
 

app/views/settings/_repositories.html.erb

@@ -58,9 +58,6 @@
                        "if ($('settings_sys_api_key').disabled == false) { $('settings_sys_api_key').value = randomKey(20) }" %>
 </p>
 
-<p><%= setting_text_field :repositories_encodings, :size => 60 %><br />
-<em><%= l(:text_comma_separated) %></em></p>
-
 <p><%= setting_text_field :repository_log_display_limit, :size => 6 %></p>
 </div>
 

config/locales/bg.yml

@@ -342,7 +342,6 @@ bg:
   setting_time_format: Формат на часа
   setting_cross_project_issue_relations: Релации на задачи между проекти
   setting_issue_list_default_columns: Показвани колони по подразбиране
-  setting_repositories_encodings: Кодови таблици
   setting_emails_header: Emails header
   setting_emails_footer: Подтекст за e-mail
   setting_protocol: Протокол
@@ -1000,3 +999,4 @@ bg:
   description_date_range_interval: Изберете диапазон чрез задаване на начална и крайна дати
   description_date_from: Въведете начална дата
   description_date_to: Въведете крайна дата
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/bs.yml

@@ -314,7 +314,6 @@ bs:
   setting_time_format: Format vremena
   setting_cross_project_issue_relations: Omogući relacije između aktivnosti na različitim projektima
   setting_issue_list_default_columns: Podrazumjevane koleone za prikaz na listi aktivnosti
-  setting_repositories_encodings: Enkodiranje repozitorija
   setting_emails_footer: Potpis na email-ovima
   setting_protocol: Protokol
   setting_per_page_options: Broj objekata po stranici
@@ -1016,3 +1015,4 @@ bs:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/ca.yml

@@ -329,7 +329,6 @@ ca:
   setting_time_format: Format de hora
   setting_cross_project_issue_relations: "Permet les relacions d'assumptes entre projectes"
   setting_issue_list_default_columns: "Columnes mostrades per defecte en la llista d'assumptes"
-  setting_repositories_encodings: Codificacions del dipòsit
   setting_emails_footer: Peu dels correus electrònics
   setting_protocol: Protocol
   setting_per_page_options: Opcions dels objectes per pàgina
@@ -1005,3 +1004,4 @@ ca:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/cs.yml

@@ -336,7 +336,6 @@ cs:
   setting_time_format: Formát času
   setting_cross_project_issue_relations: Povolit vazby úkolů napříč projekty
   setting_issue_list_default_columns: Výchozí sloupce zobrazené v seznamu úkolů
-  setting_repositories_encodings: Kódování 
   setting_emails_header: Hlavička emailů
   setting_emails_footer: Patička emailů
   setting_protocol: Protokol
@@ -1006,3 +1005,4 @@ cs:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/da.yml

@@ -303,7 +303,6 @@ da:
   setting_time_format: Tidsformat
   setting_cross_project_issue_relations: Tillad sagsrelationer på tværs af projekter
   setting_issue_list_default_columns: Standardkolonner på sagslisten
-  setting_repositories_encodings: Repository-tegnsæt
   setting_emails_footer: Email-fodnote
   setting_protocol: Protokol
   setting_user_format: Brugervisningsformat
@@ -1019,3 +1018,4 @@ da:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/de.yml

@@ -344,7 +344,6 @@ de:
   setting_time_format: Zeitformat
   setting_cross_project_issue_relations: Ticket-Beziehungen zwischen Projekten erlauben
   setting_issue_list_default_columns: Default-Spalten in der Ticket-Auflistung
-  setting_repositories_encodings: Kodierungen der Projektarchive
   setting_emails_footer: E-Mail-Fußzeile
   setting_protocol: Protokoll
   setting_per_page_options: Objekte pro Seite
@@ -1023,3 +1022,4 @@ de:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/el.yml

@@ -309,7 +309,6 @@ el:
   setting_time_format: Μορφή ώρας
   setting_cross_project_issue_relations: Επιτρέψτε συσχετισμό θεμάτων σε διασταύρωση-έργων
   setting_issue_list_default_columns: Προκαθορισμένες εμφανιζόμενες στήλες στη λίστα θεμάτων
-  setting_repositories_encodings: Κωδικοποίηση χαρακτήρων αποθετηρίου
   setting_emails_footer: Υποσέλιδο στα email
   setting_protocol: Πρωτόκολο
   setting_per_page_options: Αντικείμενα ανά σελίδα επιλογών
@@ -1002,3 +1001,4 @@ el:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/en-GB.yml

@@ -338,7 +338,6 @@ en-GB:
   setting_time_format: Time format
   setting_cross_project_issue_relations: Allow cross-project issue relations
   setting_issue_list_default_columns: Default columns displayed on the issue list
-  setting_repositories_encodings: Repositories encodings
   setting_emails_header: Emails header
   setting_emails_footer: Emails footer
   setting_protocol: Protocol
@@ -1005,3 +1004,4 @@ en-GB:
   label_parent_revision: Parent
   label_child_revision: Child
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/en.yml

@@ -342,7 +342,7 @@ en:
   setting_time_format: Time format
   setting_cross_project_issue_relations: Allow cross-project issue relations
   setting_issue_list_default_columns: Default columns displayed on the issue list
-  setting_repositories_encodings: Repositories encodings
+  setting_repositories_encodings: Attachments and repositories encodings
   setting_emails_header: Emails header
   setting_emails_footer: Emails footer
   setting_protocol: Protocol

config/locales/es.yml

@@ -777,7 +777,6 @@ es:
   setting_per_page_options: Objetos por página
   setting_plain_text_mail: sólo texto plano (no HTML)
   setting_protocol: Protocolo
-  setting_repositories_encodings: Codificaciones del repositorio
   setting_self_registration: Registro permitido
   setting_sequential_project_identifiers: Generar identificadores de proyecto
   setting_sys_api_enabled: Habilitar SW para la gestión del repositorio
@@ -1039,3 +1038,4 @@ es:
   label_child_revision: Child
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/eu.yml

@@ -320,7 +320,6 @@ eu:
   setting_time_format: Ordu formatua
   setting_cross_project_issue_relations: Zereginak proiektuen artean erlazionatzea baimendu
   setting_issue_list_default_columns: Zereginen zerrendan defektuz ikusten diren zutabeak
-  setting_repositories_encodings: Biltegien kodeketak
   setting_emails_footer: Eposten oina
   setting_protocol: Protokoloa
   setting_per_page_options: Orriko objektuen aukerak
@@ -1006,3 +1005,4 @@ eu:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/fa.yml

@@ -332,7 +332,6 @@ fa:
   setting_time_format: قالب زمان
   setting_cross_project_issue_relations: توانایی وابستگی میان پروژه‌ای پیامدها
   setting_issue_list_default_columns: ستون‌های پیش‌گزیده نمایش داده شده در فهرست پیامدها
-  setting_repositories_encodings: کدگذاری انباره‌ها
   setting_emails_header: سرنویس ایمیل‌ها
   setting_emails_footer: پانویس ایمیل‌ها
   setting_protocol: پیوندنامه
@@ -1005,3 +1004,4 @@ fa:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/fi.yml

@@ -311,7 +311,6 @@ fi:
   setting_time_format: Ajan muoto
   setting_cross_project_issue_relations: Salli projektien väliset tapahtuminen suhteet
   setting_issue_list_default_columns: Vakiosarakkeiden näyttö tapahtumalistauksessa
-  setting_repositories_encodings: Tietovaraston koodaus
   setting_emails_footer: Sähköpostin alatunniste
   setting_protocol: Protokolla
   setting_per_page_options: Sivun objektien määrän asetukset
@@ -1023,3 +1022,4 @@ fi:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/fr.yml

@@ -341,7 +341,6 @@ fr:
   setting_time_format: Format d'heure
   setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
   setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes
-  setting_repositories_encodings: Encodages des dépôts
   setting_emails_footer: Pied-de-page des emails
   setting_protocol: Protocole
   setting_per_page_options: Options d'objets affichés par page
@@ -1017,3 +1016,4 @@ fr:
   label_parent_revision: Parent
   label_child_revision: Child
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/gl.yml

@@ -753,7 +753,6 @@ gl:
   setting_per_page_options: Obxectos por páxina
   setting_plain_text_mail: só texto plano (non HTML)
   setting_protocol: Protocolo
-  setting_repositories_encodings: Codificacións do repositorio
   setting_self_registration: Rexistro permitido
   setting_sequential_project_identifiers: Xerar identificadores de proxecto
   setting_sys_api_enabled: Habilitar SW para a xestión do repositorio
@@ -1014,3 +1013,4 @@ gl:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/he.yml

@@ -332,7 +332,6 @@ he:
   setting_time_format: פורמט זמן
   setting_cross_project_issue_relations: הרשה קישור נושאים בין פרויקטים
   setting_issue_list_default_columns: עמודות ברירת מחדל המוצגות ברשימת הנושאים
-  setting_repositories_encodings: קידוד המאגרים
   setting_emails_footer: תחתית דוא"ל
   setting_protocol: פרוטוקול
   setting_per_page_options: אפשרויות אוביקטים לפי דף
@@ -1007,3 +1006,4 @@ he:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/hr.yml

@@ -315,7 +315,6 @@ hr:
   setting_time_format: Format vremena
   setting_cross_project_issue_relations: Dozvoli povezivanje predmeta izmedu različitih projekata
   setting_issue_list_default_columns: Stupci prikazani na listi predmeta
-  setting_repositories_encodings: Kodna stranica
   setting_emails_footer: Zaglavlje e-pošte
   setting_protocol: Protokol
   setting_per_page_options: Objekata po stranici opcija
@@ -1009,3 +1008,4 @@ hr:
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings

config/locales/hu.yml

@@ -311,7 +311,6 @@
   setting_time_format: Idő formátum
   setting_cross_project_issue_relations: Kereszt-projekt feladat hivatkozások engedélyezése
   setting_issue_list_default_columns: Az alapértelmezésként megjelenített oszlopok a feladat listában
-  setting_repositories_encodings: Tárolók kódolása
   setting_emails_footer: E-mail lábléc
   setting_protocol: Protokol
   setting_per_page_options: Objektum / oldal opciók
@@ -1021,3 +1020,4 @@
   error_scm_annotate_big_text_file: The entry cannot be annotated, as it exceeds the maximum text file size.
   setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
   button_edit_section: Edit this section
+  setting_repositories_encodings: Attachments and repositories encodings