[gtk+] Updated Bengali India Translation



commit 515f0a47a9b555824d5010966716949287296d58
Author: Runa Bhattacharjee <runab redhat com>
Date:   Thu Feb 17 20:02:47 2011 +0530

    Updated Bengali India Translation

 po/bn_IN.po | 2587 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 2581 insertions(+), 6 deletions(-)
---
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 7e65a3b..a79d027 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -6,59 +6,98 @@
 # Sayamindu Dasgupta <unmadindu Softhome net>, 2004.
 # Progga <progga BengaLinux Org>, 2004, 2005.
 # Runa Bhattacharjee <runabh gmail com>, 2007.
-# Runa Bhattacharjee <runab redhat com>, 2008, 2009, 2010.
+# Runa Bhattacharjee <runab redhat com>, 2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: bn_IN\n"
+<<<<<<< HEAD
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-10-01 15:41-0400\n"
 "PO-Revision-Date: 2010-03-30 15:02+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab redhat com>\n"
 "Language-Team: Bengali INDIA <anubad lists ankur org in>\n"
 "Language: \n"
+=======
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
+"cgi?product=gtk%2b&component=general\n"
+"POT-Creation-Date: 2011-02-13 14:22+0000\n"
+"PO-Revision-Date: 2011-02-17 19:42+0530\n"
+"Last-Translator: \n"
+"Language-Team: Bengali (India) <anubad lists ankur org in>\n"
+>>>>>>> Updated Bengali India Translation
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.1\n"
 
+<<<<<<< HEAD
 #: gdk/gdk.c:103
+=======
+#: ../gdk/gdk.c:135
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Error parsing option --gdk-debug"
 msgstr "--gdk-debug বি�ল�প�ি পার�স �রত� সমস�যা"
 
+<<<<<<< HEAD
 #: gdk/gdk.c:123
+=======
+#: ../gdk/gdk.c:155
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Error parsing option --gdk-no-debug"
 msgstr "--gdk-no-debug বি�ল�প পার�স �রত� সমস�যা"
 
 #. Description of --class=CLASS in --help output
+<<<<<<< HEAD
 #: gdk/gdk.c:151
+=======
+#: ../gdk/gdk.c:183
+>>>>>>> Updated Bengali India Translation
 msgid "Program class as used by the window manager"
 msgstr "��ন�ড� পরি�ালনব�যবস�থা দ�বারা ব�যবহ�ত প�র���রাম-��লাস"
 
 #. Placeholder in --class=CLASS in --help output
+<<<<<<< HEAD
 #: gdk/gdk.c:152
+=======
+#: ../gdk/gdk.c:184
+>>>>>>> Updated Bengali India Translation
 msgid "CLASS"
 msgstr "CLASS"
 
 #. Description of --name=NAME in --help output
+<<<<<<< HEAD
 #: gdk/gdk.c:154
+=======
+#: ../gdk/gdk.c:186
+>>>>>>> Updated Bengali India Translation
 msgid "Program name as used by the window manager"
 msgstr "��ন�ড� পরি�ালনব�যবস�থা দ�বারা ব�যবহ�ত প�র���রাম�র নাম"
 
 #. Placeholder in --name=NAME in --help output
+<<<<<<< HEAD
 #: gdk/gdk.c:155
+=======
+#: ../gdk/gdk.c:187
+>>>>>>> Updated Bengali India Translation
 msgid "NAME"
 msgstr "NAME"
 
 #. Description of --display=DISPLAY in --help output
+<<<<<<< HEAD
 #: gdk/gdk.c:157
+=======
+#: ../gdk/gdk.c:189
+>>>>>>> Updated Bengali India Translation
 msgid "X display to use"
 msgstr "ব�যবহার�র �দ�দ�শ�য� �িহ�নিত X ডিসপ�ল�"
 
 #. Placeholder in --display=DISPLAY in --help output
+<<<<<<< HEAD
 #: gdk/gdk.c:158
 msgid "DISPLAY"
 msgstr "DISPLAY"
@@ -78,246 +117,593 @@ msgstr "SCREEN"
 #, fuzzy
 msgid "GDK debugging flags to set"
 msgstr "মান নির�ধারণ�র �দ�দ�শ�য� �িহ�নিত GTK+ ডিবা�ি� ফ�ল�যা�"
+=======
+#: ../gdk/gdk.c:190
+msgid "DISPLAY"
+msgstr "DISPLAY"
+
+#. Description of --gdk-debug=FLAGS in --help output
+#: ../gdk/gdk.c:193
+msgid "GDK debugging flags to set"
+msgstr "নির�ধারণ�র �দ�দ�শ�য� �িহ�নিত GTK+ ডিবা�ি� ফ�ল�যা�"
+>>>>>>> Updated Bengali India Translation
 
 #. Placeholder in --gdk-debug=FLAGS in --help output
 #. Placeholder in --gdk-no-debug=FLAGS in --help output
 #. Placeholder in --gtk-debug=FLAGS in --help output
 #. Placeholder in --gtk-no-debug=FLAGS in --help output
+<<<<<<< HEAD
 #: gdk/gdk.c:165 gdk/gdk.c:168 gtk/gtkmain.c:533 gtk/gtkmain.c:536
+=======
+#: ../gdk/gdk.c:194 ../gdk/gdk.c:197 ../gtk/gtkmain.c:570 ../gtk/gtkmain.c:573
+>>>>>>> Updated Bengali India Translation
 msgid "FLAGS"
 msgstr "FLAGS"
 
 #. Description of --gdk-no-debug=FLAGS in --help output
+<<<<<<< HEAD
 #: gdk/gdk.c:167
 #, fuzzy
 msgid "GDK debugging flags to unset"
 msgstr "মান ম��� ফ�লার �দ�দ�শ�য� �িহ�নিত GTK+ ডিবা�ি� ফ�ল�যা�"
 
 #: gdk/keyname-table.h:3940
+=======
+#: ../gdk/gdk.c:196
+msgid "GDK debugging flags to unset"
+msgstr "ম��� ফ�লার �দ�দ�শ�য� �িহ�নিত GTK+ ডিবা�ি� ফ�ল�যা�"
+
+#.
+#. * Translators, the strings in the 'keyboard label' context are
+#. * display names for keyboard keys. Some of them have prefixes like
+#. * XF86 or ISO_ - these should be removed in the translation. Similarly,
+#. * underscores should be replaced by spaces. The prefix 'KP_' stands
+#. * for 'key pad' and you may want to include that in your translation.
+#. * Here are some examples of English translations:
+#. * XF86AudioMute - Audio mute
+#. * Scroll_lock   - Scroll lock
+#. * KP_Space      - Space (keypad)
+#.
+#: ../gdk/keyname-table.h:3951
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "BackSpace"
 msgstr "BackSpace"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3941
+=======
+#: ../gdk/keyname-table.h:3952
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Tab"
 msgstr "Tab"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3942
+=======
+#: ../gdk/keyname-table.h:3953
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Return"
 msgstr "Return"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3943
+=======
+#: ../gdk/keyname-table.h:3954
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Pause"
 msgstr "Pause"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3944
+=======
+#: ../gdk/keyname-table.h:3955
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Scroll_Lock"
 msgstr "Scroll_Lock"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3945
+=======
+#: ../gdk/keyname-table.h:3956
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Sys_Req"
 msgstr "Sys_Req"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3946
+=======
+#: ../gdk/keyname-table.h:3957
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Escape"
 msgstr "Escape"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3947
+=======
+#: ../gdk/keyname-table.h:3958
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Multi_key"
 msgstr "Multi_key"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3948
+=======
+#: ../gdk/keyname-table.h:3959
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Home"
 msgstr "Home"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3949
+=======
+#: ../gdk/keyname-table.h:3960
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Left"
 msgstr "Left"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3950
+=======
+#: ../gdk/keyname-table.h:3961
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Up"
 msgstr "Up"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3951
+=======
+#: ../gdk/keyname-table.h:3962
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Right"
 msgstr "Right"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3952
+=======
+#: ../gdk/keyname-table.h:3963
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Down"
 msgstr "Down"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3953
+=======
+#: ../gdk/keyname-table.h:3964
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Page_Up"
 msgstr "Page_Up"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3954
+=======
+#: ../gdk/keyname-table.h:3965
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Page_Down"
 msgstr "Page_Down"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3955
+=======
+#: ../gdk/keyname-table.h:3966
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "End"
 msgstr "End"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3956
+=======
+#: ../gdk/keyname-table.h:3967
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Begin"
 msgstr "Begin"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3957
+=======
+#: ../gdk/keyname-table.h:3968
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Print"
 msgstr "Print"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3958
+=======
+#: ../gdk/keyname-table.h:3969
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Insert"
 msgstr "Insert"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3959
+=======
+#: ../gdk/keyname-table.h:3970
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Num_Lock"
 msgstr "Num_Lock"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3960
+=======
+#. Translators: KP_ means 'key pad' here
+#: ../gdk/keyname-table.h:3972
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Space"
 msgstr "KP_Space"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3961
+=======
+#: ../gdk/keyname-table.h:3973
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Tab"
 msgstr "KP_Tab"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3962
+=======
+#: ../gdk/keyname-table.h:3974
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Enter"
 msgstr "KP_Enter"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3963
+=======
+#: ../gdk/keyname-table.h:3975
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Home"
 msgstr "KP_Home"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3964
+=======
+#: ../gdk/keyname-table.h:3976
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Left"
 msgstr "KP_Left"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3965
+=======
+#: ../gdk/keyname-table.h:3977
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Up"
 msgstr "KP_Up"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3966
+=======
+#: ../gdk/keyname-table.h:3978
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Right"
 msgstr "KP_Right"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3967
+=======
+#: ../gdk/keyname-table.h:3979
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Down"
 msgstr "KP_Down"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3968
+=======
+#: ../gdk/keyname-table.h:3980
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Page_Up"
 msgstr "KP_Page_Up"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3969
+=======
+#: ../gdk/keyname-table.h:3981
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Prior"
 msgstr "KP_Prior"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3970
+=======
+#: ../gdk/keyname-table.h:3982
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Page_Down"
 msgstr "KP_Page_Down"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3971
+=======
+#: ../gdk/keyname-table.h:3983
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Next"
 msgstr "KP_Next"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3972
+=======
+#: ../gdk/keyname-table.h:3984
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_End"
 msgstr "KP_End"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3973
+=======
+#: ../gdk/keyname-table.h:3985
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Begin"
 msgstr "KP_Begin"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3974
+=======
+#: ../gdk/keyname-table.h:3986
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Insert"
 msgstr "KP_Insert"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3975
+=======
+#: ../gdk/keyname-table.h:3987
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "KP_Delete"
 msgstr "KP_Delete"
 
+<<<<<<< HEAD
 #: gdk/keyname-table.h:3976
+=======
+#: ../gdk/keyname-table.h:3988
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Delete"
 msgstr "Delete"
 
+<<<<<<< HEAD
 #. Description of --sync in --help output
 #: gdk/win32/gdkmain-win32.c:54
+=======
+#. Translators: 'Mon' means Monitor here, and the XF86 prefix should be removed
+#: ../gdk/keyname-table.h:3990
+msgctxt "keyboard label"
+msgid "XF86MonBrightnessUp"
+msgstr "XF86MonBrightnessUp"
+
+#: ../gdk/keyname-table.h:3991
+msgctxt "keyboard label"
+msgid "XF86MonBrightnessDown"
+msgstr "XF86MonBrightnessDown"
+
+#: ../gdk/keyname-table.h:3992
+msgctxt "keyboard label"
+msgid "XF86AudioMute"
+msgstr "XF86AudioMute"
+
+#: ../gdk/keyname-table.h:3993
+msgctxt "keyboard label"
+msgid "XF86AudioLowerVolume"
+msgstr "XF86AudioLowerVolume"
+
+#: ../gdk/keyname-table.h:3994
+msgctxt "keyboard label"
+msgid "XF86AudioRaiseVolume"
+msgstr "XF86AudioRaiseVolume"
+
+#: ../gdk/keyname-table.h:3995
+msgctxt "keyboard label"
+msgid "XF86AudioPlay"
+msgstr "XF86AudioPlay"
+
+#: ../gdk/keyname-table.h:3996
+msgctxt "keyboard label"
+msgid "XF86AudioStop"
+msgstr "XF86AudioStop"
+
+#: ../gdk/keyname-table.h:3997
+msgctxt "keyboard label"
+msgid "XF86AudioNext"
+msgstr "XF86AudioNext"
+
+#: ../gdk/keyname-table.h:3998
+msgctxt "keyboard label"
+msgid "XF86AudioPrev"
+msgstr "XF86AudioPrev"
+
+#: ../gdk/keyname-table.h:3999
+msgctxt "keyboard label"
+msgid "XF86AudioRecord"
+msgstr "XF86AudioRecord"
+
+#: ../gdk/keyname-table.h:4000
+msgctxt "keyboard label"
+msgid "XF86AudioPause"
+msgstr "XF86AudioPause"
+
+#: ../gdk/keyname-table.h:4001
+msgctxt "keyboard label"
+msgid "XF86AudioRewind"
+msgstr "XF86AudioRewind"
+
+#: ../gdk/keyname-table.h:4002
+msgctxt "keyboard label"
+msgid "XF86AudioMedia"
+msgstr "XF86AudioMedia"
+
+#: ../gdk/keyname-table.h:4003
+msgctxt "keyboard label"
+msgid "XF86ScreenSaver"
+msgstr "XF86ScreenSaver"
+
+#: ../gdk/keyname-table.h:4004
+msgctxt "keyboard label"
+msgid "XF86Battery"
+msgstr "XF86Battery"
+
+#: ../gdk/keyname-table.h:4005
+msgctxt "keyboard label"
+msgid "XF86Launch1"
+msgstr "XF86Launch1"
+
+#: ../gdk/keyname-table.h:4006
+#| msgctxt "Stock label, navigation"
+#| msgid "_Forward"
+msgctxt "keyboard label"
+msgid "XF86Forward"
+msgstr "XF86Forward"
+
+#: ../gdk/keyname-table.h:4007
+#| msgctxt "Stock label, navigation"
+#| msgid "_Back"
+msgctxt "keyboard label"
+msgid "XF86Back"
+msgstr "XF86Back"
+
+#: ../gdk/keyname-table.h:4008
+msgctxt "keyboard label"
+msgid "XF86Sleep"
+msgstr "XF86Sleep"
+
+#: ../gdk/keyname-table.h:4009
+msgctxt "keyboard label"
+msgid "XF86Hibernate"
+msgstr "XF86Hibernate"
+
+#: ../gdk/keyname-table.h:4010
+msgctxt "keyboard label"
+msgid "XF86WLAN"
+msgstr "XF86WLAN"
+
+#: ../gdk/keyname-table.h:4011
+msgctxt "keyboard label"
+msgid "XF86WebCam"
+msgstr "XF86WebCam"
+
+#: ../gdk/keyname-table.h:4012
+msgctxt "keyboard label"
+msgid "XF86Display"
+msgstr "XF86Display"
+
+#: ../gdk/keyname-table.h:4013
+msgctxt "keyboard label"
+msgid "XF86TouchpadToggle"
+msgstr "XF86TouchpadToggle"
+
+#: ../gdk/keyname-table.h:4014
+msgctxt "keyboard label"
+msgid "XF86WakeUp"
+msgstr "XF86WakeUp"
+
+#: ../gdk/keyname-table.h:4015
+msgctxt "keyboard label"
+msgid "XF86Suspend"
+msgstr "XF86Suspend"
+
+#. Description of --sync in --help output
+#: ../gdk/win32/gdkmain-win32.c:55
+>>>>>>> Updated Bengali India Translation
 msgid "Don't batch GDI requests"
 msgstr "GDI �ন�র�ধ ��ত�র (ব�যা�) �রা হব� না"
 
 #. Description of --no-wintab in --help output
+<<<<<<< HEAD
 #: gdk/win32/gdkmain-win32.c:56
+=======
+#: ../gdk/win32/gdkmain-win32.c:57
+>>>>>>> Updated Bengali India Translation
 msgid "Don't use the Wintab API for tablet support"
 msgstr "��যাবল�� সমর�থন�র �ন�য Wintab API ব�যবহার �রা হব� না"
 
 #. Description of --ignore-wintab in --help output
+<<<<<<< HEAD
 #: gdk/win32/gdkmain-win32.c:58
+=======
+#: ../gdk/win32/gdkmain-win32.c:59
+>>>>>>> Updated Bengali India Translation
 msgid "Same as --no-wintab"
 msgstr "--no-wintab'র �ন�র�প"
 
 #. Description of --use-wintab in --help output
+<<<<<<< HEAD
 #: gdk/win32/gdkmain-win32.c:60
+=======
+#: ../gdk/win32/gdkmain-win32.c:61
+>>>>>>> Updated Bengali India Translation
 msgid "Do use the Wintab API [default]"
 msgstr "Wintab API ব�যবহার �রা হব� না [ডিফল�� মান]"
 
 #. Description of --max-colors=COLORS in --help output
+<<<<<<< HEAD
 #: gdk/win32/gdkmain-win32.c:62
+=======
+#: ../gdk/win32/gdkmain-win32.c:63
+>>>>>>> Updated Bengali India Translation
 msgid "Size of the palette in 8 bit mode"
 msgstr "৮-বি� ম�ড� প�যাল���র মাপ"
 
 #. Placeholder in --max-colors=COLORS in --help output
+<<<<<<< HEAD
 #: gdk/win32/gdkmain-win32.c:63
 msgid "COLORS"
 msgstr "COLORS"
 
 #: gdk/x11/gdkapplaunchcontext-x11.c:312
+=======
+#: ../gdk/win32/gdkmain-win32.c:64
+msgid "COLORS"
+msgstr "COLORS"
+
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:294
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Starting %s"
 msgstr "%s �রম�ভ �রা হ����"
 
+<<<<<<< HEAD
 #: gdk/x11/gdkapplaunchcontext-x11.c:316
+=======
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:307
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Opening %s"
 msgstr "%s ��লা হ����"
 
+<<<<<<< HEAD
 #: gdk/x11/gdkapplaunchcontext-x11.c:321
 #, fuzzy, c-format
 msgid "Opening %d Item"
@@ -329,10 +715,19 @@ msgstr[1] "%s ��লা হ����"
 #: gdk/x11/gdkmain-x11.c:96
 msgid "Make X calls synchronous"
 msgstr "X'র �ল স�স��তর�প� (সি����র�নাস) �রা হব�"
+=======
+#: ../gdk/x11/gdkapplaunchcontext-x11.c:312
+#, c-format
+msgid "Opening %d Item"
+msgid_plural "Opening %d Items"
+msgstr[0] "%d-�ি সাম��র� ��লা হ����"
+msgstr[1] "%d-�ি সাম��র� ��লা হ����"
+>>>>>>> Updated Bengali India Translation
 
 #. Translators: this is the license preamble; the string at the end
 #. * contains the URL of the license.
 #.
+<<<<<<< HEAD
 #: gtk/gtkaboutdialog.c:101
 #, c-format
 msgid "This program comes with ABSOLUTELY NO WARRANTY; for details, visit %s"
@@ -343,15 +738,36 @@ msgid "License"
 msgstr "লা�স�ন�স"
 
 #: gtk/gtkaboutdialog.c:340
+=======
+#: ../gtk/gtkaboutdialog.c:104
+#, c-format
+msgid ""
+"This program comes with ABSOLUTELY NO WARRANTY; for details, visit <a href="
+"\"%s\">%s</a>"
+msgstr ""
+"�� প�র���রাম�র �ন�য ��ন� ধরন�র ��ার�ন��ি �পলব�ধ �রা হ� না; �ধি� বিবরণ�র �ন�য <a href="
+"\"%s\">%s</a> দ���ন"
+
+#: ../gtk/gtkaboutdialog.c:346
+msgid "License"
+msgstr "লা�স�ন�স"
+
+#: ../gtk/gtkaboutdialog.c:347
+>>>>>>> Updated Bengali India Translation
 msgid "The license of the program"
 msgstr "�� প�র���রাম�র লা�স�ন�স"
 
 #. Add the credits button
+<<<<<<< HEAD
 #: gtk/gtkaboutdialog.c:621
