[tomboy] updating for Punjabi by A S Alam



commit f3de3a5e08dc64363a4becca3ed72f5dcc6ff458
Author: A S Alam <aalam users sf net>
Date:   Mon Mar 15 07:40:00 2010 +0530

    updating for Punjabi by A S Alam

 po/pa.po |  758 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 451 insertions(+), 307 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index df855b0..398c6ca 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -2,17 +2,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
-# A S Alam <aalam users sf net>, 2007, 2009.
+# A S Alam <aalam users sf net>, 2007, 2009, 2010.
 # ASB <aalam users sf net>, 2007.
 # Amanpreet Singh Alam <aalam users sf net>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: tomboy.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=tomboy&component=general\n";
-"POT-Creation-Date: 2009-09-08 02:05+0000\n"
-"PO-Revision-Date: 2009-09-13 21:53+0530\n"
+"POT-Creation-Date: 2010-03-06 00:32+0000\n"
+"PO-Revision-Date: 2010-03-15 07:39+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
+"Language-Team: Punjabi/Panjabi <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,21 +33,26 @@ msgid "Tomboy Applet Factory"
 msgstr "��ਮਬਾ� �ਪਲਿ� ਫ���ਰ�"
 
 #: ../data/GNOME_TomboyApplet.server.in.in.h:4 ../data/tomboy.desktop.in.h:3
-#: ../Tomboy/Tray.cs:563
+#: ../Tomboy/Tray.cs:568
 msgid "Tomboy Notes"
 msgstr "��ਮਬਾ� ਨ��ਿਸ"
 
-#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:164
+#: ../data/GNOME_TomboyApplet.xml.h:1 ../Tomboy/ActionManager.cs:179
+#: ../Tomboy/Tray.cs:263
+msgid "S_ynchronize Notes"
+msgstr "ਨ��ਿਸ ਸਿ�ਰ�ਨਾ��਼ �ਰ�(_y)"
+
+#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:164
 msgid "_About"
 msgstr "�ਸ ਬਾਰ�(_A)"
 
-#: ../data/GNOME_TomboyApplet.xml.h:2 ../Tomboy/ActionManager.cs:157
-#: ../Tomboy/Tray.cs:272
+#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:157
+#: ../Tomboy/Tray.cs:277
 msgid "_Help"
 msgstr "ਮੱਦਦ(_H)"
 
-#: ../data/GNOME_TomboyApplet.xml.h:3 ../Tomboy/ActionManager.cs:153
-#: ../Tomboy/Tray.cs:267
+#: ../data/GNOME_TomboyApplet.xml.h:4 ../Tomboy/ActionManager.cs:153
+#: ../Tomboy/Tray.cs:272
 msgid "_Preferences"
 msgstr "ਮ�ਰ� ਪਸੰਦ(_P)"
 
@@ -64,62 +69,66 @@ msgid "Accept SSL Certificates"
 msgstr "SSL ਸਰ��ਫਿ��� ਮਨ�਼�ਰ"
 
 #: ../data/tomboy.schemas.in.h:2
+msgid "Automatic Background Synchronization Timeout"
+msgstr "���ਮ��ਿ� ਬ���ਰਾ��ਡ ਸ��ਰ�ਨਾ��਼ �ਾ�ਮ-���"
+
+#: ../data/tomboy.schemas.in.h:3
 msgid "Create a new Note"
 msgstr "�ੱ� ਨਵਾ� ਨ�� ਬਣਾ�"
 
-#: ../data/tomboy.schemas.in.h:3
+#: ../data/tomboy.schemas.in.h:4
 msgid "Custom Font Face"
 msgstr "ਪਸੰਦ�ਦਾ ਫ��� ਸ਼�ਲ"
 
-#: ../data/tomboy.schemas.in.h:4
+#: ../data/tomboy.schemas.in.h:5
 msgid "Determines X coordinate of Search window; stored on Tomboy exit."
 msgstr "��� ਵਿੰਡ� ਦਾ X ਧ�ਰਾ ਲਵ�; ��ਮਬ� ਬੰਦ ਹ�ਣ ਸਮ�� ਸੰਭਾਲ� ��।"
 
-#: ../data/tomboy.schemas.in.h:5
+#: ../data/tomboy.schemas.in.h:6
 msgid "Determines Y coordinate of Search window; stored on Tomboy exit."
 msgstr "��� ਵਿੰਡ� ਦਾ Y ਧ�ਰਾ ਲਵ�; ��ਮਬ� ਬੰਦ ਹ�ਣ ਸਮ�� ਸੰਭਾਲ� ��।"
 
-#: ../data/tomboy.schemas.in.h:6
+#: ../data/tomboy.schemas.in.h:7
 msgid "Determines pixel height of Search window; stored on Tomboy exit."
 msgstr "��� ਵਿੰਡ� ਦ� ਪਿ�ਸਲ ��ਾ� ਲਵ�; ��ਮਬ� ਬੰਦ ਹ�ਣ ਸਮ�� ਸੰਭਾਲ� ��।"
 
-#: ../data/tomboy.schemas.in.h:7
+#: ../data/tomboy.schemas.in.h:8
 msgid "Determines pixel width of Search window; stored on Tomboy exit."
 msgstr "��� ਵਿੰਡ� ਦ� ਪਿ�ਸਲ ���ਾ� ਲਵ�; ��ਮਬ� ਬੰਦ ਹ�ਣ ਸਮ�� ਸੰਭਾਲ� ��।"
 
-#: ../data/tomboy.schemas.in.h:8
+#: ../data/tomboy.schemas.in.h:9
 msgid "Enable Auto bulleted lists."
 msgstr "��� ਬਿੰਦ� ਲਿਸ� ਯ�� �ਰ�।"
 
-#: ../data/tomboy.schemas.in.h:9
+#: ../data/tomboy.schemas.in.h:10
 msgid "Enable Middle-Click Paste On Icon."
 msgstr "���ਾਨ �ੱਤ� ਮੱਧ-�ਲਿੱ� ��ਪਣ ਯ�� �ਰ�।"
 
-#: ../data/tomboy.schemas.in.h:10
+#: ../data/tomboy.schemas.in.h:11
 msgid "Enable WikiWord highlighting"
 msgstr "ਵਿੱ��ਵਰਲਡ �ਭਾਰਨਾ ਯ��"
 
-#: ../data/tomboy.schemas.in.h:11
+#: ../data/tomboy.schemas.in.h:12
 msgid "Enable closing notes with escape."
 msgstr "�ਸ��ਪ ਨਾਲ ਨ��ਿਸ ਬੰਦ �ਰਨ� ਯ��।"
 
-#: ../data/tomboy.schemas.in.h:12
+#: ../data/tomboy.schemas.in.h:13
 msgid "Enable custom font"
 msgstr "�ਸ�ਮ ਫ��� ਯ��"
 
-#: ../data/tomboy.schemas.in.h:13
+#: ../data/tomboy.schemas.in.h:14
 msgid "Enable global keybindings"
 msgstr "�ਲ�ਬਲ ਸਵਿੱ�-ਬਾ�ਡਿੰ� ਦ� ਵਰਤ�� ਯ��"
 
-#: ../data/tomboy.schemas.in.h:14
+#: ../data/tomboy.schemas.in.h:15
 msgid "Enable spellchecking"
 msgstr "ਸ਼ਬਦ-��� �ਾ�� ਯ��"
 
-#: ../data/tomboy.schemas.in.h:15
+#: ../data/tomboy.schemas.in.h:16
 msgid "Enable startup notes"
 msgstr "ਸ�ਾਰ��ੱਪ ਨ�� ਯ�� �ਰ�"
 
-#: ../data/tomboy.schemas.in.h:16
+#: ../data/tomboy.schemas.in.h:17
 msgid ""
 "Enable this option if you want bulleted lists to be automatic when you place "
 "- or * at the beginning of a line."
@@ -127,7 +136,7 @@ msgstr ""
 "�� ਤ�ਸ�� ���ਮ��ਿ� ਹ� ਬਿੰਦ��� ਵਾਲ� ਲਿਸ� ਬਣਾ�ਣ� �ਾਹ�ੰਦ� ਹ�, �ਦ�� �ਿ �ੱ� ਲਾ�ਨ ਦ� ਸ਼�ਰ� ਵਿੱ� - �ਾ� * "
 "ਲਿ�� ਤਾ� �ਹ ��ਣ ਯ�� �ਰ�।"
 
-#: ../data/tomboy.schemas.in.h:17
+#: ../data/tomboy.schemas.in.h:18
 msgid ""
 "Enable this option if you want to be able to middle-click the Tomboy icon to "
 "paste timestamped content into the Start Here note."
@@ -135,7 +144,7 @@ msgstr ""
 "�ਹ ��ਣ �ਰ�, �� ਤ�ਸ�� �ੱਥ�� ਸ਼�ਰ� �ਰ� ਨ�� ਵਿੱ� ਸਮਾ�-ਮ�ਹਰ ਸਮੱ�ਰ� ��ਪਣ ਲ� ��ਮਬ� ���ਾਨ �ੱਤ� ਮੱਧ-�ਲਿੱ� "
 "ਵਰਤਣਾ �ਾਹ�ੰਦ� ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:18
+#: ../data/tomboy.schemas.in.h:19
 msgid ""
 "Enable this option to highlight words ThatLookLikeThis. Clicking the word "
 "will create a note with that name."
@@ -143,23 +152,23 @@ msgstr ""
 "ThatLookLikeThis ਵਰ�� ਸ਼ਬਦ �ਭਾਰਨ ਲ� �ਹ ��ਣ �ਰ�। �ਸ ਸ਼ਬਦ ਨ�ੰ ਦਬਾ�ਣਾ ਨਾਲ �ਸ ਨਾ� ਨਾਲ �ੱ� "
 "ਸ��ਨਾ ਬਣਾ� �ਾਵ���।"
 
-#: ../data/tomboy.schemas.in.h:19
+#: ../data/tomboy.schemas.in.h:20
 msgid "FUSE Mounting Timeout (ms)"
 msgstr "FUSE ਮਾ���ਿੰ� �ਾ�ਮ-��� (ms)"
 
-#: ../data/tomboy.schemas.in.h:20
+#: ../data/tomboy.schemas.in.h:21
 msgid "HTML Export All Linked Notes"
 msgstr "HTML ��ਸਪ�ਰ� ਸਭ ਲਿੰ� ਨ��ਿਸ"
 
-#: ../data/tomboy.schemas.in.h:21
+#: ../data/tomboy.schemas.in.h:22
 msgid "HTML Export Last Directory"
 msgstr "HTML ��ਸਪ�ਰ� ��ਰ� ਡਾ�ਰ���ਰ�"
 
-#: ../data/tomboy.schemas.in.h:22
+#: ../data/tomboy.schemas.in.h:23
 msgid "HTML Export Linked Notes"
 msgstr "HTML ��ਸਪ�ਰ� ਲਿੰ� ਨ��ਿਸ"
 
-#: ../data/tomboy.schemas.in.h:23
+#: ../data/tomboy.schemas.in.h:24
 msgid ""
 "If enable_custom_font is true, the font name set here will be used as the "
 "font when displaying notes."
@@ -167,7 +176,7 @@ msgstr ""
 "�� enable_custom_font ਠ�� ਰੱ�� �� ਤਾ� �ੱਥ� ਸ�ੱ� ��ਤਾ �ਿ� ਫ��� ਨਾ� ਸ�ੱ� ਨ�ੰ ਨ�� ਵ��ਾ�ਣ ਲ� ਸਮ�� "
 "ਵਰਤਿ� �ਾਵ��ਾ।"
 
-#: ../data/tomboy.schemas.in.h:24
+#: ../data/tomboy.schemas.in.h:25
 msgid ""
 "If enabled, all notes that were open when Tomboy quit will automatically be "
 "reopened at startup."
@@ -175,11 +184,11 @@ msgstr ""
 "�� ਯ�� ��ਤਾ ਤਾ�, ਸਭ ਨ��ਿਸ, �� �ਿ ��ਮਬਾ� ਦ� ਬੰਦ �ਰਨ ਸਮ�� ��ੱਲ�ਹ� ਹ�ਣ��, ਸ਼�ਰ� ਹ�ਣ �ੱਤ� ���ਮ��ਿ� ਹ� ਮ��-"
 "��ਲ�ਹ� �ਾਣ��।"
 
-#: ../data/tomboy.schemas.in.h:25
+#: ../data/tomboy.schemas.in.h:26
 msgid "If enabled, an opened note can be closed by hitting the escape key."
 msgstr "�� �ਹ ��ਣ ਯ�� ��ਤ� ਤਾ� �ਸ��ਪ (ESC) ਸਵਿੱ� ਦੱਬਣ ਨਾਨਲ ਨ��ਿਸ ਬੰਦ ਹ� ਸ�ਦ� ਹਨ।"
 
-#: ../data/tomboy.schemas.in.h:26
+#: ../data/tomboy.schemas.in.h:27
 msgid ""
 "If true, misspellings will be underlined in red, and correct spelling "
 "suggestions shown in the right-click menu."
@@ -187,7 +196,7 @@ msgstr ""
 "�� ਠ�� ਹ� ਤਾ� �ਲਤ-ਸ਼ਬਦ ��� ਹ�ਠ ਲਾਲ ਰੰ� ਦ� ਲ��ਰ �ਿੱ�� �ਾਵ��� �ਤ� ਠ�� ਸ਼ਬਦ ��� ਨ�ੰ ਸੱ�ਾ ਬ�ਨ "
 "ਦਬਾ�ਣ ਵਾਲ� ਮ�ਨ� ਵਿੱ� ਸ��ਾ� ਵ��� ਵ��ਾ�� �ਾਵ��ਾ।"
 
