additional_tags 1.0.5 → 1.0.7

data/config/locales/de.yml

@@ -1,38 +1,45 @@
 de:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: verwendet sich gegenseitig ausschließende TAGs
+  field_issue_tags: Ticket TAGs
   field_tag_list: TAGs
   field_tags: TAGs
-  field_issue_tags: Ticket TAGs
   label_active_issue_tags: Ticket TAGs aktivieren
   label_active_wiki_tags: Wiki TAGs aktivieren
   label_add_tags: Tags hinzufügen
+  label_amount_entities_with_tags: Anzahl %{name} mit TAGs
+  label_amount_tags: Anzahl TAGs
   label_edit_tags: Tags bearbeiten
   label_manage_tags: TAGs verwalten
   label_merge_selected_tags: Ausgewählte TAGs zusammenführen
   label_open_issues_only: Zeige nur offene Tickets
+  label_quantity: Anzahl
   label_show_with_count: Zeige Anzahl zu TAG
+  label_tag_color_theme: Farbschema %{value}
+  label_tags_color_theme: Farbe
+  label_tags_sidebar: Zeige TAGs in der Sidebar
+  label_tags_sort_by: Sortiere TAGs nach
+  label_tags_suggestion_order: Reihenfolge der Vorschläge
   label_tags_tag: TAG
-  label_use_colors: Farben verwenden
-  label_wiki_index_for_tag_html: Wiki Seiten mit TAG <em>%{tag}</em>
+  label_tags_without_color: Ohne
+  label_use_colors: Farbe verwenden
+  label_wiki_index_for_tag: Wiki Seiten mit TAG
+  label_with_chart: Mit Chart
+  label_with_table_of_values: Mit Wertetabelle
   notice_failed_to_add_tags: Fehler beim hinzufügen der TAGs
   notice_tags_added: Tags hinzugefügt
   permission_add_wiki_tags: Wiki TAGs hinzufügen
   permission_create_issue_tags: Ticket TAGs erstellen
   permission_edit_issue_tags: Ticket TAGs bearbeiten
   permission_view_issue_tags: Ticket TAGs anzeigen
-  tags_order_by_last_created: zuletzt angelegt
   tags_order_by_count: am meisten benutzt
+  tags_order_by_last_created: zuletzt angelegt
   tags_order_by_name: Name
   tags_sidebar_cloud: Cloud
   tags_sidebar_list: Liste
   tags_sidebar_none: Keine
   tags_sidebar_simple_cloud: Einfache Cloud
-  label_tags_sidebar: Zeige TAGs in der Sidebar
   tags_sort_by_count: Anzahl
   tags_sort_by_name: Name
-  label_tags_sort_by: Sortiere TAGs nach
-  label_tags_suggestion_order: Reihenfolge der Vorschläge
-  label_with_table_of_values: Mit Wertetabelle
-  label_with_chart: Mit Chart
-  label_amount_tags: Anzahl TAGs
-  label_amount_entities_with_tags: Anzahl %{name} mit TAGs
-  label_quantity: Anzahl

data/config/locales/en.yml

@@ -1,38 +1,45 @@
 en:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: uses mutually exclusive tags
+  field_issue_tags: Issue tags
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: Issue tags
   label_active_issue_tags: "Activate issue tags"
   label_active_wiki_tags: "Activate wiki tags"
   label_add_tags: "Add tags"
+  label_amount_entities_with_tags: "Amount %{name} with tags"
+  label_amount_tags: "Amount tags"
   label_edit_tags: "Edit tags"
   label_manage_tags: "Manage tags"
   label_merge_selected_tags: "Merge selected tags"
   label_open_issues_only: "Display open issues only"
+  label_quantity: "Quantity"
   label_show_with_count: "Display amount on tag"
+  label_tag_color_theme: Color theme %{value}
+  label_tags_color_theme: Color
+  label_tags_sidebar: "Display tags on sidebar as"
+  label_tags_sort_by: "Sort tags by"
+  label_tags_suggestion_order: "Suggestion order"
   label_tags_tag: "Tag"