+=======
+#: ../gtk/gtkaboutdialog.c:739
+>>>>>>> Updated Bengali India Translation
 msgid "C_redits"
 msgstr "স�ব���তি (_r)"
 
 #. Add the license button
+<<<<<<< HEAD
 #: gtk/gtkaboutdialog.c:635
 msgid "_License"
 msgstr "লা�স�ন�স (_L)"
@@ -361,10 +777,28 @@ msgid "Could not show link"
 msgstr "লি�� প�রদর�শন �রত� ব�যর�থ"
 
 #: gtk/gtkaboutdialog.c:932
+=======
+#: ../gtk/gtkaboutdialog.c:752
+msgid "_License"
+msgstr "লা�স�ন�স (_L)"
+
+#: ../gtk/gtkaboutdialog.c:957
+msgid "Could not show link"
+msgstr "লি�� প�রদর�শন �রত� ব�যর�থ"
+
+#: ../gtk/gtkaboutdialog.c:994
+#| msgctxt "keyboard label"
+#| msgid "Home"
+msgid "Homepage"
+msgstr "হ�ম-প��"
+
+#: ../gtk/gtkaboutdialog.c:1048
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "About %s"
 msgstr "%s পরি�িতি"
 
+<<<<<<< HEAD
 #: gtk/gtkaboutdialog.c:2153
 msgid "Credits"
 msgstr "স�ব���তি"
@@ -382,6 +816,22 @@ msgid "Translated by"
 msgstr "�ন�বাদ�"
 
 #: gtk/gtkaboutdialog.c:2204
+=======
+#: ../gtk/gtkaboutdialog.c:2372
+#| msgid "C_reate"
+msgid "Created by"
+msgstr "নির�মাতা"
+
+#: ../gtk/gtkaboutdialog.c:2375
+msgid "Documented by"
+msgstr "সহা�ি�া লি����ন"
+
+#: ../gtk/gtkaboutdialog.c:2385
+msgid "Translated by"
+msgstr "�ন�বাদ�"
+
+#: ../gtk/gtkaboutdialog.c:2390
+>>>>>>> Updated Bengali India Translation
 msgid "Artwork by"
 msgstr "শিল�প�"
 
@@ -390,7 +840,11 @@ msgstr "শিল�প�"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
+<<<<<<< HEAD
 #: gtk/gtkaccellabel.c:160
+=======
+#: ../gtk/gtkaccellabel.c:158
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Shift"
 msgstr "Shift"
@@ -400,7 +854,11 @@ msgstr "Shift"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
+<<<<<<< HEAD
 #: gtk/gtkaccellabel.c:166
+=======
+#: ../gtk/gtkaccellabel.c:164
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Ctrl"
 msgstr "Ctrl"
@@ -410,7 +868,11 @@ msgstr "Ctrl"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
+<<<<<<< HEAD
 #: gtk/gtkaccellabel.c:172
+=======
+#: ../gtk/gtkaccellabel.c:170
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Alt"
 msgstr "Alt"
@@ -420,7 +882,11 @@ msgstr "Alt"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
+<<<<<<< HEAD
 #: gtk/gtkaccellabel.c:770
+=======
+#: ../gtk/gtkaccellabel.c:786
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Super"
 msgstr "Super"
@@ -430,7 +896,11 @@ msgstr "Super"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
+<<<<<<< HEAD
 #: gtk/gtkaccellabel.c:783
+=======
+#: ../gtk/gtkaccellabel.c:799
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Hyper"
 msgstr "Hyper"
@@ -440,26 +910,137 @@ msgstr "Hyper"
 #. * translated on keyboards used for your language, don't translate
 #. * this.
 #.
+<<<<<<< HEAD
 #: gtk/gtkaccellabel.c:797
+=======
+#: ../gtk/gtkaccellabel.c:813
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Meta"
 msgstr "Meta"
 
+<<<<<<< HEAD
 #: gtk/gtkaccellabel.c:813
+=======
+#: ../gtk/gtkaccellabel.c:829
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Space"
 msgstr "Space"
 
+<<<<<<< HEAD
 #: gtk/gtkaccellabel.c:816
+=======
+#: ../gtk/gtkaccellabel.c:832
+>>>>>>> Updated Bengali India Translation
 msgctxt "keyboard label"
 msgid "Backslash"
 msgstr "Backslash"
 
+<<<<<<< HEAD
 #: gtk/gtkbuilderparser.c:343
+=======
+#: ../gtk/gtkappchooserbutton.c:264
+#| msgid "Application"
+msgid "Other application..."
+msgstr "�ন�যান�য ��যাপ�লি��শন..."
+
+#: ../gtk/gtkappchooserdialog.c:128
+msgid "Failed to look for applications online"
+msgstr "�নলা�ন ��যাপ�লি��শন �ন�সন�ধান �রত� ব�যর�থ"
+
+#: ../gtk/gtkappchooserdialog.c:165
+msgid "Find applications online"
+msgstr "�নলা�ন ��যাপ�লি��শন �ন�সন�ধান �র�ন"
+
+#: ../gtk/gtkappchooserdialog.c:209
+#| msgid "Could not clear list"
+msgid "Could not run application"
+msgstr "��যাপ�লি��শন স���ালন �রত� ব�যর�থ"
+
+#: ../gtk/gtkappchooserdialog.c:222
+#, c-format
+#| msgid "Could not mount %s"
+msgid "Could not find '%s'"
+msgstr "'%s' সন�ধান �রত� ব�যর�থ"
+
+#: ../gtk/gtkappchooserdialog.c:225
+#| msgid "Could not show link"
+msgid "Could not find application"
+msgstr "��যাপ�লি��শন সন�ধান �রত� ব�যর�থ"
+
+#. Translators: %s is a filename
+#: ../gtk/gtkappchooserdialog.c:335
+#, c-format
+msgid "Select an application to open \"%s\""
+msgstr "\"%s\" ��লার �ন�য ���ি ��যাপ�লি��শন নির�বা�ন �র�ন"
+
+#: ../gtk/gtkappchooserdialog.c:336 ../gtk/gtkappchooserwidget.c:640
+#, c-format
+msgid "No applications available to open \"%s\""
+msgstr "\"%s\" ��লার �ন�য ��ন� ��যাপ�লি��শন �পলব�ধ ন��"
+
+#. Translators: %s is a file type description
+#: ../gtk/gtkappchooserdialog.c:342
+#, c-format
+msgid "Select an application for \"%s\" files"
+msgstr "\"%s\" ফা�ল�র �ন�য ���ি ��যাপ�লি��শন নির�বা�ন �র�ন"
+
+#: ../gtk/gtkappchooserdialog.c:345
+#, c-format
+msgid "No applications available to open \"%s\" files"
+msgstr "\"%s\" ফা�ল ��লার �ন�য ��ন� ��যাপ�লি��শন �পলব�ধ ন�"
+
+#: ../gtk/gtkappchooserdialog.c:362
+msgid ""
+"Click \"Show other applications\", for more options, or \"Find applications "
+"online\" to install a new application"
+msgstr ""
+"�তিরি��ত বি�ল�প��লি প�রাপ�ত �রার �ন�য \"�ন�যান�য ��যাপ�লি��শন\" ��লি� �র�ন। নত�ন "
+"��যাপ�লি��শন �নস��ল �রার �ন�য \"�নলা�ন ��যাপ�লি��শন �ন�সন�ধান �র�ন\" ��লি� �র�ন।"
+
+#: ../gtk/gtkappchooserdialog.c:432
+#| msgid "Forget password _immediately"
+msgid "Forget association"
+msgstr "য��ায�� মন� রা�া হব� না"
+
+#: ../gtk/gtkappchooserdialog.c:497
+#| msgid "Show GTK+ Options"
+msgid "Show other applications"
+msgstr "�ন�যান�য ��যাপ�লি��শন"
+
+#: ../gtk/gtkappchooserdialog.c:515
+#| msgid "_Selection: "
+msgid "_Select"
+msgstr "নির�বা�ন �র�ন (_S)"
+
+#: ../gtk/gtkappchooserwidget.c:591
+#| msgid "Application"
+msgid "Default Application"
+msgstr "ডিফল�� ��যাপ�লি��শন"
+
+#: ../gtk/gtkappchooserwidget.c:726
+#| msgid "Application"
+msgid "Recommended Applications"
+msgstr "প�রস�তাবিত ��যাপ�লি��শন"
+
+#: ../gtk/gtkappchooserwidget.c:740
+#| msgid "Application"
+msgid "Related Applications"
+msgstr "য���ত ��যাপ�লি��শন"
+
+#: ../gtk/gtkappchooserwidget.c:754
+#| msgid "Application"
+msgid "Other Applications"
+msgstr "�ন�যান�য ��যাপ�লি��শন"
+
+#: ../gtk/gtkbuilderparser.c:342
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Invalid type function on line %d: '%s'"
 msgstr "%d প���তিত� �পস�থিত ফা�শান�র ধরন ব�ধ ন�: '%s'"
 
+<<<<<<< HEAD
 #: gtk/gtkbuilderparser.c:407
 #, fuzzy, c-format
 msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
@@ -468,11 +1049,24 @@ msgstr ""
 "�পস�থিতি)"
 
 #: gtk/gtkbuilderparser.c:859
+=======
+#: ../gtk/gtkbuilderparser.c:406
+#, c-format
+msgid "Duplicate object ID '%s' on line %d (previously on line %d)"
+msgstr ""
+"'%s' �ব����� ID %d প���তির মধ�য� দ�বিত��বার �ল�লি�িত হ���� (%d প���তিত� প�রথম �পস�থিতি)"
+
+#: ../gtk/gtkbuilderparser.c:858
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Invalid root element: '%s'"
 msgstr "�ব�ধ root সাম��র�: '%s'"
 
+<<<<<<< HEAD
 #: gtk/gtkbuilderparser.c:898
+=======
+#: ../gtk/gtkbuilderparser.c:897
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Unhandled tag: '%s'"
 msgstr "��যা��র ব�যবস�থাপনা হ�নি: '%s'"
@@ -487,7 +1081,11 @@ msgstr "��যা��র ব�যবস�থাপনা হ�নি: '%
 #. * text direction of RTL and specify "calendar:YM", then the year
 #. * will appear to the right of the month.
 #.
+<<<<<<< HEAD
 #: gtk/gtkcalendar.c:883
+=======
+#: ../gtk/gtkcalendar.c:871
+>>>>>>> Updated Bengali India Translation
 msgid "calendar:MY"
 msgstr "calendar:MY"
 
@@ -495,7 +1093,11 @@ msgstr "calendar:MY"
 #. * first day of the week to calendar:week_start:1 if you want Monday
 #. * to be the first day of the week, and so on.
 #.
+<<<<<<< HEAD
 #: gtk/gtkcalendar.c:921
+=======
+#: ../gtk/gtkcalendar.c:909
+>>>>>>> Updated Bengali India Translation
 msgid "calendar:week_start:0"
 msgstr "calendar:week_start:0"
 
@@ -504,7 +1106,11 @@ msgstr "calendar:week_start:0"
 #. *
 #. * If you don't understand this, leave it as "2000"
 #.
+<<<<<<< HEAD
 #: gtk/gtkcalendar.c:2006
+=======
+#: ../gtk/gtkcalendar.c:1910
+>>>>>>> Updated Bengali India Translation
 msgctxt "year measurement template"
 msgid "2000"
 msgstr "2000"
@@ -519,7 +1125,11 @@ msgstr "2000"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
+<<<<<<< HEAD
 #: gtk/gtkcalendar.c:2037 gtk/gtkcalendar.c:2719
+=======
+#: ../gtk/gtkcalendar.c:1941 ../gtk/gtkcalendar.c:2638
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgctxt "calendar:day:digits"
 msgid "%d"
@@ -535,7 +1145,11 @@ msgstr "%d"
 #. * digits. That needs support from your system and locale definition
 #. * too.
 #.
+<<<<<<< HEAD
 #: gtk/gtkcalendar.c:2069 gtk/gtkcalendar.c:2579
+=======
+#: ../gtk/gtkcalendar.c:1973 ../gtk/gtkcalendar.c:2499
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgctxt "calendar:week:digits"
 msgid "%d"
@@ -551,7 +1165,11 @@ msgstr "%d"
 #. *
 #. * "%Y" is appropriate for most locales.
 #.
+<<<<<<< HEAD
 #: gtk/gtkcalendar.c:2361
+=======
+#: ../gtk/gtkcalendar.c:2268
+>>>>>>> Updated Bengali India Translation
 msgctxt "calendar year format"
 msgid "%Y"
 msgstr "%Y"
@@ -559,7 +1177,11 @@ msgstr "%Y"
 #. This label is displayed in a treeview cell displaying
 #. * a disabled accelerator key combination.
 #.
+<<<<<<< HEAD
 #: gtk/gtkcellrendereraccel.c:272
+=======
+#: ../gtk/gtkcellrendereraccel.c:271
+>>>>>>> Updated Bengali India Translation
 msgctxt "Accelerator"
 msgid "Disabled"
 msgstr "নিষ���রি�"
@@ -568,7 +1190,11 @@ msgstr "নিষ���রি�"
 #. * an accelerator key combination that is not valid according
 #. * to gtk_accelerator_valid().
 #.
+<<<<<<< HEAD
 #: gtk/gtkcellrendereraccel.c:282
+=======
+#: ../gtk/gtkcellrendereraccel.c:281
+>>>>>>> Updated Bengali India Translation
 msgctxt "Accelerator"
 msgid "Invalid"
 msgstr "�ব�ধ"
@@ -577,16 +1203,25 @@ msgstr "�ব�ধ"
 #. * an accelerator when the cell is clicked to change the
 #. * acelerator.
 #.
+<<<<<<< HEAD
 #: gtk/gtkcellrendereraccel.c:418 gtk/gtkcellrendereraccel.c:675
 msgid "New accelerator..."
 msgstr "নত�ন �তিবর�ধ�..."
 
 #: gtk/gtkcellrendererprogress.c:362 gtk/gtkcellrendererprogress.c:452
+=======
+#: ../gtk/gtkcellrendereraccel.c:417 ../gtk/gtkcellrendereraccel.c:729
+msgid "New accelerator..."
+msgstr "নত�ন �তিবর�ধ�..."
+
+#: ../gtk/gtkcellrendererprogress.c:362 ../gtk/gtkcellrendererprogress.c:452
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgctxt "progress bar label"
 msgid "%d %%"
 msgstr "%d %%"
 
+<<<<<<< HEAD
 #: gtk/gtkcolorbutton.c:176 gtk/gtkcolorbutton.c:445
 msgid "Pick a Color"
 msgstr "���ি র� ব��� নিন"
@@ -596,6 +1231,17 @@ msgid "Received invalid color data\n"
 msgstr "র� সম�পর��� �ব�ধ তথ�য প�রাপ�ত\n"
 
 #: gtk/gtkcolorsel.c:384
+=======
+#: ../gtk/gtkcolorbutton.c:187 ../gtk/gtkcolorbutton.c:483
+msgid "Pick a Color"
+msgstr "���ি র� ব��� নিন"
+
+#: ../gtk/gtkcolorbutton.c:372
+msgid "Received invalid color data\n"
+msgstr "র� সম�পর��� �ব�ধ তথ�য প�রাপ�ত\n"
+
+#: ../gtk/gtkcolorsel.c:415
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "Select the color you want from the outer ring. Select the darkness or "
 "lightness of that color using the inner triangle."
@@ -603,7 +1249,11 @@ msgstr ""
 "বাহির ব�ত�ত�র মধ�য� �পস�থিত র���লি থ��� প�রয���য র� নির�বা�ন �র�ন। মধ�য� স�থিত ত�রি��ণ "
 "প�র��� �র� র� হাল�া �থবা �া� �র�ন।"
 
+<<<<<<< HEAD
 #: gtk/gtkcolorsel.c:408
+=======
+#: ../gtk/gtkcolorsel.c:441
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "Click the eyedropper, then click a color anywhere on your screen to select "
 "that color."
@@ -611,6 +1261,7 @@ msgstr ""
 "��-ড�রপার ��লি� �র�ন � পর�দার মধ�য� প�রদর�শিত ��ন� প�ন�দস� র��র �পর ��লি� �র� স��ি "
 "ব�যবহার�র �ন�য নির�বা�ন �র�ন।"
 
+<<<<<<< HEAD
 #: gtk/gtkcolorsel.c:417
 msgid "_Hue:"
 msgstr "হি�: (_H)"
@@ -673,6 +1324,69 @@ msgid "Color _name:"
 msgstr "র��র নাম: (_n)"
 
 #: gtk/gtkcolorsel.c:470
+=======
+#: ../gtk/gtkcolorsel.c:451
+msgid "_Hue:"
+msgstr "হি�: (_H)"
+
+#: ../gtk/gtkcolorsel.c:452
+msgid "Position on the color wheel."
+msgstr "র� প�রদর�শন�ার� �া�তির �বস�থান।"
+
+#: ../gtk/gtkcolorsel.c:454
+msgid "_Saturation:"
+msgstr "�নত�ব: (_S)"
+
+#: ../gtk/gtkcolorsel.c:455
+msgid "Intensity of the color."
+msgstr "র��র �ভ�রতা।"
+
+#: ../gtk/gtkcolorsel.c:456
+msgid "_Value:"
+msgstr "মান:(_V)"
+
+#: ../gtk/gtkcolorsel.c:457
+msgid "Brightness of the color."
+msgstr "র��র �����বলতা।"
+
+#: ../gtk/gtkcolorsel.c:458
+msgid "_Red:"
+msgstr "লাল:(_R)"
+
+#: ../gtk/gtkcolorsel.c:459
+msgid "Amount of red light in the color."
+msgstr "র��র মধ�য� লাল �ল�র পরিমাণ।"
+
+#: ../gtk/gtkcolorsel.c:460
+msgid "_Green:"
+msgstr "সব��: (_G)"
+
+#: ../gtk/gtkcolorsel.c:461
+msgid "Amount of green light in the color."
+msgstr "র��র মধ�য� সব�� �ল�র পরিমাণ।"
+
+#: ../gtk/gtkcolorsel.c:462
+msgid "_Blue:"
+msgstr "ন�ল: (_B)"
+
+#: ../gtk/gtkcolorsel.c:463
+msgid "Amount of blue light in the color."
+msgstr "র��র মধ�য� ন�ল �ল�র পরিমাণ।"
+
+#: ../gtk/gtkcolorsel.c:466
+msgid "Op_acity:"
+msgstr "স�ব���তা: (_a)"
+
+#: ../gtk/gtkcolorsel.c:473 ../gtk/gtkcolorsel.c:483
+msgid "Transparency of the color."
+msgstr "র��র স�ব���তা।"
+
+#: ../gtk/gtkcolorsel.c:490
+msgid "Color _name:"
+msgstr "র��র নাম: (_n)"
+
+#: ../gtk/gtkcolorsel.c:504
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "You can enter an HTML-style hexadecimal color value, or simply a color name "
 "such as 'orange' in this entry."
@@ -680,6 +1394,7 @@ msgstr ""
 "র� �িহ�ন �রত� ���ান�, HTML-বিন�যাস�র হ���সা-ড�সিম�ল মান লি��ন �থবা ��ন� র��র নাম "
 "য�মন 'orange' লি��ন।"
 
+<<<<<<< HEAD
 #: gtk/gtkcolorsel.c:500
 msgid "_Palette:"
 msgstr "প�যাল��: (_P)"
@@ -689,6 +1404,17 @@ msgid "Color Wheel"
 msgstr "র� প�রদর�শন�ার� �া�তি"
 
 #: gtk/gtkcolorsel.c:988
+=======
+#: ../gtk/gtkcolorsel.c:536
+msgid "_Palette:"
+msgstr "প�যাল��: (_P)"
+
+#: ../gtk/gtkcolorsel.c:565
+msgid "Color Wheel"
+msgstr "র� প�রদর�শন�ার� �া�তি"
+
+#: ../gtk/gtkcolorsel.c:1038
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now. You can drag this color to a palette entry, or select this color as "
@@ -697,7 +1423,11 @@ msgstr ""
 "বর�তমান� নির�বা�িত র��র সাথ� প�র�ব নির�বা�িত র� ত�লনা �র�ন। �� র��ি প�যাল��� ��ন� "
 "�ন�ন �থবা পার�শ�ববর�ত� র� ধারণ ��ষ�ত�র� ��ন� �ন� বর�তমান নির�বা�ন র�প� স�থাপন �র�ন।"
 