-#: ../data/tomboy.schemas.in.h:27
+#: ../data/tomboy.schemas.in.h:28
 msgid ""
 "If true, the desktop-global keybindings set in /apps/tomboy/"
 "global_keybindings will be enabled, allowing for useful Tomboy actions to be "
@@ -197,7 +206,7 @@ msgstr ""
 "�ਾਲ� ��ਤਾ �ਾਵ��ਾ, �� �ਿ ��ਮਬ� �ਾਰਵਾ� ਨ�ੰ �ਿਸ� ਵ� ਹ�ਰ �ਾਰ� ਰਾਹ�� �ਪਲੱਬਧ �ਰਵਾ�ਣ ਲ� ਸਹਾ�� "
 "ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:28
+#: ../data/tomboy.schemas.in.h:29
 msgid ""
 "If true, the font name set in custom_font_face will be used as the font when "
 "displaying notes. Otherwise the desktop default font will be used."
@@ -205,7 +214,7 @@ msgstr ""
 "�� ਠ�� ਹ��� ਤਾ� custom_font_face ਵਿੱ� ਫ��� ਨਾ� ਸ�ੱ� ਨ�ੰ ਨ�� ਵ��ਾ�ਣ ਦ�ਰਾਨ ਵਰਤਿ� �ਾਵ��ਾ। ਨਹ�� "
 "ਤਾ� ਡ�ਸ��ਾਪ ਡਿਫਾਲ� ਫ��� ਹ� ਵਰਤ� �ਾਣ��।"
 
-#: ../data/tomboy.schemas.in.h:29
+#: ../data/tomboy.schemas.in.h:30
 msgid ""
 "Indicates that the Sticky Note Importer plugin has not been run, so it "
 "should run automatically the next time Tomboy starts."
@@ -213,13 +222,24 @@ msgstr ""
 "ਦਰਸਾ�ਦਾ ਹ� �ਿ ਸ�ਿੱ�� ਨ�� �ਯਾਤ�ਾਰ ਪਲੱ��ਨ �ੱਲ ਨਹ�� ਰਹ� ਹ�, �ਸ�ਰ�� ��ਲ� ਵਾਰ ��ਮਬ� �ਾਲ� ਹ�ਣ "
 "ਸਮ�� ���ਮ��ਿ� �ੱਲਣਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:30
+#: ../data/tomboy.schemas.in.h:31
 msgid ""
 "Integer determining the minimum number of notes to show in the Tomboy note "
 "menu."
 msgstr "�ੰ� ��ਮਬ� ਨ�� ਮ�ਨ� ਵਿੱ� ਵ��ਾ� �ਾਣ ਵਾਲ� ਨ��ਿਸਾ� ਦ� �ੱ��-�ੱ� �ਿਣਤ� ਦਰਸਾ�ਦਾ ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:31
+#: ../data/tomboy.schemas.in.h:32
+msgid ""
+"Integer value indicating how frequently to perform a background sync of your "
+"notes (when sync is configured). Any value less than 1 indicates that "
+"autosync is disabled. The lowest acceptable positive value is 5. Value is in "
+"minutes."
+msgstr ""
+"�ੰ� ਮ�ੱਲ ਦਰਸਾ��ਦਾ ਹ� �ਿ �ਪਣ� ਨ��ਾ� ਨ�ੰ ਬ���ਰਾ��ਡ ਨਾਲ �ਿੰਨ� �� ਵਾਰ ਸ��ਰ�ਨਾ��਼ �ਰਨਾ "
+"ਹ� (�� ਸ��ਰ�ਨਾ��਼ ਸੰਰ�ਨਾ ��ਤ� ਹ�ਵ�)। 1 ਤ�� �ੱ� ਮ�ੱਲ ਦਾ ਮਤਲਬ ਹ� �ਿ ���-ਸ��ਰ� ਨਹ�� ਹ�ੰਦਾ। "
+"�ੱ��-�ੱ� ਮਨ�਼�ਰ ਮ�ੱਲ ੫ ਹ�। ਮ�ੱਲ ਮਿੰ�ਾ� ਵਿੱ� ਹ�।"
+
+#: ../data/tomboy.schemas.in.h:33
 msgid ""
 "Integer value indicating if there is a preference to always perform a "
 "specific behavior when a conflict is detected, instead of prompting the "
@@ -231,115 +251,141 @@ msgstr ""
 "ਨ�ੰ ਪ�ੱ��। ਮ�ੱਲ ਨ�ੰ �ੰਦਰ�ਨ� �ਿਣਤ� ਨਾਲ ਮ�ਪ ��ਤਾ �ਿ� ਹ�। 0 ਦਾ ਮਤਲਬ ਹ� �ਿ ਯ��਼ਰ �ਪਵਾਦ ਹ�ਣ ਦ� "
 "ਹਾਲਤ ਵਿੱ� ਪ�ੱ�ਿ� �ਾਣਾ �ਾਹ�ੰਦਾ ਹ�, ਤਾ� �ਿ ਹਰ �ਪਵਾਦ ਹਾਲਤ ਵਿੱ� ��ਸ ਮ�ਤਾਬ� ��ਦ ਹ��ਡਲ �ਰ ਸ��।"
 
-#: ../data/tomboy.schemas.in.h:32
+#: ../data/tomboy.schemas.in.h:34
+#| msgid ""
+#| "Integer value indicating if there is a preference to always perform a "
+#| "specific behavior when a conflict is detected, instead of prompting the "
+#| "user. The values map to an internal enumeration. 0 indicates that the "
+#| "user wishes to be prompted when a conflict occurs, so that they may "
+#| "handle each conflict situation on a case-by-case basis."
+msgid ""
+"Integer value indicating if there is a preference to always perform a "
+"specific link updating behavior when a note is renamed, instead of prompting "
+"the user. The values map to an internal enumeration. 0 indicates that the "
+"user wishes to be prompted when renaming a note may impact links that exist "
+"in other notes. 1 indicates that links should automatically be removed. 2 "
+"indicates that link text should be updated to the new note name so that it "
+"will continue linking to the renamed note."
+msgstr ""
+"�ੰ� ਮ�ੱਲ ਵ��ਾ�ਦਾ ਹ� �ਿ �ਦ�� ਵ� �ੱ� ਲਿੰ� �ੱਪਡ�� ਰਵੱ�� ਹ�ਣ ਦ� ਹਾਲਤ ਵਿੱ� �ਾਸ ਰਵੱ�� ਹਮ�ਸ਼ਾ �ਰ�, "
+"ਨਾ �ਿ ਯ��਼ਰ ਨ�ੰ ਪ�ੱ��। ਮ�ੱਲ ਨ�ੰ �ੰਦਰ�ਨ� �ਿਣਤ� ਨਾਲ ਮ�ਪ ��ਤਾ �ਿ� ਹ�। 0 ਦਾ ਮਤਲਬ ਹ� �ਿ ਯ��਼ਰ �ਪਵਾਦ "
+"ਹ�ਣ ਦ�  ਹਾਲਤ ਵਿੱ� ਪ�ੱ�ਿ� �ਾਣਾ �ਾਹ�ੰਦਾ ਹ�, �ਦ�� ਵ� ਨ�� ਲਿ� ਬਦਲਿ� ਨਾ� ਹ�ਰ ਮ���ਦ ਲਿੰ� ਦਾ ਨਾ� "
+"ਹ�ਵ�। 1 ਦਰਸਾ��ਦਾ ਹ� �ਿ ਲਿੰ� ਨ�ੰ ���ਮ��ਿ� ਹ�ਾ ਦਿੱਤਾ �ਾਵ��ਾ। 2 ਦਰਸਾ��ਦਾ ਹ� �ਿ �ਹ ਲਿੰ� ���ਸ� "
+"ਨ�ੰ ਨਵ�� ਨ�� ਨਾ� ਨਾਲ �ੱਪਡ�� ��ਤਾ �ਾਵ��ਾ ਤਾ� �ਿ ਲਿੰ� �ਰਨ ਲ� ਨ�� ਨਾ� ਬਦਲਣ ਨਾਲ �ਾਰ� ਰੱ�ਿ� �ਾਵ�।"
+
+#: ../data/tomboy.schemas.in.h:35
+msgid "Link Updating Behavior on Note Rename"
+msgstr "ਨ�� ਨਾ� ਬਦਲਣ ਨਾਲ ਲਿੰ� �ੱਪਡ�� �ਰਨ ਰਵੱ��"
+
+#: ../data/tomboy.schemas.in.h:36
 msgid "List of pinned notes."
 msgstr "ਪਿੰਨ ��ਤ� ਨ��ਿਸਾ� ਦ� ਲਿਸ� ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:33
+#: ../data/tomboy.schemas.in.h:37
 msgid ""
 "Maximum characters of note title to show in the Tomboy tray or panel applet "
 "note menu."
 msgstr "��ਮਬ�� �ਰ� �ਾ� ਪ�ਨਲ �ਪਲਿ� ਨ�� ਮ�ਨ� ਵਿੱ� ਵ��ਾ�ਣ ਲ� ਨ�� �ਾ��ਲ ਦ� ਵੱਧ ਤ�� ਵੱਧ �ੱ�ਰ।"
 
-#: ../data/tomboy.schemas.in.h:34
+#: ../data/tomboy.schemas.in.h:38
 msgid "Maximum note title length to show in tray menu."
 msgstr "ਮ�ਨ� ਵਿੱ� ਵ��ਾ�ਣ ਲ� ਵੱਧ�-ਵੱਧ ਨ�� �ਾ��ਲ ਦ� ਲੰਬਾ�।"
 
-#: ../data/tomboy.schemas.in.h:35
+#: ../data/tomboy.schemas.in.h:39
 msgid "Minimum number of notes to show in menu"
 msgstr "ਮ�ਨ� ਵਿੱ� ਵ��ਾ�ਣ ਲ� �ੱ��-�ੱ� ਨ��ਿਸਾ� ਦ� �ਿਣਤ� ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:36
+#: ../data/tomboy.schemas.in.h:40
 msgid "Note Synchronization Conflict Saved Behavior"
 msgstr "ਨ�� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ �ਪਵਾਦ ਸੰਭਾਲਣ ਰਵੱ��"
 
-#: ../data/tomboy.schemas.in.h:37
+#: ../data/tomboy.schemas.in.h:41
 msgid "Open Recent Changes"
 msgstr "ਤਾ�਼ਾ ਬਦਲਾ� ��ਲ�ਹ�"
 
-#: ../data/tomboy.schemas.in.h:38
+#: ../data/tomboy.schemas.in.h:42
 msgid "Open Search Dialog"
 msgstr "��� ਡਾ�ਲਾ� ��ਲ�ਹ�"
 
-#: ../data/tomboy.schemas.in.h:39
+#: ../data/tomboy.schemas.in.h:43
 msgid "Open Start Here"
 msgstr "�ੱਥ� ਸ�ਾਰ� ��ਲ�ਹ�"
 
-#: ../data/tomboy.schemas.in.h:40
+#: ../data/tomboy.schemas.in.h:44
 msgid "Path on SSH server to Tomboy synchronization directory (optional)."
 msgstr "SSH ਸਰਵਰ ਲ� ਪਾਥ, �ਿੱਥ� ��ਮਬ� ਸ��ਰ�ਨਾ��਼�ਸ਼ਨ ਡਾ�ਰ���ਰ� ਹ� (��ਣਵਾ�)।"
 
-#: ../data/tomboy.schemas.in.h:41
+#: ../data/tomboy.schemas.in.h:45
 msgid ""
 "Path to the synchronization server when using the filesystem synchronization "
 "service addin."
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਰ ਲ� ਮਾਰ� ਹ�, �ਦ�� �ਿ ਫਾ�ਲ-ਸਿਸ�ਮ ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਿਸ addin ਦ� ਵਰਤ�� ਹ�ਵ�।"
 
-#: ../data/tomboy.schemas.in.h:42
+#: ../data/tomboy.schemas.in.h:46
 msgid "SSHFS Remote Synchronization Folder"
 msgstr "SSHFS ਰਿਮ�� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਫ�ਲਡਰ"
 
-#: ../data/tomboy.schemas.in.h:43
+#: ../data/tomboy.schemas.in.h:47
 msgid "SSHFS Remote Synchronization User Name"
 msgstr "SSHFS ਰਿਮ�� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਯ��਼ਰ ਨਾ�"
 
-#: ../data/tomboy.schemas.in.h:44
+#: ../data/tomboy.schemas.in.h:48
 msgid "SSHFS Synchronization Server Port"
 msgstr "SSHFS ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਰ ਪ�ਰ�"
 
-#: ../data/tomboy.schemas.in.h:45
+#: ../data/tomboy.schemas.in.h:49
 msgid "SSHFS Synchronization Server URL"
 msgstr "SSHFS ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਰ URL"
 
-#: ../data/tomboy.schemas.in.h:46
+#: ../data/tomboy.schemas.in.h:50
 msgid "Saved height of Search window"
 msgstr "��� ਵਿੰਡ� ਦ� ਸੰਭਾਲ� ��ਾ�"
 
-#: ../data/tomboy.schemas.in.h:47
+#: ../data/tomboy.schemas.in.h:51
 msgid "Saved horizontal position of Search window"
 msgstr "��� ਵਿੰਡ� ਦ� ਸੰਭਾਲ� ਹਰ��ੱ�ਲ ਸਥਿਤ�"
 
-#: ../data/tomboy.schemas.in.h:48
+#: ../data/tomboy.schemas.in.h:52
 msgid "Saved vertical position of Search window"
 msgstr "��� ਵਿੰਡ� ਦ� ਸੰਭਾਲ� ਵਰ���ਲ ਸਥਿਤ�"
 
