diff --git a/app/Http/Controllers/Staff/PollController.php b/app/Http/Controllers/Staff/PollController.php
index bc070372e0..1e220e9007 100644
--- a/app/Http/Controllers/Staff/PollController.php
+++ b/app/Http/Controllers/Staff/PollController.php
@@ -99,4 +99,103 @@ public function store(StorePoll $request)
         return redirect()->route('staff.polls.index')
             ->withSuccess('Your poll has been created.');
     }
+
+    /**
+     * Poll Edit Form.
+     *
+     * @param $id
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function edit($id)
+    {
+        $poll = Poll::findOrFail($id);
+
+        return view('Staff.poll.edit', ['poll' => $poll]);
+    }
+
+    /**
+     * Update A New Poll.
+     *
+     * @param StorePoll $request
+     *
+     * @return Illuminate\Http\RedirectResponse
+     */
+    public function update(StorePoll $request, $id)
+    {
+        $poll = Poll::findOrFail($id);
+
+        $poll->title = $request->input('title');
+
+        if ($request->input('multiple_choice')) {
+            $poll->multiple_choice = true;
+        } else {
+            $poll->multiple_choice = false;
+        }
+
+        // Remove the deleted options in poll
+        $oldOptionIds = collect($poll->options)->map(function ($option) {
+            return $option->id;
+        })->all();
+
+        $existingOldOptionIds = collect($request->input('option-id'))->map(function ($id) {
+            return intval($id);
+        })->all();
+
+        $idsOfOptionToBeRemove = array_diff($oldOptionIds, $existingOldOptionIds);
+
+        foreach ($idsOfOptionToBeRemove as $id) {
+            $option = Option::findOrFail($id);
+            $option->delete();
+        }
+
+        // Update existing options
+        $existingOldOptionContents = collect($request->input('option-content'))->map(function ($content) {
+            return strval($content);
+        })->all();
+
+        if (count($existingOldOptionContents) === count($existingOldOptionIds)) {
+            $len = count($existingOldOptionContents);
+            for ($i = 0; $i < $len; $i++) {
+                $option = Option::findOrFail($existingOldOptionIds[$i]);
+                $option->name = $existingOldOptionContents[$i];
+                $option->save();
+            }
+        }
+
+        // Insert new options
+        $newOptions = collect($request->input('new-option-content'))->map(function ($content) {
+            return new Option(['name' => $content]);
+        });
+
+        $poll->options()->saveMany($newOptions);
+
+        // Last work from store()
+        $poll_url = hrefPoll($poll);
+
+        $this->chat->systemMessage(
+            "A poll has been updated [url={$poll_url}]{$poll->title}[/url] vote on it now! :slight_smile:"
+        );
+
+        $poll->save();
+
+        return redirect()->route('staff.polls.index')
+            ->withSuccess('Your poll has been edited.');
+    }
+
+    /**
+     * Delete A Poll.
+     *
+     * @param $id
+     *
+     * @return Illuminate\Http\RedirectResponse
+     */
+    public function destroy($id)
+    {
+        $poll = Poll::findOrFail($id);
+        $poll->delete();
+
+        return redirect()->route('staff.polls.index')
+            ->withSuccess('Poll has successfully been deleted');
+    }
 }
diff --git a/app/Models/Poll.php b/app/Models/Poll.php
index ff7a7230a2..d4ad93c04a 100644
--- a/app/Models/Poll.php
+++ b/app/Models/Poll.php
@@ -24,7 +24,6 @@
  * @property int $user_id
  * @property string $title
  * @property string $slug