+<<<<<<< HEAD
 #: gtk/gtkcolorsel.c:991
+=======
+#: ../gtk/gtkcolorsel.c:1044
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "The color you've chosen. You can drag this color to a palette entry to save "
 "it for use in the future."
@@ -705,13 +1435,18 @@ msgstr ""
 "নির�বা�িত র�। ভবিষ�যত� ব�যবহার�র �দ�দ�শ�য� �� র��ি ��ন� �ন� ���ি প�যাল��� স�থাপন "
 "�রা যাব�।"
 
+<<<<<<< HEAD
 #: gtk/gtkcolorsel.c:996
+=======
+#: ../gtk/gtkcolorsel.c:1050
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "The previously-selected color, for comparison to the color you're selecting "
 "now."
 msgstr ""
 "বর�তমান� নির�বা�িত র���র সাথ� ত�লনা �রার �দ�দ�শ�য�, প�র�ব� নির�বা�িত র���র প�রদর�শন।"
 
+<<<<<<< HEAD
 #: gtk/gtkcolorsel.c:999
 msgid "The color you've chosen."
 msgstr "�পনার নির�বা�িত র�।"
@@ -721,6 +1456,17 @@ msgid "_Save color here"
 msgstr "�িহ�নিত স�থান� র� স�র��ষণ �র�ন (_S)"
 
 #: gtk/gtkcolorsel.c:1601
+=======
+#: ../gtk/gtkcolorsel.c:1054
+msgid "The color you've chosen."
+msgstr "�পনার নির�বা�িত র�।"
+
+#: ../gtk/gtkcolorsel.c:1456
+msgid "_Save color here"
+msgstr "�িহ�নিত স�থান� র� স�র��ষণ �র�ন (_S)"
+
+#: ../gtk/gtkcolorsel.c:1661
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "Click this palette entry to make it the current color. To change this entry, "
 "drag a color swatch here or right-click it and select \"Save color here.\""
@@ -729,7 +1475,11 @@ msgstr ""
 "পরিবর�তন �রার �ন�য ���ি র� ��ন� �ন�ন �থবা স��ির �পর ��লি� �র�  \"�� স�থান র� "
 "স�র��ষণ �র�ন\" নির�বা�ন �র�ন।"
 
+<<<<<<< HEAD
 #: gtk/gtkcolorseldialog.c:189
+=======
+#: ../gtk/gtkcolorseldialog.c:189
+>>>>>>> Updated Bengali India Translation
 msgid "Color Selection"
 msgstr "র� নির�বা�ন"
 
@@ -739,11 +1489,16 @@ msgstr "র� নির�বা�ন"
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
+<<<<<<< HEAD
 #: gtk/gtkcustompaperunixdialog.c:116
+=======
+#: ../gtk/gtkcustompaperunixdialog.c:116
+>>>>>>> Updated Bengali India Translation
 msgid "default:mm"
 msgstr "default:mm"
 
 #. And show the custom paper dialog
+<<<<<<< HEAD
 #: gtk/gtkcustompaperunixdialog.c:374 gtk/gtkprintunixdialog.c:3233
 msgid "Manage Custom Sizes"
 msgstr "স�বনির�বা�িত মাপ পরি�ালনা �র�ন"
@@ -761,10 +1516,30 @@ msgid "Margins from Printer..."
 msgstr "প�রিন��ার থ��� প�রান�ত�র মাপ..."
 
 #: gtk/gtkcustompaperunixdialog.c:747
+=======
+#: ../gtk/gtkcustompaperunixdialog.c:372 ../gtk/gtkprintunixdialog.c:3255
+msgid "Manage Custom Sizes"
+msgstr "স�বনির�বা�িত মাপ পরি�ালনা �র�ন"
+
+#: ../gtk/gtkcustompaperunixdialog.c:532 ../gtk/gtkpagesetupunixdialog.c:788
+msgid "inch"
+msgstr "inch"
+
+#: ../gtk/gtkcustompaperunixdialog.c:534 ../gtk/gtkpagesetupunixdialog.c:786
+msgid "mm"
+msgstr "mm"
+
+#: ../gtk/gtkcustompaperunixdialog.c:579
+msgid "Margins from Printer..."
+msgstr "প�রিন��ার থ��� প�রান�ত�র মাপ..."
+
+#: ../gtk/gtkcustompaperunixdialog.c:745
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Custom Size %d"
 msgstr "স�বনির�বা�িত মাপ %d"
 
+<<<<<<< HEAD
 #: gtk/gtkcustompaperunixdialog.c:1059
 msgid "_Width:"
 msgstr "প�রস�থ:(_W)"
@@ -815,12 +1590,64 @@ msgid "Num Lock is on"
 msgstr "��যাপ�স-ল� �ি স��রি� ���"
 
 #: gtk/gtkentry.c:10019
+=======
+#: ../gtk/gtkcustompaperunixdialog.c:1057
+msgid "_Width:"
+msgstr "প�রস�থ:(_W)"
+
+#: ../gtk/gtkcustompaperunixdialog.c:1069
+msgid "_Height:"
+msgstr "����তা:(_H)"
+
+#: ../gtk/gtkcustompaperunixdialog.c:1081
+msgid "Paper Size"
+msgstr "�া���র মাপ"
+
+#: ../gtk/gtkcustompaperunixdialog.c:1090
+msgid "_Top:"
+msgstr "�পর�:(_T)"
+
+#: ../gtk/gtkcustompaperunixdialog.c:1102
+msgid "_Bottom:"
+msgstr "ন���:(_B)"
+
+#: ../gtk/gtkcustompaperunixdialog.c:1114
+msgid "_Left:"
+msgstr "বা�দি��:(_L)"
+
+#: ../gtk/gtkcustompaperunixdialog.c:1126
+msgid "_Right:"
+msgstr "ডানদি��:(_R)"
+
+#: ../gtk/gtkcustompaperunixdialog.c:1167
+msgid "Paper Margins"
+msgstr "�া���র প�রান�ত"
+
+#: ../gtk/gtkentry.c:8748 ../gtk/gtktextview.c:8272
+msgid "Input _Methods"
+msgstr "�নপ�� পদ�ধতি (_M)"
+
+#: ../gtk/gtkentry.c:8762 ../gtk/gtktextview.c:8286
+msgid "_Insert Unicode Control Character"
+msgstr "��নি��ড�র �ন���র�ল ���ষর সন�নিব�শ �র�ন (_I)"
+
+#: ../gtk/gtkentry.c:10170
+msgid "Caps Lock and Num Lock are on"
+msgstr "��যাপ�স-ল� � নাম-ল� স��রি� ���"
+
+#: ../gtk/gtkentry.c:10172
+msgid "Num Lock is on"
+msgstr "নাম-ল� �ি স��রি� ���"
+
+#: ../gtk/gtkentry.c:10174
+>>>>>>> Updated Bengali India Translation
 msgid "Caps Lock is on"
 msgstr "��যাপ�স-ল� �ি স��রি� ���"
 
 #. **************** *
 #. *  Private Macros  *
 #. * ****************
+<<<<<<< HEAD
 #: gtk/gtkfilechooserbutton.c:61
 msgid "Select A File"
 msgstr "���ি ফা�ল নির�বা�ন �র�ন"
@@ -834,6 +1661,22 @@ msgid "(None)"
 msgstr "(শ�ণ�য)"
 
 #: gtk/gtkfilechooserbutton.c:2005
+=======
+#: ../gtk/gtkfilechooserbutton.c:62
+#| msgid "Select A File"
+msgid "Select a File"
+msgstr "���ি ফা�ল নির�বা�ন �র�ন"
+
+#: ../gtk/gtkfilechooserbutton.c:63 ../gtk/gtkfilechooserdefault.c:1865
+msgid "Desktop"
+msgstr "ড�স���প"
+
+#: ../gtk/gtkfilechooserbutton.c:64
+msgid "(None)"
+msgstr "(শ�ণ�য)"
+
+#: ../gtk/gtkfilechooserbutton.c:1997
+>>>>>>> Updated Bengali India Translation
 msgid "Other..."
 msgstr "�ন�যান�য..."
 
@@ -841,6 +1684,7 @@ msgstr "�ন�যান�য..."
 msgid "Type name of new folder"
 msgstr "নত�ন ফ�ল�ডার�র নাম লি��ন"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:938
 msgid "Could not retrieve information about the file"
 msgstr "ফা�ল সম�পর��িত তথ�য প�রাপ�ত �রত� ব�যর�থ"
@@ -858,6 +1702,25 @@ msgid "The folder could not be created"
 msgstr "ফ�ল�ডার নির�মাণ �রত� ব�যর�থ"
 
 #: gtk/gtkfilechooserdefault.c:984
+=======
+#: ../gtk/gtkfilechooserdefault.c:960
+msgid "Could not retrieve information about the file"
+msgstr "ফা�ল সম�পর��িত তথ�য প�রাপ�ত �রত� ব�যর�থ"
+
+#: ../gtk/gtkfilechooserdefault.c:971
+msgid "Could not add a bookmark"
+msgstr "ব��মার�� য�� �রত� ব�যর�থ"
+
+#: ../gtk/gtkfilechooserdefault.c:982
+msgid "Could not remove bookmark"
+msgstr "ব��মার�� ম��� ফ�লত� ব�যর�থ"
+
+#: ../gtk/gtkfilechooserdefault.c:993
+msgid "The folder could not be created"
+msgstr "ফ�ল�ডার নির�মাণ �রত� ব�যর�থ"
+
+#: ../gtk/gtkfilechooserdefault.c:1006
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -865,11 +1728,37 @@ msgstr ""
 "�� নাম�র ���ি ফা�ল বর�তমান� �পস�থিত থা�ার ফল� ফ�ল�ডার�ি নির�মাণ �রত� ব�যর�থ।  "
 "ফ�ল�ডার�র �ন�য প�থ� নাম ব�যবহার �র�ন �থবা �পস�থিত ফা�ল�র নাম পরিবর�তন �র�ন।"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:995
 msgid "Invalid file name"
 msgstr "ফা�ল�র নাম ব�ধ ন�"
 
 #: gtk/gtkfilechooserdefault.c:1005
+=======
+#: ../gtk/gtkfilechooserdefault.c:1020
+msgid "You need to choose a valid filename."
+msgstr "���ি ব�ধ ফা�ল�র নাম নির�বা�ন �রা �বশ�য�।"
+
+#: ../gtk/gtkfilechooserdefault.c:1023
+#, c-format
+#| msgid "Cannot change to folder because it is not local"
+msgid "Cannot create a file under %s as it is not a folder"
+msgstr " %s ফ�ল�ডার না হ��ার ফল� ��ি �ধ�ন ফা�ল প�রস�ত�ত �রা সম�ভব ন�"
+
+#: ../gtk/gtkfilechooserdefault.c:1035
+msgid ""
+"You may only select folders.  The item that you selected is not a folder; "
+"try using a different item."
+msgstr ""
+"শ�ধ�মাত�র ফ�ল�ডার নির�বা�ন �রা যাব�। নির�বা�িত সাম��র� ফ�ল�ডার ন�; ভিন�ন ��ন� সাম��র� "
+"ব�যবহার�র ��ষ��া �র�ন।"
+
+#: ../gtk/gtkfilechooserdefault.c:1045
+msgid "Invalid file name"
+msgstr "ফা�ল�র নাম ব�ধ ন�"
+
+#: ../gtk/gtkfilechooserdefault.c:1055
+>>>>>>> Updated Bengali India Translation
 msgid "The folder contents could not be displayed"
 msgstr "ফ�ল�ডার� বিষ�বস�ত� প�রদর�শন �রত� ব�যর�থ"
 
@@ -877,11 +1766,16 @@ msgstr "ফ�ল�ডার� বিষ�বস�ত� প�রদর�
 #. * is a hostname. Nautilus and the panel contain the same string
 #. * to translate.
 #.
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:1555
+=======
+#: ../gtk/gtkfilechooserdefault.c:1608
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s, %2$s'র �পর"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:1731
 msgid "Search"
 msgstr "�ন�সন�ধান"
@@ -895,30 +1789,62 @@ msgid "Select which types of files are shown"
 msgstr "প�রদর�শন�র �দ�দ�শ�য� বিভিন�ন ফা�ল�র বিন�যাস নির�বা�ন �র�ন"
 
 #: gtk/gtkfilechooserdefault.c:2768
+=======
+#: ../gtk/gtkfilechooserdefault.c:1784
+msgid "Search"
+msgstr "�ন�সন�ধান"
+
+#: ../gtk/gtkfilechooserdefault.c:1808 ../gtk/gtkfilechooserdefault.c:9466
+msgid "Recently Used"
+msgstr "সম�প�রতি ব�যবহ�ত"
+
+#: ../gtk/gtkfilechooserdefault.c:2464
+msgid "Select which types of files are shown"
+msgstr "প�রদর�শন�র �দ�দ�শ�য� বিভিন�ন ফা�ল�র বিন�যাস নির�বা�ন �র�ন"
+
+#: ../gtk/gtkfilechooserdefault.c:2823
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "'%s' নাম� ফ�ল�ডার�ি ব��মার���র মধ�য� য�� �র�ন"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:2812
+=======
+#: ../gtk/gtkfilechooserdefault.c:2867
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Add the current folder to the bookmarks"
 msgstr "বর�তমান ফ�ল�ডার�ি ব��মার��� য�� �র�ন"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:2814
+=======
+#: ../gtk/gtkfilechooserdefault.c:2869
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Add the selected folders to the bookmarks"
 msgstr "নির�বা�িত ফ�ল�ডার��লি ব��মার��� য�� �র�ন"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:2852
+=======
+#: ../gtk/gtkfilechooserdefault.c:2907
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "'%s' নাম� ব��মার���ি ম��� ফ�ল�ন"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:2854
+=======
+#: ../gtk/gtkfilechooserdefault.c:2909
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Bookmark '%s' cannot be removed"
 msgstr "'%s' ব��মার�� ম��� ফ�লা সম�ভব ন�"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:2861 gtk/gtkfilechooserdefault.c:3725
 msgid "Remove the selected bookmark"
 msgstr "নির�বা�িত ব��মার�� ম��� ফ�ল�ন"
@@ -928,15 +1854,31 @@ msgid "Remove"
 msgstr "ম��� ফ�ল�ন"
 
 #: gtk/gtkfilechooserdefault.c:3430
+=======
+#: ../gtk/gtkfilechooserdefault.c:2916 ../gtk/gtkfilechooserdefault.c:3798
+msgid "Remove the selected bookmark"
+msgstr "নির�বা�িত ব��মার�� ম��� ফ�ল�ন"
+
+#: ../gtk/gtkfilechooserdefault.c:3479
+msgid "Remove"
+msgstr "ম��� ফ�ল�ন"
+
+#: ../gtk/gtkfilechooserdefault.c:3488
+>>>>>>> Updated Bengali India Translation
 msgid "Rename..."
 msgstr "নাম পরিবর�তন..."
 
 #. Accessible object name for the file chooser's shortcuts pane
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:3593
+=======
+#: ../gtk/gtkfilechooserdefault.c:3651
+>>>>>>> Updated Bengali India Translation
 msgid "Places"
 msgstr "�বস�থান"
 
 #. Column header for the file chooser's shortcuts pane
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:3650
 msgid "_Places"
 msgstr "�বস�থান (_P)"
@@ -982,24 +1924,76 @@ msgid "Size"
 msgstr "মাপ"
 
 #: gtk/gtkfilechooserdefault.c:4369
+=======
+#: ../gtk/gtkfilechooserdefault.c:3708
+msgid "_Places"
+msgstr "�বস�থান (_P)"
+
+#: ../gtk/gtkfilechooserdefault.c:3786
+msgid "Add the selected folder to the Bookmarks"
+msgstr "নির�বা�িত ফ�ল�ডার�ি ব��মার��� য�� �র�ন"
+
+#: ../gtk/gtkfilechooserdefault.c:3933
+msgid "Could not select file"
+msgstr "ফা�ল নির�বা�ন �রত� ব�যর�থ"
+
+#: ../gtk/gtkfilechooserdefault.c:4106
+msgid "_Add to Bookmarks"
+msgstr "ব��মার�� তালি�া� য�� �র�ন(_A)"
+
+#: ../gtk/gtkfilechooserdefault.c:4119
+msgid "Show _Hidden Files"
+msgstr "ল���ন� ফা�ল প�রদর�শন �রা হব� (_H)"
+
+#: ../gtk/gtkfilechooserdefault.c:4126
+msgid "Show _Size Column"
+msgstr "মাপ শ�র�ষ� �লাম প�রদর�শিত হব� (_S)"
+
+#: ../gtk/gtkfilechooserdefault.c:4351
+msgid "Files"
+msgstr "ফা�ল"
+
+#: ../gtk/gtkfilechooserdefault.c:4402
+msgid "Name"
+msgstr "নাম"
+
+#: ../gtk/gtkfilechooserdefault.c:4425
+msgid "Size"
+msgstr "মাপ"
+
+#: ../gtk/gtkfilechooserdefault.c:4439
+>>>>>>> Updated Bengali India Translation
 msgid "Modified"
 msgstr "সর�বশ�ষ পরিবর�তন"
 
 #. Label
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:4624 gtk/gtkprinteroptionwidget.c:801
+=======
+#: ../gtk/gtkfilechooserdefault.c:4694 ../gtk/gtkprinteroptionwidget.c:793
+>>>>>>> Updated Bengali India Translation
 msgid "_Name:"
 msgstr "নাম:(_N)"
 
 # FIXME
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:4667
 msgid "_Browse for other folders"
 msgstr "�ন�যান�য ফ�ল�ডার �ন�সন�ধান�র �ন�য ব�রা�� �র�ন (_B)"
 
 #: gtk/gtkfilechooserdefault.c:4937
+=======
+#: ../gtk/gtkfilechooserdefault.c:4737
+msgid "_Browse for other folders"
+msgstr "�ন�যান�য ফ�ল�ডার �ন�সন�ধান�র �ন�য ব�রা�� �র�ন (_B)"
+
+#: ../gtk/gtkfilechooserdefault.c:5007
+>>>>>>> Updated Bengali India Translation
 msgid "Type a file name"
 msgstr "ফা�ল�র নাম �া�প �র�ন"
 
 #. Create Folder
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:4980
 msgid "Create Fo_lder"
 msgstr "ফ�ল�ডার নির�মাণ �র�ন (_l)"
@@ -1017,11 +2011,31 @@ msgid "Create in _folder:"
 msgstr "�িহ�নিত ফ�ল�ডার� নির�মাণ �রা �র�ন:(_f)"
 
 #: gtk/gtkfilechooserdefault.c:6248
+=======
+#: ../gtk/gtkfilechooserdefault.c:5050
+msgid "Create Fo_lder"
+msgstr "ফ�ল�ডার নির�মাণ �র�ন (_l)"
+
+#: ../gtk/gtkfilechooserdefault.c:5060
+msgid "_Location:"
+msgstr "�বস�থান :(_L)"
+
+#: ../gtk/gtkfilechooserdefault.c:5265
+msgid "Save in _folder:"
+msgstr "�িহ�নিত ফ�ল�ডার� স�র��ষণ �র�ন:(_f)"
+
+#: ../gtk/gtkfilechooserdefault.c:5267
+msgid "Create in _folder:"
+msgstr "�িহ�নিত ফ�ল�ডার� নির�মাণ �রা �র�ন:(_f)"
+
+#: ../gtk/gtkfilechooserdefault.c:6331
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Could not read the contents of %s"
 msgstr "%s-র বিষ�বস�ত� প�ত� ব�যর�থ"
 
 # FIXME
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:6252
 msgid "Could not read the contents of the folder"
 msgstr "ফ�ল�ডার�র বিষ�বস�ত� প�ত� ব�যর�থ"