-#: ../data/tomboy.schemas.in.h:49
+#: ../data/tomboy.schemas.in.h:53
 msgid "Saved width of Search window"
 msgstr "��� ਵਿੰਡ� ਦ� ਸੰਭਾਲ� ���ਾ�"
 
-#: ../data/tomboy.schemas.in.h:50
+#: ../data/tomboy.schemas.in.h:54
 msgid "Selected Synchronization Service Addin"
 msgstr "��ਣ� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਿਸ addin"
 
-#: ../data/tomboy.schemas.in.h:51
+#: ../data/tomboy.schemas.in.h:55
 msgid "Set to TRUE to activate"
 msgstr "ਸਰ�ਰਮ �ਰਨ ਲ� ਸਹ�� ਸ�ੱ� �ਰ�"
 
-#: ../data/tomboy.schemas.in.h:52
+#: ../data/tomboy.schemas.in.h:56
 msgid "Show applet menu"
 msgstr "�ਪਲਿ� ਮ�ਨ� ਵ��ਾ�"
 
-#: ../data/tomboy.schemas.in.h:53
+#: ../data/tomboy.schemas.in.h:57
 msgid "Start Here Note"
 msgstr "�ੱਥ�� ਸ�ਾਰ� ਨ��"
 
-#: ../data/tomboy.schemas.in.h:54
+#: ../data/tomboy.schemas.in.h:58
 msgid "Sticky Note Importer First Run"
 msgstr "ਸ�ਿੱ�� ਨ�� �ਯਾਤ�ਾਰ ਪਹਿਲ�� ਵਾਰ"
 
-#: ../data/tomboy.schemas.in.h:55
+#: ../data/tomboy.schemas.in.h:59
 msgid "Synchronization Client ID"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ �ਲਾ�� ID"
 
-#: ../data/tomboy.schemas.in.h:56
+#: ../data/tomboy.schemas.in.h:60
 msgid "Synchronization Local Server Path"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਲ��ਲ ਸਰਵਰ ਮਾਰ�"
 
-#: ../data/tomboy.schemas.in.h:57
+#: ../data/tomboy.schemas.in.h:61
 msgid "The date format that is used for the timestamp."
 msgstr "�ਾ�ਮ-ਮ�ਹਰ ਵਿੱ� ਵਰਤਣ ਵਾਸਤ� ਮਿਤ� ਫਾਰਮ�� ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:58
+#: ../data/tomboy.schemas.in.h:62
 msgid ""
 "The global keybinding for creating and displaying a new Note. The format "
 "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
@@ -353,7 +399,7 @@ msgstr ""
 "ਸਮ�ਦਾ ਹ� �ਤ� ਸੰ��ਪ �ੱ�ਰ, �ਿਵ�� \"&lt;Ctl&gt;\" �ਤ� \"&lt;Ctrl&gt;\" ਵ�। �� ਤ�ਸ�� �ਾਸ "
 "ਲਾ�ਨ \"disabled\" ਲ� ��ਣ ਸ�ੱ� ��ਤ� ਤਾ�, �ਹ �ਾਰਵਾ� ��� ਸਵਿੱ�-ਬਾ�ਡਿੰ� ਨਹ�� ਹ�ਵ���।"
 
-#: ../data/tomboy.schemas.in.h:59
+#: ../data/tomboy.schemas.in.h:63
 msgid ""
 "The global keybinding for opening the \"Start Here\" note. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
@@ -367,7 +413,7 @@ msgstr ""
 "ਸੰ��ਪ �ੱ�ਰ, �ਿਵ�� \"&lt;Ctl&gt;\" �ਤ� \"&lt;Ctrl&gt;\" ਵ�। �� ਤ�ਸ�� �ਾਸ ਲਾ�ਨ "
 "\"disabled\" ਲ� ��ਣ ਸ�ੱ� ��ਤ� ਤਾ�, �ਹ �ਾਰਵਾ� ��� ਸਵਿੱ�-ਬਾ�ਡਿੰ� ਨਹ�� ਹ�ਵ���।"
 
-#: ../data/tomboy.schemas.in.h:60
+#: ../data/tomboy.schemas.in.h:64
 msgid ""
 "The global keybinding for opening the Note Search dialog. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
@@ -381,7 +427,7 @@ msgstr ""
 "ਸੰ��ਪ �ੱ�ਰ, �ਿਵ�� \"&lt;Ctl&gt;\" �ਤ� \"&lt;Ctrl&gt;\" ਵ�। �� ਤ�ਸ�� �ਾਸ ਲਾ�ਨ "
 "\"disabled\" ਲ� ��ਣ ਸ�ੱ� ��ਤ� ਤਾ�, �ਹ �ਾਰਵਾ� ��� ਸਵਿੱ�-ਬਾ�ਡਿੰ� ਨਹ�� ਹ�ਵ���।"
 
-#: ../data/tomboy.schemas.in.h:61
+#: ../data/tomboy.schemas.in.h:65
 msgid ""
 "The global keybinding for opening the Recent Changes dialog. The format "
 "looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The "
@@ -395,7 +441,7 @@ msgstr ""
 "ਹ� �ਤ� ਸੰ��ਪ �ੱ�ਰ, �ਿਵ�� \"&lt;Ctl&gt;\" �ਤ� \"&lt;Ctrl&gt;\" ਵ�। �� ਤ�ਸ�� �ਾਸ ਲਾ�ਨ "
 "\"disabled\" ਲ� ��ਣ ਸ�ੱ� ��ਤ� ਤਾ�, �ਹ �ਾਰਵਾ� ��� ਸਵਿੱ�-ਬਾ�ਡਿੰ� ਨਹ�� ਹ�ਵ���।"
 
-#: ../data/tomboy.schemas.in.h:62
+#: ../data/tomboy.schemas.in.h:66
 msgid ""
 "The global keybinding for showing the Tomboy applet's menu. The format looks "
 "like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is "
@@ -409,21 +455,21 @@ msgstr ""
 "ਹ� �ਤ� ਸੰ��ਪ �ੱ�ਰ, �ਿਵ�� \"&lt;Ctl&gt;\" �ਤ� \"&lt;Ctrl&gt;\" ਵ�। �� ਤ�ਸ�� �ਾਸ ਲਾ�ਨ "
 "\"disabled\" ਲ� ��ਣ ਸ�ੱ� ��ਤ� ਤਾ�, �ਹ �ਾਰਵਾ� ��� ਸਵਿੱ�-ਬਾ�ਡਿੰ� ਨਹ�� ਹ�ਵ���।"
 
-#: ../data/tomboy.schemas.in.h:63
+#: ../data/tomboy.schemas.in.h:67
 msgid "The handler for \"note://\" URLs"
 msgstr "\"note://\" URL ਲ� ਹ��ਡਲਰ"
 
-#: ../data/tomboy.schemas.in.h:64
+#: ../data/tomboy.schemas.in.h:68
 msgid "The last directory a note was exported to using the Export To HTML plugin."
 msgstr "��ਰ� ਡਾ�ਰ���ਰ� �ੱ� ਨ�� HTML ਲ� ��ਸਪ�ਰ� ਪਲੱ��ਨ ਦ� ਵਰਤ�� �ਰ�� ��ਸਪ�ਰ� ��ਤ� �� ਸ�।"
 
-#: ../data/tomboy.schemas.in.h:65
+#: ../data/tomboy.schemas.in.h:69
 msgid ""
 "The last setting for the 'Export linked notes' checkbox in the Export to "
 "HTML plugin."
 msgstr "HTML ਲ� ��ਸਪ�ਰ� ਪਲੱ��ਨ ਵਿੱ� 'ਲਿੰ� ��ਤ� ਨ�� ��ਸਪ�ਰ�' ��ਣ ਬ�ਸ� ਲ� ��ਰ� ਸ��ਿੰ� ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:66
+#: ../data/tomboy.schemas.in.h:70
 msgid ""
 "The last setting for the 'Include all other linked notes' checkbox in the "
 "Export to HTML plugin. This setting is used in conjunction with the 'HTML "
@@ -434,7 +480,7 @@ msgstr ""
 "ਨ�ੰ 'HTML ��ਸਪ�ਰ� ਲਿੰ� ਨ��' ਸ��ਿੰ� ਨਾਲ ��� �� ਵਰਤਿ� �ਾਵ��ਾ �ਤ� ਤਹਿ �ਰ��ਾ �ਿ HTML ਲ� "
 "��ਸਪ�ਰ� �ਰਨ ਦ�ਰਾਨ ਸਭ ਨ��ਿਸਾ� (ਲ�ਾਤਾਰ �ੰਦਰ�ਨ�) ਨ�ੰ ਵ� ਸ਼ਾਮਿਲ �ਰਨਾ ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:67
+#: ../data/tomboy.schemas.in.h:71
 msgid ""
 "The note URI of the note that should be considered the \"Start Here\" note, "
 "which is always placed at the bottom of the Tomboy note menu and also "
@@ -443,7 +489,7 @@ msgstr ""
 "ਨ�� ਦਾ ਨ��ਿਸ URI �ਿਸ ਨ�ੰ \"�ੱਥ�� ਸ਼�ਰ� �ਰ�\" ਨ��ਿਸ ਮੰਨਿ� �ਾਵ�, �� �ਿ ਹਮ�ਸ਼ਾ ��ਮਬ� ਨ�� ਮ�ਨ� ਦ� ਤਲ "
 "�ੱਤ� ਰੱ�ਿ� �ਤ� ਹਾ�-ਸਵਿੱ�ਾ� ਰਾਹ�� ��ਲ�ਹਿ� �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:68
+#: ../data/tomboy.schemas.in.h:72
 msgid ""
 "The port to use when connecting to the synchronization server via SSH. Set "
 "to -1 or less if default SSH port settings should be used instead."
@@ -451,7 +497,7 @@ msgstr ""
 "SSH ਰਾਹ�� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰਨ ਵਾਸਤ� ਵਰਤਣ ਲ� ਪ�ਰ� ਹ�। -1 �ਾ� �ੱ� ਸ�ੱ� �ਰ� �� "
 "ਡਿਫਾਲ� SSH ਪ�ਰ� ਸ��ਿੰ� ਦ� ਵਰਤ�� �ਰਨ� ਹ�ਵ�।"
 
-#: ../data/tomboy.schemas.in.h:69
+#: ../data/tomboy.schemas.in.h:73
 msgid ""
 "Time (in milliseconds) Tomboy should wait for a response when using FUSE to "
 "mount a sync share."
@@ -459,21 +505,21 @@ msgstr ""
 "ਸਮਾ� (ਮਿਲ�ਸ�ਿੰ� ਵਿੱ�), �� ��ਮਬ� �ਵਾਬ ਦ�ਣ ਤ�� ਪਹਿਲਾ� �ਡ���, �ਦ�� FUSE ਨ�ੰ �ੱ� ਸ��ਰ� ਸ਼��ਰ ਮਾ��� "
 "�ਰਨ ਲ� ਵਰਤ�।"
 
-#: ../data/tomboy.schemas.in.h:70
+#: ../data/tomboy.schemas.in.h:74
 msgid "Timestamp format"
 msgstr "�ਾ�ਮ-ਸ���ਪ ਫਾਰਮ��"
 
-#: ../data/tomboy.schemas.in.h:71
+#: ../data/tomboy.schemas.in.h:75
 msgid "URL of SSH server containing Tomboy synchronization directory."
 msgstr "SSH ਸਰਵਰ ਦਾ URL ��ਮਬ� ਸ��ਰ�ਨਾ��਼�ਸ਼ਨ ਡਾ�ਰ���ਰ� ਰੱ�ਦਾ ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:72
+#: ../data/tomboy.schemas.in.h:76
 msgid ""
 "Unique identifier for the currently configured note synchronization service "
 "addin."
 msgstr "�ਸ ਸਮ�� ਸੰਰ�ਿਤ ਨ�� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਿਸ addin ਲ� ਵਿੱਲ�ਣ ਪ�ਾਣ�ਰਤਾ।"
 
-#: ../data/tomboy.schemas.in.h:73
+#: ../data/tomboy.schemas.in.h:77
 msgid ""
 "Unique identifier for this Tomboy client, used when communicating with a "
 "sychronization server."
@@ -481,17 +527,17 @@ msgstr ""
 "�ਹ ��ਮਬਾ� �ਲਾ�� ਲ� ਵਿਲੱ�ਣ ਪ�ਾਣ, �� �ਿ ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਰ ਨਾਲ �ਮਿ�ਨ���� �ਰਨ ਲ� ਵਰਤ� "
 "�ਾ�ਦ� ਹ�।"
 
-#: ../data/tomboy.schemas.in.h:74
+#: ../data/tomboy.schemas.in.h:78
 msgid ""
 "Use wdfs option \"-ac\" to accept SSL certificates without prompting the "
 "user."
 msgstr "ਬਿਨਾ� ਯ��਼ਰ ਨ�ੰ ਪ�ੱ�� SSL ਸਰ��ਫਿ��� ਮਨ�਼�ਰ �ਰਨ ਵਾਸਤ� wdfs ��ਣ \"-ac\" ਵਰਤ��।"
 
-#: ../data/tomboy.schemas.in.h:75
+#: ../data/tomboy.schemas.in.h:79
 msgid "User name to use when connecting to the synchronization server via SSH."
 msgstr "SSH ਰਾਹ�� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰਨ ਵਾਸਤ� ਯ��਼ਰ ਨਾ�।"
 
-#: ../data/tomboy.schemas.in.h:76
+#: ../data/tomboy.schemas.in.h:80
 msgid ""
 "Whitespace-separated list of note URIs for notes that should always appear "
 "in the Tomboy note menu."