-  label_use_colors: "Use colors"
-  label_wiki_index_for_tag_html: "Wiki pages with tag <em>%{tag}</em>"
+  label_tags_without_color: Without color
+  label_use_colors: Use colors
+  label_wiki_index_for_tag: "Wiki pages with tag"
+  label_with_chart: "With chart"
+  label_with_table_of_values: "With table of values"
   notice_failed_to_add_tags: "Failed to add tags"
   notice_tags_added: "Tags added"
   permission_add_wiki_tags: "Add wiki tags"
   permission_create_issue_tags: "Add issue tags"
   permission_edit_issue_tags: "Edit issue tags"
   permission_view_issue_tags: "Display issue tags"
-  tags_order_by_last_created: "Last created"
   tags_order_by_count: "Most used"
+  tags_order_by_last_created: "Last created"
   tags_order_by_name: "Name"
   tags_sidebar_cloud: "Cloud"
   tags_sidebar_list: "List"
   tags_sidebar_none: "None"
   tags_sidebar_simple_cloud: "Simple cloud"
-  label_tags_sidebar: "Display tags on sidebar as"
   tags_sort_by_count: "Count"
   tags_sort_by_name: "Name"
-  label_tags_sort_by: "Sort tags by"
-  label_tags_suggestion_order: "Suggestion order"
-  label_with_table_of_values: "With table of values"
-  label_with_chart: "With chart"
-  label_amount_tags: "Amount tags"
-  label_amount_entities_with_tags: "Amount %{name} with tags"
-  label_quantity: "Quantity"

data/config/locales/es.yml

@@ -1,38 +1,45 @@
 es:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "utiliza etiquetas mutuamente excluyentes"
+  field_issue_tags: "Petición tags"
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: "Petición tags"
   label_active_issue_tags: "Activar tags de peticiones"
   label_active_wiki_tags: "Activar tags wiki"
   label_add_tags: "Agregar etiquetas"
+  label_amount_entities_with_tags: "Cantidad %{name} con tags"
+  label_amount_tags: "Valor tags"
   label_edit_tags: "Tratar tags"
   label_manage_tags: "Manejar  tags"
   label_merge_selected_tags: "Fusionar tags seleccionadas"
   label_open_issues_only: "Mostrar sólo las peticiones abiertas"
+  label_quantity: "Ctd."
   label_show_with_count: "Mostrar la cantidad en la tags"
+  label_tag_color_theme: "Tema del color %{value}"
+  label_tags_colors: "Color"
+  label_tags_sidebar: "Mostrar las tags en la barra lateral como"
+  label_tags_sort_by: "Ordenar las tags por"
+  label_tags_suggestion_order: "Orden de sugerencia"
   label_tags_tag: "Tag"
-  label_use_colors: "Usar los colores"
-  label_wiki_index_for_tag_html: "Páginas Wiki con la tags <em>%{tag}</em>"
+  label_tags_without_color: "Sin color"
+  label_use_colors: "Usar colores"
+  label_wiki_index_for_tag: "Páginas Wiki con la tags"
+  label_with_chart: "Con tabla"
+  label_with_table_of_values: "Con tabla de valores"
   notice_failed_to_add_tags: "No se han añadido tags"
   notice_tags_added: "Tags añadidas"
   permission_add_wiki_tags: "Añadir tags wiki"
   permission_create_issue_tags: "Agregar tags de peticiones"
   permission_edit_issue_tags: "Editar tags de peticiones"
   permission_view_issue_tags: "Mostrar las tags de peticiones"
-  tags_order_by_last_created: "Última creación"
   tags_order_by_count: "La más usada"
+  tags_order_by_last_created: "Última creación"
   tags_order_by_name: "Nombre"
   tags_sidebar_cloud: "Cloud"
   tags_sidebar_list: "Lista"
   tags_sidebar_none: "Ninguno"
   tags_sidebar_simple_cloud: "Simple cloud"