@@ -1044,21 +2058,57 @@ msgid "Cannot change to folder because it is not local"
 msgstr "স�থান�� �বস�থান� না হ��ার ফল� ফ�ল�ডার পরিবর�তন �রত� ব�যর�থ"
 
 #: gtk/gtkfilechooserdefault.c:7625 gtk/gtkfilechooserdefault.c:7646
+=======
+#: ../gtk/gtkfilechooserdefault.c:6335
+msgid "Could not read the contents of the folder"
+msgstr "ফ�ল�ডার�র বিষ�বস�ত� প�ত� ব�যর�থ"
+
+#: ../gtk/gtkfilechooserdefault.c:6428 ../gtk/gtkfilechooserdefault.c:6496
+#: ../gtk/gtkfilechooserdefault.c:6641
+msgid "Unknown"
+msgstr "��ানা"
+
+#: ../gtk/gtkfilechooserdefault.c:6443
+msgid "%H:%M"
+msgstr "%H:%M"
+
+#: ../gtk/gtkfilechooserdefault.c:6445
+msgid "Yesterday at %H:%M"
+msgstr "�ত�াল %H:%M"
+
+#: ../gtk/gtkfilechooserdefault.c:7107
+msgid "Cannot change to folder because it is not local"
+msgstr "স�থান�� �বস�থান� না হ��ার ফল� ফ�ল�ডার পরিবর�তন �রত� ব�যর�থ"
+
+#: ../gtk/gtkfilechooserdefault.c:7704 ../gtk/gtkfilechooserdefault.c:7725
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "%s শর���া� বর�তমান� �পস�থিত র����"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:7736
+=======
+#: ../gtk/gtkfilechooserdefault.c:7815
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "%s শর���া� বর�তমান� �ন�পস�থিত"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:7997 gtk/gtkprintunixdialog.c:480
+=======
+#: ../gtk/gtkfilechooserdefault.c:8074 ../gtk/gtkprintunixdialog.c:480
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "\"%s\" নাম� ফা�ল বর�তমান� �পস�থিত র����। প�রতিস�থাপন �রা হব� �ি?"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:8000 gtk/gtkprintunixdialog.c:484
+=======
+#: ../gtk/gtkfilechooserdefault.c:8077 ../gtk/gtkprintunixdialog.c:484
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
@@ -1066,6 +2116,7 @@ msgstr ""
 "ফা�ল \"%s\"'র মধ�য� বর�তমান� �পস�থিত র����। নত�ন ফা�ল দ�বারা প�রতিস�থাপন �রা হল� "
 "প�র�ববর�ত� ফা�ল�র বিষ�বস�ত� ম��� যাব�।"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:8005 gtk/gtkprintunixdialog.c:491
 msgid "_Replace"
 msgstr "প�রতিস�থাপন (_R)"
@@ -1075,6 +2126,17 @@ msgid "Could not start the search process"
 msgstr "�ন�সন�ধান �রম�ভ �রত� ব�যর�থ"
 
 #: gtk/gtkfilechooserdefault.c:8659
+=======
+#: ../gtk/gtkfilechooserdefault.c:8082 ../gtk/gtkprintunixdialog.c:491
+msgid "_Replace"
+msgstr "প�রতিস�থাপন (_R)"
+
+#: ../gtk/gtkfilechooserdefault.c:8808
+msgid "Could not start the search process"
+msgstr "�ন�সন�ধান �রম�ভ �রত� ব�যর�থ"
+
+#: ../gtk/gtkfilechooserdefault.c:8809
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
@@ -1082,6 +2144,7 @@ msgstr ""
 "প�র���রাম দ�বারা indexer ড�মন�র সাথ� স�য�� স�থাপন �রত� ব�যর�থ। �ন���রহ �র� নিশ��িত "
 "�র�ন ��ি �ল�� �ি না।"
 
+<<<<<<< HEAD
 #: gtk/gtkfilechooserdefault.c:8673
 msgid "Could not send the search request"
 msgstr "�ন�সন�ধান�র �ন�র�ধ পাঠাত� ব�যর�থ"
@@ -1091,27 +2154,50 @@ msgid "Search:"
 msgstr "�ন�সন�ধান:"
 
 #: gtk/gtkfilechooserdefault.c:9466
+=======
+#: ../gtk/gtkfilechooserdefault.c:8823
+msgid "Could not send the search request"
+msgstr "�ন�সন�ধান�র �ন�র�ধ পাঠাত� ব�যর�থ"
+
+#: ../gtk/gtkfilechooserdefault.c:9042
+msgid "Search:"
+msgstr "�ন�সন�ধান:"
+
+#: ../gtk/gtkfilechooserdefault.c:9643
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Could not mount %s"
 msgstr "%s মা�ন�� �রত� ব�যর�থ"
 
 #. Translators: this is shown in the feedback for Tab-completion in a file
 #. * chooser's text entry, when the user enters an invalid path.
+<<<<<<< HEAD
 #: gtk/gtkfilechooserentry.c:702 gtk/gtkfilechooserentry.c:1169
+=======
+#: ../gtk/gtkfilechooserentry.c:702 ../gtk/gtkfilechooserentry.c:1179
+>>>>>>> Updated Bengali India Translation
 msgid "Invalid path"
 msgstr "�ব�ধ পাথ"
 
 #. translators: this text is shown when there are no completions
 #. * for something the user typed in a file chooser entry
 #.
+<<<<<<< HEAD
 #: gtk/gtkfilechooserentry.c:1101
+=======
+#: ../gtk/gtkfilechooserentry.c:1111
+>>>>>>> Updated Bengali India Translation
 msgid "No match"
 msgstr "মিল পা��া যা�নি"
 
 #. translators: this text is shown when there is exactly one completion
 #. * for something the user typed in a file chooser entry
 #.
+<<<<<<< HEAD
 #: gtk/gtkfilechooserentry.c:1112
+=======
+#: ../gtk/gtkfilechooserentry.c:1122
+>>>>>>> Updated Bengali India Translation
 msgid "Sole completion"
 msgstr "���ি মিল"
 
@@ -1119,13 +2205,21 @@ msgstr "���ি মিল"
 #. * entry is a complete filename, but could be continued to find
 #. * a longer match
 #.
+<<<<<<< HEAD
 #: gtk/gtkfilechooserentry.c:1128
+=======
+#: ../gtk/gtkfilechooserentry.c:1138
+>>>>>>> Updated Bengali India Translation
 msgid "Complete, but not unique"
 msgstr "মিল, �িন�ত� সম�প�র�ণ ন�"
 
 #. Translators: this text is shown while the system is searching
 #. * for possible completions for filenames in a file chooser entry.
+<<<<<<< HEAD
 #: gtk/gtkfilechooserentry.c:1160
+=======
+#: ../gtk/gtkfilechooserentry.c:1170
+>>>>>>> Updated Bengali India Translation
 msgid "Completing..."
 msgstr "সম�প�র�ণ মিল �ন�সন�ধান..."
 
@@ -1133,7 +2227,11 @@ msgstr "সম�প�র�ণ মিল �ন�সন�ধান..."
 #. Translators: this is shown in the feedback for Tab-completion in a
 #. * file chooser's text entry when the user enters something like
 #. * "sftp://blahblah"; in an app that only supports local filenames.
+<<<<<<< HEAD
 #: gtk/gtkfilechooserentry.c:1182 gtk/gtkfilechooserentry.c:1207
+=======
+#: ../gtk/gtkfilechooserentry.c:1192 ../gtk/gtkfilechooserentry.c:1217
+>>>>>>> Updated Bengali India Translation
 msgid "Only local files may be selected"
 msgstr "শ�ধ�মাত�র স�থান�� �বস�থান� �পস�থিত ফা�ল নির�বা�ন �রা যাব�"
 
@@ -1141,13 +2239,18 @@ msgstr "শ�ধ�মাত�র স�থান�� �বস�থান
 #. Translators: this is shown in the feedback for Tab-completion in a
 #. * file chooser's text entry when the user hasn't entered the first '/'
 #. * after a hostname and yet hits Tab (such as "sftp://blahblah[Tab]";)
+<<<<<<< HEAD
 #: gtk/gtkfilechooserentry.c:1191
+=======
+#: ../gtk/gtkfilechooserentry.c:1201
+>>>>>>> Updated Bengali India Translation
 msgid "Incomplete hostname; end it with '/'"
 msgstr "হ�স��-ন�ম সম�প�র�ণ �রা হ�নি; �ন�ত� '/' �িহ�ন থা�া �বশ�য�"
 
 #. Translators: this is shown in the feedback for Tab-completion in a file
 #. * chooser's text entry when the user enters a path that does not exist
 #. * and then hits Tab
+<<<<<<< HEAD
 #: gtk/gtkfilechooserentry.c:1202
 msgid "Path does not exist"
 msgstr "পাথ বর�তমান� �ন�পস�থিত"
@@ -1157,16 +2260,30 @@ msgstr "পাথ বর�তমান� �ন�পস�থিত"
 msgid "Error creating folder '%s': %s"
 msgstr "'%s' ফ�ল�ডার নির�মাণ� সমস�যা: %s"
 
+=======
+#: ../gtk/gtkfilechooserentry.c:1212
+msgid "Path does not exist"
+msgstr "পাথ বর�তমান� �ন�পস�থিত"
+
+>>>>>>> Updated Bengali India Translation
 #. The pointers we return for a GtkFileSystemVolume are opaque tokens; they are
 #. * really pointers to GDrive, GVolume or GMount objects.  We need an extra
 #. * token for the fake "File System" volume.  So, we'll return a pointer to
 #. * this particular string.
 #.
+<<<<<<< HEAD
 #: gtk/gtkfilesystem.c:48
 msgid "File System"
 msgstr "ফা�ল-সিস���ম"
 
 #: gtk/gtkfontbutton.c:142 gtk/gtkfontbutton.c:266
+=======
+#: ../gtk/gtkfilesystem.c:48
+msgid "File System"
+msgstr "ফা�ল-সিস���ম"
+
+#: ../gtk/gtkfontbutton.c:142 ../gtk/gtkfontbutton.c:266
+>>>>>>> Updated Bengali India Translation
 msgid "Pick a Font"
 msgstr "���ি ফন�� নির�বা�ন �র�ন"
 
@@ -1181,6 +2298,7 @@ msgstr "ফন��"
 
 #. This is the default text shown in the preview entry, though the user
 #. can set it. Remember that some fonts only have capital letters.
+<<<<<<< HEAD
 #: gtk/gtkfontsel.c:103
 msgid "abcdefghijk ABCDEFGHIJK"
 msgstr "������������ �����������ঠডঢণতথদধনপফবভমযরলশষসহ"
@@ -1194,27 +2312,58 @@ msgid "_Style:"
 msgstr "বিন�যাস:(_S)"
 
 #: gtk/gtkfontsel.c:382
+=======
+#: ../gtk/gtkfontsel.c:100
+msgid "abcdefghijk ABCDEFGHIJK"
+msgstr "������������ �����������ঠডঢণতথদধনপফবভমযরলশষসহ"
+
+#: ../gtk/gtkfontsel.c:366
+msgid "_Family:"
+msgstr "স��লন: (_F)"
+
+#: ../gtk/gtkfontsel.c:372
+msgid "_Style:"
+msgstr "বিন�যাস:(_S)"
+
+#: ../gtk/gtkfontsel.c:378
+>>>>>>> Updated Bengali India Translation
 msgid "Si_ze:"
 msgstr "মাপ:(_z)"
 
 #. create the text entry widget
+<<<<<<< HEAD
 #: gtk/gtkfontsel.c:559
 msgid "_Preview:"
 msgstr "প�র�বপ�রদর�শন:(_P)"
 
 #: gtk/gtkfontsel.c:1659
+=======
+#: ../gtk/gtkfontsel.c:554
+msgid "_Preview:"
+msgstr "প�র�বপ�রদর�শন:(_P)"
+
+#: ../gtk/gtkfontsel.c:1653
+>>>>>>> Updated Bengali India Translation
 msgid "Font Selection"
 msgstr "ফন�� নির�বা�ন"
 
 #. Remove this icon source so we don't keep trying to
 #. * load it.
 #.
+<<<<<<< HEAD
 #: gtk/gtkiconfactory.c:1356
+=======
+#: ../gtk/gtkiconfactory.c:1358
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Error loading icon: %s"
 msgstr "���ন ল�ড �রত� সমস�যা: %s"
 
+<<<<<<< HEAD
 #: gtk/gtkicontheme.c:1354
+=======
+#: ../gtk/gtkicontheme.c:1336
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1227,11 +2376,16 @@ msgstr ""
 "নিম�নলি�িত স�থান থ��� ��ি প�রাপ�ত �রা যাব�:\n"
 "\t%s"
 
+<<<<<<< HEAD
 #: gtk/gtkicontheme.c:1535
+=======
+#: ../gtk/gtkicontheme.c:1518
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "থিম�র মধ�য� ���ন '%s' �ন�পস�থিত"
 
+<<<<<<< HEAD
 #: gtk/gtkicontheme.c:3048
 msgid "Failed to load icon"
 msgstr "���ন ল�ড �রত� ব�যর�থ"
@@ -1241,27 +2395,51 @@ msgid "Simple"
 msgstr "সাধারণ"
 
 #: gtk/gtkimmulticontext.c:588
+=======
+#: ../gtk/gtkicontheme.c:3038
+msgid "Failed to load icon"
+msgstr "���ন ল�ড �রত� ব�যর�থ"
+
+#: ../gtk/gtkimmodule.c:526
+msgid "Simple"
+msgstr "সাধারণ"
+
+#: ../gtk/gtkimmulticontext.c:588
+>>>>>>> Updated Bengali India Translation
 msgctxt "input method menu"
 msgid "System"
 msgstr "সিস���ম"
 
+<<<<<<< HEAD
 #: gtk/gtkimmulticontext.c:598
+=======
+#: ../gtk/gtkimmulticontext.c:598
+>>>>>>> Updated Bengali India Translation
 msgctxt "input method menu"
 msgid "None"
 msgstr "শ�ণ�য"
 
+<<<<<<< HEAD
 #: gtk/gtkimmulticontext.c:681
+=======
+#: ../gtk/gtkimmulticontext.c:681
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgctxt "input method menu"
 msgid "System (%s)"
 msgstr "সিস���ম (%s)"
 
 #. Open Link
+<<<<<<< HEAD
 #: gtk/gtklabel.c:6202
+=======
+#: ../gtk/gtklabel.c:6243
+>>>>>>> Updated Bengali India Translation
 msgid "_Open Link"
 msgstr "লি�� ��ল�ন (_O)"
 
 #. Copy Link Address
+<<<<<<< HEAD
 #: gtk/gtklabel.c:6214
 msgid "Copy _Link Address"
 msgstr "লি���র ঠি�ানা �পি �র�ন (_L)"
@@ -1271,31 +2449,62 @@ msgid "Copy URL"
 msgstr "URL �পি �র�ন"
 
 #: gtk/gtklinkbutton.c:601
+=======
+#: ../gtk/gtklabel.c:6255
+msgid "Copy _Link Address"
+msgstr "লি���র ঠি�ানা �পি �র�ন (_L)"
+
+#: ../gtk/gtklinkbutton.c:482
+msgid "Copy URL"
+msgstr "URL �পি �র�ন"
+
+#: ../gtk/gtklinkbutton.c:645
+>>>>>>> Updated Bengali India Translation
 msgid "Invalid URI"
 msgstr "�ব�ধ URI"
 
 #. Description of --gtk-module=MODULES in --help output
+<<<<<<< HEAD
 #: gtk/gtkmain.c:526
+=======
+#: ../gtk/gtkmain.c:563
+>>>>>>> Updated Bengali India Translation
 msgid "Load additional GTK+ modules"
 msgstr "�তিরি��ত GTK+ মডি�ল ল�ড �র�ন"
 
 #. Placeholder in --gtk-module=MODULES in --help output
+<<<<<<< HEAD
 #: gtk/gtkmain.c:527
+=======
+#: ../gtk/gtkmain.c:564
+>>>>>>> Updated Bengali India Translation
 msgid "MODULES"
 msgstr "MODULES"
 
 #. Description of --g-fatal-warnings in --help output
+<<<<<<< HEAD
 #: gtk/gtkmain.c:529
+=======
+#: ../gtk/gtkmain.c:566
+>>>>>>> Updated Bengali India Translation
 msgid "Make all warnings fatal"
 msgstr "স�ল সতর��বার�তা ��র�তর হিসাব� �িহ�নিত হব�"
 
 #. Description of --gtk-debug=FLAGS in --help output
+<<<<<<< HEAD
 #: gtk/gtkmain.c:532
+=======
+#: ../gtk/gtkmain.c:569
+>>>>>>> Updated Bengali India Translation
 msgid "GTK+ debugging flags to set"
 msgstr "মান নির�ধারণ�র �দ�দ�শ�য� �িহ�নিত GTK+ ডিবা�ি� ফ�ল�যা�"
 
 #. Description of --gtk-no-debug=FLAGS in --help output
+<<<<<<< HEAD
 #: gtk/gtkmain.c:535
+=======
+#: ../gtk/gtkmain.c:572
+>>>>>>> Updated Bengali India Translation
 msgid "GTK+ debugging flags to unset"
 msgstr "মান ম��� ফ�লার �দ�দ�শ�য� �িহ�নিত GTK+ ডিবা�ি� ফ�ল�যা�"
 
@@ -1304,15 +2513,24 @@ msgstr "মান ম��� ফ�লার �দ�দ�শ�য� �
 #. * Do *not* translate it to "predefinito:LTR", if it
 #. * it isn't default:LTR or default:RTL it will not work
 #.
+<<<<<<< HEAD
 #: gtk/gtkmain.c:798
 msgid "default:LTR"
 msgstr "default:LTR"
 
 #: gtk/gtkmain.c:863
+=======
+#: ../gtk/gtkmain.c:846
+msgid "default:LTR"
+msgstr "default:LTR"
+
+#: ../gtk/gtkmain.c:910
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Cannot open display: %s"
 msgstr "ডিসপ�ল� ��লত� ব�যর�থ: %s"
 
+<<<<<<< HEAD
 #: gtk/gtkmain.c:922
 msgid "GTK+ Options"
 msgstr "GTK+ স���রান�ত বি�ল�প"
@@ -1403,10 +2621,102 @@ msgid "Cannot end process with PID %d: %s"
 msgstr "pid %d বিশিষ�� প�রস�স বন�ধ �রত� ব�যর�থ: %s"
 
 #: gtk/gtknotebook.c:4619 gtk/gtknotebook.c:7170