@@ -535,7 +581,7 @@ msgstr "ਬੰਦ �ਰ�(_C)"
 msgid "Close this window"
 msgstr "�ਹ ਵਿੰਡ� ਬੰਦ �ਰ�"
 
-#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:284
+#: ../Tomboy/ActionManager.cs:146 ../Tomboy/Tray.cs:289
 msgid "_Quit"
 msgstr "ਬਾਹਰ(_Q)"
 
@@ -547,7 +593,7 @@ msgstr "��ਮਬ�� ਬੰਦ �ਰ�"
 msgid "_Edit"
 msgstr "ਸ�ਧ(_E)"
 
-#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:62
+#: ../Tomboy/ActionManager.cs:154 ../Tomboy/PreferencesDialog.cs:65
 msgid "Tomboy Preferences"
 msgstr "��ਮਬਾ� ਪਸੰਦ"
 
@@ -579,10 +625,6 @@ msgstr "ਸਭ ਨ��ਿਸ ���(_S)"
 msgid "Open the Search All Notes window"
 msgstr "ਸਭ ਨ��ਿਸ ��� ਵਿੰਡ� ��ਲ�ਹ�"
 
-#: ../Tomboy/ActionManager.cs:179 ../Tomboy/Tray.cs:258
-msgid "S_ynchronize Notes"
-msgstr "ਨ��ਿਸ ਸਿ�ਰ�ਨਾ��਼ �ਰ�(_y)"
-
 #: ../Tomboy/ActionManager.cs:180
 msgid "Start synchronizing notes"
 msgstr "ਨ��ਿਸ ਸਿ�ਰ�ਨਾ��਼ ਸ�ਾਰ�"
@@ -690,23 +732,19 @@ msgstr "�-ਮ�ਲ ਨਹ�� ��ਲ�ਹ� �ਾ ਸ�ਦ�"
 msgid "_Folder Path:"
 msgstr "ਫ�ਲਡਰ ਪਾਥ(_F):"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:109
-msgid "_Browse..."
-msgstr "�ਲ�(_B)..."
-
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:128
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:100
 msgid "Select Synchronization Folder..."
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਫ�ਲਡਰ ��ਣ�..."
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:156
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:126
 msgid "Folder path field is empty."
 msgstr "ਫ�ਲਡਰ ਮਾਰ� ��ਤਰ �ਾਲ� ਹ�।"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:165
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:135
 msgid "Specified folder path does not exist, and Tomboy was unable to create it."
 msgstr "ਦਿੱਤਾ ਫ�ਲਡਰ ਮਾਰ� ਮ���ਦ ਨਹ�� ਹ�, �ਤ� ��ਮਬ� ਬਣਾ�ਣ ਲ� �ਸਮੱਰਥ ਹ�।"
 
-#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:243
+#: ../Tomboy/Addins/FileSystemSyncService/FileSystemSyncServiceAddin.cs:213
 msgid "Local Folder"
 msgstr "ਲ��ਲ ਫ�ਲਡਰ"
 
@@ -730,7 +768,7 @@ msgstr "�ਾ�ਮ-ਸ���ਪ ਸ਼ਾਮਲ"
 
 #. initial newline
 #: ../Tomboy/Addins/InsertTimestamp/InsertTimestampPreferences.cs:29
-#: ../Tomboy/Applet.cs:210 ../Tomboy/Preferences.cs:137
+#: ../Tomboy/Applet.cs:221 ../Tomboy/Preferences.cs:146
 msgid "dddd, MMMM d, h:mm tt"
 msgstr "dddd, MMMM d, h:mm tt"
 
@@ -803,7 +841,7 @@ msgid "Add a sketch"
 msgstr "�ੱ� ਸ��� ਸ਼ਾਮਲ"
 
 #: ../Tomboy/Addins/SshSyncService/SshSyncServiceAddin.cs:47
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:55
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:59
 msgid "Se_rver:"
 msgstr "ਸਰਵਰ(_r):"
 
@@ -928,55 +966,78 @@ msgstr "�ਨ�ਮ ��-ਰਿੰ� ਵਿੱ� ਸੰਰ�ਨਾ ਸੰ
 msgid "Tomboy Web"
 msgstr "��ਮਬਾ� ਵ�ੱਬ"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:62
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:92
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:66
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:96
 msgid "Connect to Server"
 msgstr "ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰ�"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:64
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:68
 msgid "Connected"
 msgstr "��ਨ��� ਹ�"
 
 #. Translators: The web service supporting Tomboy WebSync is not responding as expected
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:119
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:144
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:125
 #: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:156
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:170
 msgid "Server not responding. Try again later."
 msgstr "ਸਰਵਰ �ਵਾਬ ਨਹ�� ਦ� ਰਿਹਾ ਹ�। ਬਾ�ਦ ਵਿੱ� ��ਸ਼ਿਸ਼ �ਰ�।"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:178
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:201
 msgid "Authorization Failed, Try Again"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਫ�ਲ�ਹ ਹ��, ਮ�� ��ਸ਼ਿਸ਼"
 
 #. Translators: Title of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:187
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:210
 msgid "Tomboy Web Authorization Successful"
 msgstr "��ਮਬ� ਵ�ੱਬ ਪਰਮਾਣ�ਿਤਾ ਸਫ਼ਲ ਰਹ�"
 
 #. Translators: Body of web page presented to user after they authorized Tomboy for sync
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:189
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:212
 msgid ""
 "Please return to the Tomboy Preferences window and press Save to start "
 "synchronizing."
 msgstr "��ਮਬ�� ਪਸੰਦ ਵਿੰਡ� �ੱਤ� ਵਾਪਸ �ਾ� �ਤ� ਸ��ਰ�ਨਾ��਼�ਸ਼ਨ ਸ਼�ਰ� �ਰਨ ਵਾਸਤ� ਸੰਭਾਲ� ਨ�ੰ ਦੱਬ�।"
 
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:197
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:221
 msgid "Connected. Press Save to start synchronizing"
 msgstr "��ਨ��� ਹ�। ਸ��ਰ�ਨਾ���ਸ਼ਨ ਸ਼�ਰ� �ਰਨ ਲ� ਸੰਭਾਲ� ਦੱਬ�"
 
 #. Translators: The user must take action in their web browser to continue the authorization process
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:204
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:215
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:227
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:239
 msgid "Authorizing in browser (Press to reset connection)"
 msgstr "ਬਰਾ��਼ਰ ਵਿੱ� ਪਰਮਾਣਿਤ ��ਤਾ �ਾ ਰਿਹਾ ਹ� (��ਨ��ਸ਼ਨ ਮ��-ਸ�ੱ� �ਰਨ ਲ� ਦੱਬ�)"
 
 #. Translators: Sometimes a user's default browser is not set, so we recommend setting it and trying again
-#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:211
+#: ../Tomboy/Addins/WebSyncService/WebSyncPreferencesWidget.cs:235
 msgid "Set the default browser and try again"
 msgstr "ਡਿਫਾਲ� ਬਰਾ��਼ਰ ਸ�ੱ� �ਰ� �ਤ� ਮ��-��ਸ਼ਿਸ਼ �ਰ�"
 
+#: ../Tomboy/JumpListManager.cs:77 ../Tomboy/RecentChanges.cs:75
+msgid "Search All Notes"
+msgstr "ਸਭ ਨ��ਿਸਾ� ਦ� ���"
+
+#. IShellLink new_notebook = CreateShellLink("New Notebook", topmboy_path, "--new-notebook",
+#. icons_path, (int)TomboyIcons.NewNotebook);
+#. if (new_notebook != null)
+#. object_collection.AddObject(new_notebook);
+#: ../Tomboy/JumpListManager.cs:87
+#| msgid "Create _New Note"
+msgid "Create New Note"
+msgstr "ਨਵਾ� ਨ�� ਬਣਾ�"
+
+#: ../Tomboy/JumpListManager.cs:117
+#, csharp-format
+#| msgid " (new)"
+msgid "{0} (new)"
+msgstr "{0} (ਨਵਾ�)"
+
+#: ../Tomboy/JumpListManager.cs:138
+msgid "Recent Notes"
+msgstr "ਤਾ�਼ਾ ਨ��"
+
 #. Translators: This is the name of "Window" menu in the Mac menubar
-#: ../Tomboy/MacApplication.cs:214
+#: ../Tomboy/MacApplication.cs:215
 msgid "_Window"
 msgstr "ਵਿੰਡ�(_W)"
 
@@ -1103,48 +1164,53 @@ msgstr "ਨ��-ਬ�ੱ�"
 msgid "_New notebook..."
 msgstr "ਨਵ�� ਨ��ਬ�ੱ�(_N)..."
 
-#: ../Tomboy/Note.cs:1449
+#: ../Tomboy/Note.cs:1569
 msgid "Really delete this note?"
 msgstr "�� ਤ�ਸ�� �ਹ ਨ�� ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../Tomboy/Note.cs:1452
+#: ../Tomboy/Note.cs:1572
 #, csharp-format
 msgid "Really delete this {0} note?"
 msgid_plural "Really delete these {0} notes?"
 msgstr[0] "�� ਤ�ਸ�� �ਹ {0} ਨ�� ਹ�ਾ�ਣਾ �ਾਹ�ੰਦ� ਹ�?"
 msgstr[1] "�� ਤ�ਸ�� �ਹ {0} ਨ�� ਹ�ਾ�ਣ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../Tomboy/Note.cs:1463
+#: ../Tomboy/Note.cs:1583
 msgid "If you delete a note it is permanently lost."
 msgstr "���ਰ ਤ�ਸ�� �ੱ� ਨ�� ਹ�ਾ ਦਿੱਤਾ ਤਾ� �ਾਣ�ਾਰ� ਹਮ�ਸ਼ਾ ਲ� ਸਮਾਪਤ ਹ� �ਾਵ���।"
 
-#: ../Tomboy/Note.cs:1497
-msgid "Error saving note data."
-msgstr "ਨ�� ਸੰਭਾਲਣ ਦ�ਰਾਨ �ਲਤ�"
-
-#: ../Tomboy/Note.cs:1498
+#: ../Tomboy/Note.cs:1611
+#, csharp-format
+#| msgid ""
+#| "An error occurred while saving your notes. Please check that you have "
+#| "sufficient disk space, and that you have appropriate rights on ~/.tomboy. "
+#| "Error details can be found in ~/.tomboy.log."
 msgid ""
 "An error occurred while saving your notes. Please check that you have "
-"sufficient disk space, and that you have appropriate rights on ~/.tomboy. "
-"Error details can be found in ~/.tomboy.log."
+"sufficient disk space, and that you have appropriate rights on {0}. Error "
+"details can be found in {1}."
 msgstr ""
 "ਤ�ਹਾਡ� ਨ�� ਸੰਭਾਲਣ ਦ�ਰਾਨ �ੱ� �ਲਤ� �� ਹ�। ��ੱ� �ਰ� �ਿ �� ਤ�ਹਾਡ� ��ਲ ਡਿਸ� ਥਾ� �ਾਲ� ਹ� �ਤ� ਤ�ਹਾਨ�ੰ "
-"~/.tomboy ਲ� ਢ�ੱ�ਵ�� �ਧਿ�ਾਰ ਹ�। �ਲਤ� ਵ�ਰਵ� ਨ�ੰ ~/.tomboy.log ਵਿੱ� ਵ��ਿ� �ਾ ਸ�ਦਾ ਹ�।"
+"{0} ਲ� ਢ�ੱ�ਵ�� �ਧਿ�ਾਰ ਹ�। �ਲਤ� ਵ�ਰਵ� ਨ�ੰ {1} ਵਿੱ� ਵ��ਿ� �ਾ ਸ�ਦਾ ਹ�।"
+
+#: ../Tomboy/Note.cs:1627
+msgid "Error saving note data."
+msgstr "ਨ�� ਸੰਭਾਲਣ ਦ�ਰਾਨ �ਲਤ�"
 
 #. New Note Template
 #. Translators: This is 'New Note' Template, not New 'Note Template'
-#: ../Tomboy/NoteManager.cs:19 ../Tomboy/PreferencesDialog.cs:208
+#: ../Tomboy/NoteManager.cs:21 ../Tomboy/PreferencesDialog.cs:256
 msgid "New Note Template"
 msgstr "ਨਵਾ� ਨ�� ��ਪਲ��"
 
 #. Create migration notification note
 #. Translators: The title of the data migration note
-#: ../Tomboy/NoteManager.cs:111
+#: ../Tomboy/NoteManager.cs:147
 msgid "Your Notes Have Moved!"
 msgstr "ਤ�ਹਾਡ� ਨ��ਿਸ ਭ��� �� ਹਨ!"
 
 #. Translators: The contents (not including the title) of the data migration note. {0}, {1}, {2}, {3}, and {4} are replaced by directory paths and should not be changed
-#: ../Tomboy/NoteManager.cs:124
+#: ../Tomboy/NoteManager.cs:160
 #, csharp-format
 msgid ""
 "In the latest version of Tomboy, your note files have moved.  You have "
@@ -1169,29 +1235,27 @@ msgid ""
 "\n"
 "Ciao!"
 msgstr ""