-  label_tags_sidebar: "Mostrar las tags en la barra lateral como"
   tags_sort_by_count: "Cuenta"
   tags_sort_by_name: "Nombre"
-  label_tags_sort_by: "Ordenar las tags por"
-  label_tags_suggestion_order: "Orden de sugerencia"
-  label_with_table_of_values: "Con tabla de valores"
-  label_with_chart: "Con tabla"
-  label_amount_tags: "Valor tags"
-  label_amount_entities_with_tags: "Cantidad %{name} con tags"
-  label_quantity: "Ctd."

data/config/locales/fr.yml

@@ -1,38 +1,45 @@
 fr:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "utilise des étiquettes mutuellement exclusives"
+  field_issue_tags: "Demande tags"
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: "Demande tags"
   label_active_issue_tags: "Activer les tags demandes"
   label_active_wiki_tags: "Activer les tags wiki"
   label_add_tags: "Gérer les tags"
+  label_amount_entities_with_tags: "Montant %{name} avec tags"
+  label_amount_tags: "Montant tags"
   label_edit_tags: "Modifier les tags"
   label_manage_tags: "Gérer les tags"
   label_merge_selected_tags: "Fusionner les tags sélectionnées"
   label_open_issues_only: "Afficher uniquement les demandes ouverts"
+  label_quantity: "Quantité"
   label_show_with_count: "Afficher le montant sur l'tags"
+  label_tag_color_theme: "Thème de la couleur %{value}"
+  label_tags_colors: "Couleur"
+  label_tags_sidebar: "Afficher les tags sur la barre latérale comme"
+  label_tags_sort_by: "Trier les balises par"
+  label_tags_suggestion_order: "Ordre de suggestion"
   label_tags_tag: "Tag"
-  label_use_colors: "Utiliser les couleurs"
-  label_wiki_index_for_tag_html: "Pages wiki avec la tags <em>%{tag}</em>"
+  label_tags_without_color: "Sans couleur"
+  label_use_colors: "Utiliser des couleurs"
+  label_wiki_index_for_tag: "Pages wiki avec la tags"
+  label_with_chart: "Avec tableau"
+  label_with_table_of_values: "Avec tableau de valeur"
   notice_failed_to_add_tags: "Omission d'ajouter des tags"
   notice_tags_added: "Tags ajoutés"
   permission_add_wiki_tags: "Ajouter des tags wiki"
   permission_create_issue_tags: "Ajouter des tags de demandes"
   permission_edit_issue_tags: "Éditer les tags de demandes"
   permission_view_issue_tags: "Afficher les tags des demandes"
-  tags_order_by_last_created: "Dernière création"
   tags_order_by_count: "Les plus utilisés"
+  tags_order_by_last_created: "Dernière création"
   tags_order_by_name: "Nom"
   tags_sidebar_cloud: "Cloud"
   tags_sidebar_list: "Liste"
   tags_sidebar_none: "Aucune"
   tags_sidebar_simple_cloud: "Simple cloud"
-  label_tags_sidebar: "Afficher les tags sur la barre latérale comme"
   tags_sort_by_count: "Compter"
   tags_sort_by_name: "Nom"
-  label_tags_sort_by: "Trier les balises par"
-  label_tags_suggestion_order: "Ordre de suggestion"
-  label_with_table_of_values: "Avec tableau de valeur"
-  label_with_chart: "Avec tableau"
-  label_amount_tags: "Montant tags"
-  label_amount_entities_with_tags: "Montant %{name} avec tags"
-  label_quantity: "Quantité"

data/config/locales/it.yml

@@ -1,38 +1,45 @@
 it:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "utilizza tag mutuamente esclusivi"
