[libbonobo] Workaround issue when branching

[Andre Klapper <aklapper src gnome org>]

commit 39dbbaedd8320b10f819cc13251ff39908af7e64
Author: Andre Klapper <a9016009 gmx de>
Date:   Wed Apr 21 13:20:29 2010 +0200

    Workaround issue when branching

 po/ne.po |   55 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 32 insertions(+), 23 deletions(-)
---
diff --git a/po/ne.po b/po/ne.po
index 43207f1..740ca54 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libbonobo.HEAD.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-24 03:48+0000\n"
+"POT-Creation-Date: 2010-04-21 13:19+0200\n"
 "PO-Revision-Date: 2007-12-11 11:34+0545\n"
 "Last-Translator: Nabin Gautam <nabin mpp org np>\n"
 "Language-Team: Nepali <info mpp org np>\n"
@@ -18,52 +18,55 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n !=1\n"
 
-#: ../activation-server/activation-context-corba.c:525
+#: ../activation-server/activation-context-corba.c:530
 msgid "Couldn't find which child the server was listed in"
 msgstr "��न �ा�ल�ड सर�भर स�����त �रि��� थिय� फ�ला पार�न स��न"
 
-#: ../activation-server/activation-context-corba.c:817
+#: ../activation-server/activation-context-corba.c:822
 msgid "Not a valid Activation ID"
 msgstr "मान�य स��रिय ��ड� ह��न"
 
-#: ../activation-server/activation-server-main.c:162
+#: ../activation-server/activation-server-main.c:176
 msgid "Directory to read .server files from"
 msgstr " .server फा�लबा� पढिन� डा�र����र�"
 
-#: ../activation-server/activation-server-main.c:162
+#: ../activation-server/activation-server-main.c:176
 msgid "DIRECTORY"
 msgstr "डा�र����र�"
 
-#: ../activation-server/activation-server-main.c:165
+#: ../activation-server/activation-server-main.c:179
 msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
 msgstr "स��रिय सन�दर�भ�ा र�पमा स�वा प�रदान �र�द� (प�र�वनिर�धारित वस�त� डा�र����र� मात�र ह�)"
 
-#: ../activation-server/activation-server-main.c:169
+#: ../activation-server/activation-server-main.c:183
 msgid "File descriptor to write IOR to"
 msgstr "IOR मा ल��िन� फा�ल वर�णन�र�ता"
 
-#: ../activation-server/activation-server-main.c:169
+#: ../activation-server/activation-server-main.c:183
 #: ../bonobo-activation/bonobo-activation-init.c:352
 #: ../bonobo-activation/bonobo-activation-init.c:397
 msgid "FD"
 msgstr "�फड�"
 
-#: ../activation-server/activation-server-main.c:172
+#: ../activation-server/activation-server-main.c:186
 msgid ""
 "Register as the user's activation server without locking.  Warning: this "
 "option can have dangerous side effects on the stability of the user's "
 "running session, and should only be used for debugging purposes"
-msgstr "ताल��ा नल�ा��न प�रय���र�ता�� स��रिय सर�भर�ा र�पमा दर�ता �र�न�ह�स� ।  ��तावन�: यस वि�ल�पल� प�रय���र�ता�� �लिरह��� सत�र स�थायित�वमा �तरना� प�रभाव पार�न स��� र त�र��िम��न �द�ध�श�य�ा ला�ि मात�र प�रय�� �र�न�पर�द�"
+msgstr ""
+"ताल��ा नल�ा��न प�रय���र�ता�� स��रिय सर�भर�ा र�पमा दर�ता �र�न�ह�स� ।  ��तावन�: यस वि�ल�पल� "
+"प�रय���र�ता�� �लिरह��� सत�र स�थायित�वमा �तरना� प�रभाव पार�न स��� र त�र��िम��न �द�ध�श�य�ा "
+"ला�ि मात�र प�रय�� �र�न�पर�द�"
 
-#: ../activation-server/activation-server-main.c:180
+#: ../activation-server/activation-server-main.c:194
 msgid "Query expression to evaluate"
 msgstr "म�ल�या���न�ा ला�ि ��व�र� �भिव�य��ति"
 
-#: ../activation-server/activation-server-main.c:180
+#: ../activation-server/activation-server-main.c:194
 msgid "EXPRESSION"
 msgstr "�भिव�य��ति"
 
-#: ../activation-server/activation-server-main.c:429
+#: ../activation-server/activation-server-main.c:547
 #: ../utils/bonobo-activation-sysconf.c:305
 #, c-format
 msgid "Run '%s --help' to see a full list of available command line options.\n"
@@ -94,7 +97,9 @@ msgstr "हाम�ल� ��� पनि �ाढा�� प�र�
 msgid ""
 "The Bonobo Activation configuration file was not read successfully. Please, "
 "check it is valid in: %s"