+=======
+#: ../gtk/gtkmain.c:976
+msgid "GTK+ Options"
+msgstr "GTK+ স���রান�ত বি�ল�প"
+
+#: ../gtk/gtkmain.c:976
+msgid "Show GTK+ Options"
+msgstr "GTK+ স���রান�ত বি�ল�প প�রদর�শন �রা হব�"
+
+#: ../gtk/gtkmountoperation.c:491
+msgid "Co_nnect"
+msgstr "স�য�� �র�ন (_n)"
+
+#: ../gtk/gtkmountoperation.c:558
+msgid "Connect _anonymously"
+msgstr "পরি�� বিনা স�য�� �র�ন (_a)"
+
+#: ../gtk/gtkmountoperation.c:567
+msgid "Connect as u_ser:"
+msgstr "ব�যবহার�ার�র�প� স�য�� �র�ন: (_s)"
+
+#: ../gtk/gtkmountoperation.c:605
+msgid "_Username:"
+msgstr "ব�যবহার�ার�র নাম: (_U)"
+
+#: ../gtk/gtkmountoperation.c:610
+msgid "_Domain:"
+msgstr "ড�ম��ন: (_D)"
+
+#: ../gtk/gtkmountoperation.c:616
+msgid "_Password:"
+msgstr "পাস��ার�ড: (_P)"
+
+#: ../gtk/gtkmountoperation.c:634
+msgid "Forget password _immediately"
+msgstr "পাস��ার�ড ত���ষনা� ম��� ফ�লা হব� (_i)"
+
+#: ../gtk/gtkmountoperation.c:644
+msgid "Remember password until you _logout"
+msgstr "ল�-��� না �রা �বধি পাস��ার�ড স�র��ষণ �রা হব� (_l)"
+
+#: ../gtk/gtkmountoperation.c:654
+msgid "Remember _forever"
+msgstr "পাস��ার�ড স�থা��র�প� স�র��ষণ �রা হব� ( _f)"
+
+#: ../gtk/gtkmountoperation.c:883
+#, c-format
+msgid "Unknown Application (PID %d)"
+msgstr "��ানা ��যাপ�লি��শন (PID %d)"
+
+#: ../gtk/gtkmountoperation.c:1066
+msgid "Unable to end process"
+msgstr "প�রস�স সমাপ�ত �রত� ব�যর�থ"
+
+#: ../gtk/gtkmountoperation.c:1103
+msgid "_End Process"
+msgstr "প�রস�স সমাপ�তি (_E)"
+
+#: ../gtk/gtkmountoperation-stub.c:64
+#, c-format
+msgid "Cannot kill process with PID %d. Operation is not implemented."
+msgstr "PID %d বিশিষ�� প�রস�স সমাপ�ত (kill) �রত� ব�যর�থ। �র�ম বাস�তাবা�িত হ�নি।"
+
+#. translators: this string is a name for the 'less' command
+#: ../gtk/gtkmountoperation-x11.c:859
+msgid "Terminal Pager"
+msgstr "�ার�মিন�যাল প��ার"
+
+#: ../gtk/gtkmountoperation-x11.c:860
+msgid "Top Command"
+msgstr "Top �মান�ড"
+
+#: ../gtk/gtkmountoperation-x11.c:861
+msgid "Bourne Again Shell"
+msgstr "ব�র�ন ���ন শ�ল"
+
+#: ../gtk/gtkmountoperation-x11.c:862
+msgid "Bourne Shell"
+msgstr "ব�র�ন শ�ল"
+
+#: ../gtk/gtkmountoperation-x11.c:863
+msgid "Z Shell"
+msgstr "Z শ�ল"
+
+#: ../gtk/gtkmountoperation-x11.c:960
+#, c-format
+msgid "Cannot end process with PID %d: %s"
+msgstr "PID %d বিশিষ�� প�রস�স বন�ধ �রত� ব�যর�থ: %s"
+
+#: ../gtk/gtknotebook.c:4808 ../gtk/gtknotebook.c:7383
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Page %u"
 msgstr "প�ষ�ঠা %u"
 
+<<<<<<< HEAD
 #: gtk/gtkpagesetup.c:596 gtk/gtkpapersize.c:838 gtk/gtkpapersize.c:880
 msgid "Not a valid page setup file"
 msgstr "ব�ধ প�ষ�ঠা প�রস�ত�তি ফা�ল ন�"
@@ -1420,6 +2730,33 @@ msgid "For portable documents"
 msgstr "স�থানান�তরয���য নথিপত�র�র �ন�য"
 
 #: gtk/gtkpagesetupunixdialog.c:809
+=======
+#. Translators: the format here is used to build the string that will be rendered
+#. * in the number emblem.
+#.
+#: ../gtk/gtknumerableicon.c:481
+#, c-format
+#| msgctxt "calendar:day:digits"
+#| msgid "%d"
+msgctxt "Number format"
+msgid "%d"
+msgstr "%d"
+
+#: ../gtk/gtkpagesetup.c:648 ../gtk/gtkpapersize.c:849
+#: ../gtk/gtkpapersize.c:889
+msgid "Not a valid page setup file"
+msgstr "ব�ধ প�ষ�ঠা প�রস�ত�তি ফা�ল ন�"
+
+#: ../gtk/gtkpagesetupunixdialog.c:177
+msgid "Any Printer"
+msgstr "য� ��ন� প�রিন��ার"
+
+#: ../gtk/gtkpagesetupunixdialog.c:177
+msgid "For portable documents"
+msgstr "স�থানান�তরয���য নথিপত�র�র �ন�য"
+
+#: ../gtk/gtkpagesetupunixdialog.c:807
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid ""
 "Margins:\n"
@@ -1434,6 +2771,7 @@ msgstr ""
 " �পর: %s %s\n"
 " ন���: %s %s"
 
+<<<<<<< HEAD
 #: gtk/gtkpagesetupunixdialog.c:858 gtk/gtkprintunixdialog.c:3284
 msgid "Manage Custom Sizes..."
 msgstr "স�বনির�বা�িত মাপ পরি�ালনা..."
@@ -1463,6 +2801,37 @@ msgid "Down Path"
 msgstr "ন���র পাথ"
 
 #: gtk/gtkpathbar.c:1497
+=======
+#: ../gtk/gtkpagesetupunixdialog.c:856 ../gtk/gtkprintunixdialog.c:3306
+msgid "Manage Custom Sizes..."
+msgstr "স�বনির�বা�িত মাপ পরি�ালনা..."
+
+#: ../gtk/gtkpagesetupunixdialog.c:907
+msgid "_Format for:"
+msgstr "বিন�যাস �রা হব�: (_F)"
+
+#: ../gtk/gtkpagesetupunixdialog.c:929 ../gtk/gtkprintunixdialog.c:3478
+msgid "_Paper size:"
+msgstr "�া���র মাপ:(_P)"
+
+#: ../gtk/gtkpagesetupunixdialog.c:960
+msgid "_Orientation:"
+msgstr "দিশা:(_O)"
+
+#: ../gtk/gtkpagesetupunixdialog.c:1024 ../gtk/gtkprintunixdialog.c:3540
+msgid "Page Setup"
+msgstr "প�ষ�ঠার ব�শিষ���য"
+
+#: ../gtk/gtkpathbar.c:157
+msgid "Up Path"
+msgstr "�পর�র পাথ"
+
+#: ../gtk/gtkpathbar.c:159
+msgid "Down Path"
+msgstr "ন���র পাথ"
+
+#: ../gtk/gtkpathbar.c:1518
+>>>>>>> Updated Bengali India Translation
 msgid "File System Root"
 msgstr "ফা�ল-সিস���ম�র Root"
 
@@ -1470,6 +2839,7 @@ msgstr "ফা�ল-সিস���ম�র Root"
 msgid "Authentication"
 msgstr "�ন�ম�দন ব�যবস�থা"
 
+<<<<<<< HEAD
 #: gtk/gtkprinteroptionwidget.c:694
 msgid "Not available"
 msgstr "�পলব�ধ ন��"
@@ -1480,6 +2850,17 @@ msgid "Select a folder"
 msgstr "���ি ফা�ল নির�বা�ন �র�ন"
 
 #: gtk/gtkprinteroptionwidget.c:813
+=======
+#: ../gtk/gtkprinteroptionwidget.c:686
+msgid "Not available"
+msgstr "�পলব�ধ ন��"
+
+#: ../gtk/gtkprinteroptionwidget.c:786
+msgid "Select a folder"
+msgstr "���ি ফ�ল�ডার নির�বা�ন �র�ন"
+
+#: ../gtk/gtkprinteroptionwidget.c:805
+>>>>>>> Updated Bengali India Translation
 msgid "_Save in folder:"
 msgstr "�িহ�নিত ফ�ল�ডার� স�র��ষণ �র�ন:(_S)"
 
@@ -1487,71 +2868,124 @@ msgstr "�িহ�নিত ফ�ল�ডার� স�র��ষণ �
 #. * jobs. %s gets replaced by the application name, %d gets replaced
 #. * by the job number.
 #.
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:190
+=======
+#: ../gtk/gtkprintoperation.c:263
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "%s job #%d"
 msgstr "%s job #%d"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:1695
+=======
+#: ../gtk/gtkprintoperation.c:1768
+>>>>>>> Updated Bengali India Translation
 msgctxt "print operation status"
 msgid "Initial state"
 msgstr "প�রারম�ভি� �বস�থা"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:1696
+=======
+#: ../gtk/gtkprintoperation.c:1769
+>>>>>>> Updated Bengali India Translation
 msgctxt "print operation status"
 msgid "Preparing to print"
 msgstr "প�রিন���র প�রস�ত�তি �রা হ����"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:1697
+=======
+#: ../gtk/gtkprintoperation.c:1770
+>>>>>>> Updated Bengali India Translation
 msgctxt "print operation status"
 msgid "Generating data"
 msgstr "তথ�য ��ত�রিত �রা হ����"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:1698
+=======
+#: ../gtk/gtkprintoperation.c:1771
+>>>>>>> Updated Bengali India Translation
 msgctxt "print operation status"
 msgid "Sending data"
 msgstr "তথ�য� প�র�রিত হ����"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:1699
+=======
+#: ../gtk/gtkprintoperation.c:1772
+>>>>>>> Updated Bengali India Translation
 msgctxt "print operation status"
 msgid "Waiting"
 msgstr "�প���ষারত"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:1700
+=======
+#: ../gtk/gtkprintoperation.c:1773
+>>>>>>> Updated Bengali India Translation
 msgctxt "print operation status"
 msgid "Blocking on issue"
 msgstr "�ারণবসত �বর�দ�ধ"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:1701
+=======
+#: ../gtk/gtkprintoperation.c:1774
+>>>>>>> Updated Bengali India Translation
 msgctxt "print operation status"
 msgid "Printing"
 msgstr "প�রিন�� �রা হ����"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:1702
+=======
+#: ../gtk/gtkprintoperation.c:1775
+>>>>>>> Updated Bengali India Translation
 msgctxt "print operation status"
 msgid "Finished"
 msgstr "সমাপ�ত"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:1703
+=======
+#: ../gtk/gtkprintoperation.c:1776
+>>>>>>> Updated Bengali India Translation
 msgctxt "print operation status"
 msgid "Finished with error"
 msgstr "ত�র��িসহ �র�ম সমাপ�ত"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:2270
+=======
+#: ../gtk/gtkprintoperation.c:2343
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Preparing %d"
 msgstr "%d প�রস�ত�ত �রা হ����"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:2272 gtk/gtkprintoperation.c:2902
 #, c-format
 msgid "Preparing"
 msgstr "প�রস�ত�তি"
 
 #: gtk/gtkprintoperation.c:2275
+=======
+#: ../gtk/gtkprintoperation.c:2345 ../gtk/gtkprintoperation.c:2975
+msgid "Preparing"
+msgstr "প�রস�ত�তি"
+
+#: ../gtk/gtkprintoperation.c:2348
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Printing %d"
 msgstr "%d প�রিন�� �রা হ����"
 
+<<<<<<< HEAD
 #: gtk/gtkprintoperation.c:2932
 #, c-format
 msgid "Error creating print preview"
@@ -1575,10 +3009,34 @@ msgid "Printer offline"
 msgstr "প�রিন��ার �ফলা�ন �বস�থা�"
 
 #: gtk/gtkprintoperation-win32.c:613
+=======
+#: ../gtk/gtkprintoperation.c:3005
+msgid "Error creating print preview"
+msgstr "প�রিন���র প�র�বর�প প�রদর�শন �রম�ভ �রত� সমস�যা"
+
+#: ../gtk/gtkprintoperation.c:3008
+msgid "The most probable reason is that a temporary file could not be created."
+msgstr "সম�ভবত �স�থা�� ফা�ল নির�মিত না হ��া ফল� ��ি হ����"
+
+#: ../gtk/gtkprintoperation-unix.c:304
+msgid "Error launching preview"
+msgstr "প�র�বর�প প�রদর�শন �রম�ভ �রত� সমস�যা"
+
+#: ../gtk/gtkprintoperation-unix.c:477 ../gtk/gtkprintoperation-win32.c:1447
+msgid "Application"
+msgstr "��যাপ�লি��শন"
+
+#: ../gtk/gtkprintoperation-win32.c:611
+msgid "Printer offline"
+msgstr "প�রিন��ার �ফলা�ন �বস�থা�"
+
+#: ../gtk/gtkprintoperation-win32.c:613
+>>>>>>> Updated Bengali India Translation
 msgid "Out of paper"
 msgstr "�া�� ফ�রি�� ����"
 
 #. Translators: this is a printer status.
+<<<<<<< HEAD
 #: gtk/gtkprintoperation-win32.c:615
 #: modules/printbackends/cups/gtkprintbackendcups.c:1998
 msgid "Paused"
@@ -1589,6 +3047,18 @@ msgid "Need user intervention"
 msgstr "ব�যবহার�ার�র সহা�তা প�র���ন"
 
 #: gtk/gtkprintoperation-win32.c:717
+=======
+#: ../gtk/gtkprintoperation-win32.c:615
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2002
+msgid "Paused"
+msgstr "স�থ�িত"
+
+#: ../gtk/gtkprintoperation-win32.c:617
+msgid "Need user intervention"
+msgstr "ব�যবহার�ার�র সহা�তা প�র���ন"
+
+#: ../gtk/gtkprintoperation-win32.c:717
+>>>>>>> Updated Bengali India Translation
 msgid "Custom size"
 msgstr "স�বনির�বা�িত মাপ"
 
@@ -1625,6 +3095,7 @@ msgstr "PrintDlgEx'র �ন�য �ব�ধ হ�যান�ড�ল"
 msgid "Unspecified error"
 msgstr "�নির�ধারিত ত�র��ি"
 
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:618
 msgid "Getting printer information failed"
 msgstr "প�রিন��ার স���রান�ত তথ�য প�রাপ�ত �রত� প�ত�"
@@ -1634,15 +3105,31 @@ msgid "Getting printer information..."
 msgstr "প�রিন��ার স���রান�ত তথ�য প�রাপ�ত �রা হ����..."
 
 #: gtk/gtkprintunixdialog.c:2139
+=======
+#: ../gtk/gtkprintunixdialog.c:618
+msgid "Getting printer information failed"
+msgstr "প�রিন��ার স���রান�ত তথ�য প�রাপ�ত �রত� প�ত�"
+
+#: ../gtk/gtkprintunixdialog.c:1873
+msgid "Getting printer information..."
+msgstr "প�রিন��ার স���রান�ত তথ�য প�রাপ�ত �রা হ����..."
+
+#: ../gtk/gtkprintunixdialog.c:2147
+>>>>>>> Updated Bengali India Translation
 msgid "Printer"
 msgstr "প�রিন��ার"
 
 #. Translators: this is the header for the location column in the print dialog
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:2149
+=======
+#: ../gtk/gtkprintunixdialog.c:2157
+>>>>>>> Updated Bengali India Translation
 msgid "Location"
 msgstr "�বস�থান"
 
 #. Translators: this is the header for the printer status column in the print dialog
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:2160
 msgid "Status"
 msgstr "�বস�থা"
@@ -1668,6 +3155,33 @@ msgid "Pag_es:"
 msgstr "প�ষ�ঠা: (_e)"
 
 #: gtk/gtkprintunixdialog.c:2217
+=======
+#: ../gtk/gtkprintunixdialog.c:2168
+msgid "Status"
+msgstr "�বস�থা"
+
+#: ../gtk/gtkprintunixdialog.c:2194
+msgid "Range"
+msgstr "স�নির�দিষ�� স�মা"
+
+#: ../gtk/gtkprintunixdialog.c:2198
+msgid "_All Pages"
+msgstr "সমস�ত পাতা (_A)"
+
+#: ../gtk/gtkprintunixdialog.c:2205
+msgid "C_urrent Page"
+msgstr "বর�তমান প�ষ�ঠা (_u)"
+
+#: ../gtk/gtkprintunixdialog.c:2215
+msgid "Se_lection"
+msgstr "নির�বা�ন:(_l)"
+
+#: ../gtk/gtkprintunixdialog.c:2224
+msgid "Pag_es:"
+msgstr "প�ষ�ঠা: (_e)"
+
+#: ../gtk/gtkprintunixdialog.c:2225
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "Specify one or more page ranges,\n"
 " e.g. 1-3,7,11"
@@ -1675,15 +3189,24 @@ msgstr ""
 "�� �থবা �ধি� প�ষ�ঠার স�মা �ল�ল�� �র�ন,\n"
 " �দাহরণস�বর�প. 1-3,7,11"
 
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:2227
 msgid "Pages"
 msgstr "প�ষ�ঠা"
 
 #: gtk/gtkprintunixdialog.c:2240
+=======
+#: ../gtk/gtkprintunixdialog.c:2235
+msgid "Pages"
+msgstr "প�ষ�ঠা"
+
+#: ../gtk/gtkprintunixdialog.c:2248
+>>>>>>> Updated Bengali India Translation
 msgid "Copies"
 msgstr "প�রতিলিপি"
 
 #. FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:2245
 msgid "Copie_s:"
 msgstr "প�রতিলিপি :(_s)"
@@ -1697,6 +3220,21 @@ msgid "_Reverse"
 msgstr "বিপর�ত দিশা (_R)"
 
 #: gtk/gtkprintunixdialog.c:2291
+=======
+#: ../gtk/gtkprintunixdialog.c:2253
+msgid "Copie_s:"
+msgstr "প�রতিলিপি :(_s)"
+
+#: ../gtk/gtkprintunixdialog.c:2271
+msgid "C_ollate"
+msgstr "��ত�রিত �র�ন (_o)"
+
+#: ../gtk/gtkprintunixdialog.c:2279
+msgid "_Reverse"
+msgstr "বিপর�ত দিশা (_R)"
+
+#: ../gtk/gtkprintunixdialog.c:2299
+>>>>>>> Updated Bengali India Translation
 msgid "General"
 msgstr "সাধারণ"
 
@@ -1706,6 +3244,7 @@ msgstr "সাধারণ"
 #. Translators: These strings name the possible arrangements of
 #. * multiple pages on a sheet when printing
 #.
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3017
 #: modules/printbackends/cups/gtkprintbackendcups.c:3508
 msgid "Left to right, top to bottom"
@@ -1743,12 +3282,52 @@ msgstr "ন��� থ��� �পর�, বা�দি� থ���
 
 #: gtk/gtkprintunixdialog.c:3020
 #: modules/printbackends/cups/gtkprintbackendcups.c:3511
+=======
+#: ../gtk/gtkprintunixdialog.c:3039
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3535
+msgid "Left to right, top to bottom"
+msgstr "বা�দি� থ��� ডানদি��, �পর থ��� ন���"
+
+#: ../gtk/gtkprintunixdialog.c:3039
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3535
+msgid "Left to right, bottom to top"
+msgstr "বা�দি� থ��� ডানদি��, ন��� থ��� �পর�"
+
+#: ../gtk/gtkprintunixdialog.c:3040
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3536
+msgid "Right to left, top to bottom"
+msgstr "ডানদি� থ��� বা�দি��, �পর থ��� ন���"
+
+#: ../gtk/gtkprintunixdialog.c:3040
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3536
+msgid "Right to left, bottom to top"
+msgstr "ডানদি� থ��� বা�দি��, ন��� থ��� �পর�"
+
+#: ../gtk/gtkprintunixdialog.c:3041
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3537
+msgid "Top to bottom, left to right"
+msgstr "�পর থ��� ন���, বা�দি� থ��� ডানদি��"
+
+#: ../gtk/gtkprintunixdialog.c:3041
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3537
+msgid "Top to bottom, right to left"
+msgstr "�পর থ��� ন���, ডানদি� থ��� বা�দি��"
+
+#: ../gtk/gtkprintunixdialog.c:3042
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3538
+msgid "Bottom to top, left to right"
+msgstr "ন��� থ��� �পর�, বা�দি� থ��� ডানদি��"
+
+#: ../gtk/gtkprintunixdialog.c:3042
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3538
+>>>>>>> Updated Bengali India Translation
 msgid "Bottom to top, right to left"
 msgstr "ন��� থ��� �পর�, ডানদি� থ��� বা�দি��"
 
 #. Translators, this string is used to label the option in the print
 #. * dialog that controls in what order multiple pages are arranged
 #.
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3024 gtk/gtkprintunixdialog.c:3037
 #: modules/printbackends/cups/gtkprintbackendcups.c:3543
 msgid "Page Ordering"
@@ -1787,10 +3366,51 @@ msgid "Page or_dering:"
 msgstr "প�ষ�ঠার �ন���রম: (_d)"
 
 #: gtk/gtkprintunixdialog.c:3359