-"��ਮਬਾ� ਦ� ਨਵ�� ਵਰ�ਨ ਵਿੱ�, ਤ�ਹਾਡ��� ਨ�� ਫਾ�ਲਾ� ਦਾ �ਿ�ਾਣਾ ਬਦਲਿ� �ਿ� ਹ�। ਤ�ਸ�� ਸ਼ਾ�ਦ ਹ� "
-"�ਦ� ਧਿ�ਨ ਦਿੱਤਾ ਹ�ਵ� �ਿ ਤ�ਹਾਡ� ਨ�� �ਿੱਥ� ਸ��ਰ ��ਤ� �ਾ�ਦ� ਹਨ, �ਤ� �� ਤ�ਸ�� ਹ�ਣ ਵ� ਨਹ�� �ਾਣਨਾ "
-"�ਾਹ�ੰਦ� ਹ� ਤਾ� <bold>�ਹ ਨ�� ਹ�ਾ ਦਿ�</bold>। :-)\n"
+"��ਮਬਾ� ਦ� ਨਵ�� ਵਰ�ਨ ਵਿੱ�, ਤ�ਹਾਡ��� ਨ�� ਫਾ�ਲਾ� ਦਾ �ਿ�ਾਣਾ ਬਦਲਿ� �ਿ� ਹ�। ਤ�ਸ�� ਸ਼ਾ�ਦ ਹ� �ਦ� "
+"ਧਿ�ਨ ਦਿੱਤਾ ਹ�ਵ� �ਿ ਤ�ਹਾਡ� ਨ�� �ਿੱਥ� ਸ��ਰ ��ਤ� �ਾ�ਦ� ਹਨ, �ਤ� �� ਤ�ਸ�� ਹ�ਣ ਵ� ਨਹ�� �ਾਣਨਾ �ਾਹ�ੰਦ� ਹ� "
+"ਤਾ� <bold>�ਹ ਨ�� ਹ�ਾ ਦਿ�</bold>। :-)\n"
 "\n"
-"ਤ�ਹਾਡ� ਪ�ਰਾਣ� ਨ�� ਡਾ�ਰ���ਰ� ਹਾਲ� ਵ� ਸ�ਰੱ�ਿ�ਤ ਹ� �ਤ� <link:url>{0}</link:url> �ੱਤ� ਮ���ਦ ਹ�। "
-"�� ਤ�ਸ�� ��ਮਬਾ� ਦਾ ਪ�ਰਾਣਾ ਵਰ�ਨ ਵਰਤਣਾ �ਾਹ�ੰਦ� ਹ� ਤਾ� �ਸ ਨ�ੰ ਨ�� �ੱਥ� ਹ� ਮਿਲ �ਾਣ��।\n"
+"ਤ�ਹਾਡ� ਪ�ਰਾਣ� ਨ�� ਡਾ�ਰ���ਰ� ਹਾਲ� ਵ� ਸ�ਰੱ�ਿ�ਤ ਹ� �ਤ� <link:url>{0}</link:url> �ੱਤ� ਮ���ਦ "
+"ਹ�। �� ਤ�ਸ�� ��ਮਬਾ� ਦਾ ਪ�ਰਾਣਾ ਵਰ�ਨ ਵਰਤਣਾ �ਾਹ�ੰਦ� ਹ� ਤਾ� �ਸ ਨ�ੰ ਨ�� �ੱਥ� ਹ� ਮਿਲ �ਾਣ��।\n"
 "\n"
-"ਪਰ �ਸ�� ਤ�ਹਾਡ� ਨ��ਿਸ �ਤ� ਸੰਰ�ਨਾ �ਾਣ�ਾਰ� ਨ�ੰ ਨਵ��� ਡਾ�ਰ���ਰ��� ਵਿੱ� �ਾਪ� �ਰ ��ੱ�� ਹਨਾ�, "
-"�ਿੱਥ� �ਿ ਹ�ਣ �ਹ ਵਰਤ��� �ਾਣ����:\n"
+"ਪਰ �ਸ�� ਤ�ਹਾਡ� ਨ��ਿਸ �ਤ� ਸੰਰ�ਨਾ �ਾਣ�ਾਰ� ਨ�ੰ ਨਵ��� ਡਾ�ਰ���ਰ��� ਵਿੱ� �ਾਪ� �ਰ ��ੱ�� ਹਨਾ�, �ਿੱਥ� "
+"�ਿ ਹ�ਣ �ਹ ਵਰਤ��� �ਾਣ����:\n"
 "\n"
-"<list><list-item dir=\"ltr\">ਨ��ਿਸਾ� ਨ�ੰ ਵ��ਿ� �ਾ ਸ�ਦਾ ਹ� <link:url>{1}</link:"
-"url> ਵਿੱ�\n"
-"</list-item><list-item dir=\"ltr\">ਸੰਰ�ਨਾ ਮ���ਦ ਹ� <link:url>{2}</link:"
-"url>\n"
-"</list-item><list-item dir=\"ltr\">ਤ�ਸ�� �ਡ-�ਨ �ੰਸ�ਾਲ �ਰ ਸ�ਦ� ਹ�You can install add-ins at <link:url>"
-"{3}</"
-"link:url> �ੱਥ�\n"
+"<list><list-item dir=\"ltr\">ਨ��ਿਸਾ� ਨ�ੰ ਵ��ਿ� �ਾ ਸ�ਦਾ ਹ� <link:url>{1}</link:url> "
+"ਵਿੱ�\n"
+"</list-item><list-item dir=\"ltr\">ਸੰਰ�ਨਾ ਮ���ਦ ਹ� <link:url>{2}</link:url>\n"
+"</list-item><list-item dir=\"ltr\">ਤ�ਸ�� �ਡ-�ਨ �ੰਸ�ਾਲ �ਰ ਸ�ਦ� ਹ�You can install "
+"add-ins at <link:url>{3}</link:url> �ੱਥ�\n"
 "</list-item><list-item dir=\"ltr\">ਲਾ� ਫਾ�ਲਾ� ਨ�ੰ ਵ��ਿ� �ਾ ਸ�ਦਾ ਹ� <link:url>{4}</"
 "link:url></list-item></list> ਵਿੱ�\n"
 "\n"
 "ਮ��ਾ� �ਰ�!"
 
-#: ../Tomboy/NoteManager.cs:222
+#: ../Tomboy/NoteManager.cs:259
 msgid ""
 "<note-content>Start Here\n"
 "\n"
@@ -1226,7 +1290,7 @@ msgstr ""
 "ਵਾਰ �ਿਵ�� �ਸ�� ਲਿ�ਦ� ਹਾ� <link:internal>��ਮਬ� ਵਿੱ� ਲਿੰ� ਦ� ਵਰਤ�� ਨਾਲ</link:internal> "
 "�ਹ ���ਮ��ਿ� ਹ� ਹ�ਠ ਲਾ�ਨ ਰੱ���ਾ?  ਸ��ਨਾ ��ਲ�ਹਣ ਲ� ਲਿੰ� ਨ�ੰ ਦਬਾ�।</note-content>"
 
-#: ../Tomboy/NoteManager.cs:241
+#: ../Tomboy/NoteManager.cs:278
 msgid ""
 "<note-content>Using Links in Tomboy\n"
 "\n"
@@ -1254,25 +1318,88 @@ msgstr ""
 "�ਰ ਦਿੱਤਾ �ਾਵ��ਾ।</note-content>"
 
 #. Attempt to find an existing Start Here note
-#: ../Tomboy/NoteManager.cs:256 ../Tomboy/NoteManager.cs:324
+#: ../Tomboy/NoteManager.cs:293 ../Tomboy/NoteManager.cs:361
 msgid "Start Here"
 msgstr "�ੱਥ�� ਸ�ਾਰ�"
 
-#: ../Tomboy/NoteManager.cs:261
+#: ../Tomboy/NoteManager.cs:298
 msgid "Using Links in Tomboy"
 msgstr "��ਮਬ� ਵਿੱ� ਲਿੰ� ਦ� ਵਰਤ��"
 
-#: ../Tomboy/NoteManager.cs:401
+#: ../Tomboy/NoteManager.cs:438
 #, csharp-format
 msgid "New Note {0}"
 msgstr "ਨਵਾ� ਨ�� {0}"
 
 #. Use a simple "Describe..." body and highlight
 #. it so it can be easily overwritten
-#: ../Tomboy/NoteManager.cs:474 ../Tomboy/NoteManager.cs:566
+#: ../Tomboy/NoteManager.cs:511 ../Tomboy/NoteManager.cs:603
 msgid "Describe your new note here."
 msgstr "�ਪਣਾ ਨ�� �ੱਥ� ਦ�ਣਾ ਸ਼�ਰ� �ਰ�।"
 
+#: ../Tomboy/NoteRenameDialog.cs:50
+msgid "Rename Note Links?"
+msgstr "ਨ�� ਲਿੰ� ਨਾ� ਬਦਲਣਾ?"
+
+#: ../Tomboy/NoteRenameDialog.cs:56
+#| msgid "_Open Link"
+msgid "_Rename Links"
+msgstr "ਲਿੰ� ਨਾ� ਬਦਲ�(_R)"
+
+#: ../Tomboy/NoteRenameDialog.cs:59
+msgid "_Don't Rename Links"
+msgstr "ਲਿੰ� ਨਾ� ਨਾ  ਬਦਲ�(_D)"
+
+#: ../Tomboy/NoteRenameDialog.cs:67
+#, csharp-format
+msgid ""
+"Rename links in other notes from \"<span underline=\"single\">{0}</span>\" "
+"to \"<span underline=\"single\">{1}</span>\"?\n"
+"\n"
+"If you do not rename the links, they will no longer link to anything."
+msgstr ""
+"\"<span underline=\"single\">{0}</span>\" ਤ�� \"<span underline=\"single\">{1}</span>\" "
+"ਹ�ਰ ਨ��ਾ� ਵਿੱ� ਲਿੰ� ਦ� ਨਾ� ਬਦਲਣ� ਹਨ?\n"
+"\n"
+"�� ਤ�ਸ�� ਲਿੰ� ਨਾ� ਨਾ ਬਦਲ� ਤਾ� �ਹ �ਿਸ� ���਼ ਨਾਲ ਵ� ਲਿੰ� ਨਹ�� ਰਹਿਣ��।"
+
+#: ../Tomboy/NoteRenameDialog.cs:81
+#| msgid "_Open Link"
+msgid "Rename Links"
+msgstr "ਲਿੰ� ਨਾ� ਬਦਲ�"
+
+#: ../Tomboy/NoteRenameDialog.cs:93
+#: ../Tomboy/Synchronization/SyncDialog.cs:119
+msgid "Note Title"
+msgstr "ਨ�� �ਾ��ਲ"
+
+#: ../Tomboy/NoteRenameDialog.cs:115
+msgid "Select All"
+msgstr "ਸਭ ��ਣ�"
+
+#: ../Tomboy/NoteRenameDialog.cs:123
+#| msgid "Select an icon..."
+msgid "Select None"
+msgstr "��� ਨਾ ��ਣ�"
+
+#: ../Tomboy/NoteRenameDialog.cs:140
+#| msgid "_Advanced..."
+msgid "Ad_vanced"
+msgstr "ਤ�ਨ���(_v)"
+
+#: ../Tomboy/NoteRenameDialog.cs:143
+#| msgid "Close this window"
+msgid "Always show this _window"
+msgstr "�ਹ ਵਿੰਡ� ਹਮ�ਸ਼ਾ ਵ���(_w)"
+
+#: ../Tomboy/NoteRenameDialog.cs:151
+msgid "Never rename _links"
+msgstr "ਲਿੰ� ਨਾ� �ਦ� ਨਾ ਬਦਲ�(_l)"
+
+#: ../Tomboy/NoteRenameDialog.cs:159
+msgid "Alwa_ys rename links"
+msgstr "ਹਮ�ਸ਼ਾ ਲਿੰ� ਨਾ� ਬਦਲ�(_y)"
+
 #: ../Tomboy/NoteWindow.cs:58
 msgid "Find in This Note"
 msgstr "�ਹ ਨ�� '� ਲੱਭ�"
@@ -1329,7 +1456,7 @@ msgstr "�ਹ ਨ�� �ੱਤ� ��ਲ ਵਰਤ��"
 msgid "Delete this note"
 msgstr "�ਸ ਨ�� ਹ�ਾ�"
 
-#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:161
+#: ../Tomboy/NoteWindow.cs:500 ../Tomboy/Synchronization/SyncManager.cs:163
 msgid "Synchronize Notes"
 msgstr "ਨ��ਿਸ ਸਿ�ਰ�ਨਾ��਼"
 
@@ -1409,27 +1536,27 @@ msgstr "ਫ��� ��ਾਰ ��ਾ�"
 msgid "Bullets"
 msgstr "ਬਿੰਦ���"
 
-#: ../Tomboy/PreferencesDialog.cs:78
+#: ../Tomboy/PreferencesDialog.cs:81
 msgid "Editing"
 msgstr "ਸੰਪਾਦਨ"
 
-#: ../Tomboy/PreferencesDialog.cs:81
+#: ../Tomboy/PreferencesDialog.cs:84
 msgid "Hotkeys"
 msgstr "ਹਾ�-ਸਵਿੱ�ਾ�"
 
-#: ../Tomboy/PreferencesDialog.cs:83
+#: ../Tomboy/PreferencesDialog.cs:86
 msgid "Synchronization"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ"
 
-#: ../Tomboy/PreferencesDialog.cs:85
+#: ../Tomboy/PreferencesDialog.cs:88
 msgid "Add-ins"
 msgstr "�ਡ-�ਨ"
 
-#: ../Tomboy/PreferencesDialog.cs:144
+#: ../Tomboy/PreferencesDialog.cs:173
 msgid "_Spell check while typing"
 msgstr "ਲਿ�ਣ ਦ�ਰਾਨ ਹ� ਸ਼ਬਦ-��� ��ੱ�(_S)"
 
-#: ../Tomboy/PreferencesDialog.cs:153
+#: ../Tomboy/PreferencesDialog.cs:182
 msgid ""
 "Misspellings will be underlined in red, with correct spelling suggestions "
 "shown in the context menu."
