Index: app/models/query.rb
===================================================================
--- app/models/query.rb	(revision 1927)
+++ app/models/query.rb	(working copy)
@@ -165,17 +165,19 @@
     end
     @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
     @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
+    @available_filters["vf_watcher"] = { :type => :list, :order => 6, :values => user_values } unless user_values.empty?
+    @available_filters["vf_personnel"] = { :type => :list, :order => 7, :values => user_values } unless user_values.empty?
   
     if project
       # project specific filters
       unless @project.issue_categories.empty?
-        @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
+        @available_filters["category_id"] = { :type => :list_optional, :order => 8, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
       end
       unless @project.versions.empty?
-        @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
+        @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 9, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
       end
       unless @project.active_children.empty?
-        @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
+        @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 15, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
       end
       add_custom_fields_filters(@project.all_issue_custom_fields)
     else
@@ -297,6 +299,14 @@
         db_field = 'value'
         is_custom_filter = true
         sql << "#{Issue.table_name}.id IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} WHERE "
+      elsif field == "vf_watcher"
+        db_table = Watcher.table_name
+        db_field = 'user_id'
+        sql << "#{Issue.table_name}.id IN (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND "       
+      elsif field == "vf_personnel"
+        db_table = "ci"
+        db_field = 'user_id'
+	sql << "#{Issue.table_name}.id IN (SELECT distinct id from ( SELECT watchable_id id, user_id FROM #{Watcher.table_name} WHERE watchable_type='Issue' union select id, assigned_to_id from #{Issue.table_name} union select id, author_id from #{Issue.table_name} ) ci WHERE "
       else
         # regular field
         db_table = Issue.table_name
@@ -305,7 +315,7 @@
       end
       
       # "me" value subsitution
-      if %w(assigned_to_id author_id).include?(field)
+      if %w(assigned_to_id author_id vf_watcher vf_personnel).include?(field)
         v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
       end
       
Index: lang/bg.yml
===================================================================
--- lang/bg.yml	(revision 1927)
+++ lang/bg.yml	(working copy)
@@ -640,3 +640,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/ca.yml
===================================================================
--- lang/ca.yml	(revision 1927)
+++ lang/ca.yml	(working copy)
@@ -641,3 +641,6 @@
 enumeration_issue_priorities: Prioritat dels assumptes
 enumeration_doc_categories: Categories del document
 enumeration_activities: Activitats (seguidor de temps)
+
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/cs.yml
===================================================================
--- lang/cs.yml	(revision 1927)
+++ lang/cs.yml	(working copy)
@@ -645,3 +645,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/da.yml
===================================================================
--- lang/da.yml	(revision 1927)
+++ lang/da.yml	(working copy)
@@ -641,3 +641,6 @@
 enumeration_issue_priorities: Sagsprioriteter
 enumeration_doc_categories: Dokumentkategorier
 enumeration_activities: Aktiviteter (tidsregistrering)
+
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/de.yml
===================================================================
--- lang/de.yml	(revision 1927)
+++ lang/de.yml	(working copy)
@@ -641,3 +641,6 @@
 enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
+
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/en.yml
===================================================================
--- lang/en.yml	(revision 1927)
+++ lang/en.yml	(working copy)
@@ -641,3 +641,6 @@
 enumeration_issue_priorities: Issue priorities
 enumeration_doc_categories: Document categories
 enumeration_activities: Activities (time tracking)
+
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/es.yml
===================================================================
--- lang/es.yml	(revision 1927)
+++ lang/es.yml	(working copy)
@@ -643,3 +643,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/fi.yml
===================================================================
--- lang/fi.yml	(revision 1927)
+++ lang/fi.yml	(working copy)
@@ -640,3 +640,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/fr.yml
===================================================================
--- lang/fr.yml	(revision 1927)
+++ lang/fr.yml	(working copy)
@@ -641,3 +641,5 @@
 enumeration_doc_categories: Catégories des documents
 enumeration_activities: Activités (suivi du temps)
 notice_unable_delete_version: Unable to delete version
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/he.yml
===================================================================
--- lang/he.yml	(revision 1927)
+++ lang/he.yml	(working copy)
@@ -640,3 +640,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/hu.yml
===================================================================
--- lang/hu.yml	(revision 1927)
+++ lang/hu.yml	(working copy)
@@ -641,3 +641,5 @@
 notice_unable_delete_version: A verziót nem lehet törölni
 label_renamed: átnevezve
 label_copied: lemásolva
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/it.yml
===================================================================
--- lang/it.yml	(revision 1927)
+++ lang/it.yml	(working copy)
@@ -640,3 +640,5 @@
 notice_unable_delete_version: Impossibile cancellare la versione
 label_renamed: rinominato
 label_copied: copiato
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/ja.yml
===================================================================
--- lang/ja.yml	(revision 1927)
+++ lang/ja.yml	(working copy)
@@ -641,3 +641,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/ko.yml
===================================================================
--- lang/ko.yml	(revision 1927)
+++ lang/ko.yml	(working copy)
@@ -640,3 +640,5 @@
 notice_unable_delete_version: 삭제 할 수 없는 버전 입니다.
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/lt.yml
===================================================================
--- lang/lt.yml	(revision 1927)
+++ lang/lt.yml	(working copy)
@@ -642,3 +642,5 @@
 notice_unable_delete_version: Neimanoma panaikinti versiją
 label_renamed: pervardintas
 label_copied: nukopijuotas
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/nl.yml
===================================================================
--- lang/nl.yml	(revision 1927)
+++ lang/nl.yml	(working copy)
@@ -643,3 +643,5 @@
 notice_unable_delete_version: Onmogelijk om deze versie te verwijderen.
 label_renamed: hernoemt
 label_copied: gekopieerd
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/no.yml
===================================================================
--- lang/no.yml	(revision 1927)
+++ lang/no.yml	(working copy)
@@ -641,3 +641,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/pl.yml
===================================================================
--- lang/pl.yml	(revision 1927)
+++ lang/pl.yml	(working copy)
@@ -1,3 +1,7 @@
+# Keep this line to avoid problems with Windows Notepad UTF-8 (EF BB BF) idea...
+# PL translation by Mariusz@Olejnik.net, 
+# Best regards from Lublin@Poland :-)
+
 _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
 
 actionview_datehelper_select_day_prefix:
@@ -49,8 +53,8 @@
 general_lang_name: 'Polski'
 general_csv_separator: ','
 general_csv_decimal_separator: '.'
-general_csv_encoding: ISO-8859-2
-general_pdf_encoding: ISO-8859-2
+general_csv_encoding: UTF-8
+general_pdf_encoding: UTF-8
 general_day_names: Poniedziałek,Wtorek,Środa,Czwartek,Piątek,Sobota,Niedziela
 general_first_day_of_week: '1'
 
@@ -63,9 +67,9 @@
 notice_can_t_change_password: To konto ma zewnętrzne źródło identyfikacji. Nie możesz zmienić hasła.
 notice_account_lost_email_sent: Email z instrukcjami zmiany hasła został wysłany do Ciebie.
 notice_account_activated: Twoje konto zostało aktywowane. Możesz się zalogować.
-notice_successful_create: Udane stworzenie.
-notice_successful_update: Udane poprawienie.
-notice_successful_delete: Udane usunięcie.
+notice_successful_create: Utworzenie zakończone sukcesem.
+notice_successful_update: Uaktualnienie zakończone sukcesem.
+notice_successful_delete: Usunięcie zakończone sukcesem.
 notice_successful_connection: Udane nawiązanie połączenia.
 notice_file_not_found: Strona do której próbujesz się dostać nie istnieje lub została usunięta.
 notice_locking_conflict: Dane poprawione przez innego użytkownika.
@@ -313,10 +317,10 @@
 label_query_new: Nowe zapytanie
 label_filter_add: Dodaj filtr
 label_filter_plural: Filtry
-label_equals: jest
-label_not_equals: nie jest
-label_in_less_than: w mniejszych od
-label_in_more_than: w większych niż
+label_equals: równa się
+label_not_equals: różni się
+label_in_less_than: mniejsze niż
+label_in_more_than: większe niż
 label_in: w
 label_today: dzisiaj
 label_less_than_ago: dni mniej
@@ -344,7 +348,7 @@
 label_sort_lower: Do dołu
 label_sort_lowest: Przesuń na dół
 label_roadmap: Mapa
-label_roadmap_due_in: W czasie %s
+label_roadmap_due_in: W czasie 
 label_roadmap_no_issues: Brak zagadnień do tej wersji
 label_search: Szukaj
 label_result_plural: Rezultatów
@@ -617,26 +621,28 @@
 label_overall_activity: Ogólna aktywność
 setting_default_projects_public: Nowe projekty są domyślnie publiczne
 error_scm_annotate: "Wpis nie istnieje lub nie można do niego dodawać adnotacji."
-label_planning: Planning
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
-label_and_its_subprojects: %s and its subprojects
-mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
-mail_subject_reminder: "%d issue(s) due in the next days"
-text_user_wrote: '%s wrote:'
-label_duplicated_by: duplicated by
-setting_enabled_scm: Enabled SCM
-text_enumeration_category_reassign_to: 'Reassign them to this value:'
-text_enumeration_destroy_question: '%d objects are assigned to this value.'
-label_incoming_emails: Incoming emails
-label_generate_key: Generate a key
-setting_mail_handler_api_enabled: Enable WS for incoming emails
-setting_mail_handler_api_key: API key
-text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
-field_parent_title: Parent page
-label_issue_watchers: Watchers
-setting_commit_logs_encoding: Commit messages encoding
-button_quote: Quote
-setting_sequential_project_identifiers: Generate sequential project identifiers
-notice_unable_delete_version: Unable to delete version
-label_renamed: renamed
-label_copied: copied
+label_planning: Planowanie
+text_subprojects_destroy_warning: 'Podprojekt(y): %s zostaną także usunięte.'
+label_and_its_subprojects: %s i podprojekty
+mail_body_reminder: "Wykaz przypisanych do Ciebie zagadnień, których termin wypada w ciągu następnych %d dni"
+mail_subject_reminder: "Uwaga na terminy, masz zagadnienia do obsłużenia w ciągu następnych %d dni!"
+text_user_wrote: '%s napisał:'
+label_duplicated_by: zdublikowane przez
+setting_enabled_scm: Dostępny SCM
+text_enumeration_category_reassign_to: 'Zmień przypisanie na tą wartość:'
+text_enumeration_destroy_question: '%d obiektów jest przypisana do tej wartości.'
+label_incoming_emails: Przygodząca poczta elektroniczna
+label_generate_key: Wygeneruj klucz
+setting_mail_handler_api_enabled: Uaktywnij usługi sieciowe (WebServices) dla poczty przychodzącej
+setting_mail_handler_api_key: Klucz API
+text_email_delivery_not_configured: "Dostarczanie poczty elektronicznej nie zostało skonfigurowane, więc powiadamianie jest nieaktywne.\nSkonfiguruj serwer SMTP w config/email.yml  a następnie zrestartuj aplikację i uaktywnij to."
+field_parent_title: Strona rodzica
+label_issue_watchers: Obserwatorzy
+setting_commit_logs_encoding: Zatwierdź kodowanie wiadomości
+button_quote: Cytuj
+setting_sequential_project_identifiers: Generuj sekwencyjne identyfikatory projektów
+notice_unable_delete_version: Nie można usunąć wersji
+label_renamed: przemianowano
+label_copied: skopiowano
+field_vf_watcher: Obserwator
+field_vf_personnel: Personel
Index: lang/pt-br.yml
===================================================================
--- lang/pt-br.yml	(revision 1927)
+++ lang/pt-br.yml	(working copy)
@@ -641,3 +641,5 @@
 notice_unable_delete_version: Não foi possível excluir a versão
 label_renamed: renomeado
 label_copied: copiado
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/pt.yml
===================================================================
--- lang/pt.yml	(revision 1927)
+++ lang/pt.yml	(working copy)
@@ -642,3 +642,6 @@
 enumeration_issue_priorities: Prioridade de tarefas
 enumeration_doc_categories: Categorias de documentos
 enumeration_activities: Actividades (Contagem de tempo)
+
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/ro.yml
===================================================================
--- lang/ro.yml	(revision 1927)
+++ lang/ro.yml	(working copy)
@@ -640,3 +640,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/ru.yml
===================================================================
--- lang/ru.yml	(revision 1927)
+++ lang/ru.yml	(working copy)
@@ -672,4 +672,5 @@
 text_user_wrote: '%s написал(а):'
 text_wiki_destroy_confirmation: Вы уверены, что хотите удалить данную Wiki и все содержимое?
 text_workflow_edit: Выберите роль и трекер для редактирования последовательности состояний
-
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/sr.yml
===================================================================
--- lang/sr.yml	(revision 1927)
+++ lang/sr.yml	(working copy)
@@ -641,3 +641,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/sv.yml
===================================================================
--- lang/sv.yml	(revision 1927)
+++ lang/sv.yml	(working copy)
@@ -641,3 +641,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/th.yml
===================================================================
--- lang/th.yml	(revision 1927)
+++ lang/th.yml	(working copy)
@@ -643,3 +643,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/tr.yml
===================================================================
--- lang/tr.yml	(revision 1927)
+++ lang/tr.yml	(working copy)
@@ -641,3 +641,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/uk.yml
===================================================================
--- lang/uk.yml	(revision 1927)
+++ lang/uk.yml	(working copy)
@@ -642,3 +642,5 @@
 notice_unable_delete_version: Unable to delete version
 label_renamed: renamed
 label_copied: copied
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/zh-tw.yml
===================================================================
--- lang/zh-tw.yml	(revision 1927)
+++ lang/zh-tw.yml	(working copy)
@@ -641,3 +641,5 @@
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel
Index: lang/zh.yml
===================================================================
--- lang/zh.yml	(revision 1927)
+++ lang/zh.yml	(working copy)
@@ -641,3 +641,5 @@
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+field_vf_watcher: Watcher
+field_vf_personnel: Personnel