[vinagre] Updated Tamil translation
- From: Thirumurthi Vasudeven <vasudeven src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [vinagre] Updated Tamil translation
- Date: Fri, 9 Oct 2009 06:58:59 +0000 (UTC)
commit 95ecdc55fde8dd662d8cfdf17a60d70b26005343
Author: drtvasudevan <agnihot3 gmail com>
Date: Fri Oct 9 12:28:42 2009 +0530
Updated Tamil translation
po/ta.po | 835 +++++++++-----------------------------------------------------
1 files changed, 115 insertions(+), 720 deletions(-)
---
diff --git a/po/ta.po b/po/ta.po
index 3881bb8..94727de 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1,31 +1,24 @@
# translation of vinagre.master.ta.po to Tamil
+# translation of ta.po to
+# translation of vinagre.ta.po to
# Dr.T.Vasudevan <agnihot3 gmail com>, 2008, 2009.
# I. Felix <ifelix redhat com>, 2008, 2009.
# Dr.T.vasudevan <agnihot3 gmail com>, 2009.
-# translation of ta.po to
-# translation of vinagre.ta.po to
msgid ""
msgstr ""
-<<<<<<< HEAD:po/ta.po
"Project-Id-Version: vinagre.master.ta\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=vinagre&component=general\n";
-"POT-Creation-Date: 2009-08-18 12:06+0000\n"
-"PO-Revision-Date: 2009-08-26 15:49+0530\n"
-"Last-Translator: I. Felix <ifelix redhat com>\n"
-"Language-Team: Tamil <fedora-trans-ta redhat com>\n"
-=======
-"Project-Id-Version: ta\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-31 11:31+0530\n"
-"PO-Revision-Date: 2009-07-31 11:49+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
+"cgi?product=vinagre&component=general\n"
+"POT-Creation-Date: 2009-09-29 18:50+0000\n"
+"PO-Revision-Date: 2009-10-09 12:28+0530\n"
"Last-Translator: Dr.T.Vasudevan <agnihot3 gmail com>\n"
"Language-Team: Tamil <Ubuntu-l10n-tam lists ubuntu com>\n"
->>>>>>> Updated Tamil translation:po/ta.po
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\\n\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\\n"
+"\n"
"\n"
"\n"
"\n"
@@ -49,27 +42,16 @@ msgstr "த�ல� பணிம����ள� �ண���தல�"
#: ../data/vinagre.desktop.in.in.h:2 ../data/vinagre-file.desktop.in.in.h:2
#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:2
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-applet.c:434 ../vinagre/vinagre-applet.c:486
#: ../vinagre/vinagre-main.c:198
-=======
-#: ../vinagre/vinagre-applet.c:421 ../vinagre/vinagre-applet.c:476
-#: ../vinagre/vinagre-main.c:185
->>>>>>> Updated Tamil translation:po/ta.po
msgid "Remote Desktop Viewer"
msgstr "த�ல� பணிம��� �ா���ி"
#: ../data/vinagre.ui.h:1
-<<<<<<< HEAD:po/ta.po
-#| msgid "<i><small>All fields above are mandatory</small></i>"
-=======
->>>>>>> Updated Tamil translation:po/ta.po
msgid "All fields above are mandatory"
msgstr "�ன�த�த� ப�ல���ள�ம� �வ�ியமானவ�"
#: ../data/vinagre.ui.h:2
-<<<<<<< HEAD:po/ta.po
-#| msgid "<b>Authentication is required</b>"
msgid "Authentication is required"
msgstr "������ாரம� த�வ�ப�ப���ிறத�"
@@ -78,17 +60,14 @@ msgid "Bookmarks"
msgstr "ப�த�த�����றி�ள�"
#: ../data/vinagre.ui.h:4
-#| msgid "Connecting..."
msgid "Connection"
msgstr "�ண�ப�ப�"
#: ../data/vinagre.ui.h:5
-#| msgid "<b>Connection options</b>"
msgid "Connection options"
msgstr "�ண�ப�ப� விர�ப�ப���ள�"
#: ../data/vinagre.ui.h:6
-#| msgid "New Folder"
msgid "Folder"
msgstr "��ப�ப�ற�"
@@ -98,63 +77,22 @@ msgid "Host:"
msgstr "ப�ரவலன�:"
#: ../data/vinagre.ui.h:8
-#| msgid "<b>Interface</b>"
msgid "Interface"
msgstr "���ம��ம�"
#: ../data/vinagre.ui.h:9
-#| msgid "<b>Options</b>"
msgid "Options"
msgstr "விர�ப�ப���ள�"
#: ../data/vinagre.ui.h:10
-#| msgid "<b>Parent Folder</b>"
msgid "Parent Folder"
msgstr "ப�ற�ற�ர� ��ப�ப�ற�>"
-=======
-msgid "Authentication is required"
-msgstr "������ாரம� �வ�ியம�"
-
-#: ../data/vinagre.ui.h:3 ../vinagre/vinagre-fav.c:848
-msgid "Bookmarks"
-msgstr "ப�த�த�����றி�ள�"
-
-#: ../data/vinagre.ui.h:4
-msgid "Connection"
-msgstr "�ண����ிறத�"
-
-#: ../data/vinagre.ui.h:5
-msgid "Connection options"
-msgstr "�ண�ப�ப� த�ர�வ��ள�"
-
-#: ../data/vinagre.ui.h:6
-msgid "Folder"
-msgstr "���வ�"
-
-#: ../data/vinagre.ui.h:7 ../plugins/vnc/vinagre-vnc-tab.c:133
-#: ../vinagre/vinagre-fav.c:423
-msgid "Host:"
-msgstr "ப�ரவலன�:"
-
-#: ../data/vinagre.ui.h:8
-msgid "Interface"
-msgstr " ���ம��ம�"
-
-#: ../data/vinagre.ui.h:9
-msgid "Options"
-msgstr "த�ர�வ��ள�"
-
-#: ../data/vinagre.ui.h:10
-msgid "Parent Folder"
-msgstr " தாய� ���வ�"
-
#: ../data/vinagre.ui.h:11
msgid "Preferences"
msgstr "விர�ப�ப���ள�"
#: ../data/vinagre.ui.h:12
-#| msgid "<b>Which machine do you want to connect to?</b>"
msgid "Which machine do you want to connect to?"
msgstr "�ந�த �ணினிய��ன� ந����ள� �ண���� வ�ண���ம�?"
@@ -185,11 +123,7 @@ msgstr "��வ�����ல� (_P):"
#: ../data/vinagre.ui.h:20
msgid "_Protocol:"
-<<<<<<< HEAD:po/ta.po
msgstr "ந�றிம�ற� (_P):"
-=======
-msgstr "_P ந�றிம�ற�:"
->>>>>>> Updated Tamil translation:po/ta.po
#: ../data/vinagre.ui.h:21
msgid "_Remember this credential"
@@ -205,24 +139,17 @@ msgstr "(_U) பயனர� ப�யர�:"
#: ../data/vinagre.schemas.in.in.h:1 ../vinagre/vinagre-plugin-manager.c:795
msgid "Active plugins"
-<<<<<<< HEAD:po/ta.po
msgstr "����தல� �ண�ப�ப� ��யல�ப��த�த�"
-=======
-msgstr "��யலில� �ள�ள ��ர��ி�ள�"
->>>>>>> Updated Tamil translation:po/ta.po
#: ../data/vinagre.schemas.in.in.h:2
msgid ""
"List of active plugins. It contains the \"Location\" of the active plugins. "
"See the .vinagre-plugin file for obtaining the \"Location\" of a given "
"plugin."
-<<<<<<< HEAD:po/ta.po
msgstr ""
-"��யலில�ள�ள ����தல� �ண�ப�ப��ளின� ப���ியல�. �த� ��யலில�ள�ள ����தல� �ண�ப�பின� \"��த�த�\" ��ண���ள�ளத�. "
-".vinagre-plugin ��ப�பின� \"��த�த�\" �������ப�ப��� ����தல� �ண�ப�ப����� ப�ற��ிறதா �ன பார����வ�ம�."
-=======
-msgstr "��யலில� �ள�ள ��ர��ி�ளின� ப���ியல�. �தில� ��ர��ி�ளின� \"��ம� \" �ள�ளத�. ��றிப�பி��� ��ர��ியின� \"��ம� \" �ாண .vinagre-plugin ��ப�ப� �ாணவ�ம�."
->>>>>>> Updated Tamil translation:po/ta.po
+"��யலில�ள�ள ����தல� �ண�ப�ப��ளின� ப���ியல�. �த� ��யலில�ள�ள ����தல� �ண�ப�பின� \"��த�த�\" "
+"��ண���ள�ளத�. .vinagre-plugin ��ப�பின� \"��த�த�\" �������ப�ப��� ����தல� �ண�ப�ப����� "
+"ப�ற��ிறதா �ன பார����வ�ம�."
#: ../data/vinagre.schemas.in.in.h:3
msgid "Maximum number of history items in connect dialog"
@@ -284,7 +211,6 @@ msgstr "த�ல� பணிம��� (வி�ன��ி(VNC)) ��
msgid "Remote Desktop Connection"
msgstr "த�ல� பணிம��� �ண�ப�ப�"
-<<<<<<< HEAD:po/ta.po
#. vim: set ts=8:
#: ../plugins/ssh/vinagre-ssh-plugin.c:70
#: ../plugins/ssh/ssh.vinagre-plugin.desktop.in.h:1
@@ -304,71 +230,75 @@ msgstr "த�ற�:"
msgid "SSH support"
msgstr "SSH த�ண�"
-#: ../plugins/vnc/vinagre-vnc-connection.c:207
-#: ../plugins/vnc/vinagre-vnc-plugin.c:214
-=======
-#: ../plugins/vnc/vinagre-vnc-connection.c:204
-#: ../plugins/vnc/vinagre-vnc-plugin.c:183
->>>>>>> Updated Tamil translation:po/ta.po
+#: ../plugins/vnc/vinagre-vnc-connection.c:218
+#: ../plugins/vnc/vinagre-vnc-plugin.c:320
#, c-format
msgid "Bad value for 'shared' flag: %d. It is supposed to be 0 or 1. Ignoring it."
msgstr ""
"ப�ிர�ந�த ��றி���� பிழ�யான மதிப�ப�: %d. �த� 0 �ல�லத� 1 �� �ர���� வ�ண���ம�. "
"�தா��னப�ப��த�தப�ப���ிறத�"
-<<<<<<< HEAD:po/ta.po
+#: ../plugins/vnc/vinagre-vnc-plugin.c:83
+#| msgid "_Recent connections"
+msgid "_Reverse Connections..."
+msgstr "_R �ண�ப�ப��ள� திர�ப�ப��..."
+
+#: ../plugins/vnc/vinagre-vnc-plugin.c:85
+msgid "Configure incoming VNC connections"
+msgstr "�ள�வர�ம� VNC �ண�ப�ப��ள� ����ம����வ�ம�"
+
#. Translators: this is a command line option (run vinagre --help)
-#: ../plugins/vnc/vinagre-vnc-plugin.c:66
+#: ../plugins/vnc/vinagre-vnc-plugin.c:172
msgid "Enable scaled mode"
msgstr "�ளவி�ப�ப��� ம�ற�ம�ய� ��யல�ப��த�த�"
#. Translators: this is a command line option (run vinagre --help)
-#: ../plugins/vnc/vinagre-vnc-plugin.c:81
+#: ../plugins/vnc/vinagre-vnc-plugin.c:187
msgid "VNC Options:"
msgstr "VNC விர�ப�ப���ள�:"
#. Translators: this is a command line option (run vinagre --help)
-#: ../plugins/vnc/vinagre-vnc-plugin.c:83
+#: ../plugins/vnc/vinagre-vnc-plugin.c:189
msgid "Show VNC Options"
msgstr "VNC விர�ப�ப���ள��� �ா����"
#. vim: set ts=8:
-#: ../plugins/vnc/vinagre-vnc-plugin.c:105
+#: ../plugins/vnc/vinagre-vnc-plugin.c:211
#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1
msgid "VNC"
msgstr "VNC"
-#: ../plugins/vnc/vinagre-vnc-plugin.c:106
+#: ../plugins/vnc/vinagre-vnc-plugin.c:212
msgid "Access Unix/Linux, Windows and other machines."
msgstr "Unix/Linux, Windows மற�ற�ம� பிற �ணினி�ள� �ண���."
-#: ../plugins/vnc/vinagre-vnc-plugin.c:163
+#: ../plugins/vnc/vinagre-vnc-plugin.c:269
msgid "Could not parse the file."
msgstr "��ப�பின� �ல�ி� ம��ியவில�ல�"
-#: ../plugins/vnc/vinagre-vnc-plugin.c:170
+#: ../plugins/vnc/vinagre-vnc-plugin.c:276
msgid "The file is not a VNC one: Missing the group \"connection\"."
msgstr "��ப�ப� �ர� VNC �ல�ல�: ��ழ� \"�ண�ப�ப�\" த�ல����ிறத�."
-#: ../plugins/vnc/vinagre-vnc-plugin.c:176
+#: ../plugins/vnc/vinagre-vnc-plugin.c:282
msgid "The file is not a VNC one: Missing the key \"host\"."
msgstr "��ப�ப� �ர� VNC �ல�ல: வி�� \"ப�ரவலன�\" த�ல����ிறத�."
-#: ../plugins/vnc/vinagre-vnc-plugin.c:243
+#: ../plugins/vnc/vinagre-vnc-plugin.c:349
msgid "VNC Options"
msgstr "VNC விர�ப�ப���ள�"
-#: ../plugins/vnc/vinagre-vnc-plugin.c:254
-#: ../plugins/vnc/vinagre-vnc-tab.c:654
+#: ../plugins/vnc/vinagre-vnc-plugin.c:360
+#: ../plugins/vnc/vinagre-vnc-tab.c:660
msgid "_View only"
msgstr "பார�வ����� ம����ம� (_V)"
-#: ../plugins/vnc/vinagre-vnc-plugin.c:261
+#: ../plugins/vnc/vinagre-vnc-plugin.c:367
msgid "_Scaling"
msgstr "(_S) �ளவ� மாற�ற�தல� "
#. Translators: this is a pattern to open *.vnc files in a open dialog.
-#: ../plugins/vnc/vinagre-vnc-plugin.c:285
+#: ../plugins/vnc/vinagre-vnc-plugin.c:391
msgid "VNC Files"
msgstr "VNC ��ப�ப��ள�"
@@ -380,172 +310,70 @@ msgstr "பணிம��� ப�யர�:"
msgid "Dimensions:"
msgstr "பரிமாண���ள�:"
-#: ../plugins/vnc/vinagre-vnc-tab.c:268
-=======
-#: ../plugins/vnc/vinagre-vnc-plugin.c:132
-msgid "Could not parse the file."
-msgstr "��ப�பின� �ல�ி� ம��ியவில�ல�"
-
-#: ../plugins/vnc/vinagre-vnc-plugin.c:139
-msgid "The file is not a VNC one: Missing the group \"connection\"."
-msgstr "��ப�ப� வி�ன��ி(VNC) ��ப�ப� �ல�ல: �ாணாத ��ழ� \"connection\""
-
-#: ../plugins/vnc/vinagre-vnc-plugin.c:145
-msgid "The file is not a VNC one: Missing the key \"host\"."
-msgstr "��ப�ப� வி�ன��ி(VNC) ��ப�ப� �ல�ல: �ாணாத வி�� \"host\". "
-
-#: ../plugins/vnc/vinagre-vnc-plugin.c:212
-msgid "VNC Options"
-msgstr "வி�ன��ி த�ர�வ��ள�"
-
-#. Translators: this is a pattern to open *.vnc files in a open dialog.
-#: ../plugins/vnc/vinagre-vnc-plugin.c:254
-msgid "VNC Files"
-msgstr "வி�ன��ி ��ப�ப��ள�"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:132
-msgid "Desktop Name:"
-msgstr "பணிம��� ப�யர�:"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:134
-msgid "Port:"
-msgstr "த�ற�:"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:135
-msgid "Dimensions:"
-msgstr "பரிமாண���ள�:"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:261
->>>>>>> Updated Tamil translation:po/ta.po
+#: ../plugins/vnc/vinagre-vnc-tab.c:274
msgid "Error connecting to host."
msgstr "ப�ரவலன��ன� �ண�����ம� ப�த� பிழ�"
#. Translators: %s is a host name or IP address; %u is a code error (number).
-<<<<<<< HEAD:po/ta.po
-#: ../plugins/vnc/vinagre-vnc-tab.c:306
+#: ../plugins/vnc/vinagre-vnc-tab.c:312
#, c-format
-#| msgid "Authentication method to host <i>%s</i> is unsupported. (%u)"
msgid "Authentication method to host %s is unsupported. (%u)"
msgstr "ப�ரவலன� %s ���� �ரிம ம�ற� த�ண�ப�ரியவில�ல�. (%u)"
-#: ../plugins/vnc/vinagre-vnc-tab.c:310
+#: ../plugins/vnc/vinagre-vnc-tab.c:316
msgid "Authentication unsupported"
msgstr "�ரிம ம�ற� த�ண�ப�ரியவில�ல�."
-#: ../plugins/vnc/vinagre-vnc-tab.c:570 ../plugins/vnc/vinagre-vnc-tab.c:587
+#: ../plugins/vnc/vinagre-vnc-tab.c:576 ../plugins/vnc/vinagre-vnc-tab.c:593
msgid "Authentication error"
msgstr "�ன�மதித�தல� பிழ�"
-#: ../plugins/vnc/vinagre-vnc-tab.c:571
+#: ../plugins/vnc/vinagre-vnc-tab.c:577
msgid "A username is required in order to access this machine."
msgstr "�ந�த �ணினிய� �ண�� �ர� பயனர� ப�யர� த�வ�ப�ப���ிறத�."
-#: ../plugins/vnc/vinagre-vnc-tab.c:588
+#: ../plugins/vnc/vinagre-vnc-tab.c:594
msgid "A password is required in order to access this machine."
msgstr "�ந�த �ணினிய� �ண�� �ர� ��வ�����ல� த�வ�ப�ப���ிறத�."
-#: ../plugins/vnc/vinagre-vnc-tab.c:639
+#: ../plugins/vnc/vinagre-vnc-tab.c:645
msgid "S_caling"
msgstr "(_c) �ளவ� மாற�ற�தல�"
-#: ../plugins/vnc/vinagre-vnc-tab.c:640
-msgid "Fits the remote screen into the current window size"
-msgstr "த�ல� திர�ய� தற�ப�த�ய �ாளர �ளவ����� ப�ர�த�த��ிறத�"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:655
-msgid "Does not send mouse and keyboard events"
-msgstr "�������ி மற�ற�ம� வி��ப�பல�� நி�ழ����ி�ள� �ன�ப�பாத�ர��ள�"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:668
-msgid "_Original size"
-msgstr "(_O) ��ல� �ளவ�"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:669
-msgid "Adjusts the window to the remote desktop's size"
-msgstr "�ாளரத�த� த�ல� ம�ல�ம��� �ளவ����� மாற�ற��"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:692 ../plugins/vnc/vinagre-vnc-tab.c:766
-#: ../plugins/vnc/vinagre-vnc-tab.c:767
-msgid "Send Ctrl-Alt-Del"
-msgstr "�ன�ப�ப� Ctrl Alt Del"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:693
-msgid "Sends Ctrl+Alt+Del to the remote machine"
-msgstr "த�ல� �ணினி���� Ctrl+Alt+Del �ன�ப�ப��ிறத�"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746
-msgid "Scaling"
-msgstr "�ளவ� மாற�ற�தல� "
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:755 ../plugins/vnc/vinagre-vnc-tab.c:756
-msgid "Read only"
-msgstr "ப�ி��� ம����ம�"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:925
-=======
-#: ../plugins/vnc/vinagre-vnc-tab.c:299, c-format
-msgid "Authentication method to host %s is unsupported. (%u)"
-msgstr "ப�ரவலன� %s ���� �ரிம ம�ற� த�ண�ப�ரியவில�ல�. (%u)"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:303
-msgid "Authentication unsupported"
-msgstr "�ரிம ம�ற� த�ண�ப�ரியவில�ல�."
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:567 ../plugins/vnc/vinagre-vnc-tab.c:584
-msgid "Authentication error"
-msgstr "�ன�மதித�தல� பிழ�"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:568
-msgid "A username is required in order to access this machine."
-msgstr "�ந�த �ணினிய� �ண�� �ர� பயனர� ப�யர� த�வ�ப�ப���ிறத�."
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:585
-msgid "A password is required in order to access this machine."
-msgstr "�ந�த �ணினிய� �ண�� �ர� ��வ�����ல� த�வ�ப�ப���ிறத�."
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:635
-msgid "S_caling"
-msgstr "(_c)�ளவ� மாற�ற�தல�"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:636
+#: ../plugins/vnc/vinagre-vnc-tab.c:646
msgid "Fits the remote screen into the current window size"
msgstr "த�ல� திர�ய� தற�ப�த�ய �ாளர �ளவ����� ப�ர�த�த��ிறத�"
-#: ../plugins/vnc/vinagre-vnc-tab.c:650
-msgid "_View only"
-msgstr "பார�வ����� ம����ம� (_V)"
-
-#: ../plugins/vnc/vinagre-vnc-tab.c:651
+#: ../plugins/vnc/vinagre-vnc-tab.c:661
msgid "Does not send mouse and keyboard events"
msgstr "�������ி மற�ற�ம� வி��ப�பல�� நி�ழ����ி�ள� �ன�ப�பாத�ர��ள�"
-#: ../plugins/vnc/vinagre-vnc-tab.c:664
+#: ../plugins/vnc/vinagre-vnc-tab.c:674
msgid "_Original size"
msgstr "(_O) ��ல� �ளவ�"
-#: ../plugins/vnc/vinagre-vnc-tab.c:665
+#: ../plugins/vnc/vinagre-vnc-tab.c:675
msgid "Adjusts the window to the remote desktop's size"
msgstr "�ாளரத�த� த�ல� ம�ல�ம��� �ளவ����� மாற�ற��"
-#: ../plugins/vnc/vinagre-vnc-tab.c:688 ../plugins/vnc/vinagre-vnc-tab.c:756
-#: ../plugins/vnc/vinagre-vnc-tab.c:757
+#: ../plugins/vnc/vinagre-vnc-tab.c:698 ../plugins/vnc/vinagre-vnc-tab.c:772
+#: ../plugins/vnc/vinagre-vnc-tab.c:773
msgid "Send Ctrl-Alt-Del"
msgstr "�ன�ப�ப� Ctrl Alt Del"
-#: ../plugins/vnc/vinagre-vnc-tab.c:689
+#: ../plugins/vnc/vinagre-vnc-tab.c:699
msgid "Sends Ctrl+Alt+Del to the remote machine"
msgstr "த�ல� �ணினி���� Ctrl+Alt+Del �ன�ப�ப��ிறத�"
-#: ../plugins/vnc/vinagre-vnc-tab.c:735 ../plugins/vnc/vinagre-vnc-tab.c:736
+#: ../plugins/vnc/vinagre-vnc-tab.c:751 ../plugins/vnc/vinagre-vnc-tab.c:752
msgid "Scaling"
msgstr "�ளவ� மாற�ற�தல� "
-#: ../plugins/vnc/vinagre-vnc-tab.c:745 ../plugins/vnc/vinagre-vnc-tab.c:746
+#: ../plugins/vnc/vinagre-vnc-tab.c:761 ../plugins/vnc/vinagre-vnc-tab.c:762
msgid "Read only"
msgstr "ப�ி��� ம����ம�"
-#: ../plugins/vnc/vinagre-vnc-tab.c:911
->>>>>>> Updated Tamil translation:po/ta.po
+#: ../plugins/vnc/vinagre-vnc-tab.c:931
msgid ""
"Scaling is not supported on this installation.\n"
"\n"
@@ -556,20 +384,9 @@ msgstr ""
"\n"
" �த� �ப�ப�ி ��யாள�வத� �ன �றிய வினா��ர�வ��ன� வந�த '�ன�ன�ப�ப�ி' ��ப�ப� பார����. "
-<<<<<<< HEAD:po/ta.po
#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2
msgid "VNC support"
msgstr "VNC த�ண�"
-=======
-#. vim: set ts=8:
-#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:1
-msgid "VNC"
-msgstr "வி�ன��ி"
-
-#: ../plugins/vnc/vnc.vinagre-plugin.desktop.in.h:2
-msgid "VNC support"
-msgstr "வி�ன��ி �தரவ�"
->>>>>>> Updated Tamil translation:po/ta.po
#: ../vinagre/GNOME_VinagreApplet.server.in.in.h:1
msgid "A menu to quickly access remote machines"
@@ -579,7 +396,6 @@ msgstr "த�ல� �ணினிய��ன� விர�வில� �
msgid "Vinagre Applet Factory"
msgstr "வினா��ர� ��ற�நிரல� த�ழிற��ால�"
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-applet.c:277 ../vinagre/vinagre-applet.c:360
msgid "Could not run vinagre:"
msgstr "வினா��ர� � �ய��� ம��ியவில�ல�:"
@@ -593,23 +409,7 @@ msgid "Access your bookmarks"
msgstr "����ள� ப�த�த�����றி�ள� �ண����"
#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:519
-#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:256
-=======
-#: ../vinagre/vinagre-applet.c:271 ../vinagre/vinagre-applet.c:352
-msgid "Could not run vinagre:"
-msgstr "வினா��ர� � �ய��� ம��ியவில�ல�:"
-
-#: ../vinagre/vinagre-applet.c:372
-msgid "Open Remote Desktop Viewer"
-msgstr "த�ல� பணிம��� �ா���ிய� திற"
-
-#: ../vinagre/vinagre-applet.c:422
-msgid "Access your bookmarks"
-msgstr "����ள� ப�த�த�����றி�ள� �ண����"
-
-#: ../vinagre/vinagre-bookmarks.c:265 ../vinagre/vinagre-connection.c:533
-#: ../vinagre/vinagre-tab.c:455
->>>>>>> Updated Tamil translation:po/ta.po
+#: ../vinagre/vinagre-tab.c:533 ../vinagre/vinagre-tube-handler.c:253
#, c-format
msgid "The protocol %s is not supported."
msgstr "ந�றிம�ற� %s த�ண�ப�ரியவில�ல�."
@@ -621,15 +421,9 @@ msgstr "ப�த�த�����றி �ரம�பி����ம
#: ../vinagre/vinagre-bookmarks.c:343 ../vinagre/vinagre-bookmarks.c:458
#: ../vinagre/vinagre-bookmarks-migration.c:135
-<<<<<<< HEAD:po/ta.po
-#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:459
+#: ../vinagre/vinagre-commands.c:170 ../vinagre/vinagre-connect.c:463
#: ../vinagre/vinagre-fav.c:681 ../vinagre/vinagre-main.c:100
-#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:266
-=======
-#: ../vinagre/vinagre-commands.c:172 ../vinagre/vinagre-connect.c:442
-#: ../vinagre/vinagre-fav.c:679 ../vinagre/vinagre-main.c:89
-#: ../vinagre/vinagre-main.c:108 ../vinagre/vinagre-window.c:263
->>>>>>> Updated Tamil translation:po/ta.po
+#: ../vinagre/vinagre-main.c:119 ../vinagre/vinagre-window.c:273
msgid "Unknown error"
msgstr "த�ரியாத பிழ�"
@@ -639,7 +433,8 @@ msgstr "ப�த�த�����றி �ரம�பி����ம
#: ../vinagre/vinagre-bookmarks.c:357
msgid "Error while initializing bookmarks: The file is not a vinagre bookmarks file"
-msgstr "ப�த�த�����றி �ரம�பி����ம� ப�த� பிழ�: �ந�த ��ப�ப� வினா��ர� ப�த�த�����றிப�ப� ��ப�ப� �ல�ல"
+msgstr ""
+"ப�த�த�����றி �ரம�பி����ம� ப�த� பிழ�: �ந�த ��ப�ப� வினா��ர� ப�த�த�����றிப�ப� ��ப�ப� �ல�ல"
#: ../vinagre/vinagre-bookmarks.c:419 ../vinagre/vinagre-bookmarks.c:426
msgid "Error while saving bookmarks: Failed to create the XML structure"
@@ -679,14 +474,8 @@ msgid "Error while migrating bookmarks: %s"
msgstr "ப�த�த�����றி�ள� ந�ர�த�த�ம� ப�த� பிழ�: %s"
#: ../vinagre/vinagre-bookmarks-migration.c:164
-<<<<<<< HEAD:po/ta.po
-#| msgid "Error while migrating bookmarks: %s"
msgid "Error while migrating bookmarks: VNC plugin is not activated"
msgstr "ப�த�த�����றி�ள� ந�ர�த�த�ம� ப�த� பிழ�:VNC ����தல� �ண�ப�பப� ��யல�ப��த�தப�ப�வில�ல�"
-=======
-msgid "Error while migrating bookmarks: VNC plugin is not activated"
-msgstr "ப�த�த�����றி�ள� ந�ர�த�த�ம� ப�த� பிழ�: வி�ன��ி VNC ��ர��ி ��யல�ப��த�தவில�ல�"
->>>>>>> Updated Tamil translation:po/ta.po
#: ../vinagre/vinagre-bookmarks-migration.c:238
msgid "Failed to create the directory"
@@ -739,12 +528,10 @@ msgstr "�ந�த �ர�ப�ப�ி���� ��ல�ல�ப
#, c-format
msgid "(Protocol: %s)"
msgstr "(ந�றிம�ற�: %s)"
-<<<<<<< HEAD:po/ta.po
#. Translators: %s is a bookmark entry name
#: ../vinagre/vinagre-bookmarks-ui.c:308
#, c-format
-#| msgid "Are you sure you want to remove <i>%s</i> from bookmarks?"
msgid "Are you sure you want to remove %s from bookmarks?"
msgstr "ந����ள� ப�த�த�����றியிலிர�ந�த� %s� நி���யம� ந���� வ�ண���மா?"
@@ -780,79 +567,27 @@ msgstr "த�ண�ப�ரிய�ம� ��ப�ப��ள� �ல
msgid ""
"None of the active plugins offer a supported file to be open. Activate some "
"plugins and try again."
-msgstr "த�ண�ப�ரிய�ம� ��ப�பின� திற��� ��யலில�ள�ள ����தல� �ண�ப�ப��ள� திற��� �ல�ல�. �ில ����தல� �ண�ப�ப��ள� ��யல�ப��த�தி ம�ண���ம� ம�யற��ி���வ�ம�."
+msgstr ""
+"த�ண�ப�ரிய�ம� ��ப�பின� திற��� ��யலில�ள�ள ����தல� �ண�ப�ப��ள� திற��� �ல�ல�. �ில ����தல� "
+"�ண�ப�ப��ள� ��யல�ப��த�தி ம�ண���ம� ம�யற��ி���வ�ம�."
#: ../vinagre/vinagre-commands.c:181
-=======
-
-#. Translators: %s is a bookmark entry name
-#: ../vinagre/vinagre-bookmarks-ui.c:307, c-format
-msgid "Are you sure you want to remove %s from bookmarks?"
-msgstr "ந����ள� ப�த�த�����றியிலிர�ந�த� %s � நி���யம� ந���� வ�ண���மா?"
-
-#: ../vinagre/vinagre-bookmarks-ui.c:313
-msgid "Remove Folder?"
-msgstr "���வ� ந����வா?"
-
-#: ../vinagre/vinagre-bookmarks-ui.c:314
-msgid "Notice that all its subfolders and items will be removed as well."
-msgstr "த�ண� ���வ��ள�ம� மற�ற �ல�லா �ர�ப�ப�ி�ள�ம� ந����ப�ப��ம� �ன �றியவ�ம�"
-
-#: ../vinagre/vinagre-bookmarks-ui.c:319
-msgid "Remove Item?"
-msgstr "�ர�ப�ப�ிய� ந����வா?"
-
-#: ../vinagre/vinagre-bookmarks-ui.c:336
-msgid "Error removing bookmark: Entry not found"
-msgstr "ப�த�த�����றி�ள� ��மி����ம� ப�த� பிழ�: �ள�ள����� �ாணவில�ல�"
-
-#: ../vinagre/vinagre-bookmarks-ui.c:353
-msgid "New Folder"
-msgstr "ப�திய ���வ�"
-
-#: ../vinagre/vinagre-commands.c:122
-msgid "Choose the file"
-msgstr "��ப�பின� த�ர�வ� ��ய�யவ�ம�"
-
-#: ../vinagre/vinagre-commands.c:150
-msgid "There are none supported files"
-msgstr "�தரவ�ள�ள ��ப�ப��ள� �த�ம� �ல�ல�"
-
-#: ../vinagre/vinagre-commands.c:150
-msgid ""
-"None of the active plugins offer a supported file to be open. Activate some "
-"plugins and try again."
-msgstr "��யலில� �ள�ள ��ர��ி�ள� �த�ம� �தரவ�ள�ள ��ப�ப� திறந�த� வ���� �தவவில�ல�. �ில ��ர��ி�ள� ��யல�ப��த�திவி���� ம�ண���ம� ம�யற��ி ��ய�� "
-
-#: ../vinagre/vinagre-commands.c:183
->>>>>>> Updated Tamil translation:po/ta.po
msgid "The following file could not be opened:"
msgid_plural "The following files could not be opened:"
msgstr[0] "பின�வர�ம� ��ப�பின� திற��� ம��ியாத�"
msgstr[1] "பின�வர�ம� ��ப�ப��ள� திற��� ம��ியாத�"
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-connect.c:86 ../vinagre/vinagre-connect.c:330
-#: ../vinagre/vinagre-connect.c:424
+#: ../vinagre/vinagre-connect.c:428
msgid "Could not get the active protocol in the protocol list."
msgstr "ந�றிம�ற� ப���ியலில� ��யலில�ள�ள ந�றிம�ற�ய� ப�ற ம��ியாத�."
#: ../vinagre/vinagre-connect.c:313
-=======
-#: ../vinagre/vinagre-connect.c:85 ../vinagre/vinagre-connect.c:319
-#: ../vinagre/vinagre-connect.c:412
-msgid "Could not get the active protocol in the protocol list."
-msgstr "ந�றிம�ற� ப���ியலில� �ள�ள ��யலில� �ள�ள ந�றிம�ற�ய� �ண���பி�ி��� ம��ியவில�ல�."
-
-#: ../vinagre/vinagre-connect.c:302
->>>>>>> Updated Tamil translation:po/ta.po
#, c-format
msgid "Error while saving history file: %s"
msgstr "வரலாற� ��ப�ப� ��மி����ம� ப�த� பிழ�: %s"
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-connect.c:340
-#| msgid "Open Remote Desktop Viewer"
msgid "Choose a Remote Desktop"
msgstr "�ர� த�ல� பணிம��� த�ர�ந�த���"
@@ -901,128 +636,59 @@ msgid "[server:port]"
msgstr "[server:port]"
#: ../vinagre/vinagre-main.c:130
-=======
-#: ../vinagre/vinagre-connect.c:329
-msgid "Choose a Remote Desktop"
-msgstr "த�ல� பணிம���ய� த�ர�வ� ��ய�"
-
-#: ../vinagre/vinagre-connection.c:641
-msgid "Could not open the file."
-msgstr "��ப�பின� திற��� ம��ியவில�ல�"
-
-#: ../vinagre/vinagre-connection.c:665
-msgid "The file was not recognized by any of the plugins."
-msgstr "��ப�ப� ��ர��ி�ள� �த�வ�ம� ���யாளம� �ாணவில�ல�"
-
-#: ../vinagre/vinagre-fav.c:668
-msgid "Invalid operation"
-msgstr "��ல�ல�ப�ியா�ாத ��யல�"
-
-#: ../vinagre/vinagre-fav.c:669
-msgid "Data received from drag&drop operation is invalid."
-msgstr "�ழ�த�த�வி��ம� ��யலில� �ர�ந�த� ப�றப�ப��� தரவ� ��ல�ல�ப�ியா�ாத�"
-
-#: ../vinagre/vinagre-fav.c:863
-msgid "Hosts nearby"
-msgstr "�ர��ில�ள�ள ப�ரவலன��ள�"
-
-#: ../vinagre/vinagre-main.c:60
-msgid "Create a new toplevel window in an existing instance of vinagre"
-msgstr "�ய���த�தில� �ள�ள �ர� வினா��ர� வில� ப�திய �யர� ம��� �ாளரம� �ர�வா����"
-
-#: ../vinagre/vinagre-main.c:64
-msgid "[server:port]"
-msgstr "[server:port]"
-
-#: ../vinagre/vinagre-main.c:119
->>>>>>> Updated Tamil translation:po/ta.po
msgid "The following error has occurred:"
msgid_plural "The following errors have occurred:"
msgstr[0] "பின�வர�ம� பிழ� �ற�ப����ள�ளத�:"
msgstr[1] "பின�வர�ம� பிழ��ள� �ற�ப����ள�ளன:"
#. Setup command line options
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-main.c:169
-#| msgid "Remote Desktop Viewer"
msgid "- Remote Desktop Viewer"
msgstr "- த�ல� பணிம��� �ா���ி"
#: ../vinagre/vinagre-main.c:193
-=======
-#: ../vinagre/vinagre-main.c:158
-msgid "- Remote Desktop Viewer"
-msgstr "-த�ல� பணிம��� �ா���ி"
-
-#: ../vinagre/vinagre-main.c:180
->>>>>>> Updated Tamil translation:po/ta.po
msgid "Run 'vinagre --help' to see a full list of available command line options"
-msgstr "'vinagre --help' �ன �ய���ினால� �ர�����ம� ����ள�வரி விர�ப�ப���ளின� ப���ியல� �������வ�ம�"
+msgstr ""
+"'vinagre --help' �ன �ய���ினால� �ர�����ம� ����ள�வரி விர�ப�ப���ளின� ப���ியல� �������வ�ம�"
-#: ../vinagre/vinagre-mdns.c:142
+#: ../vinagre/vinagre-mdns.c:144
#, c-format
msgid "Failed to resolve avahi hostname: %s\n"
msgstr "�வாஹி ப�ரவலன� ப�யர� �ண��றிதல� த�ாற�றத�: %s\n"
-#: ../vinagre/vinagre-mdns.c:200
+#: ../vinagre/vinagre-mdns.c:202
#, c-format
msgid "Plugin %s has already registered a browser for service %s."
-<<<<<<< HEAD:po/ta.po
msgstr "����தல� �ண�ப�ப� %s ��வ� %s���� �ற��னவ� �ர� �லாவியில� பதிவ� ��ய�யப�ப���த�."
-#: ../vinagre/vinagre-mdns.c:209
+#: ../vinagre/vinagre-mdns.c:211
#, c-format
-#| msgid "Failed to browse for hosts: %s\n"
msgid "Failed to add mDNS browser for service %s."
msgstr "%s���� mDNS �லாவி���ான ��வ�ய� ��ர���� ம��ியவில�ல�."
-=======
-msgstr "��ர��ி %s �ற���ன�வ� �ர� �லாவிய� ��வ����� பதிவ� ��ய�த�ள�ளத�. "
-#: ../vinagre/vinagre-mdns.c:209, c-format
-msgid "Failed to add mDNS browser for service %s."
-msgstr "ப�ரவலன��ள����� �லாவல� த�ாற�றத� : %s"
->>>>>>> Updated Tamil translation:po/ta.po
-
-#: ../vinagre/vinagre-mdns.c:225
+#: ../vinagre/vinagre-mdns.c:227
#, c-format
msgid "Failed to browse for hosts: %s\n"
msgstr "ப�ரவலன��ள����� �லாவல� த�ாற�றத� : %s\n"
-<<<<<<< HEAD:po/ta.po
-#: ../vinagre/vinagre-mdns.c:298
+#: ../vinagre/vinagre-mdns.c:300
#, c-format
-#| msgid "Failed to browse for hosts: %s\n"
msgid "Failed to initialize mDNS browser: %s\n"
msgstr "mDNS �லாவிய� த�வ��� ம��ியவில�ல� : %s\n"
#. Translators: %s is a host name or IP address.
#: ../vinagre/vinagre-notebook.c:461
#, c-format
-#| msgid "Connection to host <i>%s</i> was closed."
msgid "Connection to host %s was closed."
msgstr "ப�ரவலன� %s ��ன� �ள�ள �ண�ப�ப� த�ண��ி���ப�ப���த�."
#: ../vinagre/vinagre-notebook.c:463
-=======
-#: ../vinagre/vinagre-mdns.c:298, c-format
-msgid "Failed to initialize mDNS browser: %s\n"
-msgstr "�ம��ி�ன��ஸ� mDNS �லாவிய�த� திறத�தல� த�ாற�றத� : %s\n"
-
-#. Translators: %s is a host name or IP address.
-#: ../vinagre/vinagre-notebook.c:403, c-format
-msgid "Connection to host %s was closed."
-msgstr "ப�ரவலன� %s ��ன� �ள�ள �ண�ப�ப� த�ண��ி���ப�ப���த�."
-
-#: ../vinagre/vinagre-notebook.c:405
->>>>>>> Updated Tamil translation:po/ta.po
msgid "Connection closed"
msgstr "�ண�ப�ப� த�ண��ி���ப�ப���த�."
#. Translators: %s is a host name or IP address.
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-notebook.c:482
#, c-format
-#| msgid "Authentication to host <i>%s</i> has failed"
msgid "Authentication to host %s has failed"
msgstr "ப�ரவலன� %s ���� �ரிமப�ப��த�த ம��ியவில�ல�"
@@ -1030,32 +696,16 @@ msgstr "ப�ரவலன� %s ���� �ரிமப�ப��த�
msgid "Authentication failed"
msgstr "�ன�மதித�தல� த�ல�வி"
-#: ../vinagre/vinagre-notebook.c:525
-msgid "Connecting..."
-msgstr "�ண����ிறத�..."
-
-#: ../vinagre/vinagre-notebook.c:552 ../vinagre/vinagre-tab.c:325
-=======
-#: ../vinagre/vinagre-notebook.c:424, c-format
-msgid "Authentication to host %s has failed"
-msgstr "ப�ரவலன� %s ���� �ரிமப�ப��த�த ம��ியவில�ல�"
-
-#: ../vinagre/vinagre-notebook.c:430
-msgid "Authentication failed"
-msgstr "�ன�மதித�தல� த�ல�வி"
-
-#: ../vinagre/vinagre-notebook.c:461
+#: ../vinagre/vinagre-notebook.c:526
msgid "Connecting..."
msgstr "�ண����ிறத�..."
-#: ../vinagre/vinagre-notebook.c:488 ../vinagre/vinagre-tab.c:380
->>>>>>> Updated Tamil translation:po/ta.po
+#: ../vinagre/vinagre-notebook.c:553 ../vinagre/vinagre-tab.c:325
msgid "Close connection"
msgstr "�ண�ப�ப� த�ண��ி���வ�ம�"
#: ../vinagre/vinagre-plugin-dialog.c:83
msgid "Plugin Manager"
-<<<<<<< HEAD:po/ta.po
msgstr "����தல� �ண�ப�ப� ம�லாளர�"
#: ../vinagre/vinagre-plugin-manager.c:45
@@ -1083,56 +733,18 @@ msgid "_Deactivate All"
msgstr "�ன�த�த�ய�ம� ��யல�ந����� (_D)"
#: ../vinagre/vinagre-plugin-manager.c:824
-#| msgid "_About"
msgid "_About Plugin"
msgstr "����தல� �ண�ப�ப� பற�றி (_A) "
#: ../vinagre/vinagre-plugin-manager.c:828
msgid "C_onfigure Plugin"
msgstr "����ம�ப�ப� ����தல� �ண�ப�ப� (_o)"
-=======
-msgstr "��ர��ி ம�லாளர�"
-
-#: ../vinagre/vinagre-plugin-manager.c:45
-msgid "Plugin"
-msgstr "��ர��ி"
-
-#: ../vinagre/vinagre-plugin-manager.c:46
-msgid "Enabled"
-msgstr "�யல�ம� ����ப�ப���த�"
-
-#: ../vinagre/vinagre-plugin-manager.c:503
-msgid "C_onfigure"
-msgstr "_o ����ம�"
-
-#: ../vinagre/vinagre-plugin-manager.c:512
-msgid "A_ctivate"
-msgstr "_c ��யல�ப��த�த� "
-
-#: ../vinagre/vinagre-plugin-manager.c:523
-msgid "Ac_tivate All"
-msgstr "_t �ன�த�த�ய�ம� ��யல�ப��த�த� "
-#: ../vinagre/vinagre-plugin-manager.c:528
-msgid "_Deactivate All"
-msgstr "_D �ன�த�த�ய�ம� ��யல�ந����� "
-
-#: ../vinagre/vinagre-plugin-manager.c:824
-msgid "_About Plugin"
-msgstr "��ர��ி பற�றி (_A) "
-
-#: ../vinagre/vinagre-plugin-manager.c:828
-msgid "C_onfigure Plugin"
-msgstr "(_o) ��ர��ி வ�ிவம�ப�ப�"
->>>>>>> Updated Tamil translation:po/ta.po
-
-#: ../vinagre/vinagre-prefs.c:217
+#: ../vinagre/vinagre-prefs.c:229
msgid "Cannot initialize preferences manager."
msgstr "ம�ன�ன�ரிம��ள� ம�லாளர� த�வ��� ம��ியவில�ல�."
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-tab.c:346
-#| msgid "_Full screen"
msgid "Leave fullscreen"
msgstr "ம�ழ�த�திர�ய� வி��"
@@ -1153,130 +765,47 @@ msgid "Save Screenshot"
msgstr "திர�ப�பி�ிப�ப� ��மி���வ�ம�"
#: ../vinagre/vinagre-tab.c:830
-=======
-#: ../vinagre/vinagre-tab.c:330
-msgid "Error saving recent connection."
-msgstr "�ம�பத�திய �ண�ப�ப� ��மி����ம� ப�த� பிழ�"
-
-#: ../vinagre/vinagre-tab.c:394
-msgid "Minimize window"
-msgstr "�ாளரத�த� �ிறிதா����"
-
-#. Machine menu
-#: ../vinagre/vinagre-tab.c:410 ../vinagre/vinagre-tab.c:411
-#: ../vinagre/vinagre-ui.h:102
-msgid "Take screenshot"
-msgstr "திர�பி�ிப�ப� ������வ�ம�"
-
-#: ../vinagre/vinagre-tab.c:650
-msgid "Error saving the credentials on the keyring."
-msgstr "வி�� வள�யத�தில� �றிம�� �வணம� ��மி����ம� ப�த� பிழ�."
-
-#: ../vinagre/vinagre-tab.c:690
-msgid "Could not get a screenshot of the connection."
-msgstr "�ண�ப�பின� திர�வ����� பி�ி��� ம��ியவில�ல�"
-
-#: ../vinagre/vinagre-tab.c:698
->>>>>>> Updated Tamil translation:po/ta.po
#, c-format
msgid "Screenshot of %s"
msgstr "%s �ன� திர�ப�பி�ிப�ப�"
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-tab.c:881
-#| msgid "Error saving recent connection."
msgid "Error saving screenshot"
msgstr "திர���மிப�ப� ��மி����ம� ப�த� பிழ�"
-#: ../vinagre/vinagre-tube-handler.c:232
+#: ../vinagre/vinagre-tube-handler.c:229
#, c-format
msgid "Impossible to get service property: %s"
msgstr "��வ� தன�ம� ப�ற ம��ியாத�: %s"
-#: ../vinagre/vinagre-tube-handler.c:289
+#: ../vinagre/vinagre-tube-handler.c:286
#, c-format
-#| msgid "Failed to create the directory"
msgid "Impossible to create the connection: %s"
msgstr "�ண�ப�ப� �ர�வா��� ம��ியவில�ல�: %s"
-#: ../vinagre/vinagre-tube-handler.c:328
+#: ../vinagre/vinagre-tube-handler.c:325
#, c-format
msgid "Impossible to accept the stream tube: %s"
msgstr "ஸ��ிரிம� ��ய�ப�ப� �ண�� ம��ியாத�: %s"
-#: ../vinagre/vinagre-tube-handler.c:404
-#, c-format
-#| msgid "Failed to resolve avahi hostname: %s\n"
-msgid "Failed to request name: %s"
-msgstr "ப�யர� விண�ணப�பி��� ம��ியவில�ல�: %s"
-
-#: ../vinagre/vinagre-tube-handler.c:405
-msgid "No error given"
-msgstr "பிழ� தரப�ப�வில�ல�"
-
-#: ../vinagre/vinagre-tube-handler.c:482
+#: ../vinagre/vinagre-tube-handler.c:463
#, c-format
msgid "Impossible to get the contact name: %s"
msgstr "த��ர�ப� ப�யர� ப�ற ம��ியாத�: %s"
-#: ../vinagre/vinagre-tube-handler.c:517
+#: ../vinagre/vinagre-tube-handler.c:498
#, c-format
msgid "Impossible to get the avatar: %s"
msgstr "�வதார� ப�ற ம��ியாத�: %s"
-#: ../vinagre/vinagre-tube-handler.c:538
+#: ../vinagre/vinagre-tube-handler.c:519
#, c-format
msgid "%s wants to share his desktop with you."
msgstr "%s �வன���ய பணிம���ய� ����ள��ன� ப�ிர விர�ம�ப��ிறான�."
-#: ../vinagre/vinagre-tube-handler.c:543
+#: ../vinagre/vinagre-tube-handler.c:524
msgid "Desktop sharing invitation"
msgstr "பணிம��� ப�ிர�ம� �ழ�ப�பிதழ�"
-=======
-#: ../vinagre/vinagre-tab.c:701
-msgid "Save Screenshot"
-msgstr "திர�ப�பி�ிப�ப� ��மி���வ�ம�"
->>>>>>> Updated Tamil translation:po/ta.po
-
-#: ../vinagre/vinagre-tab.c:712
-msgid "Supported formats"
-msgstr "த�ண�ப�ரிய�ம� வ�ிவ���ள�"
-
-#: ../vinagre/vinagre-tube-handler.c:228
-#, c-format
-msgid "Impossible to accept the stream tube: %s"
-msgstr "��� ��ழாய� �ற�பத� �யலவ� �யலாத�: %s"
-
-#: ../vinagre/vinagre-tube-handler.c:257, c-format
-msgid "Impossible to create the connection: %s"
-msgstr "�ண�ப�ப� �ர�வா����தல� ம��ியவ� ம��ியாத�: %s"
-
-#: ../vinagre/vinagre-tube-handler.c:341, c-format
-msgid "Failed to request name: %s"
-msgstr "ப�யர� �����ல� த�ாற�றத�: %s"
-
-#: ../vinagre/vinagre-tube-handler.c:342
-msgid "No error given"
-msgstr "பிழ� �த�ம� தரப�ப�வில�ல�"
-
-#: ../vinagre/vinagre-tube-handler.c:419
-#, c-format
-msgid "Impossible to get the contact name: %s"
-msgstr "த��ர�ப� ப�யர� � ப�ற வாய�ப�பில�ல�: %s"
-
-#: ../vinagre/vinagre-tube-handler.c:454
-#, c-format
-msgid "Impossible to get the avatar: %s"
-msgstr "�வதாரத�த� � ப�ற வாய�ப�பில�ல�: %s"
-
-#: ../vinagre/vinagre-tube-handler.c:475
-#, c-format
-msgid "%s wants to share his desktop with you."
-msgstr "%s ����ள� ம�ல�ம���ய� ப�ிர�ந�த� ��ள�ள விர�ம�ப��ிறார�."
-
-#: ../vinagre/vinagre-tube-handler.c:480
-msgid "Desktop sharing invitation"
-msgstr "ம�ல�ம��� ப�ிர�வ� �ழ�ப�ப�"
#. Toplevel
#: ../vinagre/vinagre-ui.h:33
@@ -1311,7 +840,6 @@ msgstr "நிரல� வி���� வ�ளிய�ற�தல�"
msgid "Edit the application preferences"
msgstr "பயன�பா���ின� விர�ப�ப���ள� திர�த�த��"
-<<<<<<< HEAD:po/ta.po
#. FIXME: Study this dialog for next release
#. { "EditPlugins", GTK_STOCK_EXECUTE, N_("_Plugins"), NULL,
#. N_("Select plugins"), G_CALLBACK (vinagre_cmd_edit_plugins) },
@@ -1346,51 +874,10 @@ msgid "_New Folder"
msgstr "_N ப�திய ���வ�"
#: ../vinagre/vinagre-ui.h:63
-=======
-#: ../vinagre/vinagre-ui.h:50
-msgid "_Plugins"
-msgstr "_P ��ர��ி�ள�"
-
-#: ../vinagre/vinagre-ui.h:51
-msgid "Select plugins"
-msgstr " ��ர��ி�ள� த�ர�வ� ��ய��"
-
-#. Bookmarks menu
-#: ../vinagre/vinagre-ui.h:54
-msgid "_Open bookmark"
-msgstr "ப�த�த�����றிய�த� திறத�தல� (_O)"
-
-#: ../vinagre/vinagre-ui.h:55
-msgid "Connect to this machine"
-msgstr "�ந�த �ணினிய��ன� �ண�"
-
-#: ../vinagre/vinagre-ui.h:56
-msgid "_Edit bookmark"
-msgstr "ப�த�த�����றிய� திர�த�த�தல� (_E)"
-
-#: ../vinagre/vinagre-ui.h:57
-msgid "Edit the details of selected bookmark"
-msgstr "த�ர�ந�த������ப�ப��� ப�த�த�����றியின� விவர���ள� திர�த�தவ�ம�"
-
-#: ../vinagre/vinagre-ui.h:58
-msgid "_Remove from bookmarks"
-msgstr "ப�த�த�����றி�ளிலிர�ந�த� ந����வ�ம� (_R)"
-
-#: ../vinagre/vinagre-ui.h:59
-msgid "Remove current selected connection from bookmarks"
-msgstr "தற�ப�த� த�ர�ந�த������ப�ப��� �ண�ப�ப� ப�த�த�����றி�ளிலிர�ந�த� ந����வ�ம�"
-
-#: ../vinagre/vinagre-ui.h:60
-msgid "_New Folder"
-msgstr "_N ப�திய ���வ�"
-
-#: ../vinagre/vinagre-ui.h:61
->>>>>>> Updated Tamil translation:po/ta.po
msgid "Create a new folder"
msgstr "ப�திய ���வ� �ர�வா���வ�ம�"
#. Help menu
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-ui.h:66
msgid "_Contents"
msgstr "�ள�ள����ம� (_C)"
@@ -1436,58 +923,10 @@ msgid "C_lose All"
msgstr "�ன�த�த�ய�ம� ம��வ�ம� (_l)"
#: ../vinagre/vinagre-ui.h:93
-=======
-#: ../vinagre/vinagre-ui.h:64
-msgid "_Contents"
-msgstr "�ள�ள����ம� (_C)"
-
-#: ../vinagre/vinagre-ui.h:65
-msgid "Open the vinagre manual"
-msgstr "வினா��ர� ��ய����� திற���வ�ம�"
-
-#: ../vinagre/vinagre-ui.h:67
-msgid "About this application"
-msgstr "�ந�தப� பயன�பா�� பற�றி"
-
-#: ../vinagre/vinagre-ui.h:72
-msgid "_Toolbar"
-msgstr "�ர�விப�ப���� (_T)"
-
-#: ../vinagre/vinagre-ui.h:73
-msgid "Show or hide the toolbar"
-msgstr "�ர�விப�ப����ய��� �ா���வ�ம� �ல�லத� மற����வ�ம�"
-
-#: ../vinagre/vinagre-ui.h:76
-msgid "_Statusbar"
-msgstr "நில�ப�ப���ி (_S)"
-
-#: ../vinagre/vinagre-ui.h:77
-msgid "Show or hide the statusbar"
-msgstr "நில�ப�ப����ய��� �ா���வ�ம� �ல�லத� மற����வ�ம�"
-
-#: ../vinagre/vinagre-ui.h:80
-msgid "Side _Panel"
-msgstr "(_P) ப��� பல�ம�"
-
-#: ../vinagre/vinagre-ui.h:81
-msgid "Show or hide the side panel"
-msgstr "ப��� பல�த�த� �ா���வ�ம� �ல�லத� மற����வ�ம�"
-
-#: ../vinagre/vinagre-ui.h:89
-msgid "Close the current connection"
-msgstr "ந�ப�ப� �ண�ப�ப� த�ண��ி���வ�ம�"
-
-#: ../vinagre/vinagre-ui.h:90
-msgid "C_lose All"
-msgstr "�ன�த�த�ய�ம� ம��வ�ம� (_l)"
-
-#: ../vinagre/vinagre-ui.h:91
->>>>>>> Updated Tamil translation:po/ta.po
msgid "Close all active connections"
msgstr "�ன�த�த� ��யலில�ள�ள �ண�ப�ப� த�ண��ித�தல�"
#. Bookmarks menu
-<<<<<<< HEAD:po/ta.po
#: ../vinagre/vinagre-ui.h:96
msgid "_Add to bookmarks"
msgstr "ப�த�த�����றி�ளில� ��ர�த�தல� (_A)"
@@ -1506,21 +945,6 @@ msgid "Take a screenshot of active connection"
msgstr "��யலில�ள�ள �ண�ப�ப� திர�ப�பி�ிப�ப� ��ய�யவ�ம�"
#: ../vinagre/vinagre-ui.h:109
-=======
-#: ../vinagre/vinagre-ui.h:94
-msgid "_Add to bookmarks"
-msgstr "ப�த�த�����றி�ளில� ��ர�த�தல� (_A)"
-
-#: ../vinagre/vinagre-ui.h:95
-msgid "Add current connection to your bookmarks"
-msgstr "ந�ப�ப� �ண�ப�ப��ள� ����ள� ப�த�த�����றி�ளில� ��ர�த�தல�"
-
-#: ../vinagre/vinagre-ui.h:103
-msgid "Take a screenshot of active connection"
-msgstr "��யலில�ள�ள �ண�ப�ப� திர�ப�பி�ிப�ப� ��ய�யவ�ம�"
-
-#: ../vinagre/vinagre-ui.h:107
->>>>>>> Updated Tamil translation:po/ta.po
msgid "View the current machine in full screen"
msgstr "ந�ப�ப� �ணினிய� ம�ழ�த�திர�யில� பார����வ�ம�"
@@ -1528,29 +952,32 @@ msgstr "ந�ப�ப� �ணினிய� ம�ழ�த�திர�
msgid "An error has occurred:"
msgstr "பிழ� �ன�ற� �ற�ப����ள�ளத�:"
-<<<<<<< HEAD:po/ta.po
-#: ../vinagre/vinagre-utils.c:150
-#, c-format
-#| msgid "Could not open the file."
-msgid "Could not load builder file: %s"
-msgstr "பில��ர� ��ப�ப� �ற�ற ம��ியவில�ல�: %s"
+#: ../vinagre/vinagre-utils.c:175
+msgid ""
+"A plugin tried to open an UI file but did not succeed, with the error "
+"message:"
+msgstr "�ர� ��ர��ி �ர� ய�� ��ப�ப� திற��� ம�யன�றத�; �னால� வ�ற�றி ���யவில�ல�. வழ� ��ய�தி:"
-#: ../vinagre/vinagre-utils.c:453
-#| msgid "Vinagre is a VNC client for the GNOME Desktop"
-msgid "Vinagre is a remote desktop viewer for the GNOME Desktop"
-msgstr "Vinagre �ன�பத� ��ன�ம� பணிம������� த�ல� பணிம��� �ா���ியா��ம�"
+#: ../vinagre/vinagre-utils.c:177
+msgid ""
+"The program tried to open an UI file but did not succeed, with the error "
+"message:"
+msgstr "�ர� நிரல� �ர� ய�� ��ப�ப� திற��� ம�யன�றத�. �னால� வ�ற�றி ���யவில�ல�. வழ� ��ய�தி:"
+
+#: ../vinagre/vinagre-utils.c:180
+msgid "Please check your installation."
+msgstr "����ள� நிற�வல� �ரிபார����வ�ம�."
-=======
-#: ../vinagre/vinagre-utils.c:150, c-format
-msgid "Could not load builder file: %s"
-msgstr "�����மான ��ப�பின� திற��� ம��ியவில�ல�: %s"
+#: ../vinagre/vinagre-utils.c:181
+#| msgid "Error while saving history file: %s"
+msgid "Error loading UI file"
+msgstr "ய�� ��ப�ப� ��மி����ம� ப�த� பிழ�"
-#: ../vinagre/vinagre-utils.c:453
+#: ../vinagre/vinagre-utils.c:486
msgid "Vinagre is a remote desktop viewer for the GNOME Desktop"
-msgstr "வினா��ர� �ன�பத� ��ன�ம� பணிம������� த�ல� பணிம��� �ா���ி ���ம�"
+msgstr "Vinagre �ன�பத� ��ன�ம� பணிம������� த�ல� பணிம��� �ா���ியா��ம�"
->>>>>>> Updated Tamil translation:po/ta.po
-#: ../vinagre/vinagre-utils.c:456
+#: ../vinagre/vinagre-utils.c:489
msgid ""
"Vinagre is free software; you can redistribute it and/or modify it under the "
"terms of the GNU General Public License as published by the Free Software "
@@ -1561,7 +988,7 @@ msgstr ""
"ப�த� �ன�மதி���ான �ந�த 2ம� பதிப�ப� �ல�லத� ���த�த பதிப�ப��ள� விதி�ளின� ப�ி ந����ள� "
"(விர�ப�பப�ப�ி) மாற�றலாம�. �ல�லத� ம�ண���ம� பறிமாறலாம�"
-#: ../vinagre/vinagre-utils.c:460
+#: ../vinagre/vinagre-utils.c:493
msgid ""
"Vinagre is distributed in the hope that it will be useful, but WITHOUT ANY "
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1572,7 +999,7 @@ msgstr ""
"��றிப�பி��� ��யல����ான த��தி �ள�ப� �ந�த �த�திரவாதம�ம� �ளி���ப�ப�வில�ல�. ம�ற� ��ண��� "
"விவர���ள����� �ி�ன�ய� ப�த� �ன�மதி���ான விதி�ள� பார����வ�ம�"
-#: ../vinagre/vinagre-utils.c:464
+#: ../vinagre/vinagre-utils.c:497
msgid ""
"You should have received a copy of the GNU General Public License along with "
"this program. If not, see <http://www.gnu.org/licenses/>."
@@ -1580,70 +1007,38 @@ msgstr ""
"�ந�த நிரல��ன� ��ன� ப�த� ப�த�வ���ம� �ரிமத�தின� பிரதி �ன�ற� த���ள������� �ி��த�திர���� "
"வ�ண���ம�.�ல�ல� �ன�றால� <http://www.gnu.org/licenses/> பார���வ�ம�."
-#: ../vinagre/vinagre-utils.c:486
+#: ../vinagre/vinagre-utils.c:519
msgid "translator-credits"
msgstr ""
"Dr. T. Vasudevan <agnihot3 gmail com> 2009, I. Felix <ifelix25 gmail com> "
"2008"
-#: ../vinagre/vinagre-utils.c:489
+#: ../vinagre/vinagre-utils.c:522
msgid "Vinagre Website"
msgstr "வினா��ர� �ண�யதளம�"
-<<<<<<< HEAD:po/ta.po
-#: ../vinagre/vinagre-window.c:397
-=======
-#: ../vinagre/vinagre-window.c:393
->>>>>>> Updated Tamil translation:po/ta.po
+#: ../vinagre/vinagre-window.c:404
#, c-format
msgid "Could not merge vinagre-ui.xml: %s"
msgstr "vinagre-ui.xml � �ண���� ம��ியவில�ல�: %s"
-<<<<<<< HEAD:po/ta.po
-#: ../vinagre/vinagre-window.c:425
-=======
-#: ../vinagre/vinagre-window.c:421
->>>>>>> Updated Tamil translation:po/ta.po
+#: ../vinagre/vinagre-window.c:432
msgid "_Recent connections"
msgstr "�ம�பத�திய �ண�ப�ப��ள� (_R)"
#. Translators: This is server:port, a statusbar tooltip when mouse is over a bookmark item on menu
-<<<<<<< HEAD:po/ta.po
-#: ../vinagre/vinagre-window.c:585
+#: ../vinagre/vinagre-window.c:592
#, c-format
msgid "Open %s:%d"
msgstr "%s � திற:%d"
-=======
-#: ../vinagre/vinagre-window.c:579
-#, c-format
-msgid "Open %s:%d"
-msgstr "%s � திற:%d"
-
-#~ msgid "<b>Connection</b>"
-#~ msgstr "<b>�ண�ப�ப�</b>"
-
-#~ msgid "<b>Folder</b>"
-#~ msgstr "<b> ���வ�</b>"
-
-#~ msgid "_Scaling"
-#~ msgstr "(_S) �ளவ� மாற�ற�தல� "
-
-#~ msgid "host or host:display or host::port"
-#~ msgstr "ப�ரவலன� �ல�லத� ப�ரவலன� :�ா���ி �ல�லத� ப�ரவலன�::த�ற�"
-
-#~ msgid "Choose a VNC Server"
-#~ msgstr "�ர� வி�ன��ி(VNC) ��வ�ய�த�த� த�ர�வ� ��ய�யவ�ம�"
-
-#~ msgid "Could not find the host address in the file."
-#~ msgstr "��ப�பில� ப�ரவலன� ம��வரிய� �ண��� பி�ி��� ம��ியவில�ல�."
-
-#~ msgid "Opens a .vnc file"
-#~ msgstr "�ர� .வி�ன��ி ��ப�பின� திற���ிறத�"
-#~ msgid "filename"
-#~ msgstr "��ப�ப� ப�யர�"
+#~| msgid "Failed to resolve avahi hostname: %s\n"
+#~ msgid "Failed to request name: %s"
+#~ msgstr "ப�யர� விண�ணப�பி��� ம��ியவில�ல�: %s"
-#~ msgid "- VNC Client for GNOME"
-#~ msgstr "- ��ன�ம����� வி�ன��ி(VNC) �ார�ந�த�ன� "
->>>>>>> Updated Tamil translation:po/ta.po
+#~ msgid "No error given"
+#~ msgstr "பிழ� தரப�ப�வில�ல�"
+#~| msgid "Could not open the file."
+#~ msgid "Could not load builder file: %s"
+#~ msgstr "பில��ர� ��ப�ப� �ற�ற ம��ியவில�ல�: %s"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