+  field_issue_tags: "Segnalazione tags"
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: "Segnalazione tags"
   label_active_issue_tags: "Attivare i tag di segnalazione"
   label_active_wiki_tags: "Attivare i tag wiki"
   label_add_tags: "Aggiungi tag"
+  label_amount_entities_with_tags: Amount %{name} with tags
+  label_amount_tags: Amount tags
   label_edit_tags: "Modifica i tag"
   label_manage_tags: "Gestire i tag"
   label_merge_selected_tags: "Unisci i tag selezionati"
   label_open_issues_only: "Mostra solo i segnalazione"
+  label_quantity: "Numero"
   label_show_with_count: "Visualizzare l'importo sul tag"
+  label_tag_color_theme: "Tema colore %{value}"
+  label_tags_colors: Colore
+  label_tags_sidebar: "Visualizzare i tag sulla barra laterale come"
+  label_tags_sort_by: "Ordina i tag per"
+  label_tags_suggestion_order: "Ordine di suggerimento"
   label_tags_tag: "Tag"
-  label_use_colors: "Utilizzare i colori"
-  label_wiki_index_for_tag_html: "Pagine Wiki con tag <em>%{tag}</em>"
+  label_tags_without_color: "Senza colore"
+  label_use_colors: "Usa i colori"
+  label_wiki_index_for_tag: "Pagine Wiki con tag"
+  label_with_chart: "Con grafico"
+  label_with_table_of_values: "Con tabella di valori"
   notice_failed_to_add_tags: "Non è stato possibile aggiungere tag"
   notice_tags_added: "Tag aggiunti"
   permission_add_wiki_tags: "Aggiungi tag wiki"
   permission_create_issue_tags: "Aggiungi i tag di segnalazione"
   permission_edit_issue_tags: "Modifica i tag di segnalazione"
   permission_view_issue_tags: "Visualizzare i tag di segnalazione"
-  tags_order_by_last_created: "Ultima creazione"
   tags_order_by_count: "I più usati"
+  tags_order_by_last_created: "Ultima creazione"
   tags_order_by_name: "Nome"
   tags_sidebar_cloud: "Cloud"
   tags_sidebar_list: "Elenco"
   tags_sidebar_none: "Nessuno"
   tags_sidebar_simple_cloud: "Simple cloud"
-  label_tags_sidebar: "Visualizzare i tag sulla barra laterale come"
   tags_sort_by_count: "Contate"
   tags_sort_by_name: "Nome"
-  label_tags_sort_by: "Ordina i tag per"
-  label_tags_suggestion_order: "Ordine di suggerimento"
-  label_with_table_of_values: With table of values
-  label_with_chart: With chart
-  label_amount_tags: Amount tags
-  label_amount_entities_with_tags: Amount %{name} with tags
-  label_quantity: "Numero"

data/config/locales/ja.yml

@@ -1,38 +1,45 @@
 ja:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "は相互に排他的なタグを使用しています。"
+  field_issue_tags: "発行タグ"
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: Issue tags
   label_active_issue_tags: "課題タグを有効にする"
   label_active_wiki_tags: "wikiのタグを有効にする"
   label_add_tags: "タグを追加"
+  label_amount_entities_with_tags: "金額 %{name} tags付き"
+  label_amount_tags: "金額  tags"
   label_edit_tags: "タグの編集"
   label_manage_tags: "タグの管理"
   label_merge_selected_tags: "選択したタグをマージ"
   label_open_issues_only: "開いている問題のみを表示"
+  label_quantity: "数量"
   label_show_with_count: "タグに金額を表示"
+  label_tag_color_theme: "カラーテーマ%{value}"
+  label_tags_colors: "カラー"
+  label_tags_sidebar: "サイドバーにタグを"
+  label_tags_sort_by: "タグを並べ替える"
+  label_tags_suggestion_order: "ご提案の順番"
   label_tags_tag: "Tag"
+  label_tags_without_color: "色なし"
   label_use_colors: "色を使う"