+=======
+#: ../gtk/gtkprintunixdialog.c:3046 ../gtk/gtkprintunixdialog.c:3059
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3570
+msgid "Page Ordering"
+msgstr "প�ষ�ঠার �ন���রম"
+
+#: ../gtk/gtkprintunixdialog.c:3075
+msgid "Left to right"
+msgstr "বা�দি� থ��� ডানদি��"
+
+#: ../gtk/gtkprintunixdialog.c:3076
+msgid "Right to left"
+msgstr "ডানদি� থ��� বা�দি�"
+
+#: ../gtk/gtkprintunixdialog.c:3088
+msgid "Top to bottom"
+msgstr "�পর থ��� ন���"
+
+#: ../gtk/gtkprintunixdialog.c:3089
+msgid "Bottom to top"
+msgstr "ন��� থ��� �পর�"
+
+#: ../gtk/gtkprintunixdialog.c:3329
+msgid "Layout"
+msgstr "বিন�যাস"
+
+#: ../gtk/gtkprintunixdialog.c:3333
+msgid "T_wo-sided:"
+msgstr "�ভ� প�ষ�ঠ: (_w)"
+
+#: ../gtk/gtkprintunixdialog.c:3348
+msgid "Pages per _side:"
+msgstr "প�রতি পার�শ�ব� প�ষ�ঠার স���যা:(_s)"
+
+#: ../gtk/gtkprintunixdialog.c:3365
+msgid "Page or_dering:"
+msgstr "প�ষ�ঠার �ন���রম: (_d)"
+
+#: ../gtk/gtkprintunixdialog.c:3381
+>>>>>>> Updated Bengali India Translation
 msgid "_Only print:"
 msgstr "শ�ধ�মাত�র প�রিন�� �রা হব�:(_O)"
 
 #. In enum order
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3374
 msgid "All sheets"
 msgstr "সমস�ত পাতা"
@@ -1824,10 +3444,46 @@ msgid "Output t_ray:"
 msgstr "���প�� ��র�: (_r)"
 
 #: gtk/gtkprintunixdialog.c:3480
+=======
+#: ../gtk/gtkprintunixdialog.c:3396
+msgid "All sheets"
+msgstr "সমস�ত পাতা"
+
+#: ../gtk/gtkprintunixdialog.c:3397
+msgid "Even sheets"
+msgstr "শ�ধ�মাত�র ��� স���য� পাতা�"
+
+#: ../gtk/gtkprintunixdialog.c:3398
+msgid "Odd sheets"
+msgstr "শ�ধ�মাত�র ব���� স���য� পাতা�"
+
+#: ../gtk/gtkprintunixdialog.c:3401
+msgid "Sc_ale:"
+msgstr "মাপ: (_a)"
+
+#: ../gtk/gtkprintunixdialog.c:3428
+msgid "Paper"
+msgstr "�া��"
+
+#: ../gtk/gtkprintunixdialog.c:3432
+msgid "Paper _type:"
+msgstr "�া���র বিন�যাস:(_t)"
+
+#: ../gtk/gtkprintunixdialog.c:3447
+msgid "Paper _source:"
+msgstr "�া�� স���রহস�থল:(_s)"
+
+#: ../gtk/gtkprintunixdialog.c:3462
+msgid "Output t_ray:"
+msgstr "���প�� ��র�: (_r)"
+
+#: ../gtk/gtkprintunixdialog.c:3502
+>>>>>>> Updated Bengali India Translation
 msgid "Or_ientation:"
 msgstr "দিশা: (_i)"
 
 #. In enum order
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3495
 msgid "Portrait"
 msgstr "প�রতি��তি"
@@ -1844,30 +3500,69 @@ msgstr "বিপর�ত প�রতি��তি"
 msgid "Reverse landscape"
 msgstr "বিপর�ত ভ�দ�শ�য"
 
-#: gtk/gtkprintunixdialog.c:3543
+#: gtk/gtkprintunixdialog.c:3543
+msgid "Job Details"
+msgstr "�র�ম স���রান�ত বিবরণ"
+
+#: gtk/gtkprintunixdialog.c:3549
+msgid "Pri_ority:"
+msgstr "��র�ত�ব:(_o)"
+
+#: gtk/gtkprintunixdialog.c:3564
+msgid "_Billing info:"
+msgstr "বিল স���রান�ত তথ�য: (_B)"
+
+#: gtk/gtkprintunixdialog.c:3582
+=======
+#: ../gtk/gtkprintunixdialog.c:3517
+msgid "Portrait"
+msgstr "প�রতি��তি"
+
+#: ../gtk/gtkprintunixdialog.c:3518
+msgid "Landscape"
+msgstr "ভ�দ�শ�য"
+
+#: ../gtk/gtkprintunixdialog.c:3519
+msgid "Reverse portrait"
+msgstr "বিপর�ত প�রতি��তি"
+
+#: ../gtk/gtkprintunixdialog.c:3520
+msgid "Reverse landscape"
+msgstr "বিপর�ত ভ�দ�শ�য"
+
+#: ../gtk/gtkprintunixdialog.c:3565
 msgid "Job Details"
 msgstr "�র�ম স���রান�ত বিবরণ"
 
-#: gtk/gtkprintunixdialog.c:3549
+#: ../gtk/gtkprintunixdialog.c:3571
 msgid "Pri_ority:"
 msgstr "��র�ত�ব:(_o)"
 
-#: gtk/gtkprintunixdialog.c:3564
+#: ../gtk/gtkprintunixdialog.c:3586
 msgid "_Billing info:"
 msgstr "বিল স���রান�ত তথ�য: (_B)"
 
-#: gtk/gtkprintunixdialog.c:3582
+#: ../gtk/gtkprintunixdialog.c:3604
+>>>>>>> Updated Bengali India Translation
 msgid "Print Document"
 msgstr "নথি প�রিন�� �র�ন"
 
 #. Translators: this is one of the choices for the print at option
 #. * in the print dialog
 #.
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3591
 msgid "_Now"
 msgstr "�� ম�হ�র�ত�(_N)"
 
 #: gtk/gtkprintunixdialog.c:3602
+=======
+#: ../gtk/gtkprintunixdialog.c:3613
+msgid "_Now"
+msgstr "�� ম�হ�র�ত�(_N)"
+
+#: ../gtk/gtkprintunixdialog.c:3624
+>>>>>>> Updated Bengali India Translation
 msgid "A_t:"
 msgstr "�িহ�নিত সম��:(_t)"
 
@@ -1875,7 +3570,11 @@ msgstr "�িহ�নিত সম��:(_t)"
 #. * You can remove the am/pm values below for your locale if they are not
 #. * supported.
 #.
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3608
+=======
+#: ../gtk/gtkprintunixdialog.c:3630
+>>>>>>> Updated Bengali India Translation
 msgid ""
 "Specify the time of print,\n"
 " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
@@ -1883,6 +3582,7 @@ msgstr ""
 "প�রিন���র সম� নির�ধারণ �রা হব�\n"
 " �দাহরণ ১৫:৩০, ২:৩৫ �পরাহ�ন, ১৪:১৫:২০, ১১:৪৬:৩০ প�র�বাহ�ন, ৪ �পরাহ�ন"
 
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3618
 msgid "Time of print"
 msgstr "প�রিন���র সম��াল"
@@ -1896,46 +3596,86 @@ msgid "Hold the job until it is explicitly released"
 msgstr "�রম�ভ�র স�নির�দিষ�� নির�দ�শ না দ���া �বধি �র�ম স�থ�িত রা�া হব�"
 
 #: gtk/gtkprintunixdialog.c:3655
+=======
+#: ../gtk/gtkprintunixdialog.c:3640
+msgid "Time of print"
+msgstr "প�রিন���র সম��াল"
+
+#: ../gtk/gtkprintunixdialog.c:3656
+msgid "On _hold"
+msgstr "�প���ষারত:(_h)"
+
+#: ../gtk/gtkprintunixdialog.c:3657
+msgid "Hold the job until it is explicitly released"
+msgstr "�রম�ভ�র স�নির�দিষ�� নির�দ�শ না দ���া �বধি �র�ম স�থ�িত রা�া হব�"
+
+#: ../gtk/gtkprintunixdialog.c:3677
+>>>>>>> Updated Bengali India Translation
 msgid "Add Cover Page"
 msgstr "প�র���দ প�ষ�ঠা সন�নিব�শ �রা হব�"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3664
+=======
+#: ../gtk/gtkprintunixdialog.c:3686
+>>>>>>> Updated Bengali India Translation
 msgid "Be_fore:"
 msgstr "�িহ�নিত প�ষ�ঠার প�র�ব�:(_f)"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3682
+=======
+#: ../gtk/gtkprintunixdialog.c:3704
+>>>>>>> Updated Bengali India Translation
 msgid "_After:"
 msgstr "�িহ�নিত প�ষ�ঠার পর�:(_A)"
 
 #. Translators: this is the tab label for the notebook tab containing
 #. * job-specific options in the print dialog
 #.
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3700
 msgid "Job"
 msgstr "�র�ম"
 
 #: gtk/gtkprintunixdialog.c:3766
+=======
+#: ../gtk/gtkprintunixdialog.c:3722
+msgid "Job"
+msgstr "�র�ম"
+
+#: ../gtk/gtkprintunixdialog.c:3788
+>>>>>>> Updated Bengali India Translation
 msgid "Advanced"
 msgstr "�ন�নত ব�শিষ���য"
 
 #. Translators: this will appear as tab label in print dialog.
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3804
+=======
+#: ../gtk/gtkprintunixdialog.c:3826
+>>>>>>> Updated Bengali India Translation
 msgid "Image Quality"
 msgstr "�বির ��ণমান"
 
 #. Translators: this will appear as tab label in print dialog.
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3808
+=======
+#: ../gtk/gtkprintunixdialog.c:3830
+>>>>>>> Updated Bengali India Translation
 msgid "Color"
 msgstr "র�"
 
 #. Translators: this will appear as tab label in print dialog.
 #. It's a typographical term, as in "Binding and finishing"
+<<<<<<< HEAD
 #: gtk/gtkprintunixdialog.c:3813
 msgid "Finishing"
 msgstr "সমাপ�তি"
@@ -1954,25 +3694,54 @@ msgid "Unable to find include file: \"%s\""
 msgstr "include ফা�ল সনা��ত �রত� ব�যর�থ: \"%s\""
 
 #: gtk/gtkrc.c:3470 gtk/gtkrc.c:3473
+=======
+#: ../gtk/gtkprintunixdialog.c:3835
+msgid "Finishing"
+msgstr "সমাপ�তি"
+
+#: ../gtk/gtkprintunixdialog.c:3845
+msgid "Some of the settings in the dialog conflict"
+msgstr "ডা�ল� ব��স� নির�বা�িত �ি�� মান পারস�পরবির�ধ�"
+
+#: ../gtk/gtkprintunixdialog.c:3868
+msgid "Print"
+msgstr "প�রিন�� �র�ন"
+
+#: ../gtk/gtkrc.c:948
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Unable to locate image file in pixmap_path: \"%s\""
 msgstr "pixmap_path'� �বির ফা�ল সনা��ত �রত� ব�যর�থ: \"%s\""
 
+<<<<<<< HEAD
 #: gtk/gtkrecentaction.c:165 gtk/gtkrecentaction.c:173
 #: gtk/gtkrecentchoosermenu.c:615 gtk/gtkrecentchoosermenu.c:623
+=======
+#: ../gtk/gtkrecentaction.c:165 ../gtk/gtkrecentaction.c:173
+#: ../gtk/gtkrecentchoosermenu.c:608 ../gtk/gtkrecentchoosermenu.c:616
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "This function is not implemented for widgets of class '%s'"
 msgstr "'%s' ��লাস�র ������র �ন�য �� ফা�শান �ার�য�র �রা হ�নি"
 
+<<<<<<< HEAD
 #: gtk/gtkrecentchooserdefault.c:482
 msgid "Select which type of documents are shown"
 msgstr "প�রদর�শন�র �দ�দ�শ�য� বিভিন�ন ড��ম�ন���র বিন�যাস নির�বা�ন �র�ন"
 
 #: gtk/gtkrecentchooserdefault.c:1138 gtk/gtkrecentchooserdefault.c:1175
+=======
+#: ../gtk/gtkrecentchooserdefault.c:483
+msgid "Select which type of documents are shown"
+msgstr "প�রদর�শন�র �দ�দ�শ�য� বিভিন�ন ড��ম�ন���র বিন�যাস নির�বা�ন �র�ন"
+
+#: ../gtk/gtkrecentchooserdefault.c:1137 ../gtk/gtkrecentchooserdefault.c:1174
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "No item for URI '%s' found"
 msgstr "URI '%s'-র ��ন� বস�ত� পা��া যা�নি"
 
+<<<<<<< HEAD
 #: gtk/gtkrecentchooserdefault.c:1302
 msgid "Untitled filter"
 msgstr "নামবিহ�ন ফিল��ার"
@@ -1998,6 +3767,33 @@ msgid "_Clear List"
 msgstr "তালি�া পরিশ�র�ত �র�ন (_C)"
 
 #: gtk/gtkrecentchooserdefault.c:1819
+=======
+#: ../gtk/gtkrecentchooserdefault.c:1301
+msgid "Untitled filter"
+msgstr "নামবিহ�ন ফিল��ার"
+
+#: ../gtk/gtkrecentchooserdefault.c:1654
+msgid "Could not remove item"
+msgstr "বস�ত� ম��� ফ�লত� ব�যর�থ"
+
+#: ../gtk/gtkrecentchooserdefault.c:1698
+msgid "Could not clear list"
+msgstr "তালি�া পরিশ�র�ত �রত� ব�যর�থ"
+
+#: ../gtk/gtkrecentchooserdefault.c:1782
+msgid "Copy _Location"
+msgstr "�বস�থান �পি �র�ন (_L)"
+
+#: ../gtk/gtkrecentchooserdefault.c:1795
+msgid "_Remove From List"
+msgstr "তালি�া থ��� ম��� ফ�ল�ন (_R)"
+
+#: ../gtk/gtkrecentchooserdefault.c:1804
+msgid "_Clear List"
+msgstr "তালি�া পরিশ�র�ত �র�ন (_C)"
+
+#: ../gtk/gtkrecentchooserdefault.c:1818
+>>>>>>> Updated Bengali India Translation
 msgid "Show _Private Resources"
 msgstr "ব�য��তি�ত রিস�র�স প�রদর�শন �রা হব� (_P)"
 
@@ -2011,21 +3807,37 @@ msgstr "ব�য��তি�ত রিস�র�স প�রদর�শ
 #. * user appended or prepended custom menu items to the
 #. * recent chooser menu widget.
 #.
+<<<<<<< HEAD
 #: gtk/gtkrecentchoosermenu.c:369
 msgid "No items found"
 msgstr "��ন� বস�ত� পা��া যা�নি"
 
 #: gtk/gtkrecentchoosermenu.c:535 gtk/gtkrecentchoosermenu.c:591
+=======
+#: ../gtk/gtkrecentchoosermenu.c:362
+msgid "No items found"
+msgstr "��ন� বস�ত� পা��া যা�নি"
+
+#: ../gtk/gtkrecentchoosermenu.c:528 ../gtk/gtkrecentchoosermenu.c:584
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "No recently used resource found with URI `%s'"
 msgstr "URI `%s''র সাথ� সম�প�রতি ব�যবহ�থ ��ন� রিস�র�স �িহ�নিত �রা যা�নি"
 
+<<<<<<< HEAD
 #: gtk/gtkrecentchoosermenu.c:802
+=======
+#: ../gtk/gtkrecentchoosermenu.c:794
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Open '%s'"
 msgstr "'%s' ��ল�ন"
 
+<<<<<<< HEAD
 #: gtk/gtkrecentchoosermenu.c:832
+=======
+#: ../gtk/gtkrecentchoosermenu.c:824
+>>>>>>> Updated Bengali India Translation
 msgid "Unknown item"
 msgstr "��ানা বস�ত�"
 
@@ -2034,7 +3846,11 @@ msgstr "��ানা বস�ত�"
 #. * the %s is the name of the item. Please keep the _ in front
 #. * of the number to give these menu items a mnemonic.
 #.
+<<<<<<< HEAD
 #: gtk/gtkrecentchoosermenu.c:843
+=======
+#: ../gtk/gtkrecentchoosermenu.c:835
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgctxt "recent menu label"
 msgid "_%d. %s"
@@ -2043,46 +3859,86 @@ msgstr "_%d. %s"
 #. This is the format that is used for items in a recent files menu.
 #. * The %d is the number of the item, the %s is the name of the item.
 #.
+<<<<<<< HEAD
 #: gtk/gtkrecentchoosermenu.c:848
+=======
+#: ../gtk/gtkrecentchoosermenu.c:840
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgctxt "recent menu label"
 msgid "%d. %s"
 msgstr "%d. %s"
 
+<<<<<<< HEAD
 #: gtk/gtkrecentmanager.c:980 gtk/gtkrecentmanager.c:993
 #: gtk/gtkrecentmanager.c:1131 gtk/gtkrecentmanager.c:1141
 #: gtk/gtkrecentmanager.c:1194 gtk/gtkrecentmanager.c:1203
 #: gtk/gtkrecentmanager.c:1218
+=======
+#: ../gtk/gtkrecentmanager.c:1000 ../gtk/gtkrecentmanager.c:1013
+#: ../gtk/gtkrecentmanager.c:1150 ../gtk/gtkrecentmanager.c:1160
+#: ../gtk/gtkrecentmanager.c:1212 ../gtk/gtkrecentmanager.c:1221
+#: ../gtk/gtkrecentmanager.c:1236
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Unable to find an item with URI '%s'"
 msgstr "URI '%s' সহ ��ন� বস�ত� �ন�সন�ধান� ব�যর�থ"
 
+<<<<<<< HEAD
 #: gtk/gtkspinner.c:456
+=======
+#: ../gtk/gtkrecentmanager.c:2436
+#, c-format
+msgid "No registered application with name '%s' for item with URI '%s' found"
+msgstr "'%s' নাম� ��ন� নিবন�ধিত ��যাপ�লি��শন URI '%s' সহ সাম��র�র �ন�য পা��া যা�নি"
+
+#: ../gtk/gtkspinner.c:287
+>>>>>>> Updated Bengali India Translation
 msgctxt "throbbing progress animation widget"
 msgid "Spinner"
 msgstr "স�পিনার"
 
+<<<<<<< HEAD
 #: gtk/gtkspinner.c:457
+=======
+#: ../gtk/gtkspinner.c:288
+>>>>>>> Updated Bengali India Translation
 msgid "Provides visual indication of progress"
 msgstr "�র�ম�র প�র�তির মাত�রার দ�শ�যমান ����িত"
 
 #. KEEP IN SYNC with gtkiconfactory.c stock icons, when appropriate
+<<<<<<< HEAD
 #: gtk/gtkstock.c:313
+=======
+#: ../gtk/gtkstock.c:313
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "Information"
 msgstr "তথ�য"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:314
+=======
+#: ../gtk/gtkstock.c:314
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "Warning"
 msgstr "সতর��বার�তা"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:315
+=======
+#: ../gtk/gtkstock.c:315
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "Error"
 msgstr "ত�র��ি"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:316
+=======
+#: ../gtk/gtkstock.c:316
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "Question"
 msgstr "প�রশ�ন"
@@ -2090,31 +3946,52 @@ msgstr "প�রশ�ন"
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
+<<<<<<< HEAD
 #: gtk/gtkstock.c:321
+=======
+#: ../gtk/gtkstock.c:321
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_About"
 msgstr "পরি�িতি (_A)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:322
+=======
+#: ../gtk/gtkstock.c:322
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Add"
 msgstr "য�� �র�ন (_A)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:323
+=======
+#: ../gtk/gtkstock.c:323
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Apply"
 msgstr "প�র��� �র�ন (_A)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:324
+=======
+#: ../gtk/gtkstock.c:324
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Bold"
 msgstr "�����বল (_B)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:325
+=======
+#: ../gtk/gtkstock.c:325
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Cancel"
 msgstr "বাতিল (_C)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:326
 #, fuzzy
 msgctxt "Stock label"
@@ -2122,60 +3999,109 @@ msgid "_CD-ROM"
 msgstr "_CD-Rom"
 
 #: gtk/gtkstock.c:327