- * @property int $ip_checking
  * @property int $multiple_choice
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
@@ -37,7 +36,6 @@
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Poll query()
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Poll whereCreatedAt($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Poll whereId($value)
- * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Poll whereIpChecking($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Poll whereMultipleChoice($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Poll whereSlug($value)
  * @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Poll whereTitle($value)
@@ -60,7 +58,6 @@ class Poll extends Model
     protected $fillable = [
         'title',
         'slug',
-        'ip_checking',
         'multiple_choice',
     ];
 
diff --git a/database/migrations/2020_02_14_185120_add_foreign_key_to_options_table.php b/database/migrations/2020_02_14_185120_add_foreign_key_to_options_table.php
new file mode 100644
index 0000000000..b944d7bd6d
--- /dev/null
+++ b/database/migrations/2020_02_14_185120_add_foreign_key_to_options_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddForeignKeyToOptionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('options', function (Blueprint $table) {
+            $table->foreign('poll_id', 'fk_options_poll')->references('id')->on('polls')->onUpdate('RESTRICT')->onDelete('CASCADE');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('options', function (Blueprint $table) {
+            $table->dropForeign('fk_options_poll');
+        });
+    }
+}
diff --git a/database/migrations/2020_02_14_202935_drop_ip_checking_in_polls_table.php b/database/migrations/2020_02_14_202935_drop_ip_checking_in_polls_table.php
new file mode 100644
index 0000000000..845248c0d4
--- /dev/null
+++ b/database/migrations/2020_02_14_202935_drop_ip_checking_in_polls_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class DropIpCheckingInPollsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('polls', function (Blueprint $table) {
+            $table->dropColumn('ip_checking');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('polls', function (Blueprint $table) {
+            $table->boolean('ip_checking')->default(0);
+        });
+    }
+}
diff --git a/database/migrations/2020_02_14_203001_drop_ip_address_in_voters_table.php b/database/migrations/2020_02_14_203001_drop_ip_address_in_voters_table.php
new file mode 100644
index 0000000000..b95f715790
--- /dev/null
+++ b/database/migrations/2020_02_14_203001_drop_ip_address_in_voters_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class DropIpAddressInVotersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('voters', function (Blueprint $table) {
+            $table->dropColumn('ip_address');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('voters', function (Blueprint $table) {
+            $table->string('ip_address')->default('dbRollback');
+        });
+    }
+}
diff --git a/resources/lang/ar/poll.php b/resources/lang/ar/poll.php
index e75507043d..8903f3409d 100644
--- a/resources/lang/ar/poll.php
+++ b/resources/lang/ar/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'إنشاء استطلاع',
   'current' => 'الاستطلاع الحالي',
   'delete-option' => 'حذف الخيار',
-  'ip-checking' => 'هذا الاستطلاع مكررة التحقق من التصويت. يمكنك التصويت مرة واحدة فقط.',
-  'ip-checking-warrning' => 'هناك حاجة فقط إذا كان الموقع في الوضع العام',
   'multiple-choice' => 'هذا استطلاع متعدد الاختيارات. حدد العديد من الإجابات التي تريدها.',
   'option' => 'اختيار',
   'poll' => 'تصويت',
diff --git a/resources/lang/az/poll.php b/resources/lang/az/poll.php
index 1ee3a6985d..020180bd66 100644
--- a/resources/lang/az/poll.php
+++ b/resources/lang/az/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Anket yaradın',
   'current' => 'Cari Anket (lər)',
   'delete-option' => 'Seçimi sil',
-  'ip-checking' => 'Bu sorğuda təkrarlanan səs yoxlanışı var. Yalnız bir dəfə səs verə bilərsiniz.',
-  'ip-checking-warrning' => 'Yalnız ictimai rejimdə site tələb olunur',
   'multiple-choice' => 'Bu çoxsaylı seçki anketidir. Istədiyiniz qədər çox cavabı seçin.',
   'option' => 'Seçim',
   'poll' => 'Anket',
diff --git a/resources/lang/be/poll.php b/resources/lang/be/poll.php
index a1a7c06d2f..ce28cad33c 100644
--- a/resources/lang/be/poll.php
+++ b/resources/lang/be/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'стварыць апытанне',
   'current' => 'Бягучы апытанне (ы)',
   'delete-option' => 'выдаліць варыянт',
-  'ip-checking' => 'Гэты апытанне мае дублікат праверкі галасоў. Вы можаце прагаласаваць толькі адзін раз.',
-  'ip-checking-warrning' => 'Неабходна толькі, калі сайт у грамадскім рэжыме',
   'multiple-choice' => 'Гэта множны выбар апытанне. Абярыце столькі адказаў, як вам падабаецца.',
   'option' => 'варыянт',
   'poll' => 'галасаванне',
diff --git a/resources/lang/bg/poll.php b/resources/lang/bg/poll.php
index 21d3398030..2902267628 100644
--- a/resources/lang/bg/poll.php
+++ b/resources/lang/bg/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Създайте анкета',
   'current' => 'Текущи анкети',
   'delete-option' => 'Изтриване на опцията',
-  'ip-checking' => 'Тази анкета има проверка на дублирания вот. Можете да гласувате само веднъж.',
-  'ip-checking-warrning' => 'Необходимо е само ако сайтът е в публичен режим',
   'multiple-choice' => 'Това е анкета с множествен избор. Изберете колкото искате отговори.',
   'option' => 'опция',
   'poll' => 'гласуване',
diff --git a/resources/lang/bn/poll.php b/resources/lang/bn/poll.php
index 6274501d9a..8f8a054c99 100644
--- a/resources/lang/bn/poll.php
+++ b/resources/lang/bn/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'পোল তৈরি করুন',
   'current' => 'বর্তমান পোল (গুলি)',
   'delete-option' => 'অপশন মুছে দিন',
-  'ip-checking' => 'এই পোল সদৃশ ভোট পরীক্ষা আছে। আপনি শুধুমাত্র একবার ভোট দিতে পারেন।',
-  'ip-checking-warrning' => 'পাবলিক মোড সাইটে শুধুমাত্র প্রয়োজন হলে',
   'multiple-choice' => 'এটি একটি একাধিক পছন্দ পোল। আপনি চান হিসাবে অনেক উত্তর নির্বাচন করুন।',
   'option' => 'পছন্দ',
   'poll' => 'ভোটগ্রহণ',
diff --git a/resources/lang/bs/poll.php b/resources/lang/bs/poll.php
index fc163e1265..c9144a3754 100644
--- a/resources/lang/bs/poll.php
+++ b/resources/lang/bs/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Napravite anketu',
   'current' => 'Trenutna anketa (e)',
   'delete-option' => 'Izbriši opciju',
-  'ip-checking' => 'Ova anketa ima dvostruku provjeru glasova. Možete glasati samo jednom.',
-  'ip-checking-warrning' => 'Potrebno je samo ako je stranica u javnom modu',
   'multiple-choice' => 'Ovo je anketa sa višestrukim izborom. Izaberite onoliko odgovora koliko želite.',
   'option' => 'Opcija',
   'poll' => 'Poll',
diff --git a/resources/lang/ca/poll.php b/resources/lang/ca/poll.php
index 1be90d8cd8..bdd138eac8 100644
--- a/resources/lang/ca/poll.php
+++ b/resources/lang/ca/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Crea una enquesta',
   'current' => 'Enquesta actual (s)',
   'delete-option' => 'Esborra l’opció',
-  'ip-checking' => 'Aquesta enquesta té un control de vots duplicat. Només podeu votar una vegada.',
-  'ip-checking-warrning' => 'Només és necessari si el lloc es troba en mode públic',
   'multiple-choice' => 'Aquesta és una enquesta d elecció múltiple. Seleccioneu tantes respostes com vulgueu.',
   'option' => 'Opció',
   'poll' => 'Enquesta',
diff --git a/resources/lang/cs/poll.php b/resources/lang/cs/poll.php
index e346952834..8e1166ba31 100644
--- a/resources/lang/cs/poll.php
+++ b/resources/lang/cs/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Vytvořit anketu',
   'current' => 'Aktuální ankety',
   'delete-option' => 'Možnost Odstranit',
-  'ip-checking' => 'Tato anketa má duplicitní kontrolu hlasování. Hlasovat můžete pouze jednou.',
-  'ip-checking-warrning' => 'Je potřeba pouze pokud je web ve veřejném režimu',
   'multiple-choice' => 'Toto je anketa s více volbami. Vyberte tolik odpovědí, kolik chcete.',
   'option' => 'Volba',
   'poll' => 'Hlasování',
diff --git a/resources/lang/cy/poll.php b/resources/lang/cy/poll.php
index 529f1194b0..8cc93b6166 100644
--- a/resources/lang/cy/poll.php
+++ b/resources/lang/cy/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Creu pôl',
   'current' => 'Pôl (au) Cyfredol',
   'delete-option' => 'Dileu opsiwn',
-  'ip-checking' => 'Mae r arolwg hwn wedi dyblygu pleidlais. Dim ond unwaith y gallwch bleidleisio.',
-  'ip-checking-warrning' => 'Dim ond ei angen os yw r safle ar ffurf gyhoeddus',
   'multiple-choice' => 'Pôl aml-ddewis yw hwn. Dewiswch gymaint o atebion ag y dymunwch.',
   'option' => 'Opsiwn',
   'poll' => 'Pôl',
diff --git a/resources/lang/da/poll.php b/resources/lang/da/poll.php
index 6caeaceebd..993d5e6faa 100644
--- a/resources/lang/da/poll.php
+++ b/resources/lang/da/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Opret afstemning',
   'current' => 'Nuværende afstemning (r)',
   'delete-option' => 'Slet valgmulighed',
-  'ip-checking' => 'Denne afstemning har dobbelt stemme kontrol. Du kan kun stemme en gang.',
-  'ip-checking-warrning' => 'Kun nødvendig, hvis webstedet er i offentlig tilstand',
   'multiple-choice' => 'Dette er en multiple choice poll. Vælg så mange svar som du vil.',
   'option' => 'Mulighed',
   'poll' => 'Afstemning',
diff --git a/resources/lang/de/poll.php b/resources/lang/de/poll.php
index 417c7f84bb..2638470268 100644
--- a/resources/lang/de/poll.php
+++ b/resources/lang/de/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Umfrage erstellen',
   'current' => 'Aktuelle Umfrage (n)',
   'delete-option' => 'Option löschen',
-  'ip-checking' => 'Diese Umfrage hat eine doppelte Stimmprüfung. Sie können nur einmal abstimmen.',
-  'ip-checking-warrning' => 'Wird nur benötigt, wenn die Site im öffentlichen Modus ist',
   'multiple-choice' => 'Dies ist eine Multiple-Choice-Umfrage. Wählen Sie so viele Antworten aus, wie Sie möchten.',
   'option' => 'Möglichkeit',
   'poll' => 'Umfrage',
diff --git a/resources/lang/el/poll.php b/resources/lang/el/poll.php
index d833325660..035f40e508 100644
--- a/resources/lang/el/poll.php
+++ b/resources/lang/el/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Δημιουργία δημοσκόπησης',
   'current' => 'Τρέχουσα δημοσκόπηση',
   'delete-option' => 'Διαγραφή επιλογής',
-  'ip-checking' => 'Αυτή η δημοσκόπηση έχει διπλό έλεγχο ψηφοφορίας. Μπορείτε να ψηφίζετε μόνο μία φορά.',
-  'ip-checking-warrning' => 'Απαιτείται μόνο αν το site βρίσκεται σε κατάσταση δημόσιας προβολής',
   'multiple-choice' => 'Αυτή είναι μια δημοσκόπηση πολλαπλών επιλογών. Επιλέξτε όσες απαντήσεις θέλετε.',
   'option' => 'Επιλογή',
   'poll' => 'Ψηφοφορία',
diff --git a/resources/lang/en/poll.php b/resources/lang/en/poll.php
index 164fe70068..04cd40c70b 100644
--- a/resources/lang/en/poll.php
+++ b/resources/lang/en/poll.php
@@ -17,9 +17,6 @@
     'current'              => 'Current Poll(s)',
     'delete-option'        => 'Delete Option',
     'edit-poll'            => 'Edit Poll',
-    'ip-checking'          => 'Enable Duplicate IP Checking',
-    'ip-checking'          => 'This poll has duplicate vote checking. You can only vote once.',
-    'ip-checking-warrning' => 'Only needed if site is in public mode',
     'multiple-choice'      => 'Allow Multiple Answers',
     'multiple-choice'      => 'This is a multiple choice poll. Select as many answers as you like.',
     'option'               => 'Option',
diff --git a/resources/lang/es/poll.php b/resources/lang/es/poll.php
index 159d1aeeaa..a45a5f9913 100644
--- a/resources/lang/es/poll.php
+++ b/resources/lang/es/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Crear encuesta',
   'current' => 'Encuesta(s) actual(es)',
   'delete-option' => 'Opción de eliminar',
-  'ip-checking' => 'Esta encuesta tiene la verificación de votos duplicados. Solo puedes votar una vez.',
-  'ip-checking-warrning' => 'Solo es necesario si el sitio está en modo público.',
   'multiple-choice' => 'Esta es una encuesta de opción múltiple. Selecciona tantas respuestas como quieras.',
   'option' => 'Opción',
   'poll' => 'Encuesta',
diff --git a/resources/lang/et/poll.php b/resources/lang/et/poll.php
index 14c358b3c6..96eff69647 100644
--- a/resources/lang/et/poll.php
+++ b/resources/lang/et/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Loo küsitlus',
   'current' => 'Praegune küsitlus',
   'delete-option' => 'Kustuta valik',
-  'ip-checking' => 'Sellel küsitlusel on kahekordne hääletuskontroll. Te saate hääletada ainult üks kord.',
-  'ip-checking-warrning' => 'Vajalik ainult siis, kui sait on avalikus režiimis',
   'multiple-choice' => 'See on mitme valiku küsitlus. Valige nii palju vastuseid kui soovite.',
   'option' => 'Võimalus',
   'poll' => 'Küsitlus',
diff --git a/resources/lang/eu/poll.php b/resources/lang/eu/poll.php
index 1bb6dcac11..00ba0e5533 100644
--- a/resources/lang/eu/poll.php
+++ b/resources/lang/eu/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Sortu inkesta',
   'current' => 'Oraingo inkesta (k)',
   'delete-option' => 'Ezabatu aukera',
-  'ip-checking' => 'Inkesta honek boto bikoiztuaren egiaztapena du. Behin botoa eman dezakezu.',
-  'ip-checking-warrning' => 'Modu publikoan gunea baldin badago bakarrik behar da',
   'multiple-choice' => 'Aukera anitzeko inkesta da. Hautatu nahi dituzun erantzunak.',
   'option' => 'aukera',
   'poll' => 'inkesta',
diff --git a/resources/lang/fa/poll.php b/resources/lang/fa/poll.php
index ec50237ff8..0a12acb864 100644
--- a/resources/lang/fa/poll.php
+++ b/resources/lang/fa/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'ایجاد نظرسنجی',
   'current' => 'نظرسنجی فعلی',
   'delete-option' => 'گزینه را حذف کنید',
-  'ip-checking' => 'این نظرسنجی دارای رأی گیری تکراری است. شما فقط می توانید یک بار رأی دهید',
-  'ip-checking-warrning' => 'فقط اگر سایت در حالت عمومی مورد نیاز باشد',
   'multiple-choice' => 'این نظرسنجی چند گزینه ای است. به عنوان بسیاری از پاسخ را انتخاب کنید که دوست دارید.',
   'option' => 'گزینه',
   'poll' => 'نظرسنجی',
diff --git a/resources/lang/fi/poll.php b/resources/lang/fi/poll.php
index c3263a27f0..ce8ebd2aac 100644
--- a/resources/lang/fi/poll.php
+++ b/resources/lang/fi/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Luo kysely',
   'current' => 'Nykyinen kysely (t)',
   'delete-option' => 'Poista vaihtoehto',
-  'ip-checking' => 'Tällä kyselyllä on kaksinkertainen äänestys. Voit äänestää vain kerran.',
-  'ip-checking-warrning' => 'Tarvitaan vain, jos sivusto on julkisessa tilassa',
   'multiple-choice' => 'Tämä on monivalintakysely. Valitse niin monta vastausta kuin haluat.',
   'option' => 'Vaihtoehto',
   'poll' => 'äänestys',
diff --git a/resources/lang/fr/poll.php b/resources/lang/fr/poll.php
index a3c8e9ed2f..30fb1aabe1 100644
--- a/resources/lang/fr/poll.php
+++ b/resources/lang/fr/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Créer un sondage',
   'current' => 'Sondage (s) actuel (s)',
   'delete-option' => 'Supprimer l option',
-  'ip-checking' => 'Ce sondage a une vérification de vote en double. Vous pouvez voter seulement une fois.',
-  'ip-checking-warrning' => 'Nécessaire uniquement si le site est en mode public',
   'multiple-choice' => 'Ceci est un sondage à choix multiples. Sélectionnez autant de réponses que vous le souhaitez.',
   'option' => 'Option',
   'poll' => 'Sondage',
diff --git a/resources/lang/gl/poll.php b/resources/lang/gl/poll.php
index 25db4b620d..9e2f8da7ac 100644
--- a/resources/lang/gl/poll.php
+++ b/resources/lang/gl/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Crear enquisa',
   'current' => 'Enquisa actual (s)',
   'delete-option' => 'Eliminar opción',
-  'ip-checking' => 'Esta enquisa ten unha verificación duplicada. Só podes votar unha vez.',
-  'ip-checking-warrning' => 'Só se precisa se o sitio está en modo público',
   'multiple-choice' => 'Esta é unha enquisa de opción múltiple. Seleccione cantas respostas desexa.',
   'option' => 'Opción',
   'poll' => 'Enquisa',
diff --git a/resources/lang/hi/poll.php b/resources/lang/hi/poll.php
index 959f7853b4..5d258ecde8 100644
--- a/resources/lang/hi/poll.php
+++ b/resources/lang/hi/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'जनमत बनाएं',
   'current' => 'वर्तमान पोल',
   'delete-option' => 'हटाने का विकल्प',
-  'ip-checking' => 'इस पोल में डुप्लीकेट वोट चेकिंग है। आप केवल एक बार वोट कर सकते हैं।',
-  'ip-checking-warrning' => 'केवल जरूरत है अगर सार्वजनिक मोड में साइट',
   'multiple-choice' => 'यह बहुविकल्पी चुनाव है। जितने चाहे उतने जवाब चुनिए',
   'option' => 'विकल्प',
   'poll' => 'मतदान',
diff --git a/resources/lang/hr/poll.php b/resources/lang/hr/poll.php
index bf6e211bcd..97a001fcc1 100644
--- a/resources/lang/hr/poll.php
+++ b/resources/lang/hr/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Izradite anketu',
   'current' => 'Trenutna anketa',
   'delete-option' => 'Izbriši opciju',
-  'ip-checking' => 'Ova anketa ima dvostruku provjeru glasova. Možete glasati samo jednom.',
-  'ip-checking-warrning' => 'Potrebno je samo ako je web-lokacija u javnom načinu',
   'multiple-choice' => 'Ovo je anketa s višestrukim izborom. Odaberite onoliko odgovora koliko želite.',
   'option' => 'Opcija',
   'poll' => 'Anketa',
diff --git a/resources/lang/hu/poll.php b/resources/lang/hu/poll.php
index eb6fd3e9fa..a1c3d4cf22 100644
--- a/resources/lang/hu/poll.php
+++ b/resources/lang/hu/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Szavazás létrehozása',
   'current' => 'Aktuális szavazás (ok)',
   'delete-option' => 'Törlés opció',
-  'ip-checking' => 'Ez a felmérés többszörös szavazásellenőrzést végez. Csak egyszer szavazhat.',
-  'ip-checking-warrning' => 'Csak akkor szükséges, ha nyilvános módban van',
   'multiple-choice' => 'Ez egy többszörös választás. Válassza ki a kívánt számú választ.',
   'option' => 'választási lehetőség',
   'poll' => 'Közvélemény kutatás',
diff --git a/resources/lang/id/poll.php b/resources/lang/id/poll.php
index 60ddd4e40d..25ba4cc0fb 100644
--- a/resources/lang/id/poll.php
+++ b/resources/lang/id/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Buat jajak pendapat',
   'current' => 'Polling Saat Ini',
   'delete-option' => 'Hapus opsi',
-  'ip-checking' => 'Jajak pendapat ini memiliki pemeriksaan suara rangkap. Anda hanya dapat memberikan suara satu kali.',
-  'ip-checking-warrning' => 'Hanya diperlukan jika situs dalam mode publik',
   'multiple-choice' => 'Ini adalah jajak pendapat pilihan ganda. Pilih jawaban sebanyak yang Anda suka.',
   'option' => 'Pilihan',
   'poll' => 'Pemilihan',
diff --git a/resources/lang/is/poll.php b/resources/lang/is/poll.php
index 25b85f1cea..a25d5ac84b 100644
--- a/resources/lang/is/poll.php
+++ b/resources/lang/is/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Búðu til könnun',
   'current' => 'Núverandi skoðanakönnun (ir)',
   'delete-option' => 'Eyða valkosti',
-  'ip-checking' => 'Þessi skoðanakönnun hefur tvíhliða atkvæðagreiðslu. Þú getur aðeins kosið einu sinni.',
-  'ip-checking-warrning' => 'Aðeins þarf ef síða í almenna ham',
   'multiple-choice' => 'Þetta er margfeldisrannsókn. Veldu eins mörg svör og þú vilt.',
   'option' => 'Valkostur',
   'poll' => 'Könnun',
diff --git a/resources/lang/it/poll.php b/resources/lang/it/poll.php
index 8d1e3710cd..e812dd61d9 100644
--- a/resources/lang/it/poll.php
+++ b/resources/lang/it/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Crea sondaggio',
   'current' => 'Sondaggio (i) corrente',
   'delete-option' => 'Elimina l opzione',
-  'ip-checking' => 'Questo sondaggio ha un doppio controllo dei voti. Puoi votare solo una volta.',
-  'ip-checking-warrning' => 'Serve solo se il sito è in modalità pubblica',
   'multiple-choice' => 'Questo è un sondaggio a scelta multipla. Seleziona tutte le risposte che vuoi.',
   'option' => 'Opzione',
   'poll' => 'Sondaggio',
diff --git a/resources/lang/ja/poll.php b/resources/lang/ja/poll.php
index 4e1bdb57c1..44e4ee2a0a 100644
--- a/resources/lang/ja/poll.php
+++ b/resources/lang/ja/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => '投票を作成',
   'current' => '現在の投票',
   'delete-option' => '削除オプション',
-  'ip-checking' => 'この投票には重複投票チェックがあります。あなたは一度だけ投票することができます。',
-  'ip-checking-warrning' => 'サイトがパブリックモードの場合にのみ必要',
   'multiple-choice' => 'これは多肢選択調査です。好きなだけ答えを選んでください。',
   'option' => 'オプション',
   'poll' => '世論調査',
diff --git a/resources/lang/ka/poll.php b/resources/lang/ka/poll.php
index 268873e02c..9713ffaf13 100644
--- a/resources/lang/ka/poll.php
+++ b/resources/lang/ka/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'გამოკითხვის შექმნა',
   'current' => 'მიმდინარე გამოკითხვა',
   'delete-option' => 'წაშლა ვარიანტი',
-  'ip-checking' => 'ეს გამოკითხვა აქვს დუბლიკატის ხმის შემოწმებას. მხოლოდ ხმის მიცემა შეგიძლიათ.',
-  'ip-checking-warrning' => 'მხოლოდ საჭიროა, თუ საიტი საჯარო რეჟიმში',
   'multiple-choice' => 'ეს არის მრავალჯერადი არჩევანი გამოკითხვა. აირჩიეთ როგორც ბევრი პასუხი, როგორც გსურთ.',
   'option' => 'ვარიანტი',
   'poll' => 'გამოკითხვა',
diff --git a/resources/lang/kk/poll.php b/resources/lang/kk/poll.php
index 1dbf38e064..b0d6e84f61 100644
--- a/resources/lang/kk/poll.php
+++ b/resources/lang/kk/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Сауалнама жасау',
   'current' => 'Ағымдағы сұраулар (лар)',
   'delete-option' => 'Параметрді жою',
-  'ip-checking' => 'Бұл сауалда екі жақты дауыс беру тексерісі бар. Сіз тек бір рет дауыс бере аласыз.',
-  'ip-checking-warrning' => 'Тек қоғамдық режимде сайт қажет болса',
   'multiple-choice' => 'Бұл бірнеше таңдауды сұрау. Қалағаныңызша көп жауаптарыңызды таңдаңыз.',
   'option' => 'Опция',
   'poll' => 'Сауалдама',
diff --git a/resources/lang/km/poll.php b/resources/lang/km/poll.php
index b3819a0454..754d599f58 100644
--- a/resources/lang/km/poll.php
+++ b/resources/lang/km/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'បង្កើតការស្ទង់មតិ',
   'current' => 'ការស្ទង់មតិបច្ចុប្បន្ន (s បាន)',
   'delete-option' => 'លុបជម្រើស',
-  'ip-checking' => 'ការស្ទង់មតិនេះមានការពិនិត្យសន្លឹកឆ្នោតស្ទួន។ អ្នកអាចបោះឆ្នោតតែម្តងប៉ុណ្ណោះ។',
-  'ip-checking-warrning' => 'ត្រូវការតែក្នុងករណីដែលគេហទំព័រនៅជាសាធារណៈប៉ុណ្ណោះ',
   'multiple-choice' => 'នេះគឺជាការស្ទង់មតិជម្រើសច្រើន។ ជ្រើសចម្លើយច្រើនតាមដែលអ្នកចូលចិត្ត។',
   'option' => 'ជម្រើស',
   'poll' => 'ការស្ទង់មតិ',
diff --git a/resources/lang/kn/poll.php b/resources/lang/kn/poll.php
index 06274bde63..0293144984 100644
--- a/resources/lang/kn/poll.php
+++ b/resources/lang/kn/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'ಪೋಲ್ ರಚಿಸಿ',
   'current' => 'ಪ್ರಸ್ತುತ ಪೋಲ್ (ಗಳು)',
   'delete-option' => 'ಆಯ್ಕೆಯನ್ನು ಅಳಿಸಿ',
-  'ip-checking' => 'ಈ ಸಮೀಕ್ಷೆಯಲ್ಲಿ ನಕಲಿ ಮತ ತಪಾಸಣೆ ಇದೆ. ನೀವು ಒಮ್ಮೆ ಮಾತ್ರ ಮತ ಚಲಾಯಿಸಬಹುದು.',
-  'ip-checking-warrning' => 'ಸಾರ್ವಜನಿಕ ಮೋಡ್ನಲ್ಲಿ ಸೈಟ್ ಮಾತ್ರ ಅಗತ್ಯವಿರುತ್ತದೆ',
   'multiple-choice' => 'ಇದು ಬಹು ಆಯ್ಕೆಯ ಅಭಿಪ್ರಾಯ ಸಂಗ್ರಹವಾಗಿದೆ. ನಿಮಗೆ ಇಷ್ಟವಾದಷ್ಟು ಉತ್ತರಗಳನ್ನು ಆಯ್ಕೆ ಮಾಡಿ.',
   'option' => 'ಆಯ್ಕೆ',
   'poll' => 'ಮತದಾನ',
diff --git a/resources/lang/ko/poll.php b/resources/lang/ko/poll.php
index 8487c228f3..7de7706708 100644
--- a/resources/lang/ko/poll.php
+++ b/resources/lang/ko/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => '설문 조사 작성',
   'current' => '현재 설문 조사',
   'delete-option' => '삭제 옵션',
-  'ip-checking' => '이 설문 조사에는 중복 된 투표가 있습니다. 한 번만 투표 할 수 있습니다.',
-  'ip-checking-warrning' => '사이트가 공개 모드 인 경우에만 필요합니다.',
   'multiple-choice' => '이것은 객관식 투표입니다. 원하는만큼 답을 선택하십시오.',
   'option' => '옵션',
   'poll' => '투표',
diff --git a/resources/lang/lt/poll.php b/resources/lang/lt/poll.php
index 6c410d61c1..541495dc4e 100644
--- a/resources/lang/lt/poll.php
+++ b/resources/lang/lt/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Sukurti apklausą',
   'current' => 'Dabartinis apklausa',
   'delete-option' => 'Ištrinti parinktį',
-  'ip-checking' => 'Šis apklausa turi dvigubą balsų patikrinimą. Galite balsuoti tik vieną kartą.',
-  'ip-checking-warrning' => 'Reikalinga tik tada, kai svetainė yra viešame režime',
   'multiple-choice' => 'Tai yra daugkartinio pasirinkimo apklausa. Pasirinkite kuo daugiau atsakymų.',
   'option' => 'Galimybė',
   'poll' => 'Apklausa',
diff --git a/resources/lang/lv/poll.php b/resources/lang/lv/poll.php
index 08ed65c320..5744805cb2 100644
--- a/resources/lang/lv/poll.php
+++ b/resources/lang/lv/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Izveidot aptauju',
   'current' => 'Pašreizējā aptauja',
   'delete-option' => 'Dzēst opciju',
-  'ip-checking' => 'Šī aptauja ir divkārša balss pārbaude. Jūs varat balsot tikai vienu reizi.',
-  'ip-checking-warrning' => 'Nepieciešams tikai tad, ja vietne ir publiskā režīmā',
   'multiple-choice' => 'Tā ir aptaujāta izvēle. Izvēlieties tik daudz atbilžu, cik vēlaties.',
   'option' => 'Iespēja',
   'poll' => 'Aptauja',
diff --git a/resources/lang/mk/poll.php b/resources/lang/mk/poll.php
index 77652b04d1..2bbf4bf32d 100644
--- a/resources/lang/mk/poll.php
+++ b/resources/lang/mk/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Креирај анкета',
   'current' => 'Тековни Анкета (и)',
   'delete-option' => 'Избриши ја опцијата',
-  'ip-checking' => 'Оваа анкета има дуплирање на проверка на гласањето. Може да гласате само еднаш.',
-  'ip-checking-warrning' => 'Потребна е само ако страницата е во јавен режим',
   'multiple-choice' => 'Ова е анкета за повеќекратен избор. Изберете што повеќе одговори колку што сакате.',
   'option' => 'Опција',
   'poll' => 'Анкета',
diff --git a/resources/lang/mn/poll.php b/resources/lang/mn/poll.php
index 7cf1e5583f..0206beab57 100644
--- a/resources/lang/mn/poll.php
+++ b/resources/lang/mn/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Санал асуулга үүсгэх',
   'current' => 'Одоогийн санал (ууд)',
   'delete-option' => 'Сонголтыг устгах',
-  'ip-checking' => 'Энэ санал асуулгад давхардсан үнэлгээтэй байна. Та зөвхөн нэг удаа л санал өгч болно.',
-  'ip-checking-warrning' => 'Зөвхөн олон нийтийн горимд байгаа газар л хэрэгтэй',
   'multiple-choice' => 'Энэ бол олон сонголттой санал асуулга юм. Өөрийн хүссэн хариултыг сонгох.',
   'option' => 'Сонголт',
   'poll' => 'Санал асуулга',
diff --git a/resources/lang/ms/poll.php b/resources/lang/ms/poll.php
index c5337ec3a8..2e7aba0e32 100644
--- a/resources/lang/ms/poll.php
+++ b/resources/lang/ms/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Buat pengundian',
   'current' => 'Pungutan Semasa',
   'delete-option' => 'Padam pilihan',
-  'ip-checking' => 'Undian ini mempunyai pemeriksaan undi pendua. Anda hanya boleh mengundi sekali.',
-  'ip-checking-warrning' => 'Hanya diperlukan jika tapak dalam mod awam',
   'multiple-choice' => 'Ini adalah pilihan pelbagai pilihan. Pilih seberapa banyak jawapan yang anda suka.',
   'option' => 'Pilihan',
   'poll' => 'Undian',
diff --git a/resources/lang/ne/poll.php b/resources/lang/ne/poll.php
index 7fd104f159..2776191fad 100644
--- a/resources/lang/ne/poll.php
+++ b/resources/lang/ne/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'सर्वेक्षण सिर्जना गर्नुहोस्',
   'current' => 'वर्तमान पोल (हरू)',
   'delete-option' => 'विकल्प मेटाउनुहोस्',
-  'ip-checking' => 'यो मतदानसँग डुप्लिकेट मतदान जाँच छ। तपाईं मात्र एक पटक मतदान गर्न सक्नुहुन्छ।',
-  'ip-checking-warrning' => 'यदि सार्वजनिक मोडमा साइट आवश्यक हुन्छ',
   'multiple-choice' => 'यो धेरै छनौट पोल छ। तपाइँ जस्तै जस्तै धेरै जवाफहरू चयन गर्नुहोस्।',
   'option' => 'विकल्प',
   'poll' => 'पोल',
diff --git a/resources/lang/nl/poll.php b/resources/lang/nl/poll.php
index c7d0364be1..71f3f94169 100644
--- a/resources/lang/nl/poll.php
+++ b/resources/lang/nl/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Maak enquête',
   'current' => 'Huidige peiling (en)',
   'delete-option' => 'Wis optie',
-  'ip-checking' => 'Deze poll heeft dubbele stemcontrole. Je kunt maar één keer stemmen.',
-  'ip-checking-warrning' => 'Alleen nodig als site in openbare modus is',
   'multiple-choice' => 'Dit is een meerkeuze poll. Selecteer zoveel antwoorden als je wilt.',
   'option' => 'Keuze',
   'poll' => 'poll',
diff --git a/resources/lang/no/poll.php b/resources/lang/no/poll.php
index 560176a838..628c423466 100644
--- a/resources/lang/no/poll.php
+++ b/resources/lang/no/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Lag avstemning',
   'current' => 'Nåværende avstemning (er)',
   'delete-option' => 'Slett valg',
-  'ip-checking' => 'Denne undersøkelsen har duplikatkontroll. Du kan bare stemme en gang.',
-  'ip-checking-warrning' => 'Bare nødvendig hvis nettstedet i offentlig modus',
   'multiple-choice' => 'Dette er en valgmåling. Velg så mange svar som du vil.',
   'option' => 'Alternativ',
   'poll' => 'avstemming',
diff --git a/resources/lang/pl/poll.php b/resources/lang/pl/poll.php
index 570082571c..39a5a324be 100644
--- a/resources/lang/pl/poll.php
+++ b/resources/lang/pl/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Utwórz ankietę',
   'current' => 'Bieżące ankiety',
   'delete-option' => 'Usuń opcję',
-  'ip-checking' => 'Ta ankieta ma podwójne sprawdzanie głosów. Możesz głosować tylko raz.',
-  'ip-checking-warrning' => 'Wymagane tylko wtedy, gdy witryna jest w trybie publicznym',
   'multiple-choice' => 'To sonda wielokrotnego wyboru. Wybierz tyle odpowiedzi, ile chcesz.',
   'option' => 'Opcja',
   'poll' => 'Głosowanie',
diff --git a/resources/lang/pt/poll.php b/resources/lang/pt/poll.php
index ea3818f63c..704cabda3e 100644
--- a/resources/lang/pt/poll.php
+++ b/resources/lang/pt/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Criar enquete',
   'current' => 'Enquete (s) atual (s)',
   'delete-option' => 'Excluir opção',
-  'ip-checking' => 'Esta enquete tem verificação de votos duplicada. Você só pode votar uma vez.',
-  'ip-checking-warrning' => 'Necessário apenas se o site estiver em modo público',
   'multiple-choice' => 'Esta é uma enquete de múltipla escolha. Selecione quantas respostas quiser.',
   'option' => 'Opção',
   'poll' => 'Votação',
diff --git a/resources/lang/ro/poll.php b/resources/lang/ro/poll.php
index b02a089554..2482201e5e 100644
--- a/resources/lang/ro/poll.php
+++ b/resources/lang/ro/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Creaza un sondaj',
   'current' => 'Sondaj curent',
   'delete-option' => 'Opțiunea ștergere',
-  'ip-checking' => 'Acest sondaj are o verificare duplicată a voturilor. Puteți vota numai o singură dată.',
-  'ip-checking-warrning' => 'Este necesar numai dacă site-ul este în modul public',
   'multiple-choice' => 'Acesta este un sondaj cu mai multe opțiuni. Selectați cât mai multe răspunsuri doriți.',
   'option' => 'Opțiune',
   'poll' => 'Sondaj',
diff --git a/resources/lang/ru/poll.php b/resources/lang/ru/poll.php
index fddb2aebc4..9ee50da5ad 100644
--- a/resources/lang/ru/poll.php
+++ b/resources/lang/ru/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Создать опрос',
   'current' => 'Текущий опрос (ы)',
   'delete-option' => 'Удалить опцию',
-  'ip-checking' => 'Этот опрос имеет дублирование проверки голоса. Вы можете проголосовать только один раз.',
-  'ip-checking-warrning' => 'Нужно только если сайт в публичном режиме',
   'multiple-choice' => 'Это опрос с множественным выбором. Выберите столько ответов, сколько хотите.',
   'option' => 'вариант',
   'poll' => 'Опрос',
diff --git a/resources/lang/si/poll.php b/resources/lang/si/poll.php
index dff0b8ae6c..22fa21a771 100644
--- a/resources/lang/si/poll.php
+++ b/resources/lang/si/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'විමසුම කරන්න',
   'current' => 'වත්මන් ඡන්දය (න්)',
   'delete-option' => 'Delete විකල්පය',
-  'ip-checking' => 'මෙම ඡන්ද විමසීමේදී ඡන්ද විමසීම් අනුමත කර ඇත. ඔබට වරක් පමණක් ඡන්දය ලබා ගත හැකිය.',
-  'ip-checking-warrning' => 'වෙබ් අඩවියේ පොදු ආකාරයෙන් පමණක් අවශ්ය වේ',
   'multiple-choice' => 'මෙය බහු විකල්ප තේරීමකි. ඔබ කැමති බොහෝ පිළිතුරු තෝරන්න.',
   'option' => 'විකල්පය',
   'poll' => 'ඡන්දය',
diff --git a/resources/lang/sk/poll.php b/resources/lang/sk/poll.php
index 9f415382cf..3132a74cab 100644
--- a/resources/lang/sk/poll.php
+++ b/resources/lang/sk/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Vytvorte anketu',
   'current' => 'Aktuálne ankety',
   'delete-option' => 'Vymazať možnosť',
-  'ip-checking' => 'Táto anketa má kontrolu duplicitného hlasovania. Hlasovať môžete len raz.',
-  'ip-checking-warrning' => 'Potrebné je len v prípade, ak je stránka vo verejnom režime',
   'multiple-choice' => 'Toto je anketa s viacerými možnosťami. Vyberte čo najviac odpovedí.',
   'option' => 'voľba',
   'poll' => 'hlasovanie',
diff --git a/resources/lang/sl/poll.php b/resources/lang/sl/poll.php
index 654b352b1e..ce4dfcb076 100644
--- a/resources/lang/sl/poll.php
+++ b/resources/lang/sl/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Ustvarite anketo',
   'current' => 'Trenutna anketa',
   'delete-option' => 'Izbriši možnost',
-  'ip-checking' => 'Ta anketa ima dvojno preverjanje glasovanja. Glasujete lahko samo enkrat.',
-  'ip-checking-warrning' => 'Potrebno samo, če je mesto v javnem načinu',
   'multiple-choice' => 'To je anketa z več izbirami. Izberite toliko odgovorov, kot želite.',
   'option' => 'Možnost',
   'poll' => 'Anketa',
diff --git a/resources/lang/sq/poll.php b/resources/lang/sq/poll.php
index 32b44b713a..e29310b8f6 100644
--- a/resources/lang/sq/poll.php
+++ b/resources/lang/sq/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Krijo sondazhin',
   'current' => 'Sondazhi aktual',
   'delete-option' => 'Fshije opsionin',
-  'ip-checking' => 'Ky sondazh ka dyfishuar kontrollin e votave. Ju mund të votoni vetëm një herë.',
-  'ip-checking-warrning' => 'Nevojitet vetëm nëse vendi në mënyrë publike',
   'multiple-choice' => 'Ky është një sondazh me zgjedhje të shumëfishta. Zgjidh sa më shumë përgjigje sa të pëlqen.',
   'option' => 'alternativë',
   'poll' => 'sondazh',
diff --git a/resources/lang/sr/poll.php b/resources/lang/sr/poll.php
index 6d9df1eeea..bfac736f4b 100644
--- a/resources/lang/sr/poll.php
+++ b/resources/lang/sr/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Направите анкету',
   'current' => 'Тренутна анкета',
   'delete-option' => 'Избриши опцију',
-  'ip-checking' => 'Ова анкета има дуплирану провјеру гласова. Можете гласати само једном.',
-  'ip-checking-warrning' => 'Потребно је само ако је сајт у јавном моду',
   'multiple-choice' => 'Ово је анкета са вишеструким избором. Изаберите онолико одговора колико желите.',
   'option' => 'Опција',
   'poll' => 'Полл',
diff --git a/resources/lang/sv/poll.php b/resources/lang/sv/poll.php
index e1771ed276..b76b1c5e67 100644
--- a/resources/lang/sv/poll.php
+++ b/resources/lang/sv/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Skapa undersökning',
   'current' => 'Nuvarande omröstning (er)',
   'delete-option' => 'Radera alternativet',
-  'ip-checking' => 'Denna undersökning har dubbla röstkontroll. Du kan bara rösta en gång.',
-  'ip-checking-warrning' => 'Endast behövs om webbplatsen är i det offentliga läget',
   'multiple-choice' => 'Detta är en multipelval omröstning. Välj så många svar som du vill.',
   'option' => 'Alternativ',
   'poll' => 'Opinionsundersökning',
diff --git a/resources/lang/sw/poll.php b/resources/lang/sw/poll.php
index 4f4709b5af..0205d8bea2 100644
--- a/resources/lang/sw/poll.php
+++ b/resources/lang/sw/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Unda uchaguzi',
   'current' => 'Poll ya sasa (s)',
   'delete-option' => 'Futa chaguo',
-  'ip-checking' => 'Uchaguzi huu una ukaguzi wa kupiga kura. Unaweza kupiga kura mara moja tu.',
-  'ip-checking-warrning' => 'Inahitajika tu kama tovuti katika hali ya umma',
   'multiple-choice' => 'Hii ni uchaguzi wa uchaguzi nyingi. Chagua majibu mengi kama unavyopenda.',
   'option' => 'Chaguo',
   'poll' => 'Uchaguzi',
diff --git a/resources/lang/tg/poll.php b/resources/lang/tg/poll.php
index 8104828279..151281abef 100644
--- a/resources/lang/tg/poll.php
+++ b/resources/lang/tg/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Эҷоди пурсиш',
   'current' => 'Равзанаи ҷорӣ',
   'delete-option' => 'Интихобро нест кунед',
-  'ip-checking' => 'Ин пурсишро санҷиши овоздиҳӣ такрор мекунад. Шумо фақат як маротиба овоз медиҳед.',
-  'ip-checking-warrning' => 'Танҳо зарур аст, ки сайт дар ҳолати умумӣ зарур бошад',
   'multiple-choice' => 'Ин як тасмими якчанд интихоб аст. Тавре, ки шумо мехоҳед ҷавобҳои бисёрро интихоб кунед.',
   'option' => 'Интихоби',
   'poll' => 'Пӯлод',
diff --git a/resources/lang/th/poll.php b/resources/lang/th/poll.php
index 7c768f28d8..4389a42b0d 100644
--- a/resources/lang/th/poll.php
+++ b/resources/lang/th/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'สร้างแบบสำรวจ',
   'current' => 'โพลปัจจุบัน',
   'delete-option' => 'ตัวเลือกลบ',
-  'ip-checking' => 'แบบสำรวจนี้มีการตรวจสอบการลงคะแนนซ้ำกัน คุณสามารถลงคะแนนได้เพียงครั้งเดียว',
-  'ip-checking-warrning' => 'จำเป็นเฉพาะเมื่อไซต์ในโหมดสาธารณะ',
   'multiple-choice' => 'นี่คือการสำรวจความคิดเห็นหลายตัวเลือก เลือกคำตอบได้มากเท่าที่คุณต้องการ',
   'option' => 'ตัวเลือก',
   'poll' => 'โพลล์',
diff --git a/resources/lang/tl/poll.php b/resources/lang/tl/poll.php
index c0f28ee1ab..62bd94afe9 100644
--- a/resources/lang/tl/poll.php
+++ b/resources/lang/tl/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Lumikha ng poll',
   'current' => 'Kasalukuyang (mga) Poll',
   'delete-option' => 'Tanggalin ang pagpipilian',
-  'ip-checking' => 'Ang poll na ito ay mayroong duplicate vote checking. Maaari ka lamang bumoto nang isang beses.',
-  'ip-checking-warrning' => 'Kailangan lamang kung ang site sa pampublikong mode',
   'multiple-choice' => 'Ito ay isang maramihang pagpipilian pinili. Pumili ng maraming mga sagot hangga t gusto mo.',
   'option' => 'Pagpipilian',
   'poll' => 'Poll',
diff --git a/resources/lang/tr/poll.php b/resources/lang/tr/poll.php
index 244ddbf587..9fd41c8476 100644
--- a/resources/lang/tr/poll.php
+++ b/resources/lang/tr/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Anket yarat',
   'current' => 'Güncel Anket (ler)',
   'delete-option' => 'Seçeneği sil',
-  'ip-checking' => 'Bu ankette çift oy kontrolü var. Sadece bir kez oy kullanabilirsiniz.',
-  'ip-checking-warrning' => 'Yalnızca site genel modda olduğunda gerekli',
   'multiple-choice' => 'Bu çoktan seçmeli bir anket. İstediğiniz kadar cevap seçin.',
   'option' => 'seçenek',
   'poll' => 'Anket',
diff --git a/resources/lang/uk/poll.php b/resources/lang/uk/poll.php
index 137cb6146c..3371308ebf 100644
--- a/resources/lang/uk/poll.php
+++ b/resources/lang/uk/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Створити опитування',
   'current' => 'Поточне опитування',
   'delete-option' => 'Опція Видалити',
-  'ip-checking' => 'У цьому опитуванні перевіряється дублікат голосів. Ви можете проголосувати лише один раз.',
-  'ip-checking-warrning' => 'Потрібно тільки, якщо сайт в публічному режимі',
   'multiple-choice' => 'Це опитування з декількома варіантами вибору. Виберіть стільки відповідей, скільки бажаєте.',
   'option' => 'Варіант',
   'poll' => 'Опитування',
diff --git a/resources/lang/ur/poll.php b/resources/lang/ur/poll.php
index b3620d374e..4d915f876c 100644
--- a/resources/lang/ur/poll.php
+++ b/resources/lang/ur/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'سروے بنائیں',
   'current' => 'موجودہ پولز',
   'delete-option' => 'اختیار حذف کریں',
-  'ip-checking' => 'اس سروے میں ڈپلٹ ووٹ چیکنگ ہے. آپ صرف ایک بار ووٹ سکتے ہیں.',
-  'ip-checking-warrning' => 'اگرچہ عوامی موڈ میں سائٹ کی ضرورت ہوتی ہے',
   'multiple-choice' => 'یہ ایک سے زیادہ انتخاب سروے ہے. آپ جیسے پسند کے طور پر بہت سے جوابات منتخب کریں.',
   'option' => 'اختیار',
   'poll' => 'پول',
diff --git a/resources/lang/uz/poll.php b/resources/lang/uz/poll.php
index 1c5704f7be..b82e088b46 100644
--- a/resources/lang/uz/poll.php
+++ b/resources/lang/uz/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'So rov yaratish',
   'current' => 'Joriy so rov (lar)',
   'delete-option' => 'Variantni o chirish',
-  'ip-checking' => 'Ushbu so rovda ikki nusxadagi ovozlarni tekshirish bor. Siz faqat bir marta ovoz berishingiz mumkin.',
-  'ip-checking-warrning' => 'Faqat ommaviy rejimda sayt zarur bo lganda',
   'multiple-choice' => 'Bu juda ko p tanlovli so rov. Istalganicha ko p javobni tanlang.',
   'option' => 'Variant',
   'poll' => 'So rov',
diff --git a/resources/lang/vi/poll.php b/resources/lang/vi/poll.php
index 31e75659d4..3379c651c4 100644
--- a/resources/lang/vi/poll.php
+++ b/resources/lang/vi/poll.php
@@ -16,8 +16,6 @@
   'create-poll' => 'Tạo bình chọn',
   'current' => 'Thăm dò ý kiến hiện tại',
   'delete-option' => 'Xóa tùy chọn',
-  'ip-checking' => 'Cuộc thăm dò này đã kiểm tra phiếu bầu trùng lặp. Bạn chỉ có thể bình chọn một lần.',
-  'ip-checking-warrning' => 'Chỉ cần nếu trang web ở chế độ công khai',
   'multiple-choice' => 'Đây là một cuộc thăm dò nhiều lựa chọn. Chọn nhiều câu trả lời như bạn muốn.',
   'option' => 'Tùy chọn',
   'poll' => 'Thăm dò ý kiến',
diff --git a/resources/lang/zh-CN/poll.php b/resources/lang/zh-CN/poll.php
index cb93507dfd..a514384637 100644
--- a/resources/lang/zh-CN/poll.php
+++ b/resources/lang/zh-CN/poll.php
@@ -17,9 +17,6 @@
     'current'              => '目前投票',
     'delete-option'        => '删除最后一个选项',
     'edit-poll'            => '编辑投票',
-    'ip-checking'          => '启用重复IP检查机制',
-    'ip-checking'          => '此投票有重复IP检查。你的IP只能投一次。',
-    'ip-checking-warrning' => '若网站在公开模式，才需要该选项',
     'multiple-choice'      => '允许多个答案',
     'multiple-choice'      => '本投票可多选。',
     'option'               => '选项',
diff --git a/resources/lang/zh-TW/poll.php b/resources/lang/zh-TW/poll.php
index 58af002475..8b6111dbde 100644
--- a/resources/lang/zh-TW/poll.php
+++ b/resources/lang/zh-TW/poll.php
@@ -16,9 +16,7 @@
     'create-poll'          => '建立投票',
     'current'              => '目前投票',
     'delete-option'        => '刪除選項',
-    'ip-checking'          => '啟動重複IP檢查機制',
-    'ip-checking'          => '此投票有重復的投票檢查。你只能投一次。',
-    'ip-checking-warrning' => '若網站在公開模式，才需此選項',
+    'edit-poll'            => '編輯投票',
     'multiple-choice'      => '容許多個答案',
     'multiple-choice'      => '這是一項多項選擇投票。可多選。',
     'option'               => '選項',
diff --git a/resources/views/Staff/poll/edit.blade.php b/resources/views/Staff/poll/edit.blade.php
new file mode 100644
index 0000000000..f93296b893
--- /dev/null
+++ b/resources/views/Staff/poll/edit.blade.php
@@ -0,0 +1,44 @@
+@extends('layout.default')
+
+@section('title')
+    <title>Polls - {{ config('other.title') }}</title>
+@endsection
+
+@section('breadcrumb')
+    <li>
+        <a href="{{ route('staff.dashboard.index') }}" itemprop="url" class="l-breadcrumb-item-link">
+            <span itemprop="title" class="l-breadcrumb-item-link-title">@lang('staff.staff-dashboard')</span>
+        </a>
+    </li>
+    <li>
+        <a href="{{ route('staff.polls.index') }}" itemprop="url" class="l-breadcrumb-item-link">
+            <span itemprop="title" class="l-breadcrumb-item-link-title">@lang('poll.polls')</span>
+        </a>
+    </li>
+    <li>
+        <a href="{{ route('staff.polls.edit', ['id'=> $poll->id]) }}" itemprop="url" class="l-breadcrumb-item-link">
+            <span itemprop="title" class="l-breadcrumb-item-link-title">@lang('poll.edit-poll') {{$poll->slug}}</span>
+        </a>
+    </li>
+@endsection
+
+@section('content')
+    <div class="container">
+        <div class="row">
+            <div class="page-title">
+                <h1>@lang('poll.edit-poll')</h1>
+            </div>
+            <div class="col-md-12">
+                <div class="panel panel-chat">
+                    <div class="panel-heading">
+                        @lang('poll.edit-poll') {{$poll->title}}
+                    </div>
+                    <div class="panel-body">
+                        @include('Staff.poll.forms.update')
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    
+@endsection
diff --git a/resources/views/Staff/poll/forms/make.blade.php b/resources/views/Staff/poll/forms/make.blade.php
index ebed736283..126ecef741 100644
--- a/resources/views/Staff/poll/forms/make.blade.php
+++ b/resources/views/Staff/poll/forms/make.blade.php
@@ -41,13 +41,6 @@
 
     <hr>
 
-    <div class="checkbox">
-        <label>
-            <input type="checkbox" name="ip_checking" value="1">@lang('poll.ip-checking') <span
-                class="text-red">({{ strtoupper(trans('poll.ip-checking-warrning')) }})</span>
-        </label>
-    </div>
-
     <div class="checkbox">
         <label>
             <input type="checkbox" name="multiple_choice" value="1">@lang('poll.multiple-choice')
diff --git a/resources/views/Staff/poll/forms/update.blade.php b/resources/views/Staff/poll/forms/update.blade.php
new file mode 100644
index 0000000000..237be7c233
--- /dev/null
+++ b/resources/views/Staff/poll/forms/update.blade.php
@@ -0,0 +1,78 @@
+<form method="POST" action="{{ route('staff.polls.update', ['id' => $poll->id]) }}">
+    @if (count($errors) > 0)
+        <div class="alert alert-danger">
+            <ul>
+                @foreach ($errors->all() as $error)
+                    <li>{{ $error }}</li>
+                @endforeach
+            </ul>
+        </div>
+    @endif
+
+    @csrf
+
+    <div class="form-group">
+        <label for="stitle">@lang('poll.title'):</label>
+        <label>
+            <input readonly type="number" name="poll-id" style="visibility: hidden" value="{{$poll->id}}">
+            <input type="text" name="title" class="form-control" value={{$poll->title}} required>
+        </label>
+    </div>
+
+    @foreach($poll->options as $key=>$option)
+        <div class="form-group <?php echo (++$key) >= 3 ? 'extra-option' : '' ?>" )>
+            <label for={{"option" . $key}}>@lang('poll.option') {{$key}}:</label>
+            <label>
+                <input readonly type="number" name="option-id[]" style="visibility: hidden" value="{{$option->id}}">
+                <input type="text" name="option-content[]" class="form-control" value={{$option->name}}>
+            </label>
+        </div>
+
+    @endforeach
+
+    <div class="more-options"></div>
+
+    <div class="form-group">
+        <button id="add" class="btn btn-primary">@lang('poll.add-option')</button>
+        <button id="del" class="btn btn-primary">@lang('poll.delete-option')</button>
+    </div>
+
+    <hr>
+
+    <div class="checkbox">
+        <label>
+            <input type="checkbox" name="multiple_choice" @if ($poll->multiple_choice) checked @endif >
+                @lang('poll.multiple-choice')
+        </label>
+    </div>
+
+    <div class="form-group">
+        <button type="submit" class="btn btn-primary">@lang('poll.edit-poll')</button>
+    </div>
+</form>
+
+@section('javascripts')
+    <script nonce="{{ Bepsvpt\SecureHeaders\SecureHeaders::nonce() }}">
+
+        var options = parseInt("<?php echo count($poll->options); ?>"); // Get the size of options passing in
+        var langOption = "<?php echo __('poll.option') ?> "
+
+        $('#add').on('click', function (e) {
+            e.preventDefault();
+            options = options + 1;
+            var optionHTML = '<div class="form-group extra-option"><label for="option' + options + '">'
+                + langOption
+                + options
+                + ':</label>'
+                + '<input type="text" name="new-option-content[]" class="form-control" value="" required></div>';
+            $('.more-options').append(optionHTML);
+        });
+
+        $('#del').on('click', function (e) {
+            e.preventDefault();
+            options = (options > 2) ? options - 1 : 2;
+            $('.extra-option').last().remove();
+        });
+
+    </script>
+@endsection
diff --git a/resources/views/Staff/poll/index.blade.php b/resources/views/Staff/poll/index.blade.php
index 34ca276fbe..ac0851fcb3 100644
--- a/resources/views/Staff/poll/index.blade.php
+++ b/resources/views/Staff/poll/index.blade.php
@@ -40,8 +40,14 @@
                             <td><a href="{{ url('/dashboard/polls/' . $poll->id) }}">{{ $poll->title }}</a></td>
                             <td>{{ date('d M Y', $poll->created_at->getTimestamp()) }}</td>
                             <td>
-                                <a href="#" class="btn btn-warning">@lang('common.edit')</a>
-                                <a href="#" class="btn btn-danger">@lang('common.delete')</a>
+                                <form action="{{ route('staff.polls.destroy', ['id' => $poll->id]) }}" method="POST">
+                                    @csrf
+                                    @method('DELETE')
+                                    <a href="{{ route('staff.polls.edit', ['id' => $poll->id]) }}"
+                                       class="btn btn-warning">@lang('common.edit')</a>
+                                    <button type="submit" class="btn btn-danger">@lang('common.delete')</button>
+                                </form>
+
                             </td>
                         </tr>
                     @endforeach
diff --git a/resources/views/poll/show.blade.php b/resources/views/poll/show.blade.php
index 5459de68be..367170d5bf 100755
--- a/resources/views/poll/show.blade.php
+++ b/resources/views/poll/show.blade.php
@@ -31,9 +31,6 @@
                         @if ($poll->multiple_choice)
                             <span class="badge-user text-bold text-red">@lang('poll.multiple-choice')</span>
                         @endif
-                        @if ($poll->ip_checking)
-                            <span class="badge-user text-bold text-red">@lang('poll.ip-checking')</span>
-                        @endif
                     </div>
                 </div>
             </div>
diff --git a/routes/web.php b/routes/web.php
index 7420d3eb10..a5ca8a2e60 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -751,6 +751,9 @@
                 Route::get('/{id}', 'PollController@show')->where('id', '[0-9]+')->name('show');
                 Route::get('/create', 'PollController@create')->name('create');
                 Route::post('/store', 'PollController@store')->name('store');
+                Route::get('/{id}/edit', 'PollController@edit')->name('edit');
+                Route::post('/{id}/update', 'PollController@update')->name('update');
+                Route::delete('/{id}/destroy', 'PollController@destroy')->name('destroy');
             });
         });