-  label_wiki_index_for_tag_html: "タグが付いているウィキのページ <em>%{tag}</em>"
+  label_wiki_index_for_tag: "タグが付いているウィキのページ"
+  label_with_chart: "チャート付き"
+  label_with_table_of_values: "価値観のテーブル付き"
   notice_failed_to_add_tags: "タグの追加に失敗"
   notice_tags_added: "追加されたタグ"
   permission_add_wiki_tags: "wikiタグの追加"
   permission_create_issue_tags: "課題タグの追加"
   permission_edit_issue_tags: "課題タグの編集"
   permission_view_issue_tags: "課題タグの表示"
-  tags_order_by_last_created: "最後に作成された"
   tags_order_by_count: "最も使用されている"
+  tags_order_by_last_created: "最後に作成された"
   tags_order_by_name: "名前"
   tags_sidebar_cloud: "クラウド"
   tags_sidebar_list: "リスト"
   tags_sidebar_none: "なし"
   tags_sidebar_simple_cloud: "シンプルなクラウド"
-  label_tags_sidebar: "サイドバーにタグを"
   tags_sort_by_count: "伯爵"
   tags_sort_by_name: "名前"
-  label_tags_sort_by: "タグを並べ替える"
-  label_tags_suggestion_order: "ご提案の順番"
-  label_with_table_of_values: "価値観のテーブル付き"
-  label_with_chart: "チャート付き"
-  label_amount_tags: "金額  tags"
-  label_amount_entities_with_tags: "金額 %{name} tags付き"
-  label_quantity: "数量"

data/config/locales/ko.yml

@@ -1,38 +1,45 @@
 ko:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "상호 배타적인 태그 사용"
+  field_issue_tags: Issue tags
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: Issue tags
   label_active_issue_tags: "이슈 태그 활성화"
   label_active_wiki_tags: "Wiki 태그 활성화"
   label_add_tags: "태그 추가"
+  label_amount_entities_with_tags: "TAG가 있는 금액 %{name}"
+  label_amount_tags: "금액 태그"
   label_edit_tags: "태그 편집"
   label_manage_tags: "태그 관리"
   label_merge_selected_tags: "선택한 태그 병합"
   label_open_issues_only: "미해결 문제 만 표시"
+  label_quantity: "수량"
   label_show_with_count: "태그에 금액 표시"
+  label_tag_color_theme: "색상 테마 %{value}"
+  label_tags_colors: "색깔"
+  label_tags_sidebar: "사이드 바에 태그 표시"
+  label_tags_sort_by: "태그 정렬 기준"
+  label_tags_suggestion_order: "제안 순서"
   label_tags_tag: "Tag"
+  label_tags_without_color: "무색"
   label_use_colors: "색상 사용"
-  label_wiki_index_for_tag_html: "태그가있는 위키 페이지 <em>%{tag}</em>"
+  label_wiki_index_for_tag: "태그가있는 위키 페이지"
+  label_with_chart: "차트 포함"
+  label_with_table_of_values: "가치 테이블"
   notice_failed_to_add_tags: "태그를 추가하지 못했습니다."
   notice_tags_added: "추가 된 태그"
   permission_add_wiki_tags: "위키 태그 추가"
   permission_create_issue_tags: "문제 태그 추가"
   permission_edit_issue_tags: "이슈 태그 수정"
   permission_view_issue_tags: "문제 태그 표시"
-  tags_order_by_last_created: "마지막 생성"
   tags_order_by_count: "가장 많이 사용"
+  tags_order_by_last_created: "마지막 생성"
   tags_order_by_name: "이름"
   tags_sidebar_cloud: "구름"
   tags_sidebar_list: "명부"
   tags_sidebar_none: "없음"
   tags_sidebar_simple_cloud: "단순 클라우드"
-  label_tags_sidebar: "사이드 바에 태그 표시"
   tags_sort_by_count: "카운트"
   tags_sort_by_name: "이름"