+=======
+#: ../gtk/gtkstock.c:326
+msgctxt "Stock label"
+msgid "_CD-ROM"
+msgstr "_CD-ROM"
+
+#: ../gtk/gtkstock.c:327
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Clear"
 msgstr "পরিশ�র�ত �র�ন (_C)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:328
+=======
+#: ../gtk/gtkstock.c:328
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Close"
 msgstr "বন�ধ �র�ন (_C)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:329
+=======
+#: ../gtk/gtkstock.c:329
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "C_onnect"
 msgstr "স�য�� �র�ন (_o)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:330
+=======
+#: ../gtk/gtkstock.c:330
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Convert"
 msgstr "র�পান�তর �র�ন (_C)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:331
+=======
+#: ../gtk/gtkstock.c:331
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Copy"
 msgstr "�পি �র�ন (_C)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:332
+=======
+#: ../gtk/gtkstock.c:332
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "Cu_t"
 msgstr "�া� �র�ন (_t)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:333
+=======
+#: ../gtk/gtkstock.c:333
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Delete"
 msgstr "ম��� ফ�ল�ন (_D)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:334
+=======
+#: ../gtk/gtkstock.c:334
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Discard"
 msgstr "বর��ন �র�ন (_D)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:335
+=======
+#: ../gtk/gtkstock.c:335
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Disconnect"
 msgstr "স�য�� বি���িন�ন �র�ন (_D)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:336
+=======
+#: ../gtk/gtkstock.c:336
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Execute"
 msgstr "স���ালন �র�ন (_E)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:337
+=======
+#: ../gtk/gtkstock.c:337
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Edit"
 msgstr "সম�পাদনা (_E)"
 
+<<<<<<< HEAD
 #: gtk/gtkstock.c:338
 #, fuzzy
 msgctxt "Stock label"
@@ -2183,6 +4109,14 @@ msgid "_File"
 msgstr "ফা�ল(_F)"
 
 #: gtk/gtkstock.c:339
+=======
+#: ../gtk/gtkstock.c:338
+msgctxt "Stock label"
+msgid "_File"
+msgstr "ফা�ল (_F)"
+
+#: ../gtk/gtkstock.c:339
+>>>>>>> Updated Bengali India Translation
 msgctxt "Stock label"
 msgid "_Find"
 msgstr "�ন�সন�ধান (_F)"
@@ -2574,7 +4508,38 @@ msgctxt "Stock label"
 msgid "Zoom _Out"
 msgstr "��� �র� প�রদর�শন (_O)"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferrichtext.c:650
+=======
+#. Translators: if the "on" state label requires more than three
+#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
+#. * the state
+#.
+#: ../gtk/gtkswitch.c:313 ../gtk/gtkswitch.c:362 ../gtk/gtkswitch.c:553
+msgctxt "switch"
+msgid "ON"
+msgstr "�াল�"
+
+#. Translators: if the "off" state label requires more than three
+#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
+#.
+#: ../gtk/gtkswitch.c:321 ../gtk/gtkswitch.c:363 ../gtk/gtkswitch.c:569
+msgctxt "switch"
+msgid "OFF"
+msgstr "বন�ধ"
+
+#: ../gtk/gtkswitch.c:968
+#| msgid "inch"
+msgctxt "light switch widget"
+msgid "Switch"
+msgstr "পরিবর�তন"
+
+#: ../gtk/gtkswitch.c:969
+msgid "Switches between on and off states"
+msgstr "�াল� � বন�ধ �বস�থার মধ�য� পরিবর�তন �রা হ�"
+
+#: ../gtk/gtktextbufferrichtext.c:651
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Unknown error when trying to deserialize %s"
 msgstr "%s ডি-সিরিà§?à§?লাà¦?à¦? à¦?রতà§? à¦?à¦?ানা সমসà§?যা à¦?তà§?â??পনà§?ন হà§?à§?à¦?à§?"
@@ -2584,67 +4549,121 @@ msgstr "%s ডি-সিরি��লা�� �রত� ��ানা 
 msgid "No deserialize function found for format %s"
 msgstr "%s বিন�যাস�র �ন�য ডি-সিরি��লা�� ফা�শান পা��া যা�নি"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:795 gtk/gtktextbufferserialize.c:821
+=======
+#: ../gtk/gtktextbufferserialize.c:800 ../gtk/gtktextbufferserialize.c:826
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Both \"id\" and \"name\" were found on the <%s> element"
 msgstr "<%s> স�বত�বার মধ�য� \"id\" � \"name\" �ভ� �পস�থিত র����"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:805 gtk/gtktextbufferserialize.c:831
+=======
+#: ../gtk/gtktextbufferserialize.c:810 ../gtk/gtktextbufferserialize.c:836
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "The attribute \"%s\" was found twice on the <%s> element"
 msgstr "\"%s\" নাম� ব�শিষ���য <%s> স�বত�বার মধ�য� দ��বার �পস�থিত র����"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:845
 #, fuzzy, c-format
 msgid "<%s> element has invalid ID \"%s\""
 msgstr "<%s> স�বত�বার id \"%s\" ব�ধ ন�"
 
 #: gtk/gtktextbufferserialize.c:855
+=======
+#: ../gtk/gtktextbufferserialize.c:852
+#, c-format
+msgid "<%s> element has invalid ID \"%s\""
+msgstr "<%s> সাম��র�র �ব�ধ ID \"%s\""
+
+#: ../gtk/gtktextbufferserialize.c:862
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "<%s> element has neither a \"name\" nor an \"id\" attribute"
 msgstr "<%s> স�বত�বার মধ�য� \"name\" � \"id\" �ন�পস�থিত"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:942
+=======
+#: ../gtk/gtktextbufferserialize.c:949
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 msgstr "\"%s\" নাম� ব�শিষ���য <%s> স�বত�বার মধ�য� দ��বার �পস�থিত র����"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:960 gtk/gtktextbufferserialize.c:985
+=======
+#: ../gtk/gtktextbufferserialize.c:967 ../gtk/gtktextbufferserialize.c:992
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "�� প�রস���� \"%s\" ব�শিষ���য <%s> স�বত�বার �ন�য ব�ধ ন�"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1024
+=======
+#: ../gtk/gtktextbufferserialize.c:1031
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Tag \"%s\" has not been defined."
 msgstr "\"%s\" ��যা��র ব�যা��যা �রা হ�নি।"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1036
 msgid "Anonymous tag found and tags can not be created."
 msgstr "নামবিহ�ন ��যা� সনা��ত �রা হ���� �ব� ��যা� নির�মাণ �রা সম�ভব ন�।"
 
 #: gtk/gtktextbufferserialize.c:1047
+=======
+#: ../gtk/gtktextbufferserialize.c:1043
+msgid "Anonymous tag found and tags can not be created."
+msgstr "নামবিহ�ন ��যা� সনা��ত �রা হ���� �ব� ��যা� নির�মাণ �রা সম�ভব ন�।"
+
+#: ../gtk/gtktextbufferserialize.c:1054
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Tag \"%s\" does not exist in buffer and tags can not be created."
 msgstr "\"%s\" নাম� ��যাত বাফার�র মধ�য� �ন�পস�থিত �ব� ��যা� নির�মাণ �রা সম�ভব ন�।"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1146 gtk/gtktextbufferserialize.c:1221
 #: gtk/gtktextbufferserialize.c:1324 gtk/gtktextbufferserialize.c:1398
+=======
+#: ../gtk/gtktextbufferserialize.c:1153 ../gtk/gtktextbufferserialize.c:1228
+#: ../gtk/gtktextbufferserialize.c:1333 ../gtk/gtktextbufferserialize.c:1407
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "<%s> স�বত�বা�ি <%s>'র ন��� ব�যবহার �রা যাব� না"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1177
+=======
+#: ../gtk/gtktextbufferserialize.c:1184
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "\"%s\" is not a valid attribute type"
 msgstr "\"%s\" ব�শিষ���য�র ব�ধ ধরন ন�"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1185
+=======
+#: ../gtk/gtktextbufferserialize.c:1192
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "\"%s\" is not a valid attribute name"
 msgstr "\"%s\" ব�শিষ���য�র ব�ধ নাম ন�"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1195
+=======
+#: ../gtk/gtktextbufferserialize.c:1202
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid ""
 "\"%s\" could not be converted to a value of type \"%s\" for attribute \"%s\""
@@ -2652,33 +4671,54 @@ msgstr ""
 "\"%s\" র�পান�তর �র� \"%s\" ধরন�র মান� পরিবর�তন �রা সম�ভব হ�নি। \"%s\" "
 "��যা��রিবি���র ��ষ�ত�র�"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1204
+=======
+#: ../gtk/gtktextbufferserialize.c:1211
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "\"%s\" is not a valid value for attribute \"%s\""
 msgstr "\"%s\", \"%s\" ��যা��রিবি���র ��ষ�ত�র� ব�ধ মান ন�"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1289
+=======
+#: ../gtk/gtktextbufferserialize.c:1296
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Tag \"%s\" already defined"
 msgstr "\"%s\" নাম� ��যা� প�র�ব� নির�ধারিত হ����"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1300
+=======
+#: ../gtk/gtktextbufferserialize.c:1309
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Tag \"%s\" has invalid priority \"%s\""
 msgstr "\"%s\" ��যা�� �ব�ধ ��র�ত�ব�র �ন���রম \"%s\" �পস�থিত"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1353
+=======
+#: ../gtk/gtktextbufferserialize.c:1362
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Outermost element in text must be <text_view_markup> not <%s>"
 msgstr ""
 "����স��র সর�বাধি� বহিস�থিত প�রান�ত� <text_view_markup> সত�ত�বা ব�যবহার �রা �বশ�য�, <"
 "%s> ন�।"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1362 gtk/gtktextbufferserialize.c:1378
+=======
+#: ../gtk/gtktextbufferserialize.c:1371 ../gtk/gtktextbufferserialize.c:1387
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "A <%s> element has already been specified"
 msgstr "���ি <%s> স�বত�বা প�র�ব� �ল�লি�িত হ����"
 
+<<<<<<< HEAD
 #: gtk/gtktextbufferserialize.c:1384
 msgid "A <text> element can't occur before a <tags> element"
 msgstr "<text> স�বত�বা <tags> স�বত�বার প�র�ব� �বস�থিত হ��া সম�ভব ন�"
@@ -2739,16 +4779,76 @@ msgid "Unable to locate theme engine in module_path: \"%s\","
 msgstr "module_path'র মধ�য� থিম ����িন সনা��ত �রত� ব�যর�থ: \"%s\","
 
 #: gtk/gtkuimanager.c:1505
+=======
+#: ../gtk/gtktextbufferserialize.c:1393
+msgid "A <text> element can't occur before a <tags> element"
+msgstr "<text> স�বত�বা <tags> স�বত�বার প�র�ব� �বস�থিত হ��া সম�ভব ন�"
+
+#: ../gtk/gtktextbufferserialize.c:1793
+msgid "Serialized data is malformed"
+msgstr "সিরি��লা�� �রা তথ�য সঠি�র�প� �ঠিত হ�নি"
+
+#: ../gtk/gtktextbufferserialize.c:1871
+msgid "Serialized data is malformed. First section isn't GTKTEXTBUFFERCONTENTS-0001"
+msgstr "সিরি��লা�� �রা তথ�য সঠি�র�প� �ঠিত হ�নি। প�রথম ��শ GTKTEXTBUFFERCONTENTS-0001 ন�"
+
+#: ../gtk/gtktextutil.c:60
+msgid "LRM _Left-to-right mark"
+msgstr "LRM বা�দি�-থ���-ডানদি��র �িহ�ন (_L)"
+
+#: ../gtk/gtktextutil.c:61
+msgid "RLM _Right-to-left mark"
+msgstr "RLM ডানরি�-থ���-বা�দি��র �িহ�ন (_R)"
+
+#: ../gtk/gtktextutil.c:62
+msgid "LRE Left-to-right _embedding"
+msgstr "LRE বা�দি�-থ���-ডানদি��র �মব�ডি� (_e)"
+
+#: ../gtk/gtktextutil.c:63
+msgid "RLE Right-to-left e_mbedding"
+msgstr "RLE ডানদি�-থ���-বা�দি��র �মব�ডি� (_m)"
+
+#: ../gtk/gtktextutil.c:64
+msgid "LRO Left-to-right _override"
+msgstr "LRO বা�দি�-থ���-ডানদি��র �ভার-রা�ড (_o)"
+
+#: ../gtk/gtktextutil.c:65
+msgid "RLO Right-to-left o_verride"
+msgstr "RLO ডানদি�-থ���-বা�দি��র �ভার-রা�ড (_v)"
+
+#: ../gtk/gtktextutil.c:66
+msgid "PDF _Pop directional formatting"
+msgstr "PDF পপ দিশার বিন�যাস (_P)"
+
+#: ../gtk/gtktextutil.c:67
+msgid "ZWS _Zero width space"
+msgstr "ZWS শ�ণ�য মাপ�র �ন�তর�বর�ত� স�থান (_Z)"
+
+#: ../gtk/gtktextutil.c:68
+msgid "ZWJ Zero width _joiner"
+msgstr "ZWJ শ�ণ�য মাপ�র স�য��� (_j)"
+
+#: ../gtk/gtktextutil.c:69
+msgid "ZWNJ Zero width _non-joiner"
+msgstr "ZWNJ শ�ণ�য মাপ�র বিভা�� (_n)"
+
+#: ../gtk/gtkuimanager.c:1506
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Unexpected start tag '%s' on line %d char %d"
 msgstr "�প�রত�যাশিত প�রারম�ভি� ��যা� '%s', %d প���তির  %d ���ষর� �পস�থিত"
 
 # FIXME
+<<<<<<< HEAD
 #: gtk/gtkuimanager.c:1595
+=======
+#: ../gtk/gtkuimanager.c:1596
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Unexpected character data on line %d char %d"
 msgstr "%d প���তির  %d ���ষর� �প�রত�যাশিত ���ষরবিশিষ�� তথ�য"
 
+<<<<<<< HEAD
 #: gtk/gtkuimanager.c:2427
 msgid "Empty"
 msgstr "ফা��া"
@@ -2786,6 +4886,45 @@ msgid "Muted"
 msgstr "নি�শব�দ"
 
 #: gtk/gtkvolumebutton.c:164
+=======
+#: ../gtk/gtkuimanager.c:2428
+msgid "Empty"
+msgstr "ফা��া"
+
+#: ../gtk/gtkvolumebutton.c:170
+msgid "Volume"
+msgstr "���া�"
+
+#: ../gtk/gtkvolumebutton.c:172
+msgid "Turns volume down or up"
+msgstr "���া� �ম �থবা ব�শি �রত� ব�যবহ�ত"
+
+#: ../gtk/gtkvolumebutton.c:175
+msgid "Adjusts the volume"
+msgstr "���া� পরিবর�তন �রত� ব�যবহ�ত"
+
+#: ../gtk/gtkvolumebutton.c:181 ../gtk/gtkvolumebutton.c:184
+msgid "Volume Down"
+msgstr "���া� হ�রাস"
+
+#: ../gtk/gtkvolumebutton.c:183
+msgid "Decreases the volume"
+msgstr "���া� �ম �রত� ব�যবহ�ত"
+
+#: ../gtk/gtkvolumebutton.c:187 ../gtk/gtkvolumebutton.c:190
+msgid "Volume Up"
+msgstr "���া� ব�দ�ধি"
+
+#: ../gtk/gtkvolumebutton.c:189
+msgid "Increases the volume"
+msgstr "���া� ব�দ�ধি �রত� ব�যবহ�ত"
+
+#: ../gtk/gtkvolumebutton.c:247
+msgid "Muted"
+msgstr "নি�শব�দ"
+
+#: ../gtk/gtkvolumebutton.c:251
+>>>>>>> Updated Bengali India Translation
 msgid "Full Volume"
 msgstr "সর�বাধি� ���া�"
 
@@ -2794,7 +4933,11 @@ msgstr "সর�বাধি� ���া�"
 #. * Translate the "%d" to "%Id" if you want to use localised digits,
 #. * or otherwise translate the "%d" to "%d".
 #.
+<<<<<<< HEAD
 #: gtk/gtkvolumebutton.c:177
+=======
+#: ../gtk/gtkvolumebutton.c:264
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgctxt "volume percentage"
 msgid "%d %%"
@@ -3625,61 +5768,106 @@ msgstr "ROC 8k"
 msgid "different idatas found for symlinked '%s' and '%s'\n"
 msgstr "সিম-লি��� �রা '%s' � '%s'-র �ন�য ভিন�ন idata সনা��ত �রা হ����\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1374
+=======
+#: ../gtk/updateiconcache.c:1370
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Failed to write header\n"
 msgstr "হ�ডার লি�ত� ব�যর�থ\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1380
+=======
+#: ../gtk/updateiconcache.c:1376
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Failed to write hash table\n"
 msgstr "হ�যাশ ��বিল লি�ত� ব�যর�থ\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1386
+=======
+#: ../gtk/updateiconcache.c:1382
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Failed to write folder index\n"
 msgstr "ফ�ল�ডার �ন�ড���স লি�ত� ব�যর�থ\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1394
+=======
+#: ../gtk/updateiconcache.c:1390
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Failed to rewrite header\n"
 msgstr "হ�ডার প�নরা� লি�ত� ব�যর�থ\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1463
+=======
+#: ../gtk/updateiconcache.c:1484
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Failed to open file %s : %s\n"
 msgstr "%s ফা�ল ��লত� ব�যর�থ : %s\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1471
+=======
+#: ../gtk/updateiconcache.c:1492 ../gtk/updateiconcache.c:1522
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Failed to write cache file: %s\n"
 msgstr "��যাশ� ফা�ল লি�ত� ব�যর�থ: %s\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1507
+=======
+#: ../gtk/updateiconcache.c:1533
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "The generated cache was invalid.\n"
 msgstr "নির�মিত ��যাশ� ব�ধ ন�।\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1521
+=======
+#: ../gtk/updateiconcache.c:1547
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Could not rename %s to %s: %s, removing %s then.\n"
 msgstr "%s'র নাম %s'� পরিবর�তন �রত� ব�যর�থ: %s, %s ম��� ফ�লা হ����।\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1535
+=======
+#: ../gtk/updateiconcache.c:1561
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Could not rename %s to %s: %s\n"
 msgstr "%s'র নাম %s'� পরিবর�তন �রত� ব�যর�থ: %s\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1545
+=======
+#: ../gtk/updateiconcache.c:1571
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Could not rename %s back to %s: %s.\n"
 msgstr "%s-র নাম %s-� প�রত�যাবর�তন �রত� ব�যর�থ: %s।\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1572
+=======
+#: ../gtk/updateiconcache.c:1598
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Cache file created successfully.\n"
 msgstr "��যাশ� ফা�ল সাফল�য�র সাথ� নির�মিত হ����।\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1611
 msgid "Overwrite an existing cache, even if up to date"
 msgstr "সাম�প�রতি� তথ�য ধারণ �রল��, �পস�থিত ��যাশ� ম��� নত�ন �র� লি��ন।"
@@ -3705,21 +5893,60 @@ msgid "Validate existing icon cache"
 msgstr "�পস�থিত ���ন ��যাশ� পর���ষা �র�ন"
 
 #: gtk/updateiconcache.c:1683
+=======
+#: ../gtk/updateiconcache.c:1637
+msgid "Overwrite an existing cache, even if up to date"
+msgstr "সাম�প�রতি� তথ�য ধারণ �রল��, �পস�থিত ��যাশ� ম��� নত�ন �র� লি��ন।"
+
+#: ../gtk/updateiconcache.c:1638
+msgid "Don't check for the existence of index.theme"
+msgstr "index.theme'র �পস�থিতি পর���ষা �রা হব� না"
+
+#: ../gtk/updateiconcache.c:1639
+msgid "Don't include image data in the cache"
+msgstr "��যাশ�র মধ�য� �বির তথ�য �ন�তর�ভ���ত �রা হব� না"
+
+#: ../gtk/updateiconcache.c:1640
+msgid "Output a C header file"
+msgstr "���ি C হ�ডার ফা�ল প�রস�ত�ত �রা হব�"
+
+#: ../gtk/updateiconcache.c:1641
+msgid "Turn off verbose output"
+msgstr "ভারব�স ���প�� বন�ধ �রা হব�"
+
+#: ../gtk/updateiconcache.c:1642
+msgid "Validate existing icon cache"
+msgstr "�পস�থিত ���ন ��যাশ� পর���ষা �র�ন"
+
+#: ../gtk/updateiconcache.c:1709
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "File not found: %s\n"
 msgstr "ফা�ল পা��া যা�নি: %s\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1689