@@ -1438,11 +1565,11 @@ msgstr ""
 "�ਾਵ��ਾ।"
 
 #. WikiWords...
-#: ../Tomboy/PreferencesDialog.cs:164
+#: ../Tomboy/PreferencesDialog.cs:193
 msgid "Highlight _WikiWords"
 msgstr "ਵਿ��-ਸ਼ਬਦ ��ਾ��(_W)"
 
-#: ../Tomboy/PreferencesDialog.cs:172
+#: ../Tomboy/PreferencesDialog.cs:201
 msgid ""
 "Enable this option to highlight words <b>ThatLookLikeThis</b>. Clicking the "
 "word will create a note with that name."
@@ -1451,31 +1578,47 @@ msgstr ""
 "ਨਾਲ �ੱ� ਨ�� ਬਣਾ�� �ਾਵ��ਾ।"
 
 #. Auto bulleted list
-#: ../Tomboy/PreferencesDialog.cs:179
+#: ../Tomboy/PreferencesDialog.cs:208
 msgid "Enable auto-_bulleted lists"
 msgstr "���-ਬਿੰਦ� ਲਿਸ� ਯ�� �ਰ�(_b)"
 
-#. Custom font...
-#: ../Tomboy/PreferencesDialog.cs:188
+#: ../Tomboy/PreferencesDialog.cs:217
 msgid "Use custom _font"
 msgstr "�ਸ�ਮ ਫ��� ਵਰਤ��(_f)"
 
-#: ../Tomboy/PreferencesDialog.cs:212
+#: ../Tomboy/PreferencesDialog.cs:235
+msgid "When renaming a linked note: "
+msgstr "�ਦ�� ਲਿੰ� ��ਤ� ਨ�� ਦਾ ਨਾ� ਬਦਲਣਾ ਹ�ਵ�: "
+
+#: ../Tomboy/PreferencesDialog.cs:238
+#| msgid "Always ask me what to do."
+msgid "Ask me what to do"
+msgstr "ਮ�ਨ�ੰ ਪ�ੱ�� �ਿ �� �ਰਨਾ ਹ�"
+
+#: ../Tomboy/PreferencesDialog.cs:239
+msgid "Never rename links"
+msgstr "ਲਿੰ� ਨਾ� �ਦ� ਨਾ ਬਦਲ�"
+
+#: ../Tomboy/PreferencesDialog.cs:240
+msgid "Always rename links"
+msgstr "ਲਿੰ� ਨਾ� ਹਮ�ਸ਼ਾ ਬਦਲ�"
+
+#: ../Tomboy/PreferencesDialog.cs:260
 msgid ""
 "Use the new note template to specify the text that should be used when "
 "creating a new note."
 msgstr "ਨਵਾ� ਨ�� ��ਪਲ�� ਵਰਤਣ ਲ� ���ਸ� ਦਿ�, �� �ਿ ਨਵਾ� ਨ�� ਬਣਾ�ਣ ਲ� ਵਰਤਿ� �ਾਣਾ �ਾਹ�ਦਾ ਹ�।"
 
-#: ../Tomboy/PreferencesDialog.cs:221
+#: ../Tomboy/PreferencesDialog.cs:269
 msgid "Open New Note Template"
 msgstr "ਨਵਾ� ਨ�� ��ਪਲ�� ��ਲ�ਹ�"
 
 #. Hotkeys...
-#: ../Tomboy/PreferencesDialog.cs:278
+#: ../Tomboy/PreferencesDialog.cs:326
 msgid "Listen for _Hotkeys"
 msgstr "ਹਾ�-ਸਵਿੱ�ਾ� ਲ� ਸ�ਣ�(_H)"
 
-#: ../Tomboy/PreferencesDialog.cs:287
+#: ../Tomboy/PreferencesDialog.cs:335
 msgid ""
 "Hotkeys allow you to quickly access your notes from anywhere with a "
 "keypress. Example Hotkeys: <b>&lt;Control&gt;&lt;Shift&gt;F11</b>, <b>&lt;"
@@ -1485,94 +1628,104 @@ msgstr ""
 "�ਦਾਹਰਨ ਲ� <b>&lt;Control&gt;&lt;Shift&gt;F11</b><b>&lt;Alt&gt;N</b>"
 
 #. Show notes menu keybinding...
-#: ../Tomboy/PreferencesDialog.cs:307
+#: ../Tomboy/PreferencesDialog.cs:355
 msgid "Show notes _menu"
 msgstr "ਨ��ਿਸ ਮ�ਨ� ਵ��ਾ�(_m)"
 
 #. Open Start Here keybinding...
-#: ../Tomboy/PreferencesDialog.cs:324
+#: ../Tomboy/PreferencesDialog.cs:372
 msgid "Open \"_Start Here\""
 msgstr "\"�ੱਥ�� ਸ�ਾਰ�(_S)\" ��ਲ�ਹ�"
 
 #. Create new note keybinding...
-#: ../Tomboy/PreferencesDialog.cs:341
+#: ../Tomboy/PreferencesDialog.cs:389
 msgid "Create _new note"
 msgstr "ਨਵਾ� ਨ�� ਬਣਾ�(_n)"
 
 #. Open Search All Notes window keybinding...
-#: ../Tomboy/PreferencesDialog.cs:358
+#: ../Tomboy/PreferencesDialog.cs:406
 msgid "Open \"Search _All Notes\""
 msgstr "\"ਸਭ ਨ��ਿਸਾ� ਦ� ���(_A)\" ��ਲ�ਹ�"
 
-#: ../Tomboy/PreferencesDialog.cs:385
+#: ../Tomboy/PreferencesDialog.cs:433
 msgid "Ser_vice:"
 msgstr "ਸਰਵਿਸ(_v):"
 
-#: ../Tomboy/PreferencesDialog.cs:438 ../Tomboy/PreferencesDialog.cs:1031
+#: ../Tomboy/PreferencesDialog.cs:486 ../Tomboy/PreferencesDialog.cs:1114
 msgid "Not configurable"
 msgstr "ਸੰਰ�ਨਾ-ਯ�� ਨਹ��"
 
+#: ../Tomboy/PreferencesDialog.cs:512
+msgid "Automaticall_y Sync in Background Every"
+msgstr "ਬ���ਰਾ��ਡ ਨਾਲ ���ਮ��ਿ� ਸ��ਰ�ਨਾ��਼ �ਰ� ਹਰ��(_y)"
+
+#. Translators: See above comment for details on
+#. this string.
+#: ../Tomboy/PreferencesDialog.cs:518
+msgid "Minutes"
+msgstr "ਮਿੰ� ਬਾ�ਦ"
+
 #. "Advanced..." button to bring up extra sync config dialog
-#: ../Tomboy/PreferencesDialog.cs:458
+#: ../Tomboy/PreferencesDialog.cs:541
 msgid "_Advanced..."
 msgstr "ਤ�ਨ���(_A)..."
 
-#: ../Tomboy/PreferencesDialog.cs:519
+#: ../Tomboy/PreferencesDialog.cs:602
 msgid "The following add-ins are installed"
 msgstr "ਹ�ਠ ਦਿੱਤ��� �ਡ-�ਨ �ੰਸ�ਾਲ ਹਨ"
 
-#: ../Tomboy/PreferencesDialog.cs:540
+#: ../Tomboy/PreferencesDialog.cs:623
 msgid "Get More Add-Ins..."
 msgstr "ਹ�ਰ �ਡ�ਨਲ ਲਵ�..."
 
-#: ../Tomboy/PreferencesDialog.cs:566
+#: ../Tomboy/PreferencesDialog.cs:649
 msgid "_Enable"
 msgstr "ਯ��(_E)"
 
-#: ../Tomboy/PreferencesDialog.cs:572
+#: ../Tomboy/PreferencesDialog.cs:655
 msgid "_Disable"
 msgstr "�ਯ��(_D)"
 
-#: ../Tomboy/PreferencesDialog.cs:703
+#: ../Tomboy/PreferencesDialog.cs:786
 msgid "Not Implemented"
 msgstr "ਹਾਲ� ਨਹ�� ਬਣਾ��"
 
-#: ../Tomboy/PreferencesDialog.cs:717
+#: ../Tomboy/PreferencesDialog.cs:800
 #, csharp-format
 msgid "{0} Preferences"
 msgstr "{0} ਪਸੰਦ"
 
-#: ../Tomboy/PreferencesDialog.cs:856
+#: ../Tomboy/PreferencesDialog.cs:939
 msgid "Choose Note Font"
 msgstr "ਨ�� ਫ��� ��ਣ�"
 
-#: ../Tomboy/PreferencesDialog.cs:900
+#: ../Tomboy/PreferencesDialog.cs:983
 msgid "Other Synchronization Options"
 msgstr "ਹ�ਰ ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ��ਣਾ�"
 
-#: ../Tomboy/PreferencesDialog.cs:906
+#: ../Tomboy/PreferencesDialog.cs:989
 msgid ""
 "When a conflict is detected between a local note and a note on the "
 "configured synchronization server:"
 msgstr "�ਦ�� �ੱ� ਲ��ਲ ਨ�� �ਤ� ਸੰਰ�ਿਤ ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਰ ਦ� ਨ�� ਵਿੱ� �ਪਵਾਦ ਹ�ਵ� ਤਾ�:"
 
-#: ../Tomboy/PreferencesDialog.cs:913
+#: ../Tomboy/PreferencesDialog.cs:996
 msgid "Always ask me what to do."
 msgstr "ਮ�ਨ�ੰ ਪ�ੱ�� �ਿ �� �ਰਨਾ ਹ�।"
 
-#: ../Tomboy/PreferencesDialog.cs:917
+#: ../Tomboy/PreferencesDialog.cs:1000
 msgid "Rename my local note."
 msgstr "ਮ�ਰ� ਲ��ਲ ਨ�� ਦਾ ਨਾ� ਬਦਲ�।"
 
-#: ../Tomboy/PreferencesDialog.cs:921
+#: ../Tomboy/PreferencesDialog.cs:1004
 msgid "Replace my local note with the server's update."
 msgstr "ਮ�ਰ� ਲ��ਲ ਨ�� ਨ�ੰ ਸਰਵਰ ਦ� �ੱਪਡ�� ਨਾਲ ਬਦਲ ਦਿ�।"
 
-#: ../Tomboy/PreferencesDialog.cs:1067
+#: ../Tomboy/PreferencesDialog.cs:1150
 msgid "WARNING: Are you sure?"
 msgstr "��ਤਾਵਨ�: �� ਤ�ਹਾਨ�ੰ ਯ��ਨ ਹ�?"
 
-#: ../Tomboy/PreferencesDialog.cs:1069
+#: ../Tomboy/PreferencesDialog.cs:1152
 msgid ""
 "Clearing your synchronization settings is not recommended.  You may be "
 "forced to synchronize all of your notes again when you save new settings."
@@ -1580,11 +1733,11 @@ msgstr ""
 "ਤ�ਹਾਡ� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸ��ਿੰ� ਨ�ੰ ਸਾਫ਼ �ਰਨ ਦ� ਸਿਫ਼ਾਰਸ਼ ਨਹ�� ��ਤ� �ਾ�ਦ� ਹ�।  ਤ�ਹਾਨ�ੰ ਨਵ�� ਸ��ਿੰ� "
 "ਸੰਭਾਲਣ ਸਮ�� ਤ�ਹਾਨ�ੰ ਸਭ ਨ�� ਸਿ�ਰ�ਨਾ��਼ �ਰਨ ਲ� ਮ�਼ਬ�ਰ ��ਤਾ �ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../Tomboy/PreferencesDialog.cs:1082
+#: ../Tomboy/PreferencesDialog.cs:1165
 msgid "Resetting Synchronization Settings"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸ��ਿੰ� ਮ��-ਸ�ੱ� ��ਤ� �ਾ ਰਹ� ਹ�"
 
-#: ../Tomboy/PreferencesDialog.cs:1084
+#: ../Tomboy/PreferencesDialog.cs:1167
 msgid ""
 "You have disabled the configured synchronization service.  Your "
 "synchronization settings will now be cleared.  You may be forced to "
@@ -1594,48 +1747,48 @@ msgstr ""
 "�ਾਵ���।  ਤ�ਹਾਨ�ੰ ਨਵ�� ਸ��ਿੰ� ਮ�� ਬਦਲਣ ਬਾ�ਦ ਤ�ਹਾਡ� ਸਭ ਨ�� ਮ�� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ �ਰਨ ਲ� ਮ�਼ਬ�ਰ ��ਤਾ "
 "�ਾ ਸ�ਦਾ ਹ�।"
 
-#: ../Tomboy/PreferencesDialog.cs:1162
+#: ../Tomboy/PreferencesDialog.cs:1245
 msgid "Success! You're connected!"
 msgstr "ਸਫ਼ਲ! ਤ�ਸ�� ��ਨ��� ਹ� �� ਹ�!"
 
-#: ../Tomboy/PreferencesDialog.cs:1164
+#: ../Tomboy/PreferencesDialog.cs:1247
 msgid ""
 "Tomboy is ready to synchronize your notes. Would you like to synchronize "
 "them now?"
 msgstr "��ਮਬ� ਤ�ਹਾਡ� ਨ�� ਸਿ�ਰ�ਨਾ��਼ �ਰਨ ਲ� ਤਿ�ਰ ਹ�। �� ਤ�ਸ�� ਹ�ਣ� ਸ��ਰ�ਨਾ��਼ �ਰਨ� �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../Tomboy/PreferencesDialog.cs:1187
+#: ../Tomboy/PreferencesDialog.cs:1270
+#, csharp-format
+#| msgid ""
+#| "Sorry, but something went wrong.  Please check your information and try "
+#| "again.  The ~/.tomboy.log might be useful too."
 msgid ""
 "Sorry, but something went wrong.  Please check your information and try "