-  label_tags_sort_by: "태그 정렬 기준"
-  label_tags_suggestion_order: "제안 순서"
-  label_with_table_of_values: "가치 테이블"
-  label_with_chart: "차트 포함"
-  label_amount_tags: "금액 태그"
-  label_amount_entities_with_tags: "TAG가 있는 금액 %{name}"
-  label_quantity: "수량"

data/config/locales/pl.yml

@@ -1,38 +1,45 @@
 pl:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "używa wzajemnie wykluczających się tagów"
+  field_issue_tags: "Znaczniki emisji"
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: Issue tags
   label_active_issue_tags: "Aktywacja znaczników emisji"
   label_active_wiki_tags: "Aktywacja tagów wiki"
   label_add_tags: "Dodaj znaczniki"
+  label_amount_entities_with_tags: "Kwota %{name} z Tags"
+  label_amount_tags: "Kwota Tags"
   label_edit_tags: "Edycja tagów"
   label_manage_tags: "Zarządzaj tagami"
   label_merge_selected_tags: "Łączenie wybranych tagów"
   label_open_issues_only: "Wyświetlaj tylko sprawy otwarte"
+  label_quantity: "Ilość"
   label_show_with_count: "Wyświetlanie ilości na etykiecie"
+  label_tag_color_theme: "Kolorowy motyw %{value}"
+  label_tags_colors: Kolor
+  label_tags_sidebar: "Wyświetlać znaczniki na pasku bocznym jako"
+  label_tags_sort_by: "Sortuj znaczniki według"
+  label_tags_suggestion_order: "Zamówienie ofertowe"
   label_tags_tag: "Tag"
-  label_use_colors: "Używaj kolorów"
-  label_wiki_index_for_tag_html: "Strony Wiki z tagiem <em>%{tag}</em>"
+  label_tags_without_color: "Bez koloru"
+  label_use_colors: "Użyj kolorów"
+  label_wiki_index_for_tag: "Strony Wiki z tagiem"
+  label_with_chart: "Z wykresem"
+  label_with_table_of_values: "Z tabelą wartości"
   notice_failed_to_add_tags: "Nie dodano znaczników"
   notice_tags_added: "Tagi dodane"
   permission_add_wiki_tags: "Dodaj znaczniki wiki"
   permission_create_issue_tags: "Dodaj znaczniki wydania"
   permission_edit_issue_tags: "Edycja znaczników wydania"
   permission_view_issue_tags: "Wyświetlanie znaczników emisji"
-  tags_order_by_last_created: "Ostatnio stworzony"
   tags_order_by_count: "Najczęściej używany"
+  tags_order_by_last_created: "Ostatnio stworzony"
   tags_order_by_name: "Nazwa"
   tags_sidebar_cloud: "Cloud"
   tags_sidebar_list: "Lista"
   tags_sidebar_none: "Brak"
   tags_sidebar_simple_cloud: "Simple cloud"
-  label_tags_sidebar: "Wyświetlać znaczniki na pasku bocznym jako"
   tags_sort_by_count: "Hrabia"
   tags_sort_by_name: "Nazwa"
-  label_tags_sort_by: "Sortuj znaczniki według"
-  label_tags_suggestion_order: "Zamówienie ofertowe"
-  label_with_table_of_values: "Z tabelą wartości"
-  label_with_chart: "Z wykresem"
-  label_amount_tags: "Kwota Tags"
-  label_amount_entities_with_tags: "Kwota %{name} z Tags"
-  label_quantity: "Ilość"

data/config/locales/pt-BR.yml

@@ -1,38 +1,45 @@
 pt-BR:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "utiliza etiquetas mutuamente exclusivas"
+  field_issue_tags: Issue tags
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: Issue tags
   label_active_issue_tags: "Ativar as etiquetas de emissão"
   label_active_wiki_tags: "Ativar as etiquetas wiki"
   label_add_tags: "Adicionar etiquetas"