+=======
+#: ../gtk/updateiconcache.c:1715
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Not a valid icon cache: %s\n"
 msgstr "ব�ধ ���ন ��যাশ� ন�: %s\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1702
+=======
+#: ../gtk/updateiconcache.c:1728
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "No theme index file.\n"
 msgstr "��ন� থিম �ন�ড���স ফা�ল �পস�থিত ন��।\n"
 
+<<<<<<< HEAD
 #: gtk/updateiconcache.c:1706
+=======
+#: ../gtk/updateiconcache.c:1732
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid ""
 "No theme index file in '%s'.\n"
@@ -3784,6 +6011,7 @@ msgstr "ভি��তনামিস (VIQR)"
 msgid "X Input Method"
 msgstr "X �নপ�� পদ�ধতি"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:811
 #: modules/printbackends/cups/gtkprintbackendcups.c:1020
 msgid "Username:"
@@ -3801,136 +6029,257 @@ msgstr "%s থ��� ফা�ল প�রাপ�ত �রার �ন
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:854
 #: modules/printbackends/cups/gtkprintbackendcups.c:1042
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:814
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1024
+msgid "Username:"
+msgstr "ব�যবহার�ার�র নাম:"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:815
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1033
+msgid "Password:"
+msgstr "পাস��ার�ড:"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:854
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1046
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Authentication is required to print document '%s' on printer %s"
 msgstr "'%s' নথি�ি %s প�রিন��ার�র মধ�য� প�রিন�� �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:856
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:856
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Authentication is required to print a document on %s"
 msgstr "%s-র মধ�য� নথিপত�র প�রিন�� �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:860
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:860
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Authentication is required to get attributes of job '%s'"
 msgstr "'%s' �র�ম�র ব�শিষ���য প�রাপ�ত �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:862
 msgid "Authentication is required to get attributes of a job"
 msgstr "�র�ম�র ব�শিষ���য প�রাপ�ত �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:866
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:862
+msgid "Authentication is required to get attributes of a job"
+msgstr "�র�ম�র ব�শিষ���য প�রাপ�ত �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:866
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Authentication is required to get attributes of printer %s"
 msgstr "'%s' প�রিন��ার�র ব�শিষ���য প�রাপ�ত �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:868
 msgid "Authentication is required to get attributes of a printer"
 msgstr "প�রিন��ার�র ব�শিষ���য প�রাপ�ত �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:871
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:868
+msgid "Authentication is required to get attributes of a printer"
+msgstr "প�রিন��ার�র ব�শিষ���য প�রাপ�ত �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:871
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Authentication is required to get default printer of %s"
 msgstr "%s-র ডিফল�� প�রিন��ার স���রান�ত তথ�য প�রাপ�ত �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:874
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:874
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Authentication is required to get printers from %s"
 msgstr "%s-র প�রিন��ার স���রান�ত তথ�য প�রাপ�ত �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:877
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:879
+#, c-format
+msgid "Authentication is required to get a file from %s"
+msgstr "%s থ��� ফা�ল প�রাপ�ত �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:881
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Authentication is required on %s"
 msgstr "%s-র ��ষ�ত�র� �ন�ম�দিত হ��া �বশ�য�"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1014
 msgid "Domain:"
 msgstr "ড�ম��ন:"
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:1044
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1018
+msgid "Domain:"
+msgstr "ড�ম��ন:"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1048
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Authentication is required to print document '%s'"
 msgstr "'%s' নথি�ি প�রিন�� �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1049
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1053
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Authentication is required to print this document on printer %s"
 msgstr "%s প�রিন��ার�র মধ�য� �� নথি�ি প�রিন�� �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1051
 msgid "Authentication is required to print this document"
 msgstr "�� নথি�ি প�রিন�� �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:1672
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1055
+msgid "Authentication is required to print this document"
+msgstr "�� নথি�ি প�রিন�� �রার �ন�য �ন�ম�দিত হ��া �বশ�য�"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1676
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Printer '%s' is low on toner."
 msgstr "'%s' প�রিন��ার� ��নার�র মাত�রা হ�রাস হ����।"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1673
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1677
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Printer '%s' has no toner left."
 msgstr "'%s' প�রিন��ার� ��নার শ�ষ হ�� ����।"
 
 #. Translators: "Developer" like on photo development context
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1675
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1679
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Printer '%s' is low on developer."
 msgstr "'%s' প�রিন��ার� ডিভ�লপর সাম��র�র মাত�রা হ�রাস হ����।"
 
 #. Translators: "Developer" like on photo development context
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1677
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1681
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Printer '%s' is out of developer."
 msgstr "'%s' প�রিন��ার� ডিভ�লপর সাম��র� শ�ষ হ�� ����।"
 
 #. Translators: "marker" is one color bin of the printer
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1679
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1683
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Printer '%s' is low on at least one marker supply."
 msgstr "'%s' প�রিন��ার� �ন�তত ���ি মার��ার ধারণস�থল�র সাম��র�র মাত�রা হ�রাস হ����।"
 
 #. Translators: "marker" is one color bin of the printer
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1681
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1685
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Printer '%s' is out of at least one marker supply."
 msgstr "'%s' প�রিন��ার� �ন�তত ���ি মার��ার ধারণস�থল�র সাম��র� শ�ষ হ�� ����।"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1682
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1686
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "The cover is open on printer '%s'."
 msgstr "'%s' প�রিন��ার�র ঢা�না ��লা।"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1683
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1687
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "The door is open on printer '%s'."
 msgstr "'%s' প�রিন��ার�র দর�া ��লা।"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1684
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1688
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Printer '%s' is low on paper."
 msgstr "'%s' প�রিন��ার� �া���র পরিমাণ হ�রাস হ����।"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1685
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1689
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Printer '%s' is out of paper."
 msgstr "'%s' প�রিন��ার� �া�� শ�ষ হ����।"
 
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1686
 #, fuzzy, c-format
 msgid "Printer '%s' is currently offline."
 msgstr "প�রিন��ার '%s' বর�তমান �ফলা�ন �বস�থা� র����।"
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:1687
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1690
+#, c-format
+msgid "Printer '%s' is currently offline."
+msgstr "প�রিন��ার '%s' বর�তমান �ফলা�ন �বস�থা� র����।"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1691
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "There is a problem on printer '%s'."
 msgstr "'%s' প�রিন��ার� �ি�� সমস�যা দ��া দি����।"
 
 #. Translators: this is a printer status.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:1995
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:1999
+>>>>>>> Updated Bengali India Translation
 msgid "Paused ; Rejecting Jobs"
 msgstr "স�থ�িত ; �া� প�রত�যা��যান �রা হ����"
 
 #. Translators: this is a printer status.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2001
 msgid "Rejecting Jobs"
 msgstr "�া� প�রত�যা��যান �রা হ����"
@@ -3960,65 +6309,139 @@ msgid "GhostScript pre-filtering"
 msgstr "GhostScript প�রি-ফিল��ারি�"
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:2791
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2005
+msgid "Rejecting Jobs"
+msgstr "�া� প�রত�যা��যান �রা হ����"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2778
+msgid "Two Sided"
+msgstr "�ভ�প�ষ�ঠ"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2779
+msgid "Paper Type"
+msgstr "�া���র ধরন"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2780
+msgid "Paper Source"
+msgstr "�া���র স���রহস�থল"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2781
+msgid "Output Tray"
+msgstr "���প��-��র�"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2782
+msgid "Resolution"
+msgstr "র�সল�লি�শন"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2783
+msgid "GhostScript pre-filtering"
+msgstr "GhostScript প�রি-ফিল��ারি�"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2792
+>>>>>>> Updated Bengali India Translation
 msgid "One Sided"
 msgstr "�� প�ষ�ঠ"
 
 #. Translators: this is an option of "Two Sided"
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2793
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2794
+>>>>>>> Updated Bengali India Translation
 msgid "Long Edge (Standard)"
 msgstr "দ�র�� প�রান�ত (প�রমিত মান)"
 
 #. Translators: this is an option of "Two Sided"
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2795
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2796
+>>>>>>> Updated Bengali India Translation
 msgid "Short Edge (Flip)"
 msgstr "��ষ�দ�র প�রান�ত (�ল�)"
 
 #. Translators: this is an option of "Paper Source"
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2797
 #: modules/printbackends/cups/gtkprintbackendcups.c:2799
 #: modules/printbackends/cups/gtkprintbackendcups.c:2807
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2798
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2800
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2808
+>>>>>>> Updated Bengali India Translation
 msgid "Auto Select"
 msgstr "স�ব����রি� নির�বা�ন"
 
 #. Translators: this is an option of "Paper Source"
 #. Translators: this is an option of "Resolution"
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2801
 #: modules/printbackends/cups/gtkprintbackendcups.c:2803
 #: modules/printbackends/cups/gtkprintbackendcups.c:2805
 #: modules/printbackends/cups/gtkprintbackendcups.c:2809
 #: modules/printbackends/cups/gtkprintbackendcups.c:3295
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2802
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2804
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2806
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2810
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3306
+>>>>>>> Updated Bengali India Translation
 msgid "Printer Default"
 msgstr "প�রিন��ার�র ডিফল�� মান"
 
 #. Translators: this is an option of "GhostScript"
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2811
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2812
+>>>>>>> Updated Bengali India Translation
 msgid "Embed GhostScript fonts only"
 msgstr "শ�ধ�মাত�র GhostScript ফন�� �মব�ড �রা হব�"
 
 #. Translators: this is an option of "GhostScript"
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2813
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2814
+>>>>>>> Updated Bengali India Translation
 msgid "Convert to PS level 1"
 msgstr "PS ল�ভ�ল ১-� র�পান�তর �রা হব�"
 
 #. Translators: this is an option of "GhostScript"
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2815
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2816
+>>>>>>> Updated Bengali India Translation
 msgid "Convert to PS level 2"
 msgstr "PS ল�ভ�ল ২-� র�পান�তর �রা হব�"
 
 #. Translators: this is an option of "GhostScript"
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2817
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2818
+>>>>>>> Updated Bengali India Translation
 msgid "No pre-filtering"
 msgstr "প�রি-ফিল��ারি� বিহ�ন"
 
 #. Translators: "Miscellaneous" is the label for a button, that opens
 #. up an extra panel of settings in a print dialog.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:2826
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:2827
+>>>>>>> Updated Bengali India Translation
 msgid "Miscellaneous"
 msgstr "বিবিধ ব�শিষ���য"
 
 #. Translators: These strings name the possible values of the
 #. * job priority option in the print dialog
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3503
 msgid "Urgent"
 msgstr "�র�র�"
@@ -4032,6 +6455,21 @@ msgid "Medium"
 msgstr "মা�ারি"
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:3503
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3530
+msgid "Urgent"
+msgstr "�র�র�"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3530
+msgid "High"
+msgstr "����"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3530
+msgid "Medium"
+msgstr "মা�ারি"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3530
+>>>>>>> Updated Bengali India Translation
 msgid "Low"
 msgstr "নিম�ন"
 
@@ -4039,27 +6477,40 @@ msgstr "নিম�ন"
 #. Translators, this string is used to label the pages-per-sheet option
 #. * in the print dialog
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3527
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3554
+>>>>>>> Updated Bengali India Translation
 msgid "Pages per Sheet"
 msgstr "প�রতি পাতা� প�ষ�ঠা স���যা"
 
 #. Translators, this string is used to label the job priority option
 #. * in the print dialog
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3564
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3591
+>>>>>>> Updated Bengali India Translation
 msgid "Job Priority"
 msgstr "�া��র ��র�ত�ব"
 
 #. Translators, this string is used to label the billing info entry
 #. * in the print dialog
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3575
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3602
+>>>>>>> Updated Bengali India Translation
 msgid "Billing Info"
 msgstr "বিল স���রান�ত তথ�য"
 
 #. Translators, these strings are names for various 'standard' cover
 #. * pages that the printing system may support.
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3590
 msgid "None"
 msgstr "(শ�ণ�য)"
@@ -4085,20 +6536,55 @@ msgid "Top Secret"
 msgstr "�তিমাত�রা� ��পন��"
 
 #: modules/printbackends/cups/gtkprintbackendcups.c:3590
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3617
+msgid "None"
+msgstr "(শ�ণ�য)"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3617
+msgid "Classified"
+msgstr "শ�র�ণ�বদ�ধ"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3617
+msgid "Confidential"
+msgstr "��পন��"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3617
+msgid "Secret"
+msgstr "��পন��"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3617
+msgid "Standard"
+msgstr "প�রমিত মান"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3617
+msgid "Top Secret"
+msgstr "�তিমাত�রা� ��পন��"
+
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3617
+>>>>>>> Updated Bengali India Translation
 msgid "Unclassified"
 msgstr "শ�র�ণ�বিহ�ন"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3625
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3652
+>>>>>>> Updated Bengali India Translation
 msgid "Before"
 msgstr "প�র���দ"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3640
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3667
+>>>>>>> Updated Bengali India Translation
 msgid "After"
 msgstr "�ন�তিম প�ষ�ঠ"
 
@@ -4106,14 +6592,22 @@ msgstr "�ন�তিম প�ষ�ঠ"
 #. * a print job is printed. Possible values are 'now', a specified time,
 #. * or 'on hold'
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3660
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3687
+>>>>>>> Updated Bengali India Translation
 msgid "Print at"
 msgstr "প�রিন�� �রা হব�"
 
 #. Translators: this is the name of the option that allows the user
 #. * to specify a time when a print job will be printed.
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3671
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3698
+>>>>>>> Updated Bengali India Translation
 msgid "Print at time"
 msgstr "�িহ�নিত সম�� প�রিন�� �রা হব�"
 
@@ -4121,7 +6615,11 @@ msgstr "�িহ�নিত সম�� প�রিন�� �রা হ
 #. * size. The two placeholders are replaced with the width and height
 #. * in points. E.g: "Custom 230.4x142.9"
 #.
+<<<<<<< HEAD
 #: modules/printbackends/cups/gtkprintbackendcups.c:3706
+=======
+#: ../modules/printbackends/cups/gtkprintbackendcups.c:3733
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Custom %sx%s"
 msgstr "স�বনির�ধারিত %sx%s"
@@ -4132,6 +6630,7 @@ msgstr "স�বনির�ধারিত %sx%s"
 msgid "output.%s"
 msgstr "output.%s"
 
+<<<<<<< HEAD
 #: modules/printbackends/file/gtkprintbackendfile.c:493
 msgid "Print to File"
 msgstr "ফা�ল� প�রিন�� �র�ন"
@@ -4158,6 +6657,34 @@ msgid "File"
 msgstr "ফা�ল"
 
 #: modules/printbackends/file/gtkprintbackendfile.c:651
+=======
+#: ../modules/printbackends/file/gtkprintbackendfile.c:501
+msgid "Print to File"
+msgstr "ফা�ল� প�রিন�� �র�ন"
+
+#: ../modules/printbackends/file/gtkprintbackendfile.c:627
+msgid "PDF"
+msgstr "PDF"
+
+#: ../modules/printbackends/file/gtkprintbackendfile.c:627
+msgid "Postscript"
+msgstr "Postscript"
+
+#: ../modules/printbackends/file/gtkprintbackendfile.c:627
+msgid "SVG"
+msgstr "SVG"
+
+#: ../modules/printbackends/file/gtkprintbackendfile.c:640
+#: ../modules/printbackends/test/gtkprintbackendtest.c:503
+msgid "Pages per _sheet:"
+msgstr "প�রতি পাতা� প�ষ�ঠার স���যা:(_s)"
+
+#: ../modules/printbackends/file/gtkprintbackendfile.c:699
+msgid "File"
+msgstr "ফা�ল"
+
+#: ../modules/printbackends/file/gtkprintbackendfile.c:709
+>>>>>>> Updated Bengali India Translation
 msgid "_Output format"
 msgstr "���প���র বিন�যাস (_O)"
 
@@ -4214,17 +6741,59 @@ msgstr "পর���ষাম�ল� প�রিন��ার� প�
 msgid "Could not get information for file '%s': %s"
 msgstr "'%s' ফা�ল সম�পর��িত তথ�য প�রাপ�ত �রত� ব�যর�থ: %s"
 
+<<<<<<< HEAD
 #: tests/testfilechooser.c:222
+=======
+#: ../tests/testfilechooser.c:222
+>>>>>>> Updated Bengali India Translation
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "'%s' ফা�ল ��লত� ব�যর�থ: %s"
 
+<<<<<<< HEAD
 #: tests/testfilechooser.c:267
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "'%s' �বির ফা�ল ল�ড �রত� ব�যর�থ: �ারণ ��ানা, সম�ভবত �বির ফা�ল�ি ��ষতি��রস�ত"
 
+=======
+#: ../tests/testfilechooser.c:267
+#, c-format
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr "'%s' �বির ফা�ল ল�ড �রত� ব�যর�থ: �ারণ ��ানা, সম�ভবত �বির ফা�ল�ি ��ষতি��রস�ত"
+
+#~ msgid "X screen to use"
+#~ msgstr "ব�যবহার�র �দ�দ�শ�য� �িহ�নিত X পর�দা"
+
+#~ msgid "SCREEN"
+#~ msgstr "SCREEN"
+
+#~ msgid "Make X calls synchronous"
+#~ msgstr "X'র �ল স�স��তর�প� (সি����র�নাস) �রা হব�"
+
+#~ msgid "Credits"
+#~ msgstr "স�ব���তি"
+
+#~ msgid "Written by"
+#~ msgstr "ল���"
+
+#~ msgid "_Add"
+#~ msgstr "য�� �র�ন (_A)"
+
+#~ msgid "_Remove"
+#~ msgstr "ম��� ফ�ল�ন (_R)"
+
+#~ msgid "Error creating folder '%s': %s"
+#~ msgstr "'%s' ফ�ল�ডার নির�মাণ� সমস�যা: %s"
+
+#~ msgid "Unable to find include file: \"%s\""
+#~ msgstr "include ফা�ল সনা��ত �রত� ব�যর�থ: \"%s\""
+
+#~ msgid "Unable to locate theme engine in module_path: \"%s\","
+#~ msgstr "module_path'র মধ�য� থিম ����িন সনা��ত �রত� ব�যর�থ: \"%s\","
+
+>>>>>>> Updated Bengali India Translation
 #~ msgid "Gdk debugging flags to set"
 #~ msgstr "মান নির�ধারণ�র �দ�দ�শ�য� �িহ�নিত Gdk ডিবা�ি� ফ�ল�যা�"
 
@@ -4924,9 +7493,12 @@ msgstr "'%s' �বির ফা�ল ল�ড �রত� ব�যর�থ
 #~ msgid "_Folder name:"
 #~ msgstr "ফ�ল�ডার�র নাম:(_F)"
 
+<<<<<<< HEAD
 #~ msgid "C_reate"
 #~ msgstr "নির�মাণ �র�ন (_r)"
 
+=======
+>>>>>>> Updated Bengali India Translation
 #~ msgid ""
 #~ "The filename \"%s\" contains symbols that are not allowed in filenames"
 #~ msgstr "\"%s\" ফা�ল�র নাম�র মধ�য� �ি�� �িহ�ন ব�যবহ�ত হ���� য���লি ��রহণয���য ন�"
@@ -4958,9 +7530,12 @@ msgstr "'%s' �বির ফা�ল ল�ড �রত� ব�যর�থ
 #~ msgid "_Rename"
 #~ msgstr "নাম পরিবর�তন �র�ন (_R)"
 
+<<<<<<< HEAD
 #~ msgid "_Selection: "
 #~ msgstr "নির�বা�ন:(_S)"
 
+=======
+>>>>>>> Updated Bengali India Translation
 #~ msgid ""
 #~ "The filename \"%s\" couldn't be converted to UTF-8. (try setting the "
 #~ "environment variable G_FILENAME_ENCODING): %s"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]