-"again.  The ~/.tomboy.log might be useful too."
+"again.  The {0} might be useful too."
 msgstr ""
-"�ਫ਼ਸ�ਸ ਹ� �ਿ ��� �ਲਤ ਹ� �ਿ� ਹ�।  �ਪਣ� �ਾਣ�ਾਰ� ��ੱ� �ਰ�� ਮ�� �ਰਾ� ਮਾਰ� ��।  ਸ਼ਾ�ਦ ~/."
-"tomboy.log ��� ਮੱਦਦ �ਰ ਸ��।"
+"�ਫ਼ਸ�ਸ ਹ� �ਿ ��� �ਲਤ ਹ� �ਿ� ਹ�।  �ਪਣ� �ਾਣ�ਾਰ� ��ੱ� �ਰ�� ਮ�� �ਰਾ� ਮਾਰ� ��।  ਸ਼ਾ�ਦ "
+"{0} ��� ਮੱਦਦ �ਰ ਸ��।"
 
-#: ../Tomboy/PreferencesDialog.cs:1196
+#: ../Tomboy/PreferencesDialog.cs:1283
 msgid "Error connecting :("
 msgstr "��ਨ��� �ਰਨ ਦ�ਰਾਨ �ਲਤ�:("
 
-#: ../Tomboy/PreferencesDialog.cs:1272
+#: ../Tomboy/PreferencesDialog.cs:1359
 msgid "Version:"
 msgstr "ਵਰ�ਨ:"
 
-#: ../Tomboy/PreferencesDialog.cs:1279
+#: ../Tomboy/PreferencesDialog.cs:1366
 msgid "Author:"
 msgstr "ਲ���:"
 
-#: ../Tomboy/PreferencesDialog.cs:1286
+#: ../Tomboy/PreferencesDialog.cs:1373
 msgid "Copyright:"
 msgstr "�ਾਪ�ਰਾ��:"
 
-#: ../Tomboy/PreferencesDialog.cs:1292
+#: ../Tomboy/PreferencesDialog.cs:1379
 msgid "Add-in Dependencies:"
 msgstr "�ਡ-�ਨ ਨਿਰਭਰਤਾ:"
 
-#: ../Tomboy/RecentChanges.cs:75
-msgid "Search All Notes"
-msgstr "ਸਭ ਨ��ਿਸਾ� ਦ� ���"
-
 #: ../Tomboy/RecentChanges.cs:90
 msgid "_Search:"
 msgstr "���(_S):"
@@ -1677,26 +1830,26 @@ msgstr[1] "ਮ�ਲ: {0} ਨ��ਿਸ"
 msgid "Notes"
 msgstr "ਨ��ਿਸ"
 
-#: ../Tomboy/Tomboy.cs:244
+#: ../Tomboy/Tomboy.cs:266
 msgid "Cannot create new note"
 msgstr "ਨਵਾ� ਨ��ਿਸ ਨਹ�� ਬਣਾ�� �ਾ ਸ�ਦਾ"
 
-#: ../Tomboy/Tomboy.cs:310
+#: ../Tomboy/Tomboy.cs:332
 msgid "Primary Development:"
 msgstr "ਪ�ਰਾ�ਮਰ� ਡਿਵ�ਲਪਮ���:"
 
-#: ../Tomboy/Tomboy.cs:315
+#: ../Tomboy/Tomboy.cs:338
 msgid "Contributors:"
 msgstr "ਯ��ਦਾਨ:"
 
-#: ../Tomboy/Tomboy.cs:333
+#: ../Tomboy/Tomboy.cs:400
 msgid "translator-credits"
 msgstr ""
 "�ਮਨਪਰ�ਤ ਸਿੰ� �ਲਮ\n"
 "ਪੰ�ਾਬ� �ਪਨ ਸ�ਰਸ ��ਮ ਵਲ��\n"
 "http://www.satluj.org";
 
-#: ../Tomboy/Tomboy.cs:342
+#: ../Tomboy/Tomboy.cs:409
 msgid ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 Others\n"
@@ -1704,15 +1857,15 @@ msgstr ""
 "Copyright © 2004-2007 Alex Graveley\n"
 "Copyright © 2004-2009 ਹ�ਰ\n"
 
-#: ../Tomboy/Tomboy.cs:344
+#: ../Tomboy/Tomboy.cs:411
 msgid "A simple and easy to use desktop note-taking application."
 msgstr "�ੱ� ਸਧਾਰਨ �ਤ� ਵਰਤਣ ਲ� ਸ��ਾ ਡ�ਸ��ਾਪ ਨ��-ਲਿ�ਣ �ਾਰ� ਹ�।"
 
-#: ../Tomboy/Tomboy.cs:354
+#: ../Tomboy/Tomboy.cs:421
 msgid "Homepage"
 msgstr "ਮ�ੱ� ਸਫ਼ਾ"
 
-#: ../Tomboy/Tomboy.cs:471
+#: ../Tomboy/Tomboy.cs:533
 msgid ""
 "Tomboy: A simple, easy to use desktop note-taking application.\n"
 "Copyright (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
@@ -1722,7 +1875,7 @@ msgstr ""
 "Copyright (C) 2004-2006 Alex Graveley <alex beatniksoftware com>\n"
 "\n"
 
-#: ../Tomboy/Tomboy.cs:483
+#: ../Tomboy/Tomboy.cs:545
 msgid ""
 "Usage:\n"
 "  --version\t\t\tPrint version information.\n"
@@ -1736,7 +1889,7 @@ msgstr ""
 "  --note-path [path]\t\tLoad/store note data in this directory.\n"
 "  --search [text]\t\tOpen the search all notes window with the search text.\n"
 
-#: ../Tomboy/Tomboy.cs:494
+#: ../Tomboy/Tomboy.cs:555
 msgid ""
 "  --new-note\t\t\tCreate and display a new note.\n"
 "  --new-note [title]\t\tCreate and display a new note, with a title.\n"
@@ -1750,125 +1903,105 @@ msgstr ""
 "  --start-here\t\t\tDisplay the 'Start Here' note.\n"
 "  --highlight-search [text]\tSearch and highlight text in the opened note.\n"
 
-#. TODO: Restore this functionality with addins
-#. usage +=
-#. Catalog.GetString (
-#. "  --check-plugin-unloading\tCheck if plugins are " +
-#. "unloaded properly.\n");
-#: ../Tomboy/Tomboy.cs:511
-msgid "D-BUS remote control disabled.\n"
-msgstr "D-BUS ਰਿਮ�� �ੰ�ਰ�ਲ ਬੰਦ ਹ�।\n"
-
-#: ../Tomboy/Tomboy.cs:519
+#: ../Tomboy/Tomboy.cs:569
 #, csharp-format
 msgid "Version {0}"
 msgstr "ਵਰ�ਨ {0}"
 
-#: ../Tomboy/Tomboy.cs:592
-#, csharp-format
-msgid ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
-msgstr ""
-"Tomboy: unsupported option '{0}'\n"
-"Try 'tomboy --help' for more information.\n"
-"D-BUS remote control disabled."
-
-#: ../Tomboy/Tray.cs:63
+#: ../Tomboy/Tray.cs:68
 msgid " (new)"
 msgstr " (ਨਵਾ�)"
 
-#: ../Tomboy/Tray.cs:277
+#: ../Tomboy/Tray.cs:282
 msgid "_About Tomboy"
 msgstr "��ਮਬ� ਬਾਰ�(_A)"
 
-#: ../Tomboy/Utils.cs:142
+#: ../Tomboy/Utils.cs:143
 msgid ""
 "The \"Tomboy Notes Manual\" could not be found.  Please verify that your "
 "installation has been completed successfully."
 msgstr "\"��ਮਬਾ� ਨ��ਿਸ ਦਸਤਾਵ��਼\" ਨਹ�� ਲੱਭਿ� �ਾ ਸ�ਿ� ਹ�। �ਾ�� �ਰ� �ਿ ਤ�ਹਾਡ� �ੰਸ�ਾਲ�ਸ਼ਨ ਪ�ਰ� ਹ� �� ਹ�।"
 
-#: ../Tomboy/Utils.cs:151
+#: ../Tomboy/Utils.cs:152
 msgid "Help not found"
 msgstr "ਮੱਦਦ ਨਹ�� ਲੱਭ�"
 
-#: ../Tomboy/Utils.cs:167
+#: ../Tomboy/Utils.cs:168
 msgid "Cannot open location"
 msgstr "�ਿ�ਾਣਾ ��ਲ�ਹਿ� ਨਹ�� �ਾ ਸ�ਦਾ"
 
-#: ../Tomboy/Utils.cs:189
+#: ../Tomboy/Utils.cs:190
 #, csharp-format
 msgid "Today, {0}"
 msgstr "�ੱ�, {0}"
 
-#: ../Tomboy/Utils.cs:191
+#: ../Tomboy/Utils.cs:192
 msgid "Today"
 msgstr "�ੱ�"
 
-#: ../Tomboy/Utils.cs:195
+#: ../Tomboy/Utils.cs:196
 #, csharp-format
 msgid "Yesterday, {0}"
 msgstr "�ੱਲ�ਹ, {0}"
 
-#: ../Tomboy/Utils.cs:197
+#: ../Tomboy/Utils.cs:198
 msgid "Yesterday"
 msgstr "�ੱਲ�ਹ"
 
-#: ../Tomboy/Utils.cs:202
+#: ../Tomboy/Utils.cs:203
 #, csharp-format
 msgid "{0} day ago, {1}"
 msgid_plural "{0} days ago, {1}"
 msgstr[0] "{0} ਦਿਨ ਪਹਿਲਾ�, {1}"
 msgstr[1] "{0} ਦਿਨ ਪਹਿਲਾ�, {1}"
 
-#: ../Tomboy/Utils.cs:206
+#: ../Tomboy/Utils.cs:207
 #, csharp-format
 msgid "{0} day ago"
 msgid_plural "{0} days ago"
 msgstr[0] "{0} ਦਿਨ ਪਹਿਲਾ�"
 msgstr[1] "{0} ਦਿਨ ਪਹਿਲਾ�"
 
-#: ../Tomboy/Utils.cs:212
+#: ../Tomboy/Utils.cs:213
 #, csharp-format
 msgid "Tomorrow, {0}"
 msgstr "ਭਲ�, {0}"
 
-#: ../Tomboy/Utils.cs:214
+#: ../Tomboy/Utils.cs:215
 msgid "Tomorrow"
 msgstr "ਭਲ�"
 
-#: ../Tomboy/Utils.cs:219
+#: ../Tomboy/Utils.cs:220
 #, csharp-format
 msgid "In {0} day, {1}"
 msgid_plural "In {0} days, {1}"
 msgstr[0] "{0} ਦਿਨਾ� ਵਿੱ�, {1}"
 msgstr[1] "{0} ਦਿਨਾ� ਵਿੱ�, {1}"
 
-#: ../Tomboy/Utils.cs:223
+#: ../Tomboy/Utils.cs:224
 #, csharp-format
 msgid "In {0} day"
 msgid_plural "In {0} days"
 msgstr[0] "{0} ਦਿਨਾ� ਵਿੱ�"
 msgstr[1] "{0} ਦਿਨਾ� ਵਿੱ�"
 
-#: ../Tomboy/Utils.cs:228
+#: ../Tomboy/Utils.cs:229
 msgid "MMMM d, h:mm tt"
 msgstr "MMMM d, h:mm tt"
 
-#: ../Tomboy/Utils.cs:229
+#: ../Tomboy/Utils.cs:230
 msgid "MMMM d"
 msgstr "MMMM d"
 
-#: ../Tomboy/Utils.cs:231
+#: ../Tomboy/Utils.cs:232
 msgid "No Date"
 msgstr "ਮਿਤ� ਨਹ��"
 
-#: ../Tomboy/Utils.cs:234
+#: ../Tomboy/Utils.cs:235
 msgid "MMMM d yyyy, h:mm tt"
 msgstr "MMMM d yyyy, h:mm tt"
 
-#: ../Tomboy/Utils.cs:235
+#: ../Tomboy/Utils.cs:236
 msgid "MMMM d yyyy"
 msgstr "MMMM d yyyy"
 
@@ -1877,7 +2010,7 @@ msgstr "MMMM d yyyy"
 msgid "(Untitled {0})"
 msgstr "(ਬਿਨਾ�-�ਾ��ਲ {0})"
 
-#: ../Tomboy/Watchers.cs:188
+#: ../Tomboy/Watchers.cs:189
 #, csharp-format
 msgid ""
 "A note with the title <b>{0}</b> already exists. Please choose another name "
@@ -1886,15 +2019,15 @@ msgstr ""
 "ਨਾ� <b>{0}</b> ਨਾਲ �ੱ� ਨ�� ਪਹਿਲਾ� ਹ� ਮ���ਦ ਹ�। �ਾਰ� ਰੱ�ਣ ਤ�� ਪਹਿਲਾ� �ਹ ਨ�� ਲ� ਹ�ਰ ਨਾ� ��ਣ� "
 "��।"
 
-#: ../Tomboy/Watchers.cs:203
+#: ../Tomboy/Watchers.cs:204
 msgid "Note title taken"
 msgstr "ਨ�� �ਾ��ਲ ਲਿ�"
 
-#: ../Tomboy/Watchers.cs:548
+#: ../Tomboy/Watchers.cs:549
 msgid "_Copy Link Address"
 msgstr "ਲਿੰ� �ਡਰ�ੱਸ �ਾਪ� �ਰ�(_C)"
 