+  label_amount_entities_with_tags: "Quantidade %{name} com etiquetas"
+  label_amount_tags: "Valor Etiquetas"
   label_edit_tags: "Editar etiquetas"
   label_manage_tags: "Gerenciar etiquetas"
   label_merge_selected_tags: "Fundir tags selecionadas"
   label_open_issues_only: "Exibir apenas questões em aberto"
+  label_quantity: "Quantidade"
   label_show_with_count: "Mostrar quantidade na etiqueta"
+  label_tag_color_theme: "Tema da cor %{value}"
+  label_tags_colors: "Cor"
+  label_tags_sidebar: "Mostrar etiquetas na barra lateral como"
+  label_tags_sort_by: "Ordenar tags por"
+  label_tags_suggestion_order: "Pedido de sugestão"
   label_tags_tag: "Tag"
+  label_tags_without_color: "Sem cor"
   label_use_colors: "Usar cores"
-  label_wiki_index_for_tag_html: "Páginas Wiki com tag <em>%{tag}</em>"
+  label_wiki_index_for_tag: "Páginas Wiki com tag"
+  label_with_chart: "Com gráfico"
+  label_with_table_of_values: "Com tabela de valores"
   notice_failed_to_add_tags: "Falha em adicionar tags"
   notice_tags_added: "Tags adicionadas"
   permission_add_wiki_tags: "Adicionar etiquetas wiki"
   permission_create_issue_tags: "Adicionar etiquetas de edição"
   permission_edit_issue_tags: "Editar etiquetas de edição"
   permission_view_issue_tags: "Exibir etiquetas de edição"
-  tags_order_by_last_created: "Última criação"
   tags_order_by_count: "Mais utilizados"
+  tags_order_by_last_created: "Última criação"
   tags_order_by_name: "Nome"
   tags_sidebar_cloud: "Cloud"
   tags_sidebar_list: "Lista"
   tags_sidebar_none: "Nenhum"
   tags_sidebar_simple_cloud: "Simple cloud"
-  label_tags_sidebar: "Mostrar etiquetas na barra lateral como"
   tags_sort_by_count: "Conde"
   tags_sort_by_name: "Nome"
-  label_tags_sort_by: "Ordenar tags por"
-  label_tags_suggestion_order: "Pedido de sugestão"
-  label_with_table_of_values: "Com tabela de valores"
-  label_with_chart: "Com gráfico"
-  label_amount_tags: "Valor Etiquetas"
-  label_amount_entities_with_tags: "Quantidade %{name} com etiquetas"
-  label_quantity: "Quantidade"

data/config/locales/ru.yml

@@ -1,38 +1,45 @@
 ru:
-  field_tag_list: Теги
-  field_tags: Теги
-  field_issue_tags: Теги задач
-  label_active_issue_tags: "Активировать теги задач"
-  label_active_wiki_tags: "Активировать теги вики"
-  label_add_tags: "Добавьте теги"
-  label_edit_tags: "Редактировать теги"
-  label_manage_tags: "Управление тегами"
-  label_merge_selected_tags: "Объединить выбранные теги"
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "использует взаимоисключающие метки"
+  field_issue_tags: "Метки задач"
+  field_tag_list: "Метки"
+  field_tags: "Метки"
+  label_active_issue_tags: "Активировать метки задач"
+  label_active_wiki_tags: "Активировать метки вики"
+  label_add_tags: "Добавьте метки"
+  label_amount_entities_with_tags: "Сумма %{name} с метками"
+  label_amount_tags: "Метки Сумма"
+  label_edit_tags: "Редактировать метки"
+  label_manage_tags: "Управление метками"
+  label_merge_selected_tags: "Объединить выбранные метки"
   label_open_issues_only: "Отображать только открытые задачи"