-msgstr "ब�न�ब� स��रिय �र�न� �न�फि�र�सन फा�ल सफलताप�र�व� पढि��� थि�न । ��पया य�: %s मा मान�य भ��� �ा�� �र�न�ह�स�"
+msgstr ""
+"ब�न�ब� स��रिय �र�न� �न�फि�र�सन फा�ल सफलताप�र�व� पढि��� थि�न । ��पया य�: %s मा मान�य "
+"भ��� �ा�� �र�न�ह�स�"
 
 #: ../activation-server/object-directory-load.c:102
 msgid "a NULL iid is not valid"
@@ -111,7 +116,7 @@ msgid "iid %s has a NULL location"
 msgstr "iid %s स�� NULL स�थान �"
 
 #: ../activation-server/object-directory-load.c:119
-#, c-format
+#, fuzzy, c-format
 msgid "invalid character '%c' in iid '%s'"
 msgstr "iid '%s' मा �मान�य ��यार����र '%c'"
 
@@ -120,12 +125,12 @@ msgstr "iid '%s' मा �मान�य ��यार����र '%c'"
 msgid "Property '%s' has no value"
 msgstr "��ण '%s' �� मान ��न"
 
-#: ../activation-server/object-directory-load.c:581
+#: ../activation-server/object-directory-load.c:583
 #, c-format
 msgid "Could not parse badly formed XML document %s"
 msgstr "�लत र�प�� ���स�म�ल (XML) �ा��ात %s पदवर�णन �र�न स��न"
 
-#: ../activation-server/object-directory-load.c:627
+#: ../activation-server/object-directory-load.c:629
 #, c-format
 msgid "Trying dir %s"
 msgstr "डा�र����र� %s प�रयास �र�द��"
@@ -140,10 +145,11 @@ msgid "Failed to read from child process: %s\n"
 msgstr "�ा�ल�ड प�र��रियाबा� पढ�न �सफल: %s\n"
 
 #: ../bonobo-activation/bonobo-activation-fork-server.c:247
+#, c-format
 msgid "EOF from child process\n"
 msgstr "�ा�ल�ड प�र��रियाबा� EOF\n"
 
-#: ../bonobo-activation/bonobo-activation-fork-server.c:434
+#: ../bonobo-activation/bonobo-activation-fork-server.c:438
 msgid "Couldn't spawn a new process"
 msgstr "नया� प�र��रिया �त�पन�न �र�न स��न"
 
@@ -203,11 +209,11 @@ msgstr "नाम"
 msgid "Application unique name"
 msgstr "�न�प�रय���� �द�वित�य नाम"
 
-#: ../bonobo/bonobo-object.c:926
+#: ../bonobo/bonobo-object.c:929
 msgid "POA"
 msgstr "प��� (POA)"
 
-#: ../bonobo/bonobo-object.c:926
+#: ../bonobo/bonobo-object.c:929
 msgid "Custom CORBA POA"
 msgstr "�न���ल CORBA POA"
 
@@ -349,8 +355,8 @@ msgid "General activation error with no description"
 msgstr "वर�णन नभ��� साधारण स��रियता त�र��ि"
 
 #: ../bonobo/bonobo-moniker.c:342
-#, c-format
-msgid "Failed to resolve, or extend '%s"
+#, fuzzy, c-format
+msgid "Failed to resolve, or extend '%s'"
 msgstr " '%s फ�रि समाधान �र�न वा विस�तार �र�न �सफल"
 
 #: ../bonobo/bonobo-moniker-util.c:247
@@ -429,6 +435,7 @@ msgid "An exception occurred '%s'"
 msgstr "���ा �पवाद �त�पन�न भय� '%s'"
 
 #: ../utils/bonobo-activation-sysconf.c:83
+#, c-format
 msgid "Could not save configuration file.\n"
 msgstr "�न�फि�र�सन फा�ल ब�त �र�न स��न ।\n"
 
@@ -438,6 +445,7 @@ msgid "Please, make sure you have permissions to write to '%s'.\n"
 msgstr "��पया, तपा��ला� '%s' मा ल���न� �न�मति भ��� निश��ित �र�न�ह�स� ।\n"
 
 #: ../utils/bonobo-activation-sysconf.c:87
+#, c-format
 msgid "Successfully wrote configuration file.\n"
 msgstr "�न�फि�र�सन फा�ल सफलताप�र�व� ल��िय� ।\n"
 
@@ -456,10 +464,12 @@ msgid "%s already in configuration file\n"
 msgstr "%s पहिला न� �न�फि�र�सन फा�लमा �\n"
 
 #: ../utils/bonobo-activation-sysconf.c:166
+#, c-format
 msgid "there is not a properly structured configuration file\n"
 msgstr "त�यहा� �न�फि�र�सन फा�ल स�र�ना�� ��ण ��न\n"
 
 #: ../utils/bonobo-activation-sysconf.c:237
+#, c-format
 msgid "Bonobo-activation configuration file contains:\n"
 msgstr "ब�न�ब� स��रियता �न�फि�र�सन फा�लल� समाविष�� �र�द�:\n"
 
@@ -483,4 +493,3 @@ msgstr "�न�फि�र�सन फा�लमा डा�र���
 #: ../utils/bonobo-activation-sysconf.c:273
 msgid "Display path to configuration file"
 msgstr "�न�फि�र�सन फा�लमा मार�� प�रदर�शन �र�न�ह�स�"
-