-#: ../Tomboy/Watchers.cs:553
+#: ../Tomboy/Watchers.cs:554
 msgid "_Open Link"
 msgstr "ਲਿੰ� ��ਲ�ਹ�(_O)"
 
@@ -1932,199 +2065,195 @@ msgid "An error ocurred while connecting to the specified server:"
 msgstr "ਦਿੱਤ� ਸਰਵਰ ਨਾਲ ��ਨ��� �ਰਨ ਦ�ਰਾਨ �ੱ� �ਲਤ� �� ਹ�।"
 
 #. Expander containing TreeView
-#: ../Tomboy/Synchronization/SyncDialog.cs:88
+#: ../Tomboy/Synchronization/SyncDialog.cs:89
 msgid "Details"
 msgstr "ਵ�ਰਵਾ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:118
-msgid "Note Title"
-msgstr "ਨ�� �ਾ��ਲ"
-
-#: ../Tomboy/Synchronization/SyncDialog.cs:125
+#: ../Tomboy/Synchronization/SyncDialog.cs:126
 msgid "Status"
 msgstr "ਹਾਲਤ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:240
+#: ../Tomboy/Synchronization/SyncDialog.cs:236
 msgid "Acquiring sync lock..."
 msgstr "sync ਲਾ� ਲਿ� �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:243
+#: ../Tomboy/Synchronization/SyncDialog.cs:239
 msgid "Committing changes..."
 msgstr "ਬਦਲਾ� �ਮਿ� ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:246
+#: ../Tomboy/Synchronization/SyncDialog.cs:242
 msgid "Synchronizing Notes"
 msgstr "ਨ��ਿਸ ਸਿ�ਰ�ਨਾ��਼ਿੰ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:247
+#: ../Tomboy/Synchronization/SyncDialog.cs:243
 msgid "Synchronizing your notes..."
 msgstr "ਤ�ਹਾਡ� ਨ�� ਸਿ�ਰ�ਨਾ��਼ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:248
+#: ../Tomboy/Synchronization/SyncDialog.cs:244
 msgid "This may take a while, kick back and enjoy!"
 msgstr "�ਸ ਨ�ੰ ��� �ਾ�ਮ ਲੱ� ਸ�ਦਾ ਹ�, ਦੱਬ� �ਤ� ਹ�ਰ ਨ�਼ਾਰ� ਲ�ੱ��!"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:250
+#: ../Tomboy/Synchronization/SyncDialog.cs:246
 msgid "Connecting to the server..."
 msgstr "ਸਰਵਰ ਨਾਲ ��ਨ��� ��ਤਾ �ਾ ਰਿਹਾ ਹ�..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:256
+#: ../Tomboy/Synchronization/SyncDialog.cs:252
 msgid "Deleting notes off of the server..."
 msgstr "ਸਰਵਰ ਤ�� ਨ�� ਹ�ਾ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:260
+#: ../Tomboy/Synchronization/SyncDialog.cs:256
 msgid "Downloading new/updated notes..."
 msgstr "ਨਵ��/�ੱਪਡ�� ਨ�� ਡਾ�ਨਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:272
+#: ../Tomboy/Synchronization/SyncDialog.cs:268
 msgid "Server Locked"
 msgstr "ਸਰਵਰ ਲਾ� ਹ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:273
+#: ../Tomboy/Synchronization/SyncDialog.cs:269
 msgid "Server is locked"
 msgstr "ਸਰਵਰ ਲਾ� ਹ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:274
+#: ../Tomboy/Synchronization/SyncDialog.cs:270
 msgid ""
 "One of your other computers is currently synchronizing.  Please wait 2 "
 "minutes and try again."
 msgstr ""
 "ਤ�ਹਾਡ� �ੰਪਿ��ਰਾ� ਵਿੱ��� �ੱ� �ਸ ਵ�ਲ� ਸਿ�ਰ�ਨਾ��਼ ਹ� ਰਿਹਾ ਹ�।  2 ਮਿੰ� ਲ� �ਡ��� �ਤ� ਮ��-��ਸ਼ਿਸ਼ �ਰ� ��।"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:278
+#: ../Tomboy/Synchronization/SyncDialog.cs:274
 msgid "Preparing to download updates from server..."
 msgstr "ਸਰਵਰ ਤ�� �ੱਪਡ�� ਡਾ�ਨਲ�ਡ �ਰਨ ਲ� ਤਿ�ਰ� �ਾਰ�..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:281
+#: ../Tomboy/Synchronization/SyncDialog.cs:277
 msgid "Preparing to upload updates to server..."
 msgstr "ਸਰਵਰ �ੱਤ� �ੱਪਡ�� �ੱਪਲ�ਡ �ਰਨ ਲ� ਤਿ�ਰ�..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:284
+#: ../Tomboy/Synchronization/SyncDialog.cs:280
 msgid "Uploading notes to server..."
 msgstr "ਨ�� ਸਰਵਰ �ੱਤ� �ੱਪਲ�ਡ ��ਤ� �ਾ ਰਹ� ਹਨ..."
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:287
+#: ../Tomboy/Synchronization/SyncDialog.cs:283
 msgid "Synchronization Failed"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਫ�ਲ�ਹ ਹ��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:288
+#: ../Tomboy/Synchronization/SyncDialog.cs:284
 msgid "Failed to synchronize"
 msgstr "ਸਿ�ਰ�ਨਾ��਼ �ਰਨ ਲ� ਫ�ਲ�ਹ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:289
+#: ../Tomboy/Synchronization/SyncDialog.cs:285
 msgid "Could not synchronize notes.  Check the details below and try again."
 msgstr "ਨ�� ਸਿ�ਰ�ਨਾ��਼ ਨਹ�� ��ਤ� �ਾ ਸ��।  ਹ�ਠਾ� ਵ�ਰਵਾ ��ੱ� �ਰ�� ਮ��-�ਰਾ� ਮਾਰ�।"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:295
+#: ../Tomboy/Synchronization/SyncDialog.cs:291
 msgid "Synchronization Complete"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਪ�ਰ� ਹ��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:296
+#: ../Tomboy/Synchronization/SyncDialog.cs:292
 msgid "Synchronization is complete"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਪ�ਰ� ਹ��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:298
+#: ../Tomboy/Synchronization/SyncDialog.cs:294
 #, csharp-format
 msgid "{0} note updated."
 msgid_plural "{0} notes updated."
 msgstr[0] "{0} ਨ�� �ੱਪਡ�� ��ਤਾ"
 msgstr[1] "{0} ਨ�� �ੱਪਡ�� ��ਤ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:303
+#: ../Tomboy/Synchronization/SyncDialog.cs:299
 msgid "Your notes are now up to date."
 msgstr "ਤ�ਹਾਡ� ਨ�� �ੱਪਡ�� ਹਨ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:307
+#: ../Tomboy/Synchronization/SyncDialog.cs:303
 msgid "Synchronization Canceled"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਰੱਦ ��ਤ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:308
+#: ../Tomboy/Synchronization/SyncDialog.cs:304
 msgid "Synchronization was canceled"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਰੱਦ ��ਤ� ��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:309
+#: ../Tomboy/Synchronization/SyncDialog.cs:305
 msgid "You canceled the synchronization.  You may close the window now."
 msgstr "ਤ�ਸ�� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਰੱਦ ��ਤ� ਸ�।  ਹ�ਣ ਤ�ਸ�� ਵਿੰਡ� ਬੰਦ �ਰ ਸ�ਦ� ਹ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:313
+#: ../Tomboy/Synchronization/SyncDialog.cs:309
 msgid "Synchronization Not Configured"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸੰਰ�ਿਤ ਨਹ�� ਹ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:314
+#: ../Tomboy/Synchronization/SyncDialog.cs:310
 msgid "Synchronization is not configured"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸੰਰ�ਿਤ ਨਹ�� ਹ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:315
+#: ../Tomboy/Synchronization/SyncDialog.cs:311
 msgid "Please configure synchronization in the preferences dialog."
 msgstr "ਪਸੰਦ ਡਾ�ਲਾ� ਵਿੱ� ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸੰਰ�ਨਾ �ਰ� ��।"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:319
+#: ../Tomboy/Synchronization/SyncDialog.cs:315
 msgid "Synchronization Service Error"
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਰ �ਲਤ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:320
+#: ../Tomboy/Synchronization/SyncDialog.cs:316
 msgid "Service error"
 msgstr "ਸਰਵਿਸ �ਲਤ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:321
+#: ../Tomboy/Synchronization/SyncDialog.cs:317
 msgid "Error connecting to the synchronization service.  Please try again."
 msgstr "ਸਿ�ਰ�ਨਾ��਼�ਸ਼ਨ ਸਰਵਿਸ ਨਾਲ ��ਨ��� �ਰਨ ਦ�ਰਾਨ �ਲਤ�।  ਬਾ�ਦ '� �ਰਾ� �ਰ�।"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:338
+#: ../Tomboy/Synchronization/SyncDialog.cs:334
 msgid "Deleted locally"
 msgstr "ਲ��ਲ� ਹ�ਾ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:341
+#: ../Tomboy/Synchronization/SyncDialog.cs:337
 msgid "Deleted from server"
 msgstr "ਸਰਵਰ ਤ�� ਹ�ਾ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:344
+#: ../Tomboy/Synchronization/SyncDialog.cs:340
 msgid "Updated"
 msgstr "�ੱਪਡ�� ��ਤਾ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:347
+#: ../Tomboy/Synchronization/SyncDialog.cs:343
 msgid "Added"
 msgstr "ਸ਼ਾਮਲ ��ਤਾ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:350
+#: ../Tomboy/Synchronization/SyncDialog.cs:346
 msgid "Uploaded changes to server"
 msgstr "ਬਦਲਾ� ਸਰਵਰ �ੱਤ� �ੱਪਲ�ਡ ��ਤ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:353
+#: ../Tomboy/Synchronization/SyncDialog.cs:349
 msgid "Uploaded new note to server"
 msgstr "ਸਰਵਰ �ੱਤ� ਨਵਾ� ਨ�� �ੱਪਲ�ਡ ��ਤਾ"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:501
+#: ../Tomboy/Synchronization/SyncDialog.cs:496
 msgid "Note Conflict"
 msgstr "ਨ�� �ਪਵਾਦ"
 
 #. Suggest renaming note by appending " (old)" to the existing title
-#: ../Tomboy/Synchronization/SyncDialog.cs:507
+#: ../Tomboy/Synchronization/SyncDialog.cs:502
 msgid " (old)"
 msgstr " (ਪ�ਰਾਣਾ)"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:546
+#: ../Tomboy/Synchronization/SyncDialog.cs:541
 msgid "Rename local note:"
 msgstr "ਲ��ਲ ਨ�� ਨਾ� ਬਦਲ�:"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:552
+#: ../Tomboy/Synchronization/SyncDialog.cs:547
 msgid "Update links in referencing notes"
 msgstr "ਹਵਾਲਾ ਨ��ਾ� ਵਿੱ� ਲਿੰ� �ੱਪਡ�� �ਰ�"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:559
+#: ../Tomboy/Synchronization/SyncDialog.cs:554
 msgid "Overwrite local note"
 msgstr "ਲ��ਲ ਨ�� �ੱਤ� ਲਿ��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:563
+#: ../Tomboy/Synchronization/SyncDialog.cs:558
 msgid "Always perform this action"
 msgstr "�ਹ ��ਸ਼ਨ ਹਮ�ਸ਼ਾ� �ਰ�"
 
 #. Set initial dialog text
-#: ../Tomboy/Synchronization/SyncDialog.cs:569
+#: ../Tomboy/Synchronization/SyncDialog.cs:564
 msgid "Note conflict detected"
 msgstr "ਨ�� �ਪਵਾਦ ਹ�ਾ��"
 
-#: ../Tomboy/Synchronization/SyncDialog.cs:570
+#: ../Tomboy/Synchronization/SyncDialog.cs:565
 #, csharp-format
 msgid ""
 "The server version of \"{0}\" conflicts with your local note.  What do you "
@@ -2133,7 +2262,7 @@ msgstr ""
 "\"{0}\" ਦਾ ਸਰਵਰ ਵਰ�ਨ ਤ�ਹਾਡ� ਲ��ਲ ਨ�� ਨਾਲ �ਪਵਾਦ ਪ�ਦਾ �ਰ ਰਿਹਾ ਹ�।  ਤ�ਸ�� �ਪਣ� ਲ��ਲ ਨ�� "
 "ਨਾਲ �� �ਰਨਾ �ਾਹ�ੰਦ� ਹ�?"
 
-#: ../Tomboy/Synchronization/SyncManager.cs:159
+#: ../Tomboy/Synchronization/SyncManager.cs:161
 msgid "_Tools"
 msgstr "��ਲ(_o)"
 
@@ -2169,5 +2298,20 @@ msgstr ""
 "�ਾਹ�ਦਾ ਹ�। /etc/init.d/boot.local ਵਿੱ� \"modprobe fuse\" �ਾ� /etc/modules ਵਿੱ� "
 "\"fuse\" ਸ਼ਾਮਲ �ਰ�।"
 
+#~ msgid "_Browse..."
+#~ msgstr "�ਲ�(_B)..."
+
+#~ msgid "D-BUS remote control disabled.\n"
+#~ msgstr "D-BUS ਰਿਮ�� �ੰ�ਰ�ਲ ਬੰਦ ਹ�।\n"
+
+#~ msgid ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+#~ msgstr ""
+#~ "Tomboy: unsupported option '{0}'\n"
+#~ "Try 'tomboy --help' for more information.\n"
+#~ "D-BUS remote control disabled."
+
 #~ msgid "C_ase Sensitive"
 #~ msgstr "�ੱ�ਰ ��ਾਰ ਨਿਰਭਰ(_a)"



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