-  label_show_with_count: "Отображать количество на теге"
-  label_tags_tag: "Тег"
+  label_quantity: "Количество"
+  label_show_with_count: "Отображать количество на метке"
+  label_tag_color_theme: "Цветовая тема %{value}"
+  label_tags_colors: "Цвет"
+  label_tags_sidebar: "Способ отображения меток на боковой панели"
+  label_tags_sort_by: "Сортировать метки по"
+  label_tags_suggestion_order: "Порядок предложения при вводе"
+  label_tags_tag: "Метка"
+  label_tags_without_color: "Без цвета"
   label_use_colors: "Использовать цвета"
-  label_wiki_index_for_tag_html: "Вики-страницы с тегом <em>%{tag}</em>"
-  notice_failed_to_add_tags: "Не удалось добавить теги"
-  notice_tags_added: "Теги добавлены"
-  permission_add_wiki_tags: "Добавление тегов вики"
-  permission_create_issue_tags: "Добавление тегов задач"
-  permission_edit_issue_tags: "Редактирование тегов задач"
-  permission_view_issue_tags: "Просмотр тегов задач"
-  tags_order_by_last_created: "Недавно созданные"
+  label_wiki_index_for_tag: "Вики-страницы с меткой"
+  label_with_chart: "С графиком"
+  label_with_table_of_values: "С таблицей значений"
+  notice_failed_to_add_tags: "Не удалось добавить метки"
+  notice_tags_added: "Метки добавлены"
+  permission_add_wiki_tags: "Добавление меток вики"
+  permission_create_issue_tags: "Добавление меток задач"
+  permission_edit_issue_tags: "Редактирование меток задач"
+  permission_view_issue_tags: "Просмотр меток задач"
   tags_order_by_count: "Наиболее часто используемые"
+  tags_order_by_last_created: "Недавно созданные"
   tags_order_by_name: "Имя"
   tags_sidebar_cloud: "Облако"
   tags_sidebar_list: "Список"
   tags_sidebar_none: "Нет"
   tags_sidebar_simple_cloud: "Простое облако"
-  label_tags_sidebar: "Способ отображения тегов на боковой панели"
   tags_sort_by_count: "Количеству"
   tags_sort_by_name: "Имени"
-  label_tags_sort_by: "Сортировать теги по"
-  label_tags_suggestion_order: "Порядок предложения при вводе"
-  label_with_table_of_values: "С таблицей значений"
-  label_with_chart: "С графиком"
-  label_amount_tags: "Теги Сумма"
-  label_amount_entities_with_tags: "Сумма %{name} с тегами"
-  label_quantity: "Количество"

data/config/settings.yml

@@ -1,9 +1,9 @@
-active_issue_tags: 0
-active_wiki_tags: 0
-open_issues_only: 0
-show_with_count: 0
+active_issue_tags: '0'
+active_wiki_tags: '0'
+open_issues_only: '0'
+show_with_count: '0'
+tags_color_theme: '1'
 tags_sidebar: 'none'
 tags_sort_by: 'name'
 tags_sort_order: 'asc'
 tags_suggestion_order: 'name'
-use_colors: 1

data/lib/additional_tags/hooks/view_hook.rb

@@ -63,9 +63,22 @@ module AdditionalTags
       def issues_bulk_tags_fix(issue, params)
         return unless params && params[:issue]
 
-        old_tags = issue.tags.map(&:name)
+        common_tags =
+          if params[:common_tags].present?
+            params[:common_tags].split(ActsAsTaggableOn.delimiter).collect(&:strip)
+          else
+            []
+          end
+        current_tags = ActsAsTaggableOn::TagList.new issue.tags.to_a
         new_tags = Array(params[:issue][:tag_list]).reject(&:empty?)
-        issue.tag_list = (old_tags + new_tags).uniq
+
+        tags_to_add = new_tags - common_tags
+        tags_to_remove = common_tags - new_tags
+
+        current_tags.add tags_to_add
+        current_tags.remove tags_to_remove
+
+        issue.tag_list = current_tags
       end
 
       def tags_journal(issue, params)