Author: sbrabec
Date: 2015-05-07 22:15:31 +0200 (Thu, 07 May 2015)
New Revision: 91630
Modified:
branches/SLE11-SP4/lcn/50-pot/ConsoleKit.pot
branches/SLE11-SP4/lcn/50-pot/NetworkManager-novellvpn.pot
branches/SLE11-SP4/lcn/50-pot/NetworkManager-openvpn.pot
branches/SLE11-SP4/lcn/50-pot/NetworkManager-vpnc.pot
branches/SLE11-SP4/lcn/50-pot/NetworkManager.pot
branches/SLE11-SP4/lcn/50-pot/PolicyKit-gnome.pot
branches/SLE11-SP4/lcn/50-pot/apparmor-parser.pot
branches/SLE11-SP4/lcn/50-pot/apparmor-utils.pot
branches/SLE11-SP4/lcn/50-pot/apparmorapplet.pot
branches/SLE11-SP4/lcn/50-pot/banshee-1.pot
branches/SLE11-SP4/lcn/50-pot/beagle.pot
branches/SLE11-SP4/lcn/50-pot/compiz.pot
branches/SLE11-SP4/lcn/50-pot/cracklib.pot
branches/SLE11-SP4/lcn/50-pot/cryptconfig.pot
branches/SLE11-SP4/lcn/50-pot/eiciel.pot
branches/SLE11-SP4/lcn/50-pot/evolution-data-server.pot
branches/SLE11-SP4/lcn/50-pot/evolution-exchange.pot
branches/SLE11-SP4/lcn/50-pot/evolution-webcal.pot
branches/SLE11-SP4/lcn/50-pot/evolution.pot
branches/SLE11-SP4/lcn/50-pot/f-spot.pot
branches/SLE11-SP4/lcn/50-pot/gnome-control-center-2.0.pot
branches/SLE11-SP4/lcn/50-pot/gnome-docker.pot
branches/SLE11-SP4/lcn/50-pot/gnome-main-menu.pot
branches/SLE11-SP4/lcn/50-pot/gnome-mount.pot
branches/SLE11-SP4/lcn/50-pot/gnome-packagekit.pot
branches/SLE11-SP4/lcn/50-pot/gnome-panel-2.0.pot
branches/SLE11-SP4/lcn/50-pot/gnome-pilot-subset.pot
branches/SLE11-SP4/lcn/50-pot/gnome-power-manager.pot
branches/SLE11-SP4/lcn/50-pot/gnome-screensaver.pot
branches/SLE11-SP4/lcn/50-pot/gnome-session-2.0.pot
branches/SLE11-SP4/lcn/50-pot/gnome-utils-2.0.pot
branches/SLE11-SP4/lcn/50-pot/krb5-ticket-watcher.pot
branches/SLE11-SP4/lcn/50-pot/libgnomedb-3.pot
branches/SLE11-SP4/lcn/50-pot/libgnomesu.pot
branches/SLE11-SP4/lcn/50-pot/libslab.pot
branches/SLE11-SP4/lcn/50-pot/limal-apparmor-control.pot
branches/SLE11-SP4/lcn/50-pot/limal-ca-mgm.pot
branches/SLE11-SP4/lcn/50-pot/limal-nfs-server.pot
branches/SLE11-SP4/lcn/50-pot/limal-runlevel.pot
branches/SLE11-SP4/lcn/50-pot/limal.pot
branches/SLE11-SP4/lcn/50-pot/linphone.pot
branches/SLE11-SP4/lcn/50-pot/login.pot
branches/SLE11-SP4/lcn/50-pot/nautilus-open-terminal.pot
branches/SLE11-SP4/lcn/50-pot/nautilus-sendto.pot
branches/SLE11-SP4/lcn/50-pot/nautilus-share.pot
branches/SLE11-SP4/lcn/50-pot/pam-config.pot
branches/SLE11-SP4/lcn/50-pot/pam_krb5.pot
branches/SLE11-SP4/lcn/50-pot/pidgin-sipe.pot
branches/SLE11-SP4/lcn/50-pot/pidgin.pot
branches/SLE11-SP4/lcn/50-pot/sabayon.pot
branches/SLE11-SP4/lcn/50-pot/shared-mime-info.pot
branches/SLE11-SP4/lcn/50-pot/tomboy.pot
branches/SLE11-SP4/lcn/50-pot/vmx-manager.pot
Log:
pot files update from the latest SLE11 SP4 snapshot of translation-update-upstream project. Includes f-spot fix for bnc#928936.
Note that now it uses "pot-tuu" files that don't duplicate gnome-patch-translation strings.
Modified: branches/SLE11-SP4/lcn/50-pot/ConsoleKit.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/ConsoleKit.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/ConsoleKit.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:22+0100\n"
+"POT-Creation-Date: 2015-05-06 17:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/NetworkManager-novellvpn.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/NetworkManager-novellvpn.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/NetworkManager-novellvpn.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:22+0100\n"
+"POT-Creation-Date: 2015-05-06 17:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/NetworkManager-openvpn.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/NetworkManager-openvpn.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/NetworkManager-openvpn.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:23+0100\n"
+"POT-Creation-Date: 2015-05-06 17:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -49,61 +49,61 @@
msgid "_Save password in keyring"
msgstr ""
-#: ../auth-dialog/main.c:94
+#: ../auth-dialog/main.c:127
#, c-format
msgid "You need to authenticate to access the Virtual Private Network '%s'."
msgstr ""
-#: ../auth-dialog/main.c:95
+#: ../auth-dialog/main.c:128
msgid "Authenticate VPN"
msgstr ""
-#: ../auth-dialog/main.c:116
+#: ../auth-dialog/main.c:149
msgid "Certificate pass_word:"
msgstr ""
-#: ../auth-dialog/main.c:130
+#: ../auth-dialog/main.c:163
msgid "Certificate password:"
msgstr ""
-#: ../properties/auth-helpers.c:161
+#: ../properties/auth-helpers.c:160
msgid "Choose a Certificate Authority certificate..."
msgstr ""
-#: ../properties/auth-helpers.c:180
+#: ../properties/auth-helpers.c:179
msgid "Choose your personal certificate..."
msgstr ""
-#: ../properties/auth-helpers.c:198
+#: ../properties/auth-helpers.c:197
msgid "Choose your private key..."
msgstr ""
-#: ../properties/auth-helpers.c:251
+#: ../properties/auth-helpers.c:250
msgid "Choose an OpenVPN static key..."
msgstr ""
-#: ../properties/auth-helpers.c:275 ../properties/auth-helpers.c:971
-#: ../properties/auth-helpers.c:1124
+#: ../properties/auth-helpers.c:274 ../properties/auth-helpers.c:938
+#: ../properties/auth-helpers.c:1091
msgid "None"
msgstr ""
-#: ../properties/auth-helpers.c:724
+#: ../properties/auth-helpers.c:691
msgid "PEM certificates (*.pem, *.crt, *.key, *.cer)"
msgstr ""
-#: ../properties/auth-helpers.c:784
+#: ../properties/auth-helpers.c:751
msgid "OpenVPN Static Keys (*.key)"
msgstr ""
-#: ../properties/auth-helpers.c:893 ../properties/auth-helpers.c:963
+#: ../properties/auth-helpers.c:860 ../properties/auth-helpers.c:930
msgid "Default"
msgstr ""
-#: ../properties/auth-helpers.c:973
+#: ../properties/auth-helpers.c:940
msgid "MD-5"
msgstr ""
-#: ../properties/auth-helpers.c:975
+#: ../properties/auth-helpers.c:942
msgid "SHA-1"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/NetworkManager-vpnc.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/NetworkManager-vpnc.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/NetworkManager-vpnc.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:23+0100\n"
+"POT-Creation-Date: 2015-05-06 17:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/NetworkManager.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/NetworkManager.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/NetworkManager.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 16:27+0100\n"
+"POT-Creation-Date: 2015-05-06 18:21+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/PolicyKit-gnome.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/PolicyKit-gnome.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/PolicyKit-gnome.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 16:30+0100\n"
+"POT-Creation-Date: 2015-05-06 18:24+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/apparmor-parser.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/apparmor-parser.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/apparmor-parser.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: apparmor-general@forge.novell.com\n"
-"POT-Creation-Date: 2013-03-13 21:23+0100\n"
+"POT-Creation-Date: 2015-05-06 17:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,51 +17,49 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../parser_include.c:96 ../parser_main.c:450 ../parser_include.c:98
-#: ../parser_main.c:466
+#: ../parser_include.c:96 ../parser_main.c:450
#, c-format
msgid "Error: Could not read profile %s: %s.\n"
msgstr ""
-#: ../parser_include.c:115 ../parser_include.c:118
+#: ../parser_include.c:115
msgid "Error: Could not allocate temporary file.\n"
msgstr ""
-#: ../parser_include.c:166 ../parser_include.c:173
+#: ../parser_include.c:166
msgid "Error: Out of memory.\n"
msgstr ""
-#: ../parser_include.c:176 ../parser_include.c:183
+#: ../parser_include.c:176
#, c-format
msgid "Error: basedir %s is not a directory, skipping.\n"
msgstr ""
-#: ../parser_include.c:190 ../parser_include.c:197
+#: ../parser_include.c:190
#, c-format
msgid "Error: Could not add directory %s to search path.\n"
msgstr ""
-#: ../parser_include.c:200 ../parser_include.c:207
+#: ../parser_include.c:200
msgid "Error: Could not allocate memory.\n"
msgstr ""
-#: ../parser_include.c:297 ../parser_include.c:304
+#: ../parser_include.c:297
#, c-format
msgid "Error: Could not allocate buffer for include at line %d in %s.\n"
msgstr ""
-#: ../parser_include.c:313 ../parser_include.c:333 ../parser_include.c:320
-#: ../parser_include.c:340
+#: ../parser_include.c:313 ../parser_include.c:333
#, c-format
msgid "Error: Bad include at line %d in %s.\n"
msgstr ""
-#: ../parser_include.c:378 ../parser_include.c:385
+#: ../parser_include.c:378
#, c-format
msgid "Error: #include %s%c not found at line %d in %s.\n"
msgstr ""
-#: ../parser_include.c:459 ../parser_include.c:470
+#: ../parser_include.c:459
#, c-format
msgid "Error: Exceeded %d levels of includes. Not processing %s include.\n"
msgstr ""
@@ -152,72 +150,69 @@
msgstr ""
#: ../parser_interface.c:798 ../parser_interface.c:931
-#: ../parser_interface.c:805 ../parser_interface.c:939
#, c-format
msgid "Unable to open %s - %s\n"
msgstr ""
-#: ../parser_interface.c:822 ../parser_interface.c:829
+#: ../parser_interface.c:822
#, c-format
msgid "Memory Allocation Error: Unable to remove ^%s\n"
msgstr ""
-#: ../parser_interface.c:835 ../parser_interface.c:842
+#: ../parser_interface.c:835
#, c-format
msgid "Memory Allocation Error: Unable to remove %s:%s."
msgstr ""
-#: ../parser_interface.c:854 ../parser_interface.c:861
+#: ../parser_interface.c:854
msgid "unable to create work area\n"
msgstr ""
-#: ../parser_interface.c:862 ../parser_interface.c:869
+#: ../parser_interface.c:862
#, c-format
msgid "unable to serialize profile %s\n"
msgstr ""
#: ../parser_interface.c:872 ../parser_interface.c:943
-#: ../parser_interface.c:879 ../parser_interface.c:951
#, c-format
msgid "%s: Unable to write entire profile entry\n"
msgstr ""
#: parser_lex.l:123 parser_lex.l:158 parser_lex.l:191 parser_lex.l:392
-#: parser_lex.l:128 parser_lex.l:163 parser_lex.l:196 parser_lex.l:425
#, c-format
msgid "Found unexpected character: '%s'"
msgstr ""
-#: parser_lex.l:232 parser_lex.l:237
+#: parser_lex.l:232
#, c-format
msgid "(network_mode) Found unexpected character: '%s'"
msgstr ""
-#: ../parser_main.c:146 ../parser_main.c:149
+#: ../parser_main.c:146
#, c-format
msgid "Warning (%s line %d): %s"
msgstr ""
-#: ../parser_main.c:275 ../parser_main.c:281
+#: ../parser_main.c:275
#, c-format
msgid "%s: Could not allocate memory for subdomainbase mount point\n"
msgstr ""
-#: ../parser_main.c:321 ../parser_main.c:327
+#: ../parser_main.c:321
#, c-format
msgid ""
"Warning: unable to find a suitable fs in %s, is it mounted?\n"
"Use --subdomainfs to override.\n"
msgstr ""
-#: ../parser_main.c:341 ../parser_main.c:347
+#: ../parser_main.c:341
#, c-format
msgid ""
"%s: Sorry. You need root privileges to run this program.\n"
"\n"
msgstr ""
-#: ../parser_main.c:348 ../parser_main.c:354
+#: ../parser_main.c:348
#, c-format
msgid ""
"%s: Warning! You've set this program setuid root.\n"
@@ -230,15 +225,10 @@
#: parser_yacc.y:530 parser_yacc.y:568 parser_yacc.y:880 parser_yacc.y:889
#: parser_yacc.y:898 parser_yacc.y:971 parser_yacc.y:1019 parser_yacc.y:1030
#: parser_yacc.y:1105 parser_yacc.y:1123 parser_yacc.y:1130 parser_yacc.y:1141
-#: ../parser_main.c:480 parser_yacc.y:221 parser_yacc.y:248 parser_yacc.y:354
-#: parser_yacc.y:366 parser_yacc.y:434 parser_yacc.y:536 parser_yacc.y:574
-#: parser_yacc.y:888 parser_yacc.y:897 parser_yacc.y:906 parser_yacc.y:979
-#: parser_yacc.y:1027 parser_yacc.y:1038 parser_yacc.y:1122 parser_yacc.y:1140
-#: parser_yacc.y:1147 parser_yacc.y:1158
msgid "Memory allocation error."
msgstr ""
-#: ../parser_main.c:509 ../parser_main.c:525
+#: ../parser_main.c:509
#, c-format
msgid "%s: Errors found in file. Aborting.\n"
msgstr ""
@@ -299,100 +289,100 @@
msgid "profile %s: has merged rule %s with multiple x modifiers\n"
msgstr ""
-#: parser_yacc.y:220 parser_yacc.y:225
+#: parser_yacc.y:220
msgid "Profile names must begin with a '/', or keyword 'profile' or 'hat'."
msgstr ""
-#: parser_yacc.y:270 parser_yacc.y:276
+#: parser_yacc.y:270
#, c-format
msgid "Failed to create alias %s -> %s\n"
msgstr ""
-#: parser_yacc.y:401 parser_yacc.y:407
+#: parser_yacc.y:401
msgid "Profile flag 'debug' is no longer valid."
msgstr ""
-#: parser_yacc.y:407 parser_yacc.y:413
+#: parser_yacc.y:407
#, c-format
msgid "Invalid profile flag: %s."
msgstr ""
-#: parser_yacc.y:442 parser_yacc.y:464 parser_yacc.y:448 parser_yacc.y:470
+#: parser_yacc.y:442 parser_yacc.y:464
msgid "Assert: `rule' returned NULL."
msgstr ""
-#: parser_yacc.y:445 parser_yacc.y:490 parser_yacc.y:451 parser_yacc.y:496
+#: parser_yacc.y:445 parser_yacc.y:490
msgid ""
"Invalid mode, in deny rules 'x' must not be preceded by exec qualifier 'i', "
"'p', or 'u'"
msgstr ""
-#: parser_yacc.y:468 parser_yacc.y:474
+#: parser_yacc.y:468
msgid ""
"Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', 'c', or 'u'"
msgstr ""
-#: parser_yacc.y:493 parser_yacc.y:499
+#: parser_yacc.y:493
msgid "Invalid mode, 'x' must be preceded by exec qualifier 'i', 'p', or 'u'"
msgstr ""
-#: parser_yacc.y:518 parser_yacc.y:556 parser_yacc.y:524 parser_yacc.y:562
+#: parser_yacc.y:518 parser_yacc.y:556
msgid "Assert: `network_rule' return invalid protocol."
msgstr ""
-#: parser_yacc.y:593 parser_yacc.y:599
+#: parser_yacc.y:593
msgid "Assert: `change_profile' returned NULL."
msgstr ""
-#: parser_yacc.y:624 parser_yacc.y:630
+#: parser_yacc.y:624
msgid "Assert: 'hat rule' returned NULL."
msgstr ""
-#: parser_yacc.y:633 parser_yacc.y:639
+#: parser_yacc.y:633
msgid "Assert: 'local_profile rule' returned NULL."
msgstr ""
-#: parser_yacc.y:768 parser_yacc.y:776
+#: parser_yacc.y:768
#, c-format
msgid "Unset boolean variable %s used in if-expression"
msgstr ""
-#: parser_yacc.y:826 parser_yacc.y:834
+#: parser_yacc.y:826
msgid "subset can only be used with link rules."
msgstr ""
-#: parser_yacc.y:828 parser_yacc.y:836
+#: parser_yacc.y:828
msgid "link and exec perms conflict on a file rule using ->"
msgstr ""
-#: parser_yacc.y:830 parser_yacc.y:849 parser_yacc.y:838 parser_yacc.y:857
+#: parser_yacc.y:830 parser_yacc.y:849
msgid "link perms are not allowed on a named profile transition.\n"
msgstr ""
-#: parser_yacc.y:846 parser_yacc.y:854
+#: parser_yacc.y:846
msgid "unsafe rule missing exec permissions"
msgstr ""
-#: parser_yacc.y:862 parser_yacc.y:870
+#: parser_yacc.y:862
#, c-format
msgid "missing an end of line character? (entry: %s)"
msgstr ""
-#: parser_yacc.y:986 parser_yacc.y:996 parser_yacc.y:994 parser_yacc.y:1004
+#: parser_yacc.y:986 parser_yacc.y:996
msgid "Invalid network entry."
msgstr ""
-#: parser_yacc.y:1050 parser_yacc.y:1058 parser_yacc.y:1066
+#: parser_yacc.y:1050 parser_yacc.y:1058
#, c-format
msgid "Invalid capability %s."
msgstr ""
-#: parser_yacc.y:1075 parser_yacc.y:1092
+#: parser_yacc.y:1075
#, c-format
msgid "AppArmor parser error in %s at line %d: %s\n"
msgstr ""
-#: parser_yacc.y:1078 parser_yacc.y:1095
+#: parser_yacc.y:1078
#, c-format
msgid "AppArmor parser error, line %d: %s\n"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/apparmor-utils.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/apparmor-utils.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/apparmor-utils.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: apparmor-general@forge.novell.com\n"
-"POT-Creation-Date: 2013-03-13 21:23+0100\n"
+"POT-Creation-Date: 2015-05-06 17:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/apparmorapplet.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/apparmorapplet.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/apparmorapplet.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:23+0100\n"
+"POT-Creation-Date: 2015-05-06 17:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,7 +17,7 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/apparmor-applet.c:281
+#: ../src/apparmor-applet.c:280
msgid ""
"AppArmorApplet is free software; you can redistribute it and/or modify\n"
"it under the terms of the GNU General Public License, version 2, as "
Modified: branches/SLE11-SP4/lcn/50-pot/banshee-1.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/banshee-1.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/banshee-1.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 16:43+0100\n"
+"POT-Creation-Date: 2015-05-06 17:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/beagle.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/beagle.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/beagle.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 16:46+0100\n"
+"POT-Creation-Date: 2015-05-06 18:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -250,24 +250,20 @@
"regular user."
msgstr ""
-#: ../search/Beagle.Search.Pages/StartDaemon.cs:23
+#: ../search/Beagle.Search.Pages/StartDaemon.cs:17
msgid "Search service not running"
msgstr ""
-#: ../search/Beagle.Search.Pages/StartDaemon.cs:25
+#: ../search/Beagle.Search.Pages/StartDaemon.cs:19
msgid ""
"The search service does not appear to be running. You can start it by "
"clicking the button below."
msgstr ""
-#: ../search/Beagle.Search.Pages/StartDaemon.cs:28
+#: ../search/Beagle.Search.Pages/StartDaemon.cs:22
msgid "Start search service"
msgstr ""
-#: ../search/Beagle.Search.Pages/StartDaemon.cs:34
-msgid "Automatically start service on login"
-msgstr ""
-
#: ../search/Beagle.Search.Tiles/ArchivedFile.cs:40
#, csharp-format
msgid "Inside archive {0}"
@@ -617,36 +613,36 @@
msgid "Accessed:"
msgstr ""
-#: ../search/Beagle.Search.Tray/TrayIcon.cs:34
-#: ../search/Beagle.Search/Search.cs:78
+#: ../search/Beagle.Search.Tray/TrayIcon.cs:33
+#: ../search/Beagle.Search/Search.cs:48
#: ../search/Beagle.Search/SearchWindow.cs:117
msgid "Desktop Search"
msgstr ""
-#: ../search/Beagle.Search.Tray/TrayIcon.cs:70
+#: ../search/Beagle.Search.Tray/TrayIcon.cs:69
msgid "No Recent Searches"
msgstr ""
-#: ../search/Beagle.Search.Tray/TrayIcon.cs:75
+#: ../search/Beagle.Search.Tray/TrayIcon.cs:74
msgid "Recent Searches"
msgstr ""
-#: ../search/Beagle.Search.Tray/TrayIcon.cs:95
+#: ../search/Beagle.Search.Tray/TrayIcon.cs:94
msgid "Clear"
msgstr ""
-#: ../search/Beagle.Search.Tray/TrayIcon.cs:103
+#: ../search/Beagle.Search.Tray/TrayIcon.cs:102
msgid "Quit"
msgstr ""
-#: ../search/Beagle.Search/Category.cs:127
+#: ../search/Beagle.Search/Category.cs:142
#, csharp-format
msgid "{0} result"
msgid_plural "{0} results"
msgstr[0] ""
msgstr[1] ""
-#: ../search/Beagle.Search/Category.cs:129
+#: ../search/Beagle.Search/Category.cs:144
#, csharp-format
msgid "{0}-{1} of {2}"
msgstr ""
@@ -708,69 +704,69 @@
msgid "Find Now"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:250
+#: ../search/Beagle.Search/SearchWindow.cs:237
msgid "Type in search terms"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:251
+#: ../search/Beagle.Search/SearchWindow.cs:238
msgid "Start searching"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:267
+#: ../search/Beagle.Search/SearchWindow.cs:254
#, csharp-format
msgid "Desktop Search: {0}"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:498
+#: ../search/Beagle.Search/SearchWindow.cs:485
msgid "There are computers near you running Beagle"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:499
+#: ../search/Beagle.Search/SearchWindow.cs:486
msgid "You can select to search other computers from the \"Search\" menu."
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:531
+#: ../search/Beagle.Search/SearchWindow.cs:518
msgid "Search service started"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:542
+#: ../search/Beagle.Search/SearchWindow.cs:529
msgid "Starting service failed"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:543
+#: ../search/Beagle.Search/SearchWindow.cs:530
msgid "Service is already running!"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:558
+#: ../search/Beagle.Search/SearchWindow.cs:545
msgid "Stopping service failed"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:559
+#: ../search/Beagle.Search/SearchWindow.cs:546
msgid "Service was not running!"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:573
+#: ../search/Beagle.Search/SearchWindow.cs:560
msgid "Search service stopped"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:612
+#: ../search/Beagle.Search/SearchWindow.cs:599
msgid "Your data is being indexed"
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:613
+#: ../search/Beagle.Search/SearchWindow.cs:600
msgid ""
"The search service is in the process of indexing your data. Search results "
"may be incomplete until indexing has finished."
msgstr ""
-#: ../search/Beagle.Search/SearchWindow.cs:639
+#: ../search/Beagle.Search/SearchWindow.cs:626
#, csharp-format
msgid "Showing {0} match"
msgid_plural "Showing all {0} matches"
msgstr[0] ""
msgstr[1] ""
-#: ../search/Beagle.Search/SearchWindow.cs:641
+#: ../search/Beagle.Search/SearchWindow.cs:628
#, csharp-format
msgid "Too many matches. Showing latest {0} of total {1}"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/compiz.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/compiz.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/compiz.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:32+0100\n"
+"POT-Creation-Date: 2015-05-06 18:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/cracklib.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/cracklib.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/cracklib.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:33+0100\n"
+"POT-Creation-Date: 2015-05-06 18:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/cryptconfig.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/cryptconfig.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/cryptconfig.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:33+0100\n"
+"POT-Creation-Date: 2015-05-06 18:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/eiciel.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/eiciel.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/eiciel.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Roger Ferrer Ibáñez \n"
-"POT-Creation-Date: 2013-03-13 21:34+0100\n"
+"POT-Creation-Date: 2015-05-06 18:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -82,7 +82,7 @@
msgid "Also show system participants"
msgstr ""
-#: ../src/eiciel_main_window.cpp:32 ../src/eiciel_nautilus_page.cpp:140
+#: ../src/eiciel_main_window.cpp:32 ../src/eiciel_nautilus_page.cpp:145
#: ../src/eiciel_container.cpp:60
msgid "Access Control List"
msgstr ""
@@ -117,7 +117,7 @@
"means an ineffective permission.</span>"
msgstr ""
-#: ../src/eiciel_nautilus_page.cpp:161 ../src/eiciel_container.cpp:68
+#: ../src/eiciel_nautilus_page.cpp:166 ../src/eiciel_container.cpp:68
msgid "Extended user attributes"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/evolution-data-server.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/evolution-data-server.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/evolution-data-server.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:35+0100\n"
+"POT-Creation-Date: 2015-05-06 19:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,29 +18,34 @@
"Content-Transfer-Encoding: 8bit\n"
#: ../addressbook/backends/file/e-book-backend-file.c:560
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2329
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2338
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
msgid "Loading..."
msgstr ""
#: ../addressbook/backends/file/e-book-backend-file.c:563
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2260
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2282
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2327
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2267
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2290
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2336
#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
msgid "Searching..."
msgstr ""
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2695
+#. Since we get contacts incrementally, 100 at a time, we can not
+#. * calculate the percentage of cache update.
+#. * Also we should be using "percent" in notify_progress() instead of
+#. * forming the message like this.
+#.
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2672
#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
#, c-format
msgid "Downloading contacts (%d)... "
msgstr ""
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2844
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3028
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3072
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2802
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2969
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3017
#, c-format
msgid "Updating contacts cache (%d)... "
msgstr ""
@@ -737,52 +742,52 @@
#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
#: ../calendar/backends/google/e-cal-backend-google.c:1189
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1079
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1380
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1097
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1395
#: ../calendar/backends/http/e-cal-backend-http.c:659
#: ../calendar/backends/weather/e-cal-backend-weather.c:488
msgid "Could not create cache file"
msgstr ""
#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1092
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1110
msgid "Could not create thread for populating cache"
msgstr ""
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2078
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1118
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2175
msgid "Reply Requested: by "
msgstr ""
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2083
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1123
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2180
msgid "Reply Requested: When convenient"
msgstr ""
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:281
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:303
#, c-format
msgid "Loading %s items"
msgstr ""
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:917
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:936
#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
msgid "Calendar"
msgstr ""
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:975
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:994
msgid "Invalid server URI"
msgstr ""
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:994
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1003
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1097
-#: ../calendar/libecal/e-cal.c:5115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1013
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1022
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/libecal/e-cal.c:5154
#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1342
-#: ../camel/providers/groupwise/camel-groupwise-store.c:598
-#: ../camel/providers/groupwise/camel-groupwise-store.c:773
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1386
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1422
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1437
+#: ../camel/providers/groupwise/camel-groupwise-store.c:591
+#: ../camel/providers/groupwise/camel-groupwise-store.c:766
#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
msgid "Authentication failed"
@@ -844,7 +849,7 @@
msgid "Forecast"
msgstr ""
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1350
msgid "Untitled appointment"
msgstr ""
@@ -989,7 +994,7 @@
msgid "Undefined"
msgstr ""
-#: ../calendar/libecal/e-cal.c:1693 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1709 ../libedataserverui/e-book-auth-util.c:199
#, c-format
msgid "Enter password for %s (user %s)"
msgstr ""
@@ -998,91 +1003,92 @@
#. This password prompt will be prompted rarely. Since the key that is passed to
#. the auth_func corresponds to the parent user.
#.
-#: ../calendar/libecal/e-cal.c:1707
+#: ../calendar/libecal/e-cal.c:1723
#, c-format
msgid "Enter password for %s to enable proxy for user %s"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5087
+#: ../calendar/libecal/e-cal.c:5126
msgid "Invalid argument"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5089
+#: ../calendar/libecal/e-cal.c:5128
msgid "Backend is busy"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:5130
#: ../calendar/libedata-cal/e-cal-backend-util.c:105
msgid "Repository is offline"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5093
+#: ../calendar/libecal/e-cal.c:5132
#: ../calendar/libedata-cal/e-cal-backend-util.c:129
msgid "No such calendar"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5095
+#: ../calendar/libecal/e-cal.c:5134
#: ../calendar/libedata-cal/e-cal-backend-util.c:111
#: ../servers/groupwise/e-gw-connection.c:233
msgid "Object not found"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5097
+#: ../calendar/libecal/e-cal.c:5136
#: ../calendar/libedata-cal/e-cal-backend-util.c:113
#: ../servers/groupwise/e-gw-connection.c:227
msgid "Invalid object"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5099
+#: ../calendar/libecal/e-cal.c:5138
msgid "URI not loaded"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:5140
msgid "URI already loaded"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:5142
#: ../calendar/libedata-cal/e-cal-backend-util.c:107
#: ../servers/exchange/storage/e-storage.c:573
msgid "Permission denied"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5105
+#: ../calendar/libecal/e-cal.c:5144
#: ../calendar/libedata-cal/e-cal-backend-util.c:131
#: ../servers/groupwise/e-gw-connection.c:235
msgid "Unknown User"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5107
+#: ../calendar/libecal/e-cal.c:5146
#: ../calendar/libedata-cal/e-cal-backend-util.c:115
msgid "Object ID already exists"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5109
+#: ../calendar/libecal/e-cal.c:5148
msgid "Protocol not supported"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:5150
msgid "Operation has been canceled"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:5152
#: ../calendar/libedata-cal/e-cal-backend-util.c:143
msgid "Could not cancel operation"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5117
+#: ../calendar/libecal/e-cal.c:5156
#: ../calendar/libedata-cal/e-cal-backend-util.c:119
#: ../camel/providers/smtp/camel-smtp-transport.c:217
msgid "Authentication required"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5119
+#: ../calendar/libecal/e-cal.c:5158
msgid "A CORBA exception has occurred"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5121
+#: ../calendar/libecal/e-cal.c:5160
#: ../calendar/libedata-cal/e-cal-backend-util.c:146
+#: ../camel/camel-net-utils.c:523
#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
#: ../camel/providers/imap/camel-imap-command.c:432
#: ../camel/providers/imap/camel-imap-store.c:743
@@ -1093,15 +1099,13 @@
#: ../camel/providers/imap4/camel-imap4-store.c:311
#: ../camel/providers/imap4/camel-imap4-store.c:818
#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:552
-#: ../camel/providers/pop3/camel-pop3-store.c:559
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:582
#: ../servers/exchange/storage/e-storage.c:587
#: ../servers/groupwise/e-gw-connection.c:241
msgid "Unknown error"
msgstr ""
-#: ../calendar/libecal/e-cal.c:5123
+#: ../calendar/libecal/e-cal.c:5162
#: ../calendar/libedata-cal/e-cal-backend-util.c:103
#: ../servers/exchange/storage/e-storage.c:555
msgid "No error"
@@ -1290,7 +1294,7 @@
msgid "Could not remove cache entry: %s: %s"
msgstr ""
-#: ../camel/camel-db.c:412
+#: ../camel/camel-db.c:426
msgid "Insufficient memory"
msgstr ""
@@ -1329,7 +1333,7 @@
msgstr ""
#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:223
+#: ../camel/providers/groupwise/camel-groupwise-store.c:216
#: ../camel/providers/imap/camel-imap-store.c:1003
#: ../camel/providers/imap/camel-imap-store.c:1813
#: ../camel/providers/imap/camel-imap-store.c:2229
@@ -1464,47 +1468,47 @@
msgid "(%s) requires the folder set"
msgstr ""
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:686
#, c-format
msgid "Unsupported operation: append message: for %s"
msgstr ""
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:1391
#, c-format
msgid "Unsupported operation: search by expression: for %s"
msgstr ""
-#: ../camel/camel-folder.c:1429
+#: ../camel/camel-folder.c:1432
#, c-format
msgid "Unsupported operation: count by expression: for %s"
msgstr ""
-#: ../camel/camel-folder.c:1468
+#: ../camel/camel-folder.c:1471
#, c-format
msgid "Unsupported operation: search by UIDs: for %s"
msgstr ""
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1584
msgid "Moving messages"
msgstr ""
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1584
msgid "Copying messages"
msgstr ""
-#: ../camel/camel-folder.c:1922
+#: ../camel/camel-folder.c:1961
msgid "Learning junk"
msgstr ""
-#: ../camel/camel-folder.c:1939
+#: ../camel/camel-folder.c:1978
msgid "Learning non-junk"
msgstr ""
-#: ../camel/camel-folder.c:1958
+#: ../camel/camel-folder.c:1997
msgid "Filtering new message(s)"
msgstr ""
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:753
#, c-format
msgid ""
"Unexpected GnuPG status message encountered:\n"
@@ -1512,114 +1516,114 @@
"%s"
msgstr ""
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:768
msgid "Failed to parse gpg userid hint."
msgstr ""
-#: ../camel/camel-gpg-context.c:790 ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:792 ../camel/camel-gpg-context.c:806
msgid "Failed to parse gpg passphrase request."
msgstr ""
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:826
#, c-format
msgid ""
"You need a PIN to unlock the key for your\n"
"SmartCard: \"%s\""
msgstr ""
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:830
#, c-format
msgid ""
"You need a passphrase to unlock the key for\n"
"user: \"%s\""
msgstr ""
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:835
#, c-format
msgid "Unexpected request from GnuPG for '%s'"
msgstr ""
-#: ../camel/camel-gpg-context.c:858 ../camel/camel-gpg-context.c:1067
+#: ../camel/camel-gpg-context.c:860 ../camel/camel-gpg-context.c:1076
#: ../camel/providers/nntp/camel-nntp-store.c:1313
msgid "Canceled."
msgstr ""
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:874
msgid "Failed to unlock secret key: 3 bad passphrases given."
msgstr ""
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:882
#, c-format
msgid "Unexpected response from GnuPG: %s"
msgstr ""
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:951
msgid "Failed to encrypt: No valid recipients specified."
msgstr ""
#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1212 ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1859 ../camel/camel-gpg-context.c:1904
+#: ../camel/camel-gpg-context.c:1224 ../camel/camel-gpg-context.c:1349
+#: ../camel/camel-gpg-context.c:1871 ../camel/camel-gpg-context.c:1916
#, c-format
msgid "Failed to execute gpg: %s"
msgstr ""
-#: ../camel/camel-gpg-context.c:1305 ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1317 ../camel/camel-smime-context.c:602
#, c-format
msgid "Could not generate signing data: %s"
msgstr ""
-#: ../camel/camel-gpg-context.c:1352 ../camel/camel-gpg-context.c:1553
-#: ../camel/camel-gpg-context.c:1569 ../camel/camel-gpg-context.c:1649
-#: ../camel/camel-gpg-context.c:1664 ../camel/camel-gpg-context.c:1780
-#: ../camel/camel-gpg-context.c:1795 ../camel/camel-gpg-context.c:1875
-#: ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1364 ../camel/camel-gpg-context.c:1565
+#: ../camel/camel-gpg-context.c:1581 ../camel/camel-gpg-context.c:1661
+#: ../camel/camel-gpg-context.c:1676 ../camel/camel-gpg-context.c:1792
+#: ../camel/camel-gpg-context.c:1807 ../camel/camel-gpg-context.c:1887
+#: ../camel/camel-gpg-context.c:1932
msgid "Failed to execute gpg."
msgstr ""
-#: ../camel/camel-gpg-context.c:1371
+#: ../camel/camel-gpg-context.c:1383
msgid "This is a digitally signed message part"
msgstr ""
-#: ../camel/camel-gpg-context.c:1457 ../camel/camel-gpg-context.c:1463
-#: ../camel/camel-gpg-context.c:1469 ../camel/camel-gpg-context.c:1484
+#: ../camel/camel-gpg-context.c:1469 ../camel/camel-gpg-context.c:1475
+#: ../camel/camel-gpg-context.c:1481 ../camel/camel-gpg-context.c:1496
#: ../camel/camel-smime-context.c:910 ../camel/camel-smime-context.c:921
#: ../camel/camel-smime-context.c:928
msgid "Cannot verify message signature: Incorrect message format"
msgstr ""
-#: ../camel/camel-gpg-context.c:1523
+#: ../camel/camel-gpg-context.c:1535
#, c-format
msgid "Cannot verify message signature: could not create temp file: %s"
msgstr ""
-#: ../camel/camel-gpg-context.c:1632
+#: ../camel/camel-gpg-context.c:1644
#, c-format
msgid "Could not generate encrypting data: %s"
msgstr ""
-#: ../camel/camel-gpg-context.c:1682
+#: ../camel/camel-gpg-context.c:1694
msgid "This is a digitally encrypted message part"
msgstr ""
-#: ../camel/camel-gpg-context.c:1735 ../camel/camel-gpg-context.c:1743
-#: ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1747 ../camel/camel-gpg-context.c:1755
+#: ../camel/camel-gpg-context.c:1774
msgid "Cannot decrypt message: Incorrect message format"
msgstr ""
-#: ../camel/camel-gpg-context.c:1752
+#: ../camel/camel-gpg-context.c:1764
msgid "Failed to decrypt MIME part: protocol error"
msgstr ""
-#: ../camel/camel-gpg-context.c:1817 ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:1829 ../camel/camel-smime-context.c:1186
msgid "Encrypted content"
msgstr ""
-#: ../camel/camel-gpg-context.c:1836
+#: ../camel/camel-gpg-context.c:1848
msgid "Unable to parse message content"
msgstr ""
-#: ../camel/camel-gpg-context.c:1860 ../camel/camel-gpg-context.c:1905
+#: ../camel/camel-gpg-context.c:1872 ../camel/camel-gpg-context.c:1917
#: ../camel/camel-tcp-stream-openssl.c:627
#: ../camel/providers/imap4/camel-imap4-utils.c:614
#: ../camel/providers/smtp/camel-smtp-transport.c:165
@@ -1725,40 +1729,40 @@
msgid "parse error"
msgstr ""
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:674
-#: ../camel/camel-net-utils.c:805
-#: ../camel/providers/pop3/camel-pop3-store.c:446
-#: ../camel/providers/pop3/camel-pop3-store.c:546
+#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:673
+#: ../camel/camel-net-utils.c:802
+#: ../camel/providers/pop3/camel-pop3-store.c:476
+#: ../camel/providers/pop3/camel-pop3-store.c:576
msgid "Canceled"
msgstr ""
-#: ../camel/camel-net-utils.c:521
+#: ../camel/camel-net-utils.c:523
msgid "cannot create thread"
msgstr ""
-#: ../camel/camel-net-utils.c:678
+#: ../camel/camel-net-utils.c:677
#, c-format
msgid "Resolving: %s"
msgstr ""
-#: ../camel/camel-net-utils.c:700
+#: ../camel/camel-net-utils.c:699
msgid "Host lookup failed"
msgstr ""
-#: ../camel/camel-net-utils.c:702
+#: ../camel/camel-net-utils.c:701
#, c-format
msgid "Host lookup failed: %s: %s"
msgstr ""
-#: ../camel/camel-net-utils.c:809
+#: ../camel/camel-net-utils.c:806
msgid "Resolving address"
msgstr ""
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:826
msgid "Name lookup failed"
msgstr ""
-#: ../camel/camel-net-utils.c:832
+#: ../camel/camel-net-utils.c:829
#, c-format
msgid "Name lookup failed: %s"
msgstr ""
@@ -2241,44 +2245,44 @@
msgid "export keys: unimplemented"
msgstr ""
-#: ../camel/camel-store.c:283
+#: ../camel/camel-store.c:279
#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
msgid "Cannot get folder: Invalid operation on this store"
msgstr ""
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:312
#, c-format
msgid "Cannot create folder '%s': folder exists"
msgstr ""
-#: ../camel/camel-store.c:395
+#: ../camel/camel-store.c:391
msgid "Cannot create folder: Invalid operation on this store"
msgstr ""
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:419
#, c-format
msgid "Cannot create folder: %s: folder exists"
msgstr ""
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
+#: ../camel/camel-store.c:483 ../camel/camel-vee-store.c:377
#: ../camel/providers/local/camel-maildir-store.c:219
#, c-format
msgid "Cannot delete folder: %s: Invalid operation"
msgstr ""
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
+#: ../camel/camel-store.c:540 ../camel/camel-vee-store.c:414
#: ../camel/providers/local/camel-maildir-store.c:291
#, c-format
msgid "Cannot rename folder: %s: Invalid operation"
msgstr ""
#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
+#: ../camel/camel-store.c:896 ../camel/camel-vtrash-folder.c:54
msgid "Trash"
msgstr ""
#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
+#: ../camel/camel-store.c:899 ../camel/camel-vtrash-folder.c:56
msgid "Junk"
msgstr ""
@@ -2398,7 +2402,7 @@
msgid "Error in application verification"
msgstr ""
-#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-openssl.c:692 ../camel/camel-tcp-stream-ssl.c:877
#, c-format
msgid ""
"Issuer: %s\n"
@@ -2407,11 +2411,11 @@
"Signature: %s"
msgstr ""
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:883
msgid "GOOD"
msgstr ""
-#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-openssl.c:698 ../camel/camel-tcp-stream-ssl.c:883
msgid "BAD"
msgstr ""
@@ -2428,7 +2432,7 @@
msgstr ""
#. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:887
#, c-format
msgid ""
"SSL Certificate check for %s:\n"
@@ -2438,28 +2442,28 @@
"Do you wish to accept?"
msgstr ""
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:931
#, c-format
msgid ""
"Certificate problem: %s\n"
"Issuer: %s"
msgstr ""
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:983
#, c-format
msgid ""
"Bad certificate domain: %s\n"
"Issuer: %s"
msgstr ""
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:1001
#, c-format
msgid ""
"Certificate expired: %s\n"
"Issuer: %s"
msgstr ""
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:1018
#, c-format
msgid ""
"Certificate revocation list expired: %s\n"
@@ -2471,17 +2475,17 @@
msgid "Could not parse URL '%s'"
msgstr ""
-#: ../camel/camel-vee-folder.c:581
+#: ../camel/camel-vee-folder.c:582
#, c-format
msgid "Error storing '%s': %s"
msgstr ""
-#: ../camel/camel-vee-folder.c:658
+#: ../camel/camel-vee-folder.c:659
#, c-format
msgid "No such message %s in %s"
msgstr ""
-#: ../camel/camel-vee-folder.c:817 ../camel/camel-vee-folder.c:823
+#: ../camel/camel-vee-folder.c:818 ../camel/camel-vee-folder.c:824
msgid "Cannot copy or move messages into a Virtual Folder"
msgstr ""
@@ -2508,14 +2512,14 @@
msgid "Cannot copy messages to the Junk folder"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
#, c-format
msgid ""
"Cannot get message: %s\n"
" %s"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:136
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
#: ../camel/providers/local/camel-maildir-folder.c:278
#: ../camel/providers/local/camel-maildir-folder.c:310
#: ../camel/providers/local/camel-mbox-folder.c:363
@@ -2524,7 +2528,7 @@
msgid "No such message"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:148
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
#: ../camel/providers/imap4/camel-imap4-folder.c:814
#: ../camel/providers/nntp/camel-nntp-folder.c:175
#: ../camel/providers/nntp/camel-nntp-folder.c:250
@@ -2536,7 +2540,7 @@
msgid "User canceled"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:155
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
#: ../camel/providers/imap4/camel-imap4-folder.c:819
#: ../camel/providers/nntp/camel-nntp-folder.c:166
#: ../camel/providers/nntp/camel-nntp-folder.c:168
@@ -2551,51 +2555,51 @@
msgid "Cannot get message %s: %s"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:172
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:180
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2463
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2562
#: ../camel/providers/imap4/camel-imap4-folder.c:837
msgid "This message is not available in offline mode."
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:194
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:201
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1966
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2017
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2063
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2114
msgid "Could not get message"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:939
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1035
#: ../camel/providers/imap/camel-imap-folder.c:296
#, c-format
msgid "Could not load summary for %s"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1012
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1108
#, c-format
msgid "Checking for deleted messages %s"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1382
msgid "Trash Folder Full. Please Empty."
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
-#: ../camel/providers/groupwise/camel-groupwise-store.c:633
-#: ../camel/providers/groupwise/camel-groupwise-store.c:763
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1616
+#: ../camel/providers/groupwise/camel-groupwise-store.c:626
+#: ../camel/providers/groupwise/camel-groupwise-store.c:756
#: ../camel/providers/imap/camel-imap-folder.c:3421
#: ../camel/providers/imap/camel-imap-folder.c:3497
#, c-format
msgid "Fetching summary information for new messages in %s"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2317
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2416
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2459
#, c-format
msgid "Cannot append message to folder '%s': %s"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2348
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2447
#, c-format
msgid "Cannot create message: %s"
msgstr ""
@@ -2689,45 +2693,45 @@
msgid "Host or user not available in url"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-store.c:204
+#: ../camel/providers/groupwise/camel-groupwise-store.c:197
#: ../camel/providers/imap/camel-imap-store.c:1358
msgid "You did not enter a password."
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-store.c:319
+#: ../camel/providers/groupwise/camel-groupwise-store.c:312
msgid "Some features may not work correctly with your current server version"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-store.c:540
+#: ../camel/providers/groupwise/camel-groupwise-store.c:533
#: ../camel/providers/imap/camel-imap-store.c:1849
#: ../camel/providers/imap/camel-imap-store.c:2047
#, c-format
msgid "No such folder %s"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1266
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
msgid "Cannot create GroupWise folders in offline mode."
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1280
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
#: ../camel/providers/imap/camel-imap-store.c:1924
#: ../camel/providers/imap/camel-imap-store.c:2304
msgid "The parent folder is not allowed to contain subfolders"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1359
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
#, c-format
msgid "Cannot rename GroupWise folder '%s' to '%s'"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1414
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
#, c-format
msgid "GroupWise server %s"
msgstr ""
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1416
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
#, c-format
msgid "GroupWise service for %s on %s"
msgstr ""
@@ -3000,8 +3004,8 @@
#: ../camel/providers/imap4/camel-imap4-store.c:262
#: ../camel/providers/nntp/camel-nntp-store.c:182
#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:170
-#: ../camel/providers/pop3/camel-pop3-store.c:184
+#: ../camel/providers/pop3/camel-pop3-store.c:192
+#: ../camel/providers/pop3/camel-pop3-store.c:206
#: ../camel/providers/smtp/camel-smtp-transport.c:259
#: ../camel/providers/smtp/camel-smtp-transport.c:274
#, c-format
@@ -3011,7 +3015,7 @@
#: ../camel/providers/imap/camel-imap-store.c:569
#: ../camel/providers/imap4/camel-imap4-store.c:248
#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:171
+#: ../camel/providers/pop3/camel-pop3-store.c:193
#: ../camel/providers/smtp/camel-smtp-transport.c:260
msgid "SSL unavailable"
msgstr ""
@@ -3263,7 +3267,7 @@
#: ../camel/providers/imapp/camel-imapp-store.c:249
#: ../camel/providers/nntp/camel-nntp-store.c:194
#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:181
+#: ../camel/providers/pop3/camel-pop3-store.c:203
#: ../camel/providers/smtp/camel-smtp-transport.c:271
msgid "Connection canceled"
msgstr ""
@@ -3276,7 +3280,7 @@
msgstr ""
#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:249
+#: ../camel/providers/pop3/camel-pop3-store.c:275
msgid "TLS negotiations failed"
msgstr ""
@@ -3799,7 +3803,7 @@
msgstr ""
#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:956
+#: ../camel/providers/local/camel-mbox-summary.c:957
#, c-format
msgid "Could not close source folder %s: %s"
msgstr ""
@@ -3815,31 +3819,31 @@
msgstr ""
#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1083
+#: ../camel/providers/local/camel-mbox-summary.c:1086
#, c-format
msgid "Could not store folder: %s"
msgstr ""
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1113
-#: ../camel/providers/local/camel-mbox-summary.c:1121
+#: ../camel/providers/local/camel-mbox-summary.c:898
+#: ../camel/providers/local/camel-mbox-summary.c:906
+#: ../camel/providers/local/camel-mbox-summary.c:1117
+#: ../camel/providers/local/camel-mbox-summary.c:1125
msgid "Summary and folder mismatch, even after a sync"
msgstr ""
-#: ../camel/providers/local/camel-mbox-summary.c:1046
+#: ../camel/providers/local/camel-mbox-summary.c:1049
#: ../camel/providers/local/camel-spool-summary.c:334
#, c-format
msgid "Unknown error: %s"
msgstr ""
-#: ../camel/providers/local/camel-mbox-summary.c:1189
-#: ../camel/providers/local/camel-mbox-summary.c:1215
+#: ../camel/providers/local/camel-mbox-summary.c:1193
+#: ../camel/providers/local/camel-mbox-summary.c:1219
#, c-format
msgid "Writing to temporary mailbox failed: %s"
msgstr ""
-#: ../camel/providers/local/camel-mbox-summary.c:1206
+#: ../camel/providers/local/camel-mbox-summary.c:1210
#, c-format
msgid "Writing to temporary mailbox failed: %s: %s"
msgstr ""
@@ -4161,79 +4165,89 @@
"claim to support it."
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:207
+#: ../camel/providers/pop3/camel-pop3-store.c:229
#, c-format
msgid "Failed to read a valid greeting from POP server %s"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:224
-#: ../camel/providers/pop3/camel-pop3-store.c:238
-#: ../camel/providers/pop3/camel-pop3-store.c:248
-#: ../camel/providers/pop3/camel-pop3-store.c:254
+#: ../camel/providers/pop3/camel-pop3-store.c:246
+#: ../camel/providers/pop3/camel-pop3-store.c:274
+#: ../camel/providers/pop3/camel-pop3-store.c:280
#, c-format
msgid "Failed to connect to POP server %s in secure mode: %s"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:225
+#: ../camel/providers/pop3/camel-pop3-store.c:247
msgid "STLS not supported by server"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:255
+#: ../camel/providers/pop3/camel-pop3-store.c:262
+#, c-format
+msgid "Failed to connect to POP server %s in secure mode%s"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-store.c:281
msgid "TLS is not available in this build"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:361
+#: ../camel/providers/pop3/camel-pop3-store.c:387
#, c-format
msgid "Could not connect to POP server %s"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:402
-#: ../camel/providers/pop3/camel-pop3-store.c:535
+#: ../camel/providers/pop3/camel-pop3-store.c:428
+#: ../camel/providers/pop3/camel-pop3-store.c:565
#, c-format
msgid ""
"Unable to connect to POP server %s: No support for requested authentication "
"mechanism."
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:418
+#: ../camel/providers/pop3/camel-pop3-store.c:446
#, c-format
-msgid "SASL '%s' Login failed for POP server %s: %s"
+msgid "SASL '%s' Login failed for POP server %s%s"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:430
+#: ../camel/providers/pop3/camel-pop3-store.c:460
#, c-format
msgid "Cannot login to POP server %s: SASL Protocol error"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:449
+#: ../camel/providers/pop3/camel-pop3-store.c:479
#, c-format
msgid "Failed to authenticate on POP server %s: %s"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:508
+#: ../camel/providers/pop3/camel-pop3-store.c:538
#, c-format
msgid ""
"Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
"attack suspected. Please contact your admin."
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:549
-#: ../camel/providers/pop3/camel-pop3-store.c:562
+#: ../camel/providers/pop3/camel-pop3-store.c:579
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
"Error sending password: %s"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:556
+#: ../camel/providers/pop3/camel-pop3-store.c:588
#, c-format
msgid ""
"Unable to connect to POP server %s.\n"
-"Error sending username: %s"
+"Error sending username%s"
msgstr ""
-#: ../camel/providers/pop3/camel-pop3-store.c:669
+#: ../camel/providers/pop3/camel-pop3-store.c:597
#, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending password%s"
+msgstr ""
+
+#: ../camel/providers/pop3/camel-pop3-store.c:703
+#, c-format
msgid "No such folder '%s'."
msgstr ""
@@ -4820,15 +4834,15 @@
msgid "Select Contacts from Address Book"
msgstr ""
-#: ../libedataserverui/e-name-selector-dialog.c:563
+#: ../libedataserverui/e-name-selector-dialog.c:558
msgid "_Add"
msgstr ""
-#: ../libedataserverui/e-name-selector-dialog.c:588
+#: ../libedataserverui/e-name-selector-dialog.c:583
msgid "_Remove"
msgstr ""
-#: ../libedataserverui/e-name-selector-dialog.c:765
+#: ../libedataserverui/e-name-selector-dialog.c:760
#: ../libedataserverui/e-name-selector-dialog.glade.h:8
msgid "Any Category"
msgstr ""
@@ -4871,25 +4885,25 @@
msgstr ""
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2513
#, c-format
msgid "E_xpand %s Inline"
msgstr ""
#. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2528
#, c-format
msgid "Cop_y %s"
msgstr ""
#. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2538
#, c-format
msgid "C_ut %s"
msgstr ""
#. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2555
#, c-format
msgid "_Edit %s"
msgstr ""
@@ -4934,13 +4948,13 @@
msgstr ""
#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:955
+#: ../servers/exchange/storage/exchange-account.c:965
#, c-format
msgid "Enter password for %s"
msgstr ""
#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:960
+#: ../servers/exchange/storage/exchange-account.c:970
msgid "Enter password"
msgstr ""
@@ -5049,21 +5063,21 @@
msgid "%s's Folders"
msgstr ""
-#: ../servers/exchange/storage/exchange-account.c:1260
+#: ../servers/exchange/storage/exchange-account.c:1270
msgid "Personal Folders"
msgstr ""
-#: ../servers/exchange/storage/exchange-account.c:1275
+#: ../servers/exchange/storage/exchange-account.c:1285
msgid "Favorite Public Folders"
msgstr ""
#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1292
+#: ../servers/exchange/storage/exchange-account.c:1302
msgid "All Public Folders"
msgstr ""
#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1306
+#: ../servers/exchange/storage/exchange-account.c:1316
msgid "Global Address List"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/evolution-exchange.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/evolution-exchange.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/evolution-exchange.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,76 +8,90 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-26 14:10+0100\n"
+"POT-Creation-Date: 2015-05-06 19:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../addressbook/apps_exchange_addressbook.schemas.in.in.h:1
-msgid "Specifies the dn entry at which to start the search."
+msgid "Specifies the time interval to refresh the GAL Cache."
msgstr ""
#: ../addressbook/apps_exchange_addressbook.schemas.in.in.h:2
-msgid "Specifies the time interval to refresh the GAL Cache."
+msgid ""
+"This key specifies the number of days interval between the GAL cache "
+"refresh. Set this value to zero, if you don't want to update GAL and use the "
+"current cache forever. This will work only if you have enabled offline "
+"caching for GAL."
msgstr ""
#: ../addressbook/apps_exchange_addressbook.schemas.in.in.h:3
-msgid ""
-"This key specifies the dn entry at which to start the search. Only the "
-"contacts under this would be cached and shown in the GAL addressbook."
+msgid "Specifies the dn entry at which to start the search."
msgstr ""
#: ../addressbook/apps_exchange_addressbook.schemas.in.in.h:4
msgid ""
-"This key specifies the number of days interval between the GAL cache "
-"refresh. Set this value to zero, if you don't want to update GAL and use the "
-"current cache forever. This will work only if you have enabled offline "
-"caching for GAL."
+"This key specifies the dn entry at which to start the search. Only the "
+"contacts under this would be cached and shown in the GAL addressbook."
msgstr ""
-#: ../addressbook/e-book-backend-exchange.c:2307
-#: ../addressbook/e-book-backend-gal.c:1907 ../storage/exchange-storage.c:134
+#: ../addressbook/e-book-backend-exchange.c:2314
+#: ../addressbook/e-book-backend-gal.c:2297
msgid "Searching..."
msgstr ""
-#: ../addressbook/e-book-backend-gal.c:310
-#: ../addressbook/e-book-backend-gal.c:331
+#: ../addressbook/e-book-backend-gal.c:311
+#: ../addressbook/e-book-backend-gal.c:332
msgid "Reconnecting to LDAP server..."
msgstr ""
-#: ../addressbook/e-book-backend-gal.c:1648
+#: ../addressbook/e-book-backend-gal.c:1649
msgid "Receiving LDAP search results..."
msgstr ""
-#: ../addressbook/e-book-backend-gal.c:1938
+#: ../addressbook/e-book-backend-gal.c:1958
+#, c-format
+msgid "Caching LDAP results for GAL...%d contacts done"
+msgstr ""
+
+#: ../addressbook/e-book-backend-gal.c:2175
+msgid "Updating LDAP results for GAL..."
+msgstr ""
+
+#: ../addressbook/e-book-backend-gal.c:2185
+msgid "Caching LDAP results for GAL..."
+msgstr ""
+
+#: ../addressbook/e-book-backend-gal.c:2328
msgid "Error performing search"
msgstr ""
-#: ../calendar/e-cal-backend-exchange-calendar.c:2113
+#: ../calendar/e-cal-backend-exchange-calendar.c:2177
#, c-format
msgid "The resource '%s' is busy during the selected time period."
msgstr ""
-#: ../calendar/e-cal-backend-exchange.c:426
+#: ../calendar/e-cal-backend-exchange.c:446
msgid "Authentication failed"
msgstr ""
-#: ../calendar/e-cal-backend-exchange.c:478
+#: ../calendar/e-cal-backend-exchange.c:511
msgid "Could not find the calendar"
msgstr ""
-#: ../camel/camel-exchange-folder.c:210
+#: ../camel/camel-exchange-folder.c:207
msgid "You cannot expunge in offline mode."
msgstr ""
-#: ../camel/camel-exchange-folder.c:241
+#: ../camel/camel-exchange-folder.c:235
msgid "No Subject"
msgstr ""
-#: ../camel/camel-exchange-folder.c:404
+#: ../camel/camel-exchange-folder.c:397
msgid "This message is not available in offline mode."
msgstr ""
@@ -89,50 +103,50 @@
msgid "Copying messages"
msgstr ""
-#: ../camel/camel-exchange-folder.c:1029
+#: ../camel/camel-exchange-folder.c:1021
#, c-format
msgid "Could not create directory %s: %s"
msgstr ""
-#: ../camel/camel-exchange-folder.c:1039
+#: ../camel/camel-exchange-folder.c:1031
#, c-format
msgid "Could not load summary for %s"
msgstr ""
-#: ../camel/camel-exchange-folder.c:1047
+#: ../camel/camel-exchange-folder.c:1039
#, c-format
msgid "Could not create cache for %s"
msgstr ""
-#: ../camel/camel-exchange-folder.c:1057
+#: ../camel/camel-exchange-folder.c:1049
#, c-format
msgid "Could not create journal for %s"
msgstr ""
-#: ../camel/camel-exchange-folder.c:1108
+#: ../camel/camel-exchange-folder.c:1098
msgid "Scanning for changed messages"
msgstr ""
-#: ../camel/camel-exchange-folder.c:1143
+#: ../camel/camel-exchange-folder.c:1125
msgid "Fetching summary information for new messages"
msgstr ""
-#: ../camel/camel-exchange-journal.c:338
+#: ../camel/camel-exchange-journal.c:333
msgid "No folder name found\n"
msgstr ""
-#: ../camel/camel-exchange-journal.c:371 ../mail/mail-stub-exchange.c:3082
+#: ../camel/camel-exchange-journal.c:366 ../mail/mail-stub-exchange.c:3082
#: ../mail/mail-stub-exchange.c:3132 ../mail/mail-stub-exchange.c:3262
#: ../mail/mail-stub-exchange.c:3289 ../mail/mail-stub-exchange.c:3342
#: ../mail/mail-stub-exchange.c:3364
msgid "Folder doesn't exist"
msgstr ""
-#: ../camel/camel-exchange-journal.c:433
+#: ../camel/camel-exchange-journal.c:428
msgid "Cannot append message in offline mode: cache unavailable"
msgstr ""
-#: ../camel/camel-exchange-journal.c:449
+#: ../camel/camel-exchange-journal.c:444
#, c-format
msgid "Cannot append message in offline mode: %s"
msgstr ""
@@ -242,56 +256,52 @@
"password authentication."
msgstr ""
-#: ../camel/camel-exchange-store.c:313
+#: ../camel/camel-exchange-store.c:305
#, c-format
msgid "Exchange server %s"
msgstr ""
-#: ../camel/camel-exchange-store.c:316
+#: ../camel/camel-exchange-store.c:308
#, c-format
msgid "Exchange account for %s on %s"
msgstr ""
-#: ../camel/camel-exchange-store.c:398
-msgid "Evolution Exchange backend process"
-msgstr ""
-
-#: ../camel/camel-exchange-store.c:441
+#: ../camel/camel-exchange-store.c:389
msgid ""
"Could not authenticate to server. (Password incorrect?)\n"
"\n"
msgstr ""
-#: ../camel/camel-exchange-store.c:494
+#: ../camel/camel-exchange-store.c:431
#, c-format
msgid "No such folder %s"
msgstr ""
-#: ../camel/camel-exchange-store.c:571
+#: ../camel/camel-exchange-store.c:503
msgid "Cannot subscribe folder in offline mode."
msgstr ""
-#: ../camel/camel-exchange-store.c:588
+#: ../camel/camel-exchange-store.c:518
msgid "Cannot unsubscribe folder in offline mode."
msgstr ""
-#: ../camel/camel-exchange-store.c:724
+#: ../camel/camel-exchange-store.c:649
msgid "Cannot get folder info in offline mode."
msgstr ""
-#: ../camel/camel-exchange-store.c:797
+#: ../camel/camel-exchange-store.c:712
msgid "Cannot create folder in offline mode."
msgstr ""
-#: ../camel/camel-exchange-store.c:824
+#: ../camel/camel-exchange-store.c:735
msgid "Cannot delete folder in offline mode."
msgstr ""
-#: ../camel/camel-exchange-store.c:848
+#: ../camel/camel-exchange-store.c:757
msgid "Cannot rename folder in offline mode."
msgstr ""
-#: ../camel/camel-exchange-transport.c:109
+#: ../camel/camel-exchange-transport.c:107
msgid "Exchange transport can only be used with Exchange mail source"
msgstr ""
@@ -299,55 +309,10 @@
msgid "Cannot send message: one or more invalid recipients"
msgstr ""
-#: ../camel/camel-exchange-transport.c:130
+#: ../camel/camel-exchange-transport.c:129
msgid "Could not find 'From' address in message"
msgstr ""
-#: ../camel/camel-stub.c:164 ../camel/camel-stub.c:228
-#, c-format
-msgid "Could not create socket: %s"
-msgstr ""
-
-#: ../camel/camel-stub.c:182
-#, c-format
-msgid "Could not connect to %s: Please restart Evolution"
-msgstr ""
-
-#: ../camel/camel-stub.c:187 ../camel/camel-stub.c:246
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr ""
-
-#: ../camel/camel-stub.c:211
-#, c-format
-msgid "Count not read file '%s': %s"
-msgstr ""
-
-#: ../camel/camel-stub.c:219
-#, c-format
-msgid "Wrong size file '%s'"
-msgstr ""
-
-#: ../camel/camel-stub.c:281
-#, c-format
-msgid "Path too long: %s"
-msgstr ""
-
-#: ../camel/camel-stub.c:316
-#, c-format
-msgid "Could not start status thread: %s"
-msgstr ""
-
-#: ../camel/camel-stub.c:570
-#, c-format
-msgid "Lost connection to %s"
-msgstr ""
-
-#: ../camel/camel-stub.c:574
-#, c-format
-msgid "Error communicating with %s: %s"
-msgstr ""
-
#: ../mail/mail-stub-exchange.c:268 ../mail/mail-stub-exchange.c:968
msgid "No such folder"
msgstr ""
@@ -450,16 +415,16 @@
msgstr ""
#: ../storage/GNOME_Evolution_Exchange_Storage.server.in.in.h:1
-msgid "Evolution Addressbook Exchange backend"
+#: ../storage/main.c:219
+msgid "Evolution Connector for Microsoft Exchange"
msgstr ""
#: ../storage/GNOME_Evolution_Exchange_Storage.server.in.in.h:2
-msgid "Evolution Calendar Exchange backend"
+msgid "Evolution Addressbook Exchange backend"
msgstr ""
#: ../storage/GNOME_Evolution_Exchange_Storage.server.in.in.h:3
-#: ../storage/main.c:219
-msgid "Evolution Connector for Microsoft Exchange"
+msgid "Evolution Calendar Exchange backend"
msgstr ""
#: ../storage/exchange-autoconfig-wizard.c:223
@@ -552,27 +517,27 @@
msgstr ""
#: ../storage/exchange-autoconfig-wizard.glade.h:1
-#: ../storage/exchange-change-password.glade.h:1
-msgid "*"
+msgid "Evolution Connector for Microsoft Exchange Configuration"
msgstr ""
#: ../storage/exchange-autoconfig-wizard.glade.h:2
-msgid "Configuration Failed"
+msgid "Welcome"
msgstr ""
#: ../storage/exchange-autoconfig-wizard.glade.h:3
-msgid "Done"
+msgid ""
+"Welcome to Evolution Connector for Microsoft Exchange.\n"
+"The next few screens will help you configure Evolution\n"
+"to connect to your Exchange account.\n"
+"\n"
+"Please click the \"Forward\" button to continue."
msgstr ""
-#: ../storage/exchange-autoconfig-wizard.glade.h:4
-msgid "Email Address:"
+#: ../storage/exchange-autoconfig-wizard.glade.h:8
+msgid "Exchange Configuration"
msgstr ""
-#: ../storage/exchange-autoconfig-wizard.glade.h:5
-msgid "Evolution Connector for Microsoft Exchange Configuration"
-msgstr ""
-
-#: ../storage/exchange-autoconfig-wizard.glade.h:6
+#: ../storage/exchange-autoconfig-wizard.glade.h:9
msgid ""
"Evolution Connector for Microsoft Exchange can use account information from "
"your existing Outlook Web Access (OWA) account.\n"
@@ -581,77 +546,77 @@
"\"Forward\".\n"
msgstr ""
-#: ../storage/exchange-autoconfig-wizard.glade.h:10
-msgid ""
-"Evolution Connector for Microsoft Exchange could not find the Global Catalog "
-"replica for your site. Please enter the name of your Global Catalog server. "
-"You may need to ask your system administrator for the correct value.\n"
+#: ../storage/exchange-autoconfig-wizard.glade.h:13
+msgid "OWA URL:"
msgstr ""
-#: ../storage/exchange-autoconfig-wizard.glade.h:12
-msgid ""
-"Evolution Connector for Microsoft Exchange has encountered a problem "
-"configuring your Exchange account.\n"
-msgstr ""
-
#: ../storage/exchange-autoconfig-wizard.glade.h:14
-msgid "Exchange Configuration"
+msgid "Username:"
msgstr ""
#: ../storage/exchange-autoconfig-wizard.glade.h:15
-msgid "Full Name:"
+msgid "Password:"
msgstr ""
#: ../storage/exchange-autoconfig-wizard.glade.h:16
-msgid "GC Server:"
+#: ../storage/exchange-change-password.glade.h:6
+msgid "*"
msgstr ""
#: ../storage/exchange-autoconfig-wizard.glade.h:17
-msgid "Make this my default account"
+msgid "Remember this password"
msgstr ""
#: ../storage/exchange-autoconfig-wizard.glade.h:18
-msgid "OWA URL:"
+msgid ""
+"Evolution Connector for Microsoft Exchange could not find the Global Catalog "
+"replica for your site. Please enter the name of your Global Catalog server. "
+"You may need to ask your system administrator for the correct value.\n"
msgstr ""
-#: ../storage/exchange-autoconfig-wizard.glade.h:19
-msgid "Password:"
-msgstr ""
-
#: ../storage/exchange-autoconfig-wizard.glade.h:20
-msgid "Remember this password"
+msgid "GC Server:"
msgstr ""
#: ../storage/exchange-autoconfig-wizard.glade.h:21
-msgid "Username:"
+msgid "Configuration Failed"
msgstr ""
#: ../storage/exchange-autoconfig-wizard.glade.h:22
-msgid "Welcome"
+msgid ""
+"Evolution Connector for Microsoft Exchange has encountered a problem "
+"configuring your Exchange account.\n"
msgstr ""
-#: ../storage/exchange-autoconfig-wizard.glade.h:23
+#: ../storage/exchange-autoconfig-wizard.glade.h:24
msgid ""
-"Welcome to Evolution Connector for Microsoft Exchange.\n"
-"The next few screens will help you configure Evolution\n"
-"to connect to your Exchange account.\n"
-"\n"
-"Please click the \"Forward\" button to continue."
+"Your account information is as follows. Please correct any errors, then "
+"click \"Forward\".\n"
msgstr ""
+#: ../storage/exchange-autoconfig-wizard.glade.h:26
+msgid "Full Name:"
+msgstr ""
+
+#: ../storage/exchange-autoconfig-wizard.glade.h:27
+msgid "Email Address:"
+msgstr ""
+
#: ../storage/exchange-autoconfig-wizard.glade.h:28
+msgid "Make this my default account"
+msgstr ""
+
+#: ../storage/exchange-autoconfig-wizard.glade.h:29
+msgid "Done"
+msgstr ""
+
+#: ../storage/exchange-autoconfig-wizard.glade.h:30
msgid ""
"Your Connector account is now ready to use. Click the \"Apply\" button to "
"save your\n"
"settings."
msgstr ""
-#: ../storage/exchange-autoconfig-wizard.glade.h:30
-msgid ""
-"Your account information is as follows. Please correct any errors, then "
-"click \"Forward\".\n"
-msgstr ""
-
#. User entered a wrong existing
#. * password. Prompt him again.
#.
@@ -665,155 +630,128 @@
msgid "The two passwords do not match. Please re-enter the passwords."
msgstr ""
-#: ../storage/exchange-change-password.glade.h:2
+#: ../storage/exchange-change-password.glade.h:1
msgid "Change Password"
msgstr ""
-#: ../storage/exchange-change-password.glade.h:3
-msgid "Confirm Password:"
+#: ../storage/exchange-change-password.glade.h:2
+msgid "Your current password has expired. Please change your password now."
msgstr ""
-#: ../storage/exchange-change-password.glade.h:4
+#: ../storage/exchange-change-password.glade.h:3
msgid "Current Password:"
msgstr ""
-#: ../storage/exchange-change-password.glade.h:5
+#: ../storage/exchange-change-password.glade.h:4
msgid "New Password:"
msgstr ""
-#: ../storage/exchange-change-password.glade.h:6
-msgid "Your current password has expired. Please change your password now."
+#: ../storage/exchange-change-password.glade.h:5
+msgid "Confirm Password:"
msgstr ""
#: ../storage/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
+msgid "Delegates"
msgstr ""
#: ../storage/exchange-delegates.glade.h:2
-msgid "C_alendar:"
+msgid ""
+"These users will be able to send mail on your behalf\n"
+"and access your folders with the permissions you give them."
msgstr ""
-#: ../storage/exchange-delegates.glade.h:3
-msgid "Co_ntacts:"
-msgstr ""
-
#: ../storage/exchange-delegates.glade.h:4
-msgid "Delegate Permissions"
+msgid "_Edit"
msgstr ""
#: ../storage/exchange-delegates.glade.h:5
-msgid "Delegates"
+msgid "Delegate Permissions"
msgstr ""
#: ../storage/exchange-delegates.glade.h:6
-msgid "Editor (read, create, edit)"
+msgid "Permissions for"
msgstr ""
#: ../storage/exchange-delegates.glade.h:7
-msgid "None"
+msgid "C_alendar:"
msgstr ""
#: ../storage/exchange-delegates.glade.h:8
-msgid "Permissions for"
+msgid "_Tasks:"
msgstr ""
#: ../storage/exchange-delegates.glade.h:9
-msgid "Reviewer (read-only)"
+msgid "_Inbox:"
msgstr ""
#: ../storage/exchange-delegates.glade.h:10
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
+msgid "Co_ntacts:"
msgstr ""
+#: ../storage/exchange-delegates.glade.h:11
+msgid "None"
+msgstr ""
+
#: ../storage/exchange-delegates.glade.h:12
-msgid "_Delegate can see private items"
+msgid "Reviewer (read-only)"
msgstr ""
#: ../storage/exchange-delegates.glade.h:13
-msgid "_Edit"
+msgid "Author (read, create)"
msgstr ""
#: ../storage/exchange-delegates.glade.h:14
-msgid "_Inbox:"
+msgid "Editor (read, create, edit)"
msgstr ""
#: ../storage/exchange-delegates.glade.h:15
-msgid "_Tasks:"
+msgid "_Delegate can see private items"
msgstr ""
#: ../storage/exchange-folder-tree.glade.h:1
msgid "Exchange Folder Tree"
msgstr ""
-#: ../storage/exchange-migrate.c:60
-msgid "Migrating Exchange Folders..."
+#: ../storage/exchange-oof.glade.h:1
+msgid "Out of Office Assistant"
msgstr ""
-#: ../storage/exchange-migrate.c:68
-#, c-format
-msgid ""
-"The location and hierarchy of the Evolution exchange account folders are "
-"changed since Evolution %d.%d.%d.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../storage/exchange-oof.glade.h:2
+msgid "No, Don't Change Status"
msgstr ""
-#: ../storage/exchange-migrate.c:101
-#, c-format
-msgid ""
-"Warning: Evolution could not migrate all the Exchange account data from the "
-"version %d.%d.%d. \n"
-"The data hasn't been deleted, but will not be seen by this version of "
-"Evolution"
+#: ../storage/exchange-oof.glade.h:3
+msgid "Yes, Change Status"
msgstr ""
-#: ../storage/exchange-migrate.c:132
-#, c-format
-msgid "Migrating `%s':"
-msgstr ""
-
-#: ../storage/exchange-oof.glade.h:1
+#: ../storage/exchange-oof.glade.h:4
msgid ""
"<b>Currently, your status is \"Out of the Office\". </b>\n"
"\n"
"Would you like to change your status to \"In the Office\"? "
msgstr ""
-#: ../storage/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr ""
-
-#: ../storage/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr ""
-
-#: ../storage/exchange-oof.glade.h:6
+#: ../storage/exchange-oof.glade.h:7
msgid ""
"<small>The message specified below will be automatically sent to each person "
"who sends\n"
"mail to you while you are out of the office.</small>"
msgstr ""
-#: ../storage/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr ""
-
#: ../storage/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
+msgid "<b>Status:</b>"
msgstr ""
#: ../storage/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
+msgid "I am currently in the office"
msgstr ""
#: ../storage/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
+msgid "I am currently out of the office"
msgstr ""
#: ../storage/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
+msgid "<b>Out of Office Message:</b>"
msgstr ""
#: ../storage/exchange-passwd-expiry.glade.h:1
@@ -821,15 +759,15 @@
msgstr ""
#: ../storage/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
+msgid "_Change Password"
msgstr ""
#: ../storage/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
+msgid "ok_button"
msgstr ""
#: ../storage/exchange-passwd-expiry.glade.h:4
-msgid "ok_button"
+msgid "Your password will expire in 7 days..."
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:1
@@ -841,15 +779,15 @@
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Delete"
+msgid "Role: "
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:4
-msgid "Cannot Edit"
+msgid "Create items"
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:5
-msgid "Create items"
+msgid "Read items"
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:6
@@ -857,11 +795,11 @@
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:7
-msgid "Delete Any Items"
+msgid "Cannot Edit"
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:8
-msgid "Delete Own Items"
+msgid "Edit Own Items"
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:9
@@ -869,7 +807,7 @@
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:10
-msgid "Edit Own Items"
+msgid "Folder owner"
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:11
@@ -877,74 +815,21 @@
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:12
-msgid "Folder owner"
+msgid "Folder visible"
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:13
-msgid "Folder visible"
+msgid "Cannot Delete"
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:14
-msgid "Read items"
+msgid "Delete Own Items"
msgstr ""
#: ../storage/exchange-permissions-dialog.glade.h:15
-msgid "Role: "
+msgid "Delete Any Items"
msgstr ""
-#: ../storage/exchange-storage.c:337
-msgid "Connecting..."
-msgstr ""
-
#: ../storage/ximian-connector-setup.c:75
msgid "Evolution Connector for Microsoft Exchange Setup Tool"
msgstr ""
-
-#: ../storage/ximian-connector.xml.h:1
-msgid "Change your Exchange server password"
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:2
-msgid "Folder _Size"
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:3
-msgid "Get the size of personal folders"
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:4
-msgid "Subscribe to _Other User's Folder..."
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:5
-msgid "Subscribe to a folder belonging to some other user on the server"
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:6
-msgid ""
-"Unsubscribe from a folder added with \"Subscribe to Other User's Folder\""
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:7
-msgid "View or change your Exchange calendar delegation settings"
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:8
-msgid "View or change your Out-of-Office status and autoreply message"
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:9
-msgid "_Change Exchange Password..."
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:10
-msgid "_Delegation Assistant"
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:11
-msgid "_Out of Office Assistant"
-msgstr ""
-
-#: ../storage/ximian-connector.xml.h:12
-msgid "_Unsubscribe from Other User's Folder"
-msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/evolution-webcal.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/evolution-webcal.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/evolution-webcal.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:36+0100\n"
+"POT-Creation-Date: 2015-05-06 19:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/evolution.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/evolution.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/evolution.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 18:14+0100\n"
+"POT-Creation-Date: 2015-05-06 19:06+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -164,7 +164,7 @@
#. specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:189
#: ../calendar/gui/calendar-component.c:777
-#: ../calendar/gui/e-day-view-top-item.c:844 ../calendar/gui/e-day-view.c:1593
+#: ../calendar/gui/e-day-view-top-item.c:857 ../calendar/gui/e-day-view.c:1593
#: ../calendar/gui/e-week-view-main-item.c:368
msgid "%a %d %b"
msgstr ""
@@ -196,7 +196,7 @@
#. change the specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:219
#: ../calendar/gui/calendar-component.c:803
-#: ../calendar/gui/e-day-view-top-item.c:848 ../calendar/gui/e-day-view.c:1609
+#: ../calendar/gui/e-day-view-top-item.c:861 ../calendar/gui/e-day-view.c:1609
#: ../calendar/gui/e-week-view-main-item.c:382
msgid "%d %b"
msgstr ""
@@ -523,11 +523,21 @@
msgstr ""
#: ../addressbook/addressbook.error.xml.h:44
+msgid "Unable to Copy/Move all contacts"
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:45
+msgid ""
+"Please mark the selected address book for offline operation and restart "
+"Evolution."
+msgstr ""
+
+#: ../addressbook/addressbook.error.xml.h:46
msgid "Cannot add new contact"
msgstr ""
#. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:46
+#: ../addressbook/addressbook.error.xml.h:48
msgid ""
"'{0}' is a read-only address book and cannot be modified. Please select a "
"different address book from the side bar in the Contacts view."
@@ -568,7 +578,7 @@
#: ../addressbook/gui/component/addressbook-view.c:1219
#: ../calendar/gui/calendar-component.c:196 ../calendar/gui/migration.c:395
#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:579
+#: ../plugins/exchange-operations/exchange-folder.c:600
msgid "Contacts"
msgstr ""
@@ -741,14 +751,15 @@
#: ../calendar/gui/dialogs/calendar-setup.c:367
#: ../calendar/gui/dialogs/calendar-setup.c:378
#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:114
-#: ../plugins/itip-formatter/itip-formatter.c:2558
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:115
+#: ../plugins/itip-formatter/itip-formatter.c:2608
#: ../smime/gui/smime-ui.glade.h:19
msgid "General"
msgstr ""
#: ../addressbook/gui/component/addressbook-config.c:1021
#: ../addressbook/gui/widgets/e-addressbook-view.c:554
+#: ../addressbook/printing/e-contact-print.c:276
#: ../mail/importers/pine-importer.c:383
msgid "Address Book"
msgstr ""
@@ -830,18 +841,18 @@
msgstr ""
#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:453
+#: ../mail/em-folder-utils.c:456
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr ""
#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:455
+#: ../mail/em-folder-utils.c:458
msgid "Rename Folder"
msgstr ""
#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:461
+#: ../mail/em-folder-utils.c:464
msgid "Folder names cannot contain '/'"
msgstr ""
@@ -856,7 +867,7 @@
#: ../addressbook/gui/component/addressbook-view.c:957
#: ../calendar/gui/calendar-component.c:631
#: ../calendar/gui/memos-component.c:482 ../calendar/gui/tasks-component.c:475
-#: ../mail/em-folder-tree.c:2122 ../ui/evolution-mail-list.xml.h:36
+#: ../mail/em-folder-tree.c:2127 ../ui/evolution-mail-list.xml.h:36
msgid "_Rename..."
msgstr ""
@@ -864,9 +875,9 @@
#: ../addressbook/gui/widgets/e-addressbook-view.c:954
#: ../calendar/gui/calendar-component.c:634
#: ../calendar/gui/e-calendar-table.c:1616
-#: ../calendar/gui/e-calendar-view.c:1831 ../calendar/gui/e-memo-table.c:952
+#: ../calendar/gui/e-calendar-view.c:1894 ../calendar/gui/e-memo-table.c:952
#: ../calendar/gui/memos-component.c:485 ../calendar/gui/tasks-component.c:478
-#: ../mail/em-folder-tree.c:2119 ../mail/em-folder-view.c:1340
+#: ../mail/em-folder-tree.c:2124 ../mail/em-folder-view.c:1346
#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:29
#: ../ui/evolution-mail-list.xml.h:38 ../ui/evolution-memos.xml.h:15
#: ../ui/evolution-tasks.xml.h:21
@@ -876,7 +887,7 @@
#: ../addressbook/gui/component/addressbook-view.c:963
#: ../calendar/gui/calendar-component.c:639
#: ../calendar/gui/memos-component.c:490 ../calendar/gui/tasks-component.c:483
-#: ../mail/em-folder-tree.c:2127 ../ui/evolution-addressbook.xml.h:39
+#: ../mail/em-folder-tree.c:2132 ../ui/evolution-addressbook.xml.h:39
#: ../ui/evolution-mail-list.xml.h:39
msgid "_Properties"
msgstr ""
@@ -976,7 +987,7 @@
msgstr ""
#: ../addressbook/gui/component/autocompletion-config.c:185
-#: ../mail/em-mailer-prefs.c:1456
+#: ../mail/em-mailer-prefs.c:1461
msgid "Table column:"
msgstr ""
@@ -1204,7 +1215,7 @@
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
#: ../addressbook/gui/widgets/e-minicard.c:198
msgid "Contact"
msgstr ""
@@ -1214,9 +1225,9 @@
msgstr ""
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../calendar/gui/dialogs/event-page.c:820
+#: ../calendar/gui/dialogs/event-page.c:842
#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/itip-formatter/itip-view.c:1910
+#: ../plugins/itip-formatter/itip-view.c:1929
msgid "_Calendar:"
msgstr ""
@@ -1354,7 +1365,7 @@
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1188
#: ../addressbook/gui/widgets/e-addressbook-model.c:324
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:417
#: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -1423,7 +1434,7 @@
#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
#: ../addressbook/gui/widgets/eab-contact-display.c:59
#: ../addressbook/gui/widgets/eab-contact-display.c:516
-#: ../calendar/gui/e-calendar-view.c:2292
+#: ../calendar/gui/e-calendar-view.c:2356
msgid "Other"
msgstr ""
@@ -1614,20 +1625,20 @@
msgid "Select..."
msgstr ""
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:678
msgid "Contact List Editor"
msgstr ""
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:771
msgid "Contact List Members"
msgstr ""
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:910
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1249
msgid "_Members"
msgstr ""
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
#: ../addressbook/gui/widgets/e-addressbook-model.c:310
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:403
#: ../addressbook/gui/widgets/e-addressbook-view.c:211
@@ -1636,7 +1647,7 @@
msgid "Book"
msgstr ""
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
msgid "Is New List"
msgstr ""
@@ -1768,7 +1779,7 @@
#: ../addressbook/gui/widgets/e-addressbook-view.c:932
#: ../calendar/gui/e-calendar-table.c:1594
-#: ../calendar/gui/e-calendar-view.c:1809 ../calendar/gui/e-memo-table.c:935
+#: ../calendar/gui/e-calendar-view.c:1872 ../calendar/gui/e-memo-table.c:935
#: ../ui/evolution-addressbook.xml.h:40
msgid "_Open"
msgstr ""
@@ -1823,8 +1834,8 @@
#: ../addressbook/gui/widgets/e-addressbook-view.c:952
#: ../calendar/gui/e-calendar-table.c:1602
-#: ../calendar/gui/e-calendar-view.c:1816 ../calendar/gui/e-memo-table.c:943
-#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1325
+#: ../calendar/gui/e-calendar-view.c:1879 ../calendar/gui/e-memo-table.c:943
+#: ../mail/em-folder-tree.c:991 ../mail/em-folder-view.c:1331
#: ../mail/message-list.c:2109 ../ui/evolution-addressbook.xml.h:49
#: ../ui/evolution-calendar.xml.h:27 ../ui/evolution-mail-message.xml.h:61
#: ../ui/evolution-memos.xml.h:13 ../ui/evolution-tasks.xml.h:19
@@ -2140,7 +2151,7 @@
msgstr ""
#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2694
+#: ../mail/em-folder-view.c:2700
msgid "_Copy Link Location"
msgstr ""
@@ -2189,9 +2200,9 @@
#: ../addressbook/gui/widgets/eab-contact-display.c:626
#: ../calendar/gui/calendar-commands.c:89
#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/gnome-cal.c:2548
+#: ../calendar/gui/gnome-cal.c:2560
#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:572
+#: ../plugins/exchange-operations/exchange-folder.c:593
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:449
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:562
@@ -2203,7 +2214,7 @@
#: ../addressbook/gui/widgets/eab-contact-display.c:627
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:128
msgid "Free/Busy"
msgstr ""
@@ -2230,12 +2241,12 @@
msgstr ""
#: ../addressbook/gui/widgets/eab-contact-display.c:646
-#: ../calendar/gui/e-calendar-view.c:2583
+#: ../calendar/gui/e-calendar-view.c:2650
msgid "Birthday"
msgstr ""
#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../calendar/gui/e-calendar-view.c:2584
+#: ../calendar/gui/e-calendar-view.c:2651
msgid "Anniversary"
msgstr ""
@@ -2306,7 +2317,7 @@
#: ../calendar/gui/e-cal-model-tasks.c:363
#: ../calendar/gui/e-cal-model-tasks.c:633
#: ../calendar/gui/e-calendar-table.c:241
-#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:2591
+#: ../calendar/gui/e-calendar-table.c:664 ../calendar/gui/print.c:3020
msgid "Canceled"
msgstr ""
@@ -2496,38 +2507,38 @@
msgid "list"
msgstr ""
-#: ../addressbook/gui/widgets/eab-gui-util.c:746
+#: ../addressbook/gui/widgets/eab-gui-util.c:748
msgid "Move contact to"
msgstr ""
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:750
msgid "Copy contact to"
msgstr ""
-#: ../addressbook/gui/widgets/eab-gui-util.c:751
+#: ../addressbook/gui/widgets/eab-gui-util.c:753
msgid "Move contacts to"
msgstr ""
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:755
msgid "Copy contacts to"
msgstr ""
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
+#: ../addressbook/gui/widgets/eab-gui-util.c:903
msgid "Multiple vCards"
msgstr ""
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
+#: ../addressbook/gui/widgets/eab-gui-util.c:910
#, c-format
msgid "vCard for %s"
msgstr ""
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
+#: ../addressbook/gui/widgets/eab-gui-util.c:922
+#: ../addressbook/gui/widgets/eab-gui-util.c:948
#, c-format
msgid "Contact information"
msgstr ""
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
+#: ../addressbook/gui/widgets/eab-gui-util.c:950
#, c-format
msgid "Contact information for %s"
msgstr ""
@@ -2636,24 +2647,24 @@
msgid "NUMBER"
msgstr ""
-#: ../addressbook/tools/evolution-addressbook-export.c:99
+#: ../addressbook/tools/evolution-addressbook-export.c:101
msgid ""
"Command line arguments error, please use --help option to see the usage."
msgstr ""
-#: ../addressbook/tools/evolution-addressbook-export.c:113
+#: ../addressbook/tools/evolution-addressbook-export.c:115
msgid "Only support csv or vcard format."
msgstr ""
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:124
msgid "In async mode, output must be file."
msgstr ""
-#: ../addressbook/tools/evolution-addressbook-export.c:130
+#: ../addressbook/tools/evolution-addressbook-export.c:132
msgid "In normal mode, there is no need for the size option."
msgstr ""
-#: ../addressbook/tools/evolution-addressbook-export.c:161
+#: ../addressbook/tools/evolution-addressbook-export.c:163
msgid "Unhandled error"
msgstr ""
@@ -3121,13 +3132,13 @@
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
#: ../calendar/gui/e-calendar-table.c:728 ../calendar/gui/e-tasks.c:1426
-#: ../calendar/gui/gnome-cal.c:1714 ../calendar/gui/print.c:2016
+#: ../calendar/gui/gnome-cal.c:1721 ../calendar/gui/print.c:2027
#: ../calendar/gui/tasks-component.c:560 ../calendar/gui/tasks-component.c:882
#: ../calendar/gui/tasks-control.c:524 ../calendar/gui/tasks-control.c:540
#: ../calendar/importers/icalendar-importer.c:76
#: ../calendar/importers/icalendar-importer.c:751
#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:586
+#: ../plugins/exchange-operations/exchange-folder.c:607
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:563
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
@@ -3144,7 +3155,7 @@
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
#: ../calendar/gui/e-memo-table.c:296 ../calendar/gui/e-memos.c:1123
-#: ../calendar/gui/gnome-cal.c:1846 ../calendar/gui/memos-component.c:567
+#: ../calendar/gui/gnome-cal.c:1853 ../calendar/gui/memos-component.c:567
#: ../calendar/gui/memos-component.c:885 ../calendar/gui/memos-control.c:386
#: ../calendar/gui/memos-control.c:402
msgid "Memos"
@@ -3155,7 +3166,7 @@
msgstr ""
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../plugins/itip-formatter/itip-formatter.c:2549
+#: ../plugins/itip-formatter/itip-formatter.c:2599
msgid "Calendar and Tasks"
msgstr ""
@@ -3217,7 +3228,7 @@
#: ../calendar/gui/alarm-notify/alarm-queue.c:1583
#: ../calendar/gui/alarm-notify/alarm-queue.c:1589
#: ../calendar/gui/e-itip-control.c:1164
-#: ../plugins/itip-formatter/itip-view.c:1023
+#: ../plugins/itip-formatter/itip-view.c:1032
msgid "Location:"
msgstr ""
@@ -3226,7 +3237,7 @@
msgstr ""
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
-#: ../calendar/gui/dialogs/comp-editor.c:1043
+#: ../calendar/gui/dialogs/comp-editor.c:1053
#: ../calendar/gui/dialogs/recurrence-page.glade.h:18
#: ../filter/filter.glade.h:4 ../mail/mail-config.glade.h:84
#: ../plugins/exchange-operations/exchange-delegates.glade.h:4
@@ -3356,7 +3367,7 @@
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
-msgid "Check this to use system timezone in Evolution."
+msgid "Use the system timezone instead of the timezone selected in Evolution."
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
@@ -3625,204 +3636,200 @@
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
-msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgid "Primary memo list"
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
-msgid "Primary memo list"
+msgid "URI of the highlighted (\"primary\") memo list"
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
-msgid "URI of the highlighted (\"primary\") memo list"
+msgid "Primary task list"
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
-msgid "Primary task list"
+msgid "URI of the highlighted (\"primary\") task list"
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
-msgid "URI of the highlighted (\"primary\") task list"
+msgid "Hide completed tasks"
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
-msgid "Hide completed tasks"
+msgid "Whether to hide completed tasks in the tasks view."
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
-msgid "Whether to hide completed tasks in the tasks view."
+msgid "Hide task units"
msgstr ""
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-msgid "Hide task units"
-msgstr ""
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
msgid ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
msgid "Hide task value"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
msgid "Number of units for determining when to hide tasks."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid "Tasks due today color"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
msgid "Overdue tasks color"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
msgid "Ask for confirmation when deleting items"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
msgid "Confirm expunge"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
msgid "Default appointment reminder"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
msgid "Whether to set a default reminder for appointments."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
msgid "Default reminder value"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
msgid "Number of units for determining a default reminder."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
msgid "Default reminder units"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
msgid "Default recurrence count"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
msgid "Count of default recurrence for a new event. -1 means forever."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
msgid "Show week number in Day and Work Week View"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
msgid "Whether to show week number in the Day and Work Week View."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
msgid "Scroll Month View by a week"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
msgid "Whether to scroll a Month View by a week, not by a month."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
msgid "Show week numbers in date navigator"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
msgid "Whether to show week numbers in the date navigator."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
msgid "Last alarm time"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
msgid "Time the last alarm ran, in time_t."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
msgid "Calendars to run alarms for"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
msgid "Alarm programs"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
msgid "Programs that are allowed to be run by alarms."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
msgid "Show display alarms in notification tray"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
msgid "Whether or not to use the notification tray for display alarms."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
msgid "Free/busy server URLs"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
msgid "List of server URLs for free/busy publishing."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
msgid "Free/busy template URL"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
"user part of the mail address and %d is replaced by the domain."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
msgid "Save directory for alarm audio"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
msgid "Directory for saving alarm audio files"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
#: ../mail/evolution-mail.schemas.in.h:147
msgid "Amount of time in seconds the error should be shown on the status bar."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
#: ../mail/evolution-mail.schemas.in.h:148
msgid "Level beyond which the message should be logged."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
msgid ""
"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
"debug messages."
@@ -3933,7 +3940,7 @@
#: ../calendar/gui/calendar-component.c:630
#: ../calendar/gui/memos-component.c:481 ../calendar/gui/tasks-component.c:474
-#: ../mail/em-folder-tree.c:2114
+#: ../mail/em-folder-tree.c:2119
msgid "_Copy..."
msgstr ""
@@ -4134,7 +4141,7 @@
msgstr ""
#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:316
msgid "Recurrence"
msgstr ""
@@ -4298,17 +4305,17 @@
#: ../calendar/gui/dialogs/cal-prefs-dialog.c:136
#: ../calendar/gui/dialogs/cal-prefs-dialog.c:185
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-#: ../calendar/gui/dialogs/event-page.c:2993
+#: ../calendar/gui/dialogs/event-page.c:3020
#: ../calendar/gui/e-cal-model-tasks.c:625
#: ../calendar/gui/e-day-view-time-item.c:785
#: ../calendar/gui/e-itip-control.c:1150 ../filter/filter-rule.c:946
-#: ../mail/em-account-editor.c:717 ../mail/em-account-editor.c:1451
+#: ../mail/em-account-editor.c:722 ../mail/em-account-editor.c:1456
#: ../mail/em-account-prefs.c:435 ../mail/em-junk-hook.c:93
#: ../plugins/calendar-weather/calendar-weather.c:333
#: ../plugins/calendar-weather/calendar-weather.c:387
#: ../plugins/email-custom-header/email-custom-header.c:391
#: ../plugins/exchange-operations/exchange-delegates-user.c:179
-#: ../plugins/itip-formatter/itip-formatter.c:2208
+#: ../plugins/itip-formatter/itip-formatter.c:2251
#: ../widgets/misc/e-cell-date-edit.c:312 ../widgets/misc/e-dateedit.c:1463
#: ../widgets/misc/e-dateedit.c:1674
#: ../widgets/misc/e-signature-combo-box.c:74
@@ -4476,7 +4483,7 @@
msgstr ""
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:163
msgid "Alerts</span>"
msgstr ""
@@ -4512,7 +4519,7 @@
msgstr ""
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
#: ../plugins/publish-calendar/publish-calendar.glade.h:3
msgid "General</span>"
msgstr ""
@@ -4572,7 +4579,7 @@
msgstr ""
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
msgid "Date/Time Format</span>"
msgstr ""
@@ -4707,237 +4714,237 @@
msgid "Validation error: %s"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2392
+#: ../calendar/gui/dialogs/comp-editor-util.c:189 ../calendar/gui/print.c:2819
msgid " to "
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2396
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2823
msgid " (Completed "
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2398
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2825
msgid "Completed "
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2403
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2830
msgid " (Due "
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2405
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2832
msgid "Due "
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:229
+#: ../calendar/gui/dialogs/comp-editor.c:232
msgid "Could not save attachments"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:492
+#: ../calendar/gui/dialogs/comp-editor.c:502
msgid "Could not update object"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:587
+#: ../calendar/gui/dialogs/comp-editor.c:597
msgid "Edit Appointment"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:594
+#: ../calendar/gui/dialogs/comp-editor.c:604
#, c-format
msgid "Meeting - %s"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:596
+#: ../calendar/gui/dialogs/comp-editor.c:606
#, c-format
msgid "Appointment - %s"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:602
+#: ../calendar/gui/dialogs/comp-editor.c:612
#, c-format
msgid "Assigned Task - %s"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:604
+#: ../calendar/gui/dialogs/comp-editor.c:614
#, c-format
msgid "Task - %s"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:609
+#: ../calendar/gui/dialogs/comp-editor.c:619
#, c-format
msgid "Memo - %s"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:625
+#: ../calendar/gui/dialogs/comp-editor.c:635
msgid "No Summary"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:777
msgid "Keep original item?"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:973
+#: ../calendar/gui/dialogs/comp-editor.c:983
msgid "Click here to close the current window"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:980
+#: ../calendar/gui/dialogs/comp-editor.c:990
msgid "Copy selected text to the clipboard"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:987
+#: ../calendar/gui/dialogs/comp-editor.c:997
msgid "Cut selected text to the clipboard"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:994
+#: ../calendar/gui/dialogs/comp-editor.c:1004
msgid "Click here to view help available"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1001
+#: ../calendar/gui/dialogs/comp-editor.c:1011
msgid "Paste text from the clipboard"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1022
+#: ../calendar/gui/dialogs/comp-editor.c:1032
msgid "Click here to save the current window"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1029
+#: ../calendar/gui/dialogs/comp-editor.c:1039
msgid "Select all text"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1036
+#: ../calendar/gui/dialogs/comp-editor.c:1046
msgid "_Classification"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1050
+#: ../calendar/gui/dialogs/comp-editor.c:1060
#: ../mail/mail-signature-editor.c:209
#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:35
msgid "_File"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1057
+#: ../calendar/gui/dialogs/comp-editor.c:1067
#: ../ui/evolution-calendar.xml.h:35 ../ui/evolution-mail-global.xml.h:32
#: ../ui/evolution.xml.h:51
msgid "_Help"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1064
+#: ../calendar/gui/dialogs/comp-editor.c:1074
msgid "_Insert"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1071
+#: ../calendar/gui/dialogs/comp-editor.c:1081
msgid "_Options"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1078 ../mail/em-folder-tree.c:2106
+#: ../calendar/gui/dialogs/comp-editor.c:1088 ../mail/em-folder-tree.c:2111
#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-mail-global.xml.h:19
#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution-tasks.xml.h:23
#: ../ui/evolution.xml.h:47
msgid "_View"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1098
#: ../composer/e-composer-actions.c:317
msgid "_Attachment..."
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1100
msgid "Click here to attach a file"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1098
+#: ../calendar/gui/dialogs/comp-editor.c:1108
msgid "_Categories"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1100
+#: ../calendar/gui/dialogs/comp-editor.c:1110
msgid "Toggles whether to display categories"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1116
msgid "Time _Zone"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1118
msgid "Toggles whether the time zone is displayed"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:1127
msgid "Pu_blic"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1119
+#: ../calendar/gui/dialogs/comp-editor.c:1129
msgid "Classify as public"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1124
+#: ../calendar/gui/dialogs/comp-editor.c:1134
msgid "_Private"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../calendar/gui/dialogs/comp-editor.c:1136
msgid "Classify as private"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1141
msgid "_Confidential"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1143
msgid "Classify as confidential"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1151
msgid "R_ole Field"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1143
+#: ../calendar/gui/dialogs/comp-editor.c:1153
msgid "Toggles whether the Role field is displayed"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1149
+#: ../calendar/gui/dialogs/comp-editor.c:1159
msgid "_RSVP"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1151
+#: ../calendar/gui/dialogs/comp-editor.c:1161
msgid "Toggles whether the RSVP field is displayed"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1167
msgid "_Status Field"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1159
+#: ../calendar/gui/dialogs/comp-editor.c:1169
msgid "Toggles whether the Status field is displayed"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1165
+#: ../calendar/gui/dialogs/comp-editor.c:1175
msgid "_Type Field"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1167
+#: ../calendar/gui/dialogs/comp-editor.c:1177
msgid "Toggles whether the Attendee Type is displayed"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1191
+#: ../calendar/gui/dialogs/comp-editor.c:1201
#: ../composer/e-composer-private.c:69
msgid "Recent _Documents"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1631
+#: ../calendar/gui/dialogs/comp-editor.c:1642
#: ../composer/e-composer-actions.c:520
msgid "Attach"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1686
+#: ../calendar/gui/dialogs/comp-editor.c:1697
msgid "Save"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:1940
-#: ../calendar/gui/dialogs/comp-editor.c:1989
-#: ../calendar/gui/dialogs/comp-editor.c:2856
+#: ../calendar/gui/dialogs/comp-editor.c:1958
+#: ../calendar/gui/dialogs/comp-editor.c:2007
+#: ../calendar/gui/dialogs/comp-editor.c:2897
msgid "Changes made to this item may be discarded if an update arrives"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:2824 ../mail/em-utils.c:373
+#: ../calendar/gui/dialogs/comp-editor.c:2865 ../mail/em-utils.c:380
#: ../plugins/prefer-plain/prefer-plain.c:91
msgid "attachment"
msgstr ""
-#: ../calendar/gui/dialogs/comp-editor.c:2885
+#: ../calendar/gui/dialogs/comp-editor.c:2926
msgid "Unable to use current version!"
msgstr ""
@@ -5018,146 +5025,146 @@
msgid "Contacts..."
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:214
msgid "_Alarms"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:216
msgid "Click here to set or unset alarms for this event"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:221
msgid "_Recurrence"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:223
msgid "Make this a recurring event"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:228
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
#: ../plugins/groupwise-features/send-options.c:212
#: ../widgets/misc/e-send-options.glade.h:1
msgid "Send Options"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:230
#: ../calendar/gui/dialogs/task-editor.c:125
msgid "Insert advanced send options"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:238
msgid "All _Day Event"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:240
msgid "Toggles whether to have All Day Event"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:246
msgid "Show Time as _Busy"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:248
msgid "Toggles whether to show time as busy"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:257
msgid "_Free/Busy"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:259
msgid "Query free / busy information for the attendees"
msgstr ""
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:313
msgid "Appoint_ment"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:748
-msgid "Event cannot be edited, because the selected calendar is read only"
+#: ../calendar/gui/dialogs/event-page.c:769
+msgid "Event cannot be edited."
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:752
-msgid "Event cannot be fully edited, because you are not the organizer"
+#: ../calendar/gui/dialogs/event-page.c:773
+msgid "Event cannot be fully edited. "
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:764
-#: ../calendar/gui/dialogs/event-page.c:2769
+#: ../calendar/gui/dialogs/event-page.c:786
+#: ../calendar/gui/dialogs/event-page.c:2796
msgid "This event has alarms"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:827
+#: ../calendar/gui/dialogs/event-page.c:849
#: ../calendar/gui/dialogs/event-page.glade.h:3
#: ../calendar/gui/dialogs/memo-page.glade.h:4
msgid "Or_ganizer:"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:874
+#: ../calendar/gui/dialogs/event-page.c:896
msgid "_Delegatees"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:876
+#: ../calendar/gui/dialogs/event-page.c:898
msgid "Atte_ndees"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1062
+#: ../calendar/gui/dialogs/event-page.c:1084
msgid "Event with no start date"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1065
+#: ../calendar/gui/dialogs/event-page.c:1087
msgid "Event with no end date"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1236
-#: ../calendar/gui/dialogs/memo-page.c:654
-#: ../calendar/gui/dialogs/task-page.c:830
+#: ../calendar/gui/dialogs/event-page.c:1258
+#: ../calendar/gui/dialogs/memo-page.c:655
+#: ../calendar/gui/dialogs/task-page.c:831
msgid "Start date is wrong"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1246
+#: ../calendar/gui/dialogs/event-page.c:1268
msgid "End date is wrong"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1291
msgid "Start time is wrong"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1276
+#: ../calendar/gui/dialogs/event-page.c:1298
msgid "End time is wrong"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1438
-#: ../calendar/gui/dialogs/memo-page.c:695
-#: ../calendar/gui/dialogs/task-page.c:890
+#: ../calendar/gui/dialogs/event-page.c:1460
+#: ../calendar/gui/dialogs/memo-page.c:696
+#: ../calendar/gui/dialogs/task-page.c:891
msgid "The organizer selected no longer has an account."
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1444
-#: ../calendar/gui/dialogs/memo-page.c:701
-#: ../calendar/gui/dialogs/task-page.c:896
+#: ../calendar/gui/dialogs/event-page.c:1466
+#: ../calendar/gui/dialogs/memo-page.c:702
+#: ../calendar/gui/dialogs/task-page.c:897
msgid "An organizer is required."
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1469
-#: ../calendar/gui/dialogs/task-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:1491
+#: ../calendar/gui/dialogs/task-page.c:921
msgid "At least one attendee is required."
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1912
-#: ../calendar/gui/dialogs/task-page.c:1219
+#: ../calendar/gui/dialogs/event-page.c:1934
+#: ../calendar/gui/dialogs/task-page.c:1220
#: ../plugins/groupwise-features/junk-settings.glade.h:7
#: ../plugins/groupwise-features/properties.glade.h:8
#: ../widgets/table/e-table-config.glade.h:7
msgid "_Remove"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:1913
-#: ../calendar/gui/dialogs/task-page.c:1220
+#: ../calendar/gui/dialogs/event-page.c:1935
+#: ../calendar/gui/dialogs/task-page.c:1221
msgid "_Add "
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:2639
+#: ../calendar/gui/dialogs/event-page.c:2666
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr ""
@@ -5168,35 +5175,35 @@
#. on behalf of some other user
#. Translators: This string is used when we are creating a Task
#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2683
-#: ../calendar/gui/dialogs/memo-page.c:910
-#: ../calendar/gui/dialogs/task-page.c:1825
+#: ../calendar/gui/dialogs/event-page.c:2710
+#: ../calendar/gui/dialogs/memo-page.c:917
+#: ../calendar/gui/dialogs/task-page.c:1831
#, c-format
msgid "You are acting on behalf of %s"
msgstr ""
-#: ../calendar/gui/dialogs/event-page.c:2967
+#: ../calendar/gui/dialogs/event-page.c:2994
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] ""
msgstr[1] ""
-#: ../calendar/gui/dialogs/event-page.c:2973
+#: ../calendar/gui/dialogs/event-page.c:3000
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] ""
msgstr[1] ""
-#: ../calendar/gui/dialogs/event-page.c:2979
+#: ../calendar/gui/dialogs/event-page.c:3006
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] ""
msgstr[1] ""
-#: ../calendar/gui/dialogs/event-page.c:2992
+#: ../calendar/gui/dialogs/event-page.c:3019
msgid "Customize"
msgstr ""
@@ -5269,32 +5276,32 @@
msgid "Custom Alarm:"
msgstr ""
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2512
+#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2941
msgid "Memo"
msgstr ""
-#: ../calendar/gui/dialogs/memo-page.c:347
-msgid "Memo cannot be edited, because the selected memo list is read only"
+#: ../calendar/gui/dialogs/memo-page.c:348
+msgid "Memo cannot be edited."
msgstr ""
-#: ../calendar/gui/dialogs/memo-page.c:351
-msgid "Memo cannot be fully edited, because you are not the organizer"
+#: ../calendar/gui/dialogs/memo-page.c:352
+msgid "Memo cannot be fully edited. "
msgstr ""
-#: ../calendar/gui/dialogs/memo-page.c:871
+#: ../calendar/gui/dialogs/memo-page.c:878
#, c-format
msgid "Unable to open memos in '%s'."
msgstr ""
-#: ../calendar/gui/dialogs/memo-page.c:1031 ../mail/em-format-html.c:1572
-#: ../mail/em-format-html.c:1630 ../mail/em-format-html.c:1655
+#: ../calendar/gui/dialogs/memo-page.c:1038 ../mail/em-format-html.c:1608
+#: ../mail/em-format-html.c:1666 ../mail/em-format-html.c:1691
#: ../mail/em-format-quote.c:209 ../mail/em-format.c:932
#: ../mail/em-mailer-prefs.c:78 ../mail/message-list.etspec.h:9
msgid "To"
msgstr ""
#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:381
#: ../calendar/gui/dialogs/task-page.glade.h:11
msgid "_Group:"
msgstr ""
@@ -5308,39 +5315,39 @@
msgid "Sta_rt date:"
msgstr ""
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:80
#, c-format
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr ""
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:82
#, c-format
msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr ""
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:86
#, c-format
msgid "You are modifying a recurring task. What would you like to modify?"
msgstr ""
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:90
#, c-format
msgid "You are modifying a recurring memo. What would you like to modify?"
msgstr ""
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:114
msgid "This Instance Only"
msgstr ""
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:118
msgid "This and Prior Instances"
msgstr ""
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:124
msgid "This and Future Instances"
msgstr ""
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:129
msgid "All Instances"
msgstr ""
@@ -5483,18 +5490,18 @@
msgid "<b>Recurrence</b>"
msgstr ""
-#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
msgid "This appointment rec_urs"
msgstr ""
-#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
#: ../calendar/gui/dialogs/recurrence-page.glade.h:5
msgid "Every"
msgstr ""
#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#.
#: ../calendar/gui/dialogs/recurrence-page.glade.h:8
msgid ""
"day(s)\n"
@@ -5504,7 +5511,7 @@
msgstr ""
#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#.
#: ../calendar/gui/dialogs/recurrence-page.glade.h:14
msgid ""
"for\n"
@@ -5517,7 +5524,7 @@
msgstr ""
#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:169
msgid "<b>Preview</b>"
msgstr ""
@@ -5604,24 +5611,24 @@
msgid "Task Details"
msgstr ""
-#: ../calendar/gui/dialogs/task-page.c:336
-msgid "Task cannot be edited, because the selected task list is read only"
+#: ../calendar/gui/dialogs/task-page.c:337
+msgid "Task cannot be edited. "
msgstr ""
-#: ../calendar/gui/dialogs/task-page.c:340
-msgid "Task cannot be fully edited, because you are not the organizer"
+#: ../calendar/gui/dialogs/task-page.c:341
+msgid "Task cannot be fully edited."
msgstr ""
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:389
#: ../calendar/gui/dialogs/task-page.glade.h:2
msgid "Organi_zer:"
msgstr ""
-#: ../calendar/gui/dialogs/task-page.c:803
+#: ../calendar/gui/dialogs/task-page.c:804
msgid "Due date is wrong"
msgstr ""
-#: ../calendar/gui/dialogs/task-page.c:1782
+#: ../calendar/gui/dialogs/task-page.c:1788
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr ""
@@ -5739,7 +5746,7 @@
msgstr ""
#: ../calendar/gui/e-cal-component-memo-preview.c:68
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3220
+#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3226
#, c-format
msgid "Click to open %s"
msgstr ""
@@ -5782,7 +5789,7 @@
#: ../calendar/gui/e-cal-component-preview.c:238
#: ../calendar/gui/e-itip-control.c:1178
#: ../plugins/exchange-operations/exchange-account-setup.c:283
-#: ../plugins/itip-formatter/itip-view.c:1054
+#: ../plugins/itip-formatter/itip-view.c:1063
msgid "Status:"
msgstr ""
@@ -5791,7 +5798,7 @@
#: ../calendar/gui/e-cal-model-tasks.c:629
#: ../calendar/gui/e-cal-model-tasks.c:706
#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:2585
+#: ../calendar/gui/e-calendar-table.c:662 ../calendar/gui/print.c:3014
msgid "In Progress"
msgstr ""
@@ -5803,7 +5810,7 @@
#: ../calendar/gui/e-calendar-table.c:239
#: ../calendar/gui/e-calendar-table.c:663 ../calendar/gui/e-itip-control.c:939
#: ../calendar/gui/e-meeting-store.c:179 ../calendar/gui/e-meeting-store.c:202
-#: ../calendar/gui/print.c:2588 ../calendar/gui/tasktypes.xml.h:13
+#: ../calendar/gui/print.c:3017 ../calendar/gui/tasktypes.xml.h:13
#: ../plugins/save-calendar/csv-format.c:361
msgid "Completed"
msgstr ""
@@ -5812,7 +5819,7 @@
#: ../calendar/gui/e-cal-model-tasks.c:357
#: ../calendar/gui/e-cal-model-tasks.c:627
#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:2582
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/print.c:3011
#: ../calendar/gui/tasktypes.xml.h:11
msgid "Not Started"
msgstr ""
@@ -5901,9 +5908,9 @@
#: ../calendar/gui/e-meeting-list-view.c:180
#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:144
#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/print.c:978
-#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1381
+#: ../calendar/gui/print.c:995 ../mail/em-utils.c:1513
#: ../plugins/itip-formatter/itip-formatter.c:449
-#: ../plugins/itip-formatter/itip-formatter.c:2233
+#: ../plugins/itip-formatter/itip-formatter.c:2276
#: ../plugins/plugin-manager/plugin-manager.c:89
#: ../widgets/misc/e-charset-picker.c:56
msgid "Unknown"
@@ -5923,7 +5930,7 @@
#. To Translators: It will display "Organiser: NameOfTheUser "
#: ../calendar/gui/e-calendar-table.c:374
-#: ../calendar/gui/e-calendar-view.c:2432
+#: ../calendar/gui/e-calendar-view.c:2499
#, c-format
msgid "Organizer: %s <%s>"
msgstr ""
@@ -5931,7 +5938,7 @@
#. With SunOne accounts, there may be no ':' in organiser.value
#. With SunOne accouts, there may be no ':' in organiser.value
#: ../calendar/gui/e-calendar-table.c:377
-#: ../calendar/gui/e-calendar-view.c:2436
+#: ../calendar/gui/e-calendar-view.c:2503
#, c-format
msgid "Organizer: %s"
msgstr ""
@@ -5993,23 +6000,23 @@
msgstr ""
#: ../calendar/gui/e-calendar-table.c:900
-#: ../calendar/gui/e-calendar-view.c:662 ../calendar/gui/e-memo-table.c:452
+#: ../calendar/gui/e-calendar-view.c:668 ../calendar/gui/e-memo-table.c:452
msgid "Deleting selected objects"
msgstr ""
#: ../calendar/gui/e-calendar-table.c:1179
-#: ../calendar/gui/e-calendar-view.c:876 ../calendar/gui/e-memo-table.c:657
+#: ../calendar/gui/e-calendar-view.c:857 ../calendar/gui/e-memo-table.c:657
msgid "Updating objects"
msgstr ""
#: ../calendar/gui/e-calendar-table.c:1367
-#: ../calendar/gui/e-calendar-view.c:1336 ../calendar/gui/e-memo-table.c:831
+#: ../calendar/gui/e-calendar-view.c:1396 ../calendar/gui/e-memo-table.c:831
#: ../composer/e-composer-actions.c:221
msgid "Save as..."
msgstr ""
#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1792
+#: ../calendar/gui/e-calendar-view.c:1855
msgid "New _Task"
msgstr ""
@@ -6018,26 +6025,26 @@
msgstr ""
#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1810 ../calendar/gui/e-memo-table.c:937
-#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:494
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:937
+#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:494
msgid "_Save As..."
msgstr ""
#: ../calendar/gui/e-calendar-table.c:1597
-#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/e-calendar-view.c:1858 ../calendar/gui/e-memo-table.c:938
msgid "P_rint..."
msgstr ""
#: ../calendar/gui/e-calendar-table.c:1601
-#: ../calendar/gui/e-calendar-view.c:1815 ../calendar/gui/e-memo-table.c:942
+#: ../calendar/gui/e-calendar-view.c:1878 ../calendar/gui/e-memo-table.c:942
#: ../ui/evolution-addressbook.xml.h:48 ../ui/evolution-calendar.xml.h:26
#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:18
msgid "C_ut"
msgstr ""
#: ../calendar/gui/e-calendar-table.c:1603
-#: ../calendar/gui/e-calendar-view.c:1798
-#: ../calendar/gui/e-calendar-view.c:1817 ../calendar/gui/e-memo-table.c:944
+#: ../calendar/gui/e-calendar-view.c:1861
+#: ../calendar/gui/e-calendar-view.c:1880 ../calendar/gui/e-memo-table.c:944
#: ../ui/evolution-addressbook.xml.h:50 ../ui/evolution-calendar.xml.h:28
#: ../ui/evolution-memos.xml.h:14 ../ui/evolution-tasks.xml.h:20
msgid "_Paste"
@@ -6107,7 +6114,7 @@
#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
#. Status: Accepted: X Declined: Y ...
#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-calendar-view.c:2340
+#: ../calendar/gui/e-calendar-view.c:2404
#: ../calendar/gui/e-meeting-list-view.c:606
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:72
@@ -6115,127 +6122,127 @@
msgid "Status"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1481
+#: ../calendar/gui/e-calendar-view.c:1541
msgid "Moving items"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1483
+#: ../calendar/gui/e-calendar-view.c:1543
msgid "Copying items"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1789
+#: ../calendar/gui/e-calendar-view.c:1852
msgid "New _Appointment..."
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1790
+#: ../calendar/gui/e-calendar-view.c:1853
msgid "New All Day _Event"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1791
+#: ../calendar/gui/e-calendar-view.c:1854
msgid "New _Meeting"
msgstr ""
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1802
+#: ../calendar/gui/e-calendar-view.c:1865
msgid "_Current View"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1804
+#: ../calendar/gui/e-calendar-view.c:1867
msgid "Select T_oday"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1805
+#: ../calendar/gui/e-calendar-view.c:1868
msgid "_Select Date..."
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-calendar-view.c:1874
msgid "Pri_nt..."
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1821
+#: ../calendar/gui/e-calendar-view.c:1884
msgid "Cop_y to Calendar..."
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1822
+#: ../calendar/gui/e-calendar-view.c:1885
msgid "Mo_ve to Calendar..."
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1823
+#: ../calendar/gui/e-calendar-view.c:1886
msgid "_Delegate Meeting..."
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1824
+#: ../calendar/gui/e-calendar-view.c:1887
msgid "_Schedule Meeting..."
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1825
+#: ../calendar/gui/e-calendar-view.c:1888
msgid "_Forward as iCalendar..."
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1826
+#: ../calendar/gui/e-calendar-view.c:1889
msgid "_Reply"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1827
-#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1330
+#: ../calendar/gui/e-calendar-view.c:1890
+#: ../mail/e-attachment-handler-mail.c:140 ../mail/em-folder-view.c:1336
#: ../mail/em-popup.c:499 ../ui/evolution-mail-message.xml.h:89
msgid "Reply to _All"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1832
+#: ../calendar/gui/e-calendar-view.c:1895
msgid "Make this Occurrence _Movable"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1833 ../ui/evolution-calendar.xml.h:30
+#: ../calendar/gui/e-calendar-view.c:1896 ../ui/evolution-calendar.xml.h:30
msgid "Delete this _Occurrence"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:1834
+#: ../calendar/gui/e-calendar-view.c:1897
msgid "Delete _All Occurrences"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:2287
+#: ../calendar/gui/e-calendar-view.c:2351
#: ../calendar/gui/e-itip-control.c:1183
#: ../calendar/gui/e-meeting-list-view.c:202
#: ../calendar/gui/e-meeting-store.c:171 ../calendar/gui/e-meeting-store.c:194
-#: ../plugins/itip-formatter/itip-formatter.c:2221
+#: ../plugins/itip-formatter/itip-formatter.c:2264
msgid "Accepted"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:2352
#: ../calendar/gui/e-itip-control.c:1191
#: ../calendar/gui/e-meeting-list-view.c:203
#: ../calendar/gui/e-meeting-store.c:173 ../calendar/gui/e-meeting-store.c:196
-#: ../plugins/itip-formatter/itip-formatter.c:2227
+#: ../plugins/itip-formatter/itip-formatter.c:2270
msgid "Declined"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:2289
+#: ../calendar/gui/e-calendar-view.c:2353
#: ../calendar/gui/e-meeting-list-view.c:204
#: ../calendar/gui/e-meeting-store.c:175 ../calendar/gui/e-meeting-store.c:198
#: ../calendar/gui/e-meeting-time-sel.c:390
msgid "Tentative"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:2290
+#: ../calendar/gui/e-calendar-view.c:2354
#: ../calendar/gui/e-meeting-list-view.c:205
#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:200
-#: ../plugins/itip-formatter/itip-formatter.c:2230
+#: ../plugins/itip-formatter/itip-formatter.c:2273
msgid "Delegated"
msgstr ""
-#: ../calendar/gui/e-calendar-view.c:2291
+#: ../calendar/gui/e-calendar-view.c:2355
msgid "Needs action"
msgstr ""
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2452 ../calendar/gui/print.c:2544
+#: ../calendar/gui/e-calendar-view.c:2519 ../calendar/gui/print.c:2973
#, c-format
msgid "Location: %s"
msgstr ""
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2483
+#: ../calendar/gui/e-calendar-view.c:2550
#, c-format
msgid "Time: %s %s"
msgstr ""
@@ -6276,25 +6283,25 @@
#. month, %B = full month name. You can change the
#. order but don't change the specifiers or add
#. anything.
-#: ../calendar/gui/e-day-view-top-item.c:840 ../calendar/gui/e-day-view.c:1576
-#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1709
+#: ../calendar/gui/e-day-view-top-item.c:853 ../calendar/gui/e-day-view.c:1576
+#: ../calendar/gui/e-week-view-main-item.c:359 ../calendar/gui/print.c:1720
msgid "%A %d %B"
msgstr ""
#. String to use in 12-hour time format for times in the morning.
#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:825
+#: ../calendar/gui/print.c:825 ../calendar/gui/print.c:2234
msgid "am"
msgstr ""
#. String to use in 12-hour time format for times in the afternoon.
#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:827
+#: ../calendar/gui/print.c:827 ../calendar/gui/print.c:2236
msgid "pm"
msgstr ""
#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2309
+#: ../calendar/gui/e-day-view.c:2338
#, c-format
msgid "Week %d"
msgstr ""
@@ -6391,12 +6398,12 @@
#: ../calendar/gui/e-itip-control.c:1084 ../calendar/gui/e-itip-control.c:1100
#: ../calendar/gui/e-itip-control.c:1111 ../calendar/gui/e-itip-control.c:1128
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:526
msgid "An unknown person"
msgstr ""
@@ -6408,7 +6415,7 @@
msgstr ""
#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2224
+#: ../plugins/itip-formatter/itip-formatter.c:2267
msgid "Tentatively Accepted"
msgstr ""
@@ -6653,7 +6660,7 @@
msgstr ""
#: ../calendar/gui/e-itip-control.c:2374
-#: ../plugins/groupwise-features/process-meeting.c:52
+#: ../plugins/groupwise-features/process-meeting.c:58
msgid "Accept"
msgstr ""
@@ -6662,7 +6669,7 @@
msgstr ""
#: ../calendar/gui/e-itip-control.c:2376
-#: ../plugins/groupwise-features/process-meeting.c:54
+#: ../plugins/groupwise-features/process-meeting.c:60
msgid "Decline"
msgstr ""
@@ -6951,43 +6958,43 @@
#. strftime format %d = day of month, %B = full
#. month name. You can change the order but don't
#. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1690
+#: ../calendar/gui/e-week-view-main-item.c:376 ../calendar/gui/print.c:1701
msgid "%d %B"
msgstr ""
-#: ../calendar/gui/gnome-cal.c:2673
+#: ../calendar/gui/gnome-cal.c:2685
msgid "_Custom View"
msgstr ""
-#: ../calendar/gui/gnome-cal.c:2674
+#: ../calendar/gui/gnome-cal.c:2686
msgid "_Save Custom View"
msgstr ""
-#: ../calendar/gui/gnome-cal.c:2679
+#: ../calendar/gui/gnome-cal.c:2691
msgid "_Define Views..."
msgstr ""
-#: ../calendar/gui/gnome-cal.c:2916
+#: ../calendar/gui/gnome-cal.c:2928
#, c-format
msgid "Loading appointments at %s"
msgstr ""
-#: ../calendar/gui/gnome-cal.c:2931
+#: ../calendar/gui/gnome-cal.c:2943
#, c-format
msgid "Loading tasks at %s"
msgstr ""
-#: ../calendar/gui/gnome-cal.c:2940
+#: ../calendar/gui/gnome-cal.c:2952
#, c-format
msgid "Loading memos at %s"
msgstr ""
-#: ../calendar/gui/gnome-cal.c:3052
+#: ../calendar/gui/gnome-cal.c:3064
#, c-format
msgid "Opening %s"
msgstr ""
-#: ../calendar/gui/gnome-cal.c:4018
+#: ../calendar/gui/gnome-cal.c:4032
msgid "Purging"
msgstr ""
@@ -7015,32 +7022,32 @@
"December"
msgstr ""
-#: ../calendar/gui/itip-utils.c:410 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:553
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:463
+#: ../calendar/gui/itip-utils.c:566
msgid "An organizer must be set."
msgstr ""
-#: ../calendar/gui/itip-utils.c:453
+#: ../calendar/gui/itip-utils.c:455
msgid "At least one attendee is necessary"
msgstr ""
-#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:781
+#: ../calendar/gui/itip-utils.c:648 ../calendar/gui/itip-utils.c:794
msgid "Event information"
msgstr ""
-#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:784
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:797
msgid "Task information"
msgstr ""
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:787
+#: ../calendar/gui/itip-utils.c:652 ../calendar/gui/itip-utils.c:800
msgid "Memo information"
msgstr ""
-#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:805
+#: ../calendar/gui/itip-utils.c:654 ../calendar/gui/itip-utils.c:818
msgid "Free/Busy information"
msgstr ""
-#: ../calendar/gui/itip-utils.c:643
+#: ../calendar/gui/itip-utils.c:656
msgid "Calendar information"
msgstr ""
@@ -7048,7 +7055,7 @@
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:677
+#: ../calendar/gui/itip-utils.c:690
msgctxt "Meeting"
msgid "Accepted"
msgstr ""
@@ -7057,7 +7064,7 @@
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:684
+#: ../calendar/gui/itip-utils.c:697
msgctxt "Meeting"
msgid "Tentatively Accepted"
msgstr ""
@@ -7069,7 +7076,7 @@
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:691 ../calendar/gui/itip-utils.c:739
+#: ../calendar/gui/itip-utils.c:704 ../calendar/gui/itip-utils.c:752
msgctxt "Meeting"
msgid "Declined"
msgstr ""
@@ -7078,7 +7085,7 @@
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:711
msgctxt "Meeting"
msgid "Delegated"
msgstr ""
@@ -7086,7 +7093,7 @@
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:711
+#: ../calendar/gui/itip-utils.c:724
msgctxt "Meeting"
msgid "Updated"
msgstr ""
@@ -7094,7 +7101,7 @@
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:731
msgctxt "Meeting"
msgid "Cancel"
msgstr ""
@@ -7102,7 +7109,7 @@
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:725
+#: ../calendar/gui/itip-utils.c:738
msgctxt "Meeting"
msgid "Refresh"
msgstr ""
@@ -7110,21 +7117,21 @@
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:732
+#: ../calendar/gui/itip-utils.c:745
msgctxt "Meeting"
msgid "Counter-proposal"
msgstr ""
-#: ../calendar/gui/itip-utils.c:802
+#: ../calendar/gui/itip-utils.c:815
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr ""
-#: ../calendar/gui/itip-utils.c:810
+#: ../calendar/gui/itip-utils.c:823
msgid "iCalendar information"
msgstr ""
-#: ../calendar/gui/itip-utils.c:981
+#: ../calendar/gui/itip-utils.c:998
msgid "You must be an attendee of the event."
msgstr ""
@@ -7392,49 +7399,49 @@
msgid "Sa"
msgstr ""
-#: ../calendar/gui/print.c:2508
+#: ../calendar/gui/print.c:2937
msgid "Appointment"
msgstr ""
-#: ../calendar/gui/print.c:2510
+#: ../calendar/gui/print.c:2939
msgid "Task"
msgstr ""
-#: ../calendar/gui/print.c:2535
+#: ../calendar/gui/print.c:2964
#, c-format
msgid "Summary: %s"
msgstr ""
-#: ../calendar/gui/print.c:2558
+#: ../calendar/gui/print.c:2987
msgid "Attendees: "
msgstr ""
-#: ../calendar/gui/print.c:2598
+#: ../calendar/gui/print.c:3027
#, c-format
msgid "Status: %s"
msgstr ""
-#: ../calendar/gui/print.c:2612
+#: ../calendar/gui/print.c:3041
#, c-format
msgid "Priority: %s"
msgstr ""
-#: ../calendar/gui/print.c:2627
+#: ../calendar/gui/print.c:3056
#, c-format
msgid "Percent Complete: %i"
msgstr ""
-#: ../calendar/gui/print.c:2638
+#: ../calendar/gui/print.c:3067
#, c-format
msgid "URL: %s"
msgstr ""
-#: ../calendar/gui/print.c:2651
+#: ../calendar/gui/print.c:3080
#, c-format
msgid "Categories: %s"
msgstr ""
-#: ../calendar/gui/print.c:2662
+#: ../calendar/gui/print.c:3091
msgid "Contacts: "
msgstr ""
@@ -7513,7 +7520,7 @@
"Really erase these tasks?"
msgstr ""
-#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1126
+#: ../calendar/gui/tasks-control.c:487 ../mail/em-folder-view.c:1132
msgid "Do not ask me again."
msgstr ""
@@ -9147,7 +9154,7 @@
msgid "Close the current file"
msgstr ""
-#: ../composer/e-composer-actions.c:331 ../mail/em-folder-view.c:1337
+#: ../composer/e-composer-actions.c:331 ../mail/em-folder-view.c:1343
#: ../ui/evolution-addressbook.xml.h:44 ../ui/evolution-calendar.xml.h:24
#: ../ui/evolution-mail-message.xml.h:60 ../ui/evolution-memos.xml.h:10
#: ../ui/evolution-tasks.xml.h:16
@@ -9380,26 +9387,26 @@
msgid "Save draft"
msgstr ""
-#: ../composer/e-msg-composer.c:807
+#: ../composer/e-msg-composer.c:809
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr ""
-#: ../composer/e-msg-composer.c:814
+#: ../composer/e-msg-composer.c:816
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr ""
-#: ../composer/e-msg-composer.c:1292
+#: ../composer/e-msg-composer.c:1294
msgid "Unable to retrieve message from editor"
msgstr ""
-#: ../composer/e-msg-composer.c:1366 ../composer/e-msg-composer.c:2153
+#: ../composer/e-msg-composer.c:1368 ../composer/e-msg-composer.c:2156
msgid "Compose Message"
msgstr ""
-#: ../composer/e-msg-composer.c:3311
+#: ../composer/e-msg-composer.c:3341
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)"
"b>"
@@ -9569,13 +9576,13 @@
msgstr ""
#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:193 ../plugins/itip-formatter/itip-view.c:191
+#: ../e-util/e-datetime-format.c:193 ../plugins/itip-formatter/itip-view.c:194
#: ../ui/evolution-calendar.xml.h:40 ../widgets/misc/e-cell-date-edit.c:304
msgid "Today"
msgstr ""
#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:219
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:222
msgid "Tomorrow"
msgstr ""
@@ -9777,23 +9784,23 @@
msgid "_Later"
msgstr ""
-#: ../e-util/e-util-labels.c:320
+#: ../e-util/e-util-labels.c:339
msgid "Label _Name:"
msgstr ""
-#: ../e-util/e-util-labels.c:343
+#: ../e-util/e-util-labels.c:362
msgid "Edit Label"
msgstr ""
-#: ../e-util/e-util-labels.c:343
+#: ../e-util/e-util-labels.c:362
msgid "Add Label"
msgstr ""
-#: ../e-util/e-util-labels.c:362
+#: ../e-util/e-util-labels.c:381
msgid "Label name cannot be empty."
msgstr ""
-#: ../e-util/e-util-labels.c:367
+#: ../e-util/e-util-labels.c:386
msgid ""
"A label having the same tag already exists on the server. Please rename your "
"label."
@@ -9978,11 +9985,11 @@
msgstr ""
#: ../filter/filter-rule.c:1042 ../filter/filter.glade.h:2
-#: ../mail/em-utils.c:311
+#: ../mail/em-utils.c:318
msgid "Incoming"
msgstr ""
-#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:312
+#: ../filter/filter-rule.c:1042 ../mail/em-utils.c:319
msgid "Outgoing"
msgstr ""
@@ -10172,12 +10179,12 @@
msgid "Evolution Network configuration control"
msgstr ""
-#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1331
+#: ../mail/e-attachment-handler-mail.c:133 ../mail/em-folder-view.c:1337
#: ../mail/em-popup.c:501 ../ui/evolution-mail-message.xml.h:90
msgid "_Forward"
msgstr ""
-#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1329
+#: ../mail/e-attachment-handler-mail.c:147 ../mail/em-folder-view.c:1335
#: ../ui/evolution-mail-message.xml.h:87
msgid "_Reply to Sender"
msgstr ""
@@ -10252,30 +10259,30 @@
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:309
+#: ../mail/em-account-editor.c:314
msgid "No encryption"
msgstr ""
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. TLS (Transport Layer Security) is commonly known by
#. this abbreviation.
-#: ../mail/em-account-editor.c:313
+#: ../mail/em-account-editor.c:318
msgid "TLS encryption"
msgstr ""
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
#. abbreviation.
-#: ../mail/em-account-editor.c:317
+#: ../mail/em-account-editor.c:322
msgid "SSL encryption"
msgstr ""
-#: ../mail/em-account-editor.c:408
+#: ../mail/em-account-editor.c:413
#, c-format
msgid "%s License Agreement"
msgstr ""
-#: ../mail/em-account-editor.c:415
+#: ../mail/em-account-editor.c:420
#, c-format
msgid ""
"\n"
@@ -10284,68 +10291,68 @@
"and tick the check box for accepting it\n"
msgstr ""
-#: ../mail/em-account-editor.c:487 ../mail/em-filter-folder-element.c:258
+#: ../mail/em-account-editor.c:492 ../mail/em-filter-folder-element.c:258
#: ../mail/em-vfolder-rule.c:513
msgid "Select Folder"
msgstr ""
-#: ../mail/em-account-editor.c:797
+#: ../mail/em-account-editor.c:802
msgid "Never"
msgstr ""
-#: ../mail/em-account-editor.c:798
+#: ../mail/em-account-editor.c:803
msgid "Always"
msgstr ""
-#: ../mail/em-account-editor.c:799
+#: ../mail/em-account-editor.c:804
msgid "Ask for each message"
msgstr ""
-#: ../mail/em-account-editor.c:1877 ../mail/mail-config.glade.h:6
+#: ../mail/em-account-editor.c:1882 ../mail/mail-config.glade.h:6
msgid "Identity"
msgstr ""
-#: ../mail/em-account-editor.c:1928 ../mail/mail-config.glade.h:8
+#: ../mail/em-account-editor.c:1941 ../mail/mail-config.glade.h:8
msgid "Receiving Email"
msgstr ""
-#: ../mail/em-account-editor.c:2216
+#: ../mail/em-account-editor.c:2229
msgid "Check for _new messages every"
msgstr ""
-#: ../mail/em-account-editor.c:2224
+#: ../mail/em-account-editor.c:2237
msgid "minu_tes"
msgstr ""
-#: ../mail/em-account-editor.c:2420 ../mail/mail-config.glade.h:10
+#: ../mail/em-account-editor.c:2440 ../mail/mail-config.glade.h:10
msgid "Sending Email"
msgstr ""
-#: ../mail/em-account-editor.c:2479 ../mail/mail-config.glade.h:65
+#: ../mail/em-account-editor.c:2499 ../mail/mail-config.glade.h:65
msgid "Defaults"
msgstr ""
#. Security settings
-#: ../mail/em-account-editor.c:2545 ../mail/mail-config.glade.h:82
+#: ../mail/em-account-editor.c:2565 ../mail/mail-config.glade.h:82
#: ../plugins/exchange-operations/exchange-account-setup.c:329
msgid "Security"
msgstr ""
#. Most sections for this is auto-generated from the camel config
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2582 ../mail/em-account-editor.c:2677
+#: ../mail/em-account-editor.c:2602 ../mail/em-account-editor.c:2697
msgid "Receiving Options"
msgstr ""
-#: ../mail/em-account-editor.c:2583 ../mail/em-account-editor.c:2678
+#: ../mail/em-account-editor.c:2603 ../mail/em-account-editor.c:2698
msgid "Checking for New Messages"
msgstr ""
-#: ../mail/em-account-editor.c:3149 ../mail/mail-config.glade.h:21
+#: ../mail/em-account-editor.c:3172 ../mail/mail-config.glade.h:21
msgid "Account Editor"
msgstr ""
-#: ../mail/em-account-editor.c:3149 ../mail/mail-config.glade.h:1
+#: ../mail/em-account-editor.c:3172 ../mail/mail-config.glade.h:1
msgid "Evolution Account Assistant"
msgstr ""
@@ -10379,33 +10386,33 @@
msgid "Signature(s)"
msgstr ""
-#: ../mail/em-composer-utils.c:1132 ../mail/em-format-quote.c:415
+#: ../mail/em-composer-utils.c:1176 ../mail/em-format-quote.c:415
msgid "-------- Forwarded Message --------"
msgstr ""
-#: ../mail/em-composer-utils.c:1587
+#: ../mail/em-composer-utils.c:1631
msgid ""
"No destination address provided, forward of the message has been cancelled."
msgstr ""
-#: ../mail/em-composer-utils.c:1593
+#: ../mail/em-composer-utils.c:1637
msgid "No account found to use, forward of the message has been cancelled."
msgstr ""
-#: ../mail/em-composer-utils.c:2060
+#: ../mail/em-composer-utils.c:2104
msgid "an unknown sender"
msgstr ""
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2107
+#: ../mail/em-composer-utils.c:2151
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
msgstr ""
-#: ../mail/em-composer-utils.c:2250
+#: ../mail/em-composer-utils.c:2294
msgid "-----Original Message-----"
msgstr ""
@@ -10530,7 +10537,7 @@
msgid "is set"
msgstr ""
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:142
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.glade.h:143
#: ../ui/evolution-mail-message.xml.h:125
msgid "Junk"
msgstr ""
@@ -10756,10 +10763,10 @@
#. translators: standard local mailbox names
#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:517
-#: ../mail/em-folder-tree.c:2637 ../mail/mail-component.c:168
+#: ../mail/em-folder-tree.c:2642 ../mail/mail-component.c:168
#: ../mail/mail-component.c:608
#: ../plugins/exchange-operations/exchange-delegates-user.c:75
-#: ../plugins/exchange-operations/exchange-folder.c:593
+#: ../plugins/exchange-operations/exchange-folder.c:614
msgid "Inbox"
msgstr ""
@@ -10804,7 +10811,13 @@
msgid "Outbox"
msgstr ""
+#. FIXME Currently there is no other way to identify if its a sent items
+#. folder, so we just compare the folder name
+#. FIXME: GW needs to set the drafts_folder_uri and sent_folder_uri properly.
+#. A workaround till then
#: ../mail/em-folder-tree-model.c:522 ../mail/mail-component.c:171
+#: ../plugins/itip-formatter/itip-formatter.c:2049
+#: ../plugins/itip-formatter/itip-formatter.c:2080
msgid "Sent"
msgstr ""
@@ -10837,12 +10850,12 @@
msgid "Mail Folder Tree"
msgstr ""
-#: ../mail/em-folder-tree.c:886
+#: ../mail/em-folder-tree.c:886 ../mail/em-folder-utils.c:100
#, c-format
msgid "Moving folder %s"
msgstr ""
-#: ../mail/em-folder-tree.c:888
+#: ../mail/em-folder-tree.c:888 ../mail/em-folder-utils.c:102
#, c-format
msgid "Copying folder %s"
msgstr ""
@@ -10869,8 +10882,8 @@
msgid "_Move to Folder"
msgstr ""
-#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:362
-#: ../mail/em-folder-view.c:1186 ../mail/message-list.c:2110
+#: ../mail/em-folder-tree.c:992 ../mail/em-folder-utils.c:365
+#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2110
msgid "_Move"
msgstr ""
@@ -10883,219 +10896,214 @@
msgid "Scanning folders in \"%s\""
msgstr ""
-#: ../mail/em-folder-tree.c:2107
+#: ../mail/em-folder-tree.c:2112
msgid "Open in _New Window"
msgstr ""
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2112
+#: ../mail/em-folder-tree.c:2117
msgid "_New Folder..."
msgstr ""
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2120
msgid "_Move..."
msgstr ""
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:37
+#: ../mail/em-folder-tree.c:2128 ../ui/evolution-mail-list.xml.h:37
msgid "Re_fresh"
msgstr ""
-#: ../mail/em-folder-tree.c:2124
+#: ../mail/em-folder-tree.c:2129
msgid "Fl_ush Outbox"
msgstr ""
-#: ../mail/em-folder-tree.c:2129 ../mail/mail.error.xml.h:25
+#: ../mail/em-folder-tree.c:2134 ../mail/mail.error.xml.h:25
msgid "_Empty Trash"
msgstr ""
-#: ../mail/em-folder-tree.c:2232
+#: ../mail/em-folder-tree.c:2237
msgid "_Unread Search Folder"
msgstr ""
-#: ../mail/em-folder-utils.c:99
-#, c-format
-msgid "Copying `%s' to `%s'"
-msgstr ""
-
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1186
-#: ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1192
+#: ../mail/em-folder-view.c:1207
#: ../mail/importers/evolution-mbox-importer.c:82
#: ../plugins/pst-import/pst-importer.c:302
msgid "Select folder"
msgstr ""
-#: ../mail/em-folder-utils.c:362 ../mail/em-folder-view.c:1201
+#: ../mail/em-folder-utils.c:365 ../mail/em-folder-view.c:1207
msgid "C_opy"
msgstr ""
-#: ../mail/em-folder-utils.c:537
+#: ../mail/em-folder-utils.c:540
#: ../plugins/groupwise-features/share-folder-common.c:144
#, c-format
msgid "Creating folder `%s'"
msgstr ""
-#: ../mail/em-folder-utils.c:695
+#: ../mail/em-folder-utils.c:698
#: ../plugins/groupwise-features/install-shared.c:168
#: ../plugins/groupwise-features/share-folder-common.c:385
msgid "Create folder"
msgstr ""
-#: ../mail/em-folder-utils.c:695
+#: ../mail/em-folder-utils.c:698
#: ../plugins/groupwise-features/install-shared.c:168
#: ../plugins/groupwise-features/share-folder-common.c:385
msgid "Specify where to create the folder:"
msgstr ""
-#: ../mail/em-folder-view.c:1089 ../mail/mail.error.xml.h:138
+#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:138
msgid "Mail Deletion Failed"
msgstr ""
-#: ../mail/em-folder-view.c:1090 ../mail/mail.error.xml.h:139
+#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:139
msgid "You do not have sufficient permissions to delete this mail."
msgstr ""
#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:77
+#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:77
msgid "_Edit as New Message..."
msgstr ""
-#: ../mail/em-folder-view.c:1341
+#: ../mail/em-folder-view.c:1347
msgid "U_ndelete"
msgstr ""
-#: ../mail/em-folder-view.c:1342
+#: ../mail/em-folder-view.c:1348
msgid "_Move to Folder..."
msgstr ""
-#: ../mail/em-folder-view.c:1343
+#: ../mail/em-folder-view.c:1349
msgid "_Copy to Folder..."
msgstr ""
-#: ../mail/em-folder-view.c:1346
+#: ../mail/em-folder-view.c:1352
msgid "Mar_k as Read"
msgstr ""
-#: ../mail/em-folder-view.c:1347
+#: ../mail/em-folder-view.c:1353
msgid "Mark as _Unread"
msgstr ""
-#: ../mail/em-folder-view.c:1348
+#: ../mail/em-folder-view.c:1354
msgid "Mark as _Important"
msgstr ""
-#: ../mail/em-folder-view.c:1349
+#: ../mail/em-folder-view.c:1355
msgid "Mark as Un_important"
msgstr ""
-#: ../mail/em-folder-view.c:1350
+#: ../mail/em-folder-view.c:1356
msgid "Mark as _Junk"
msgstr ""
-#: ../mail/em-folder-view.c:1351
+#: ../mail/em-folder-view.c:1357
msgid "Mark as _Not Junk"
msgstr ""
-#: ../mail/em-folder-view.c:1352
+#: ../mail/em-folder-view.c:1358
msgid "Mark for Follo_w Up..."
msgstr ""
-#: ../mail/em-folder-view.c:1354
+#: ../mail/em-folder-view.c:1360
msgid "_Label"
msgstr ""
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../mail/em-folder-view.c:1355 ../widgets/misc/e-dateedit.c:469
+#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:469
msgid "_None"
msgstr ""
-#: ../mail/em-folder-view.c:1358
+#: ../mail/em-folder-view.c:1364
msgid "_New Label"
msgstr ""
-#: ../mail/em-folder-view.c:1362
+#: ../mail/em-folder-view.c:1368
msgid "Fla_g Completed"
msgstr ""
-#: ../mail/em-folder-view.c:1363
+#: ../mail/em-folder-view.c:1369
msgid "Cl_ear Flag"
msgstr ""
-#: ../mail/em-folder-view.c:1366
+#: ../mail/em-folder-view.c:1372
msgid "Crea_te Rule From Message"
msgstr ""
#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1368
+#: ../mail/em-folder-view.c:1374
msgid "Search Folder based on _Subject"
msgstr ""
-#: ../mail/em-folder-view.c:1369
+#: ../mail/em-folder-view.c:1375
msgid "Search Folder based on Se_nder"
msgstr ""
-#: ../mail/em-folder-view.c:1370
+#: ../mail/em-folder-view.c:1376
msgid "Search Folder based on _Recipients"
msgstr ""
-#: ../mail/em-folder-view.c:1371
+#: ../mail/em-folder-view.c:1377
msgid "Search Folder based on Mailing _List"
msgstr ""
#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1376
+#: ../mail/em-folder-view.c:1382
msgid "Filter based on Sub_ject"
msgstr ""
-#: ../mail/em-folder-view.c:1377
+#: ../mail/em-folder-view.c:1383
msgid "Filter based on Sen_der"
msgstr ""
-#: ../mail/em-folder-view.c:1378
+#: ../mail/em-folder-view.c:1384
msgid "Filter based on Re_cipients"
msgstr ""
-#: ../mail/em-folder-view.c:1379
+#: ../mail/em-folder-view.c:1385
msgid "Filter based on _Mailing List"
msgstr ""
#. default charset used in mail view
#. we changed user, thus reset the chosen calendar combo too, because
#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2232 ../mail/em-folder-view.c:2275
+#: ../mail/em-folder-view.c:2238 ../mail/em-folder-view.c:2281
#: ../plugins/google-account-setup/google-source.c:304
#: ../plugins/google-account-setup/google-source.c:613
#: ../plugins/google-account-setup/google-source.c:784
msgid "Default"
msgstr ""
-#: ../mail/em-folder-view.c:2493
+#: ../mail/em-folder-view.c:2499
msgid "Unable to retrieve message"
msgstr ""
-#: ../mail/em-folder-view.c:2696
+#: ../mail/em-folder-view.c:2702
msgid "Create _Search Folder"
msgstr ""
-#: ../mail/em-folder-view.c:2697
+#: ../mail/em-folder-view.c:2703
msgid "_From this Address"
msgstr ""
-#: ../mail/em-folder-view.c:2698
+#: ../mail/em-folder-view.c:2704
msgid "_To this Address"
msgstr ""
-#: ../mail/em-folder-view.c:3201
+#: ../mail/em-folder-view.c:3207
#, c-format
msgid "Click to mail %s"
msgstr ""
-#: ../mail/em-folder-view.c:3213
+#: ../mail/em-folder-view.c:3219
#, c-format
msgid "Click to call %s"
msgstr ""
-#: ../mail/em-folder-view.c:3218
+#: ../mail/em-folder-view.c:3224
msgid "Click to hide/unhide addresses"
msgstr ""
@@ -11248,7 +11256,7 @@
"view it unformatted or with an external text editor."
msgstr ""
-#: ../mail/em-format-html-print.c:157
+#: ../mail/em-format-html-print.c:162
#, c-format
msgid "Page %d of %d"
msgstr ""
@@ -11295,32 +11303,32 @@
msgid "Formatting message"
msgstr ""
-#: ../mail/em-format-html.c:1420
+#: ../mail/em-format-html.c:1422
msgid "Formatting Message..."
msgstr ""
-#: ../mail/em-format-html.c:1573 ../mail/em-format-html.c:1637
-#: ../mail/em-format-html.c:1658 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1609 ../mail/em-format-html.c:1673
+#: ../mail/em-format-html.c:1694 ../mail/em-format-quote.c:209
#: ../mail/em-format.c:933 ../mail/em-mailer-prefs.c:79
msgid "Cc"
msgstr ""
-#: ../mail/em-format-html.c:1574 ../mail/em-format-html.c:1643
-#: ../mail/em-format-html.c:1661 ../mail/em-format-quote.c:209
+#: ../mail/em-format-html.c:1610 ../mail/em-format-html.c:1679
+#: ../mail/em-format-html.c:1697 ../mail/em-format-quote.c:209
#: ../mail/em-format.c:934 ../mail/em-mailer-prefs.c:80
msgid "Bcc"
msgstr ""
#. pseudo-header
-#: ../mail/em-format-html.c:1753 ../mail/em-format-quote.c:352
-#: ../mail/em-mailer-prefs.c:1435
+#: ../mail/em-format-html.c:1789 ../mail/em-format-quote.c:352
+#: ../mail/em-mailer-prefs.c:1440
msgid "Mailer"
msgstr ""
#. To translators: This message suggests to the receipients that the sender of the mail is
#. different from the one listed in From field.
#.
-#: ../mail/em-format-html.c:1925
+#: ../mail/em-format-html.c:1961
#, c-format
msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
msgstr ""
@@ -11452,7 +11460,7 @@
msgid "No Junk plugin available"
msgstr ""
-#: ../mail/em-mailer-prefs.c:1455
+#: ../mail/em-mailer-prefs.c:1460
msgid "Date header:"
msgstr ""
@@ -11589,29 +11597,28 @@
msgstr ""
#. Check buttons
-#: ../mail/em-utils.c:123
+#: ../mail/em-utils.c:130
#: ../plugins/attachment-reminder/attachment-reminder.c:129
msgid "_Do not show this message again."
msgstr ""
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:326
msgid "Message Filters"
msgstr ""
-#: ../mail/em-utils.c:371
+#: ../mail/em-utils.c:378
msgid "message"
msgstr ""
-#: ../mail/em-utils.c:654
+#: ../mail/em-utils.c:661
msgid "Save Message..."
msgstr ""
-#: ../mail/em-utils.c:717
+#: ../mail/em-utils.c:724
msgid "Add address"
msgstr ""
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1265
+#: ../mail/em-utils.c:1347
#, c-format
msgid "Messages from %s"
msgstr ""
@@ -11759,7 +11766,7 @@
"from the View menu when a news account is chosen."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:31 ../mail/mail-config.glade.h:149
+#: ../mail/evolution-mail.schemas.in.h:31 ../mail/mail-config.glade.h:150
msgid "Encode file names in an Outlook/GMail way"
msgstr ""
@@ -12462,11 +12469,39 @@
msgstr ""
#: ../mail/evolution-mail.schemas.in.h:189
-msgid "Server synchronization interval"
+msgid "Drag'n'drop export format"
msgstr ""
#: ../mail/evolution-mail.schemas.in.h:190
msgid ""
+"Define the email export format when doing drag'n'drop. Possible values are : "
+"mbox or pdf"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:191
+msgid "Format of the drag'n'drop export filename"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:192
+msgid ""
+"Exported file name will be : YYYmmDDHHMMSS_email_title Possible values : 1 "
+"(: email sent date), 2 (: drag'n'drop date)"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:193
+msgid "Swap the Prev and Next buttons"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:194
+msgid "Swap the action of Previous and Next buttons in the message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:195
+msgid "Server synchronization interval"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:196
+msgid ""
"Controls how frequently local changes are synchronized with the remote mail "
"server. The interval must be at least 30 seconds."
msgstr ""
@@ -13027,133 +13062,137 @@
msgid "Confirm _when expunging a folder"
msgstr ""
+#: ../mail/mail-config.glade.h:114
+msgid "Move up on message _deletion"
+msgstr ""
+
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
msgid "_Show image animations"
msgstr ""
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr ""
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
msgid "Loading Images</span>"
msgstr ""
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
msgid "_Never load images from the Internet"
msgstr ""
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
msgid "_Load images in messages from contacts"
msgstr ""
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
msgid "_Always load images from the Internet"
msgstr ""
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
msgid "HTML Messages"
msgstr ""
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
msgid "Labels</span>"
msgstr ""
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
msgid ""
"Note: Underscore in the label name is used as mnemonic identifier in menu."
msgstr ""
-#: ../mail/mail-config.glade.h:126 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.glade.h:127 ../mail/message-list.etspec.h:19
msgid "Labels"
msgstr ""
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
msgid "<b>Sender Photograph</b>"
msgstr ""
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
msgid "_Show the photograph of sender in the message preview"
msgstr ""
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
msgid "S_earch for sender photograph only in local address books"
msgstr ""
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
msgid "Displayed Message _Headers</span>"
msgstr ""
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
msgid "Mail Headers Table"
msgstr ""
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
msgid "Headers"
msgstr ""
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
msgid "_Default junk plugin:"
msgstr ""
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
msgid "Checks incoming mail messages to be Junk"
msgstr ""
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
msgid "Check incoming _messages for junk"
msgstr ""
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
msgid "Delete junk messages on e_xit"
msgstr ""
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
msgid "Check cu_stom headers for junk"
msgstr ""
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr ""
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:141
msgid "_Lookup in local address book only"
msgstr ""
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:142
msgid "Option is ignored if a match for custom junk headers is found."
msgstr ""
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:144
msgid "Message Composer"
msgstr ""
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:145
msgid "Default Behavior</span>"
msgstr ""
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:146
msgid "Format messages in _HTML"
msgstr ""
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:147
msgid "Automatically insert _emoticon images"
msgstr ""
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:148
msgid "Always request rea_d receipt"
msgstr ""
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:149
msgid "Start _typing at the bottom on replying"
msgstr ""
-#: ../mail/mail-config.glade.h:150
+#: ../mail/mail-config.glade.h:151
msgid "_Reply style:"
msgstr ""
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:152
msgid ""
"Attachment\n"
"Inline (Outlook style)\n"
@@ -13161,162 +13200,162 @@
"Do not quote"
msgstr ""
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:156
msgid ""
"Attachment\n"
"Inline\n"
"Quoted"
msgstr ""
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.glade.h:159
msgid "_Forward style:"
msgstr ""
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:160
msgid "C_haracter set:"
msgstr ""
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:161
msgid "<b>Top Posting Option</b> (Not Recommended)"
msgstr ""
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:162
msgid "_Keep Signature above the original message on replying"
msgstr ""
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:164
msgid "_Prompt when sending messages with an empty subject line"
msgstr ""
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:165
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr ""
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
msgid "<b>Sig_natures</b>"
msgstr ""
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
msgid "Signatures Table"
msgstr ""
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:168
msgid "Add _Script"
msgstr ""
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:170
msgid "Signatures"
msgstr ""
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:171
msgid "<b>_Languages</b>"
msgstr ""
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:172
msgid "Languages Table"
msgstr ""
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:173
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr ""
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:174
msgid "Options</span>"
msgstr ""
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:175
msgid "Check spelling while I _type"
msgstr ""
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:176
msgid "Color for _misspelled words:"
msgstr ""
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
msgid "Spell Checking"
msgstr ""
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:178
msgid "Font Properties"
msgstr ""
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
msgid "Printed Fonts</span>"
msgstr ""
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
msgid "V_ariable-width:"
msgstr ""
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
msgid "Fi_xed-width:"
msgstr ""
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:182
msgid "Select HTML fixed width font for printing"
msgstr ""
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:183
msgid "Select HTML variable width font for printing"
msgstr ""
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:184
msgid "_Add Signature"
msgstr ""
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:185
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used for display purposes only."
msgstr ""
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:187
msgid "_Script:"
msgstr ""
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:188
msgid "Proxy Settings</span>"
msgstr ""
-#: ../mail/mail-config.glade.h:188
+#: ../mail/mail-config.glade.h:189
msgid "_Use system defaults"
msgstr ""
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.glade.h:190
msgid "_Direct connection to the Internet"
msgstr ""
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.glade.h:191
msgid "_Manual proxy configuration:"
msgstr ""
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.glade.h:192
msgid "H_TTP Proxy:"
msgstr ""
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.glade.h:193
msgid "_Secure HTTP Proxy:"
msgstr ""
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.glade.h:194
msgid "No _Proxy for:"
msgstr ""
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.glade.h:195
msgid "Port:"
msgstr ""
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.glade.h:196
msgid "Use Authe_ntication"
msgstr ""
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.glade.h:197
msgid "Us_ername:"
msgstr ""
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.glade.h:198
msgid "Pass_word:"
msgstr ""
@@ -13617,7 +13656,7 @@
msgstr ""
#: ../mail/mail-session.c:215
-#: ../plugins/exchange-operations/exchange-config-listener.c:705
+#: ../plugins/exchange-operations/exchange-config-listener.c:710
#, c-format
msgid "Enter Password for %s"
msgstr ""
@@ -14278,7 +14317,7 @@
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:205
+#: ../mail/message-list.c:1661 ../plugins/itip-formatter/itip-view.c:208
msgid "Today %l:%M %p"
msgstr ""
@@ -14481,144 +14520,144 @@
msgid "Play audio attachments directly from Evolution."
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:139
+#: ../plugins/backup-restore/backup-restore.c:143
msgid "Select name of the Evolution backup file"
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:167
+#: ../plugins/backup-restore/backup-restore.c:171
msgid "_Restart Evolution after backup"
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:190
+#: ../plugins/backup-restore/backup-restore.c:194
msgid "Select name of the Evolution backup file to restore"
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:214
+#: ../plugins/backup-restore/backup-restore.c:218
msgid "_Restart Evolution after restore"
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:287
+#: ../plugins/backup-restore/backup-restore.c:291
msgid "Restore from backup"
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:289
+#: ../plugins/backup-restore/backup-restore.c:293
msgid ""
"You can restore Evolution from your backup. It can restore all the Mails, "
"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
"settings, mail filters etc."
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:301
msgid "_Restore Evolution from the backup file"
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:308
msgid "Please select an Evolution Archive to restore:"
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:311
msgid "Choose a file to restore"
msgstr ""
-#: ../plugins/backup-restore/backup.c:62
+#: ../plugins/backup-restore/backup.c:63
msgid "Backup Evolution directory"
msgstr ""
-#: ../plugins/backup-restore/backup.c:64
+#: ../plugins/backup-restore/backup.c:65
msgid "Restore Evolution directory"
msgstr ""
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup.c:67
msgid "Check Evolution Backup"
msgstr ""
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:69
msgid "Restart Evolution"
msgstr ""
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:71
msgid "With Graphical User Interface"
msgstr ""
-#: ../plugins/backup-restore/backup.c:188
-#: ../plugins/backup-restore/backup.c:250
+#: ../plugins/backup-restore/backup.c:189
+#: ../plugins/backup-restore/backup.c:251
msgid "Shutting down Evolution"
msgstr ""
-#: ../plugins/backup-restore/backup.c:195
+#: ../plugins/backup-restore/backup.c:196
msgid "Backing Evolution accounts and settings"
msgstr ""
-#: ../plugins/backup-restore/backup.c:201
+#: ../plugins/backup-restore/backup.c:202
msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
msgstr ""
-#: ../plugins/backup-restore/backup.c:212
+#: ../plugins/backup-restore/backup.c:213
msgid "Backup complete"
msgstr ""
-#: ../plugins/backup-restore/backup.c:217
-#: ../plugins/backup-restore/backup.c:238
-#: ../plugins/backup-restore/backup.c:284
+#: ../plugins/backup-restore/backup.c:218
+#: ../plugins/backup-restore/backup.c:239
+#: ../plugins/backup-restore/backup.c:286
msgid "Restarting Evolution"
msgstr ""
-#: ../plugins/backup-restore/backup.c:254
+#: ../plugins/backup-restore/backup.c:255
msgid "Backup current Evolution data"
msgstr ""
-#: ../plugins/backup-restore/backup.c:259
+#: ../plugins/backup-restore/backup.c:260
msgid "Extracting files from backup"
msgstr ""
-#: ../plugins/backup-restore/backup.c:266
+#: ../plugins/backup-restore/backup.c:267
msgid "Loading Evolution settings"
msgstr ""
-#: ../plugins/backup-restore/backup.c:273
+#: ../plugins/backup-restore/backup.c:275
msgid "Removing temporary backup files"
msgstr ""
-#: ../plugins/backup-restore/backup.c:280
+#: ../plugins/backup-restore/backup.c:282
msgid "Ensuring local sources"
msgstr ""
-#: ../plugins/backup-restore/backup.c:429
+#: ../plugins/backup-restore/backup.c:431
#, c-format
msgid "Backing up to the folder %s"
msgstr ""
-#: ../plugins/backup-restore/backup.c:434
+#: ../plugins/backup-restore/backup.c:436
#, c-format
msgid "Restoring from the folder %s"
msgstr ""
#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:456
msgid "Evolution Backup"
msgstr ""
-#: ../plugins/backup-restore/backup.c:454
+#: ../plugins/backup-restore/backup.c:456
msgid "Evolution Restore"
msgstr ""
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:491
msgid "Backing up Evolution Data"
msgstr ""
-#: ../plugins/backup-restore/backup.c:490
+#: ../plugins/backup-restore/backup.c:492
msgid "Please wait while Evolution is backing up your data."
msgstr ""
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:494
msgid "Restoring Evolution Data"
msgstr ""
-#: ../plugins/backup-restore/backup.c:493
+#: ../plugins/backup-restore/backup.c:495
msgid "Please wait while Evolution is restoring your data."
msgstr ""
-#: ../plugins/backup-restore/backup.c:511
+#: ../plugins/backup-restore/backup.c:513
msgid "This may take a while depending on the amount of data in your account."
msgstr ""
@@ -14685,35 +14724,35 @@
msgid "R_estore Settings..."
msgstr ""
-#: ../plugins/bbdb/bbdb.c:622 ../plugins/bbdb/bbdb.c:631
+#: ../plugins/bbdb/bbdb.c:638 ../plugins/bbdb/bbdb.c:647
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr ""
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:646
+#: ../plugins/bbdb/bbdb.c:662
msgid "Create _address book entries when sending mails"
msgstr ""
-#: ../plugins/bbdb/bbdb.c:652
+#: ../plugins/bbdb/bbdb.c:668
msgid "Select Address book for Automatic Contacts"
msgstr ""
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:683
msgid "Instant Messaging Contacts"
msgstr ""
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:698
msgid "Synchronize contact info and images from Pidgin buddy list"
msgstr ""
-#: ../plugins/bbdb/bbdb.c:688
+#: ../plugins/bbdb/bbdb.c:704
msgid "Select Address book for Pidgin buddy list"
msgstr ""
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:715
msgid "Synchronize with _buddy list now"
msgstr ""
@@ -15218,7 +15257,7 @@
msgid "Confirm Password:"
msgstr ""
-#: ../plugins/exchange-operations/exchange-config-listener.c:657
+#: ../plugins/exchange-operations/exchange-config-listener.c:662
#, c-format
msgid "Your password will expire in the next %d days"
msgstr ""
@@ -15346,7 +15385,7 @@
#. Translators: This is used for permissions for <user> for the folder Tasks.
#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
-#: ../plugins/itip-formatter/itip-view.c:1912
+#: ../plugins/itip-formatter/itip-view.c:1931
msgid "_Tasks:"
msgstr ""
@@ -15404,19 +15443,19 @@
msgstr ""
#: ../plugins/exchange-operations/exchange-folder.c:65
-#: ../plugins/exchange-operations/exchange-folder.c:233
-#: ../plugins/exchange-operations/exchange-folder.c:243
+#: ../plugins/exchange-operations/exchange-folder.c:252
+#: ../plugins/exchange-operations/exchange-folder.c:262
msgid "Unsubscribe Folder..."
msgstr ""
-#: ../plugins/exchange-operations/exchange-folder.c:463
-#: ../plugins/exchange-operations/exchange-folder.c:518
+#: ../plugins/exchange-operations/exchange-folder.c:484
+#: ../plugins/exchange-operations/exchange-folder.c:539
#, c-format
msgid "Really unsubscribe from folder \"%s\"?"
msgstr ""
-#: ../plugins/exchange-operations/exchange-folder.c:475
-#: ../plugins/exchange-operations/exchange-folder.c:530
+#: ../plugins/exchange-operations/exchange-folder.c:496
+#: ../plugins/exchange-operations/exchange-folder.c:551
#, c-format
msgid "Unsubscribe from \"%s\""
msgstr ""
@@ -15609,10 +15648,18 @@
msgid "Subscribe to Other User's Contacts"
msgstr ""
+#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:2
+msgid "Subscribe to Other User's Exchange Contacts"
+msgstr ""
+
#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
msgid "Subscribe to Other User's Calendar"
msgstr ""
+#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:2
+msgid "Subscribe to Other User's Exchange Calendar"
+msgstr ""
+
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
msgid "Exchange Operations"
msgstr ""
@@ -15927,10 +15974,18 @@
msgid "Subscribe to Other User's Tasks"
msgstr ""
+#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:2
+msgid "Subscribe to Other User's Exchange Tasks"
+msgstr ""
+
#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
msgid "Check folder permissions"
msgstr ""
+#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:2
+msgid "Subscribe to Other User's Exchange Folder"
+msgstr ""
+
#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
msgid "Default External Editor"
msgstr ""
@@ -16273,11 +16328,11 @@
msgid "The original will be removed from the recipient's mailbox."
msgstr ""
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../plugins/groupwise-features/process-meeting.c:59
msgid "Accept Tentatively"
msgstr ""
-#: ../plugins/groupwise-features/process-meeting.c:319
+#: ../plugins/groupwise-features/process-meeting.c:331
msgid "Rese_nd Meeting..."
msgstr ""
@@ -16364,12 +16419,12 @@
msgid "Access Rights"
msgstr ""
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#. To Translators: In this case, Proxy does not mean something like
#: ../plugins/groupwise-features/proxy-listing.glade.h:2
msgid "Proxy"
msgstr ""
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#. To Translators: In this case, Proxy does not mean something like
#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:2
msgid "Proxy Login"
msgstr ""
@@ -16740,485 +16795,508 @@
"imported"
msgstr ""
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2050
+#: ../plugins/itip-formatter/itip-formatter.c:2081
+msgid "Sent Items"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2135
+msgid "[Fwd: "
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:2385
msgid "This meeting recurs"
msgstr ""
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../plugins/itip-formatter/itip-formatter.c:2388
msgid "This task recurs"
msgstr ""
-#: ../plugins/itip-formatter/itip-formatter.c:2341
+#: ../plugins/itip-formatter/itip-formatter.c:2391
msgid "This memo recurs"
msgstr ""
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2574
+#: ../plugins/itip-formatter/itip-formatter.c:2624
msgid "_Delete message after acting"
msgstr ""
-#: ../plugins/itip-formatter/itip-formatter.c:2584
-#: ../plugins/itip-formatter/itip-formatter.c:2617
+#: ../plugins/itip-formatter/itip-formatter.c:2634
+#: ../plugins/itip-formatter/itip-formatter.c:2667
msgid "Conflict Search"
msgstr ""
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2599
+#: ../plugins/itip-formatter/itip-formatter.c:2649
msgid "Select the calendars to search for meeting conflicts"
msgstr ""
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:199
msgid "Today %H:%M"
msgstr ""
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:203
msgid "Today %H:%M:%S"
msgstr ""
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:212
msgid "Today %l:%M:%S %p"
msgstr ""
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:227
msgid "Tomorrow %H:%M"
msgstr ""
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:231
msgid "Tomorrow %H:%M:%S"
msgstr ""
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:236
msgid "Tomorrow %l:%M %p"
msgstr ""
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:240
msgid "Tomorrow %l:%M:%S %p"
msgstr ""
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:259
#, c-format
msgid "%A"
msgstr ""
#. strftime format of a weekday and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
+#: ../plugins/itip-formatter/itip-view.c:264
msgid "%A %H:%M"
msgstr ""
#. strftime format of a weekday and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:268
msgid "%A %H:%M:%S"
msgstr ""
#. strftime format of a weekday and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:270
+#: ../plugins/itip-formatter/itip-view.c:273
msgid "%A %l:%M %p"
msgstr ""
#. strftime format of a weekday and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:277
msgid "%A %l:%M:%S %p"
msgstr ""
#. strftime format of a weekday and a date
#. without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
+#: ../plugins/itip-formatter/itip-view.c:286
msgid "%A, %B %e"
msgstr ""
#. strftime format of a weekday, a date
#. without a year and a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:292
msgid "%A, %B %e %H:%M"
msgstr ""
#. strftime format of a weekday, a date without a year
#. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:296
msgid "%A, %B %e %H:%M:%S"
msgstr ""
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:301
msgid "%A, %B %e %l:%M %p"
msgstr ""
#. strftime format of a weekday, a date without a year
#. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:305
msgid "%A, %B %e %l:%M:%S %p"
msgstr ""
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:311
msgid "%A, %B %e, %Y"
msgstr ""
#. strftime format of a weekday, a date and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:316
msgid "%A, %B %e, %Y %H:%M"
msgstr ""
#. strftime format of a weekday, a date and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:320
msgid "%A, %B %e, %Y %H:%M:%S"
msgstr ""
#. strftime format of a weekday, a date and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:325
msgid "%A, %B %e, %Y %l:%M %p"
msgstr ""
#. strftime format of a weekday, a date and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:329
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
#, c-format
msgid "Please respond on behalf of <b>%s</b>"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:532
#, c-format
msgid "Received on behalf of <b>%s</b>"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:361
#, c-format
msgid "<b>%s</b> through %s has published the following meeting information:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:363
#, c-format
msgid "<b>%s</b> has published the following meeting information:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:368
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:371
#, c-format
msgid "<b>%s</b> through %s requests your presence at the following meeting:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:373
#, c-format
msgid "<b>%s</b> requests your presence at the following meeting:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:379
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:381
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:385
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following meeting:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:387
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following meeting:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:391
#, c-format
msgid "<b>%s</b> through %s has sent back the following meeting response:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:393
#, c-format
msgid "<b>%s</b> has sent back the following meeting response:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:397
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:399
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:403
#, c-format
msgid "<b>%s</b> through %s has proposed the following meeting changes."
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:405
#, c-format
msgid "<b>%s</b> has proposed the following meeting changes."
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:409
#, c-format
msgid "<b>%s</b> through %s has declined the following meeting changes:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:411
#, c-format
msgid "<b>%s</b> has declined the following meeting changes."
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:449
#, c-format
msgid "<b>%s</b> through %s has published the following task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:451
#, c-format
msgid "<b>%s</b> has published the following task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:456
#, c-format
msgid "<b>%s</b> requests the assignment of %s to the following task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:459
#, c-format
msgid "<b>%s</b> through %s has assigned you a task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:461
#, c-format
msgid "<b>%s</b> has assigned you a task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:467
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:469
#, c-format
msgid "<b>%s</b> wishes to add to an existing task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:473
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following assigned task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:475
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following "
"assigned task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:479
#, c-format
msgid ""
"<b>%s</b> through %s has sent back the following assigned task response:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:481
#, c-format
msgid "<b>%s</b> has sent back the following assigned task response:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:485
#, c-format
msgid "<b>%s</b> through %s has canceled the following assigned task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:487
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:491
#, c-format
msgid ""
"<b>%s</b> through %s has proposed the following task assignment changes:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:493
#, c-format
msgid "<b>%s</b> has proposed the following task assignment changes:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:497
#, c-format
msgid "<b>%s</b> through %s has declined the following assigned task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:499
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
#, c-format
msgid "<b>%s</b> through %s has published the following memo:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
#, c-format
msgid "<b>%s</b> has published the following memo:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing memo:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
#, c-format
msgid "<b>%s</b> wishes to add to an existing memo:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
#, c-format
msgid "<b>%s</b> through %s has canceled the following shared memo:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
#, c-format
msgid "<b>%s</b> has canceled the following shared memo:"
msgstr ""
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:686
+msgid "Start day:"
+msgstr ""
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1042
+msgid "Start time:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "End day:"
+msgstr ""
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
+msgid "End time:"
+msgstr ""
+
#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:823
+#: ../plugins/itip-formatter/itip-view.c:832
msgid "_Open Calendar"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:829
-#: ../plugins/itip-formatter/itip-view.c:833
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:856
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:870
msgid "_Decline"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:835
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
+#: ../plugins/itip-formatter/itip-view.c:839
+#: ../plugins/itip-formatter/itip-view.c:844
+#: ../plugins/itip-formatter/itip-view.c:851
+#: ../plugins/itip-formatter/itip-view.c:867
+#: ../plugins/itip-formatter/itip-view.c:872
msgid "_Accept"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:842
msgid "_Decline all"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:834
+#: ../plugins/itip-formatter/itip-view.c:843
msgid "_Tentative all"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:840
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
msgid "_Tentative"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:835
+#: ../plugins/itip-formatter/itip-view.c:844
msgid "_Accept all"
msgstr ""
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:846
+#: ../plugins/itip-formatter/itip-view.c:855
msgid "_Send Information"
msgstr ""
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:859
msgid "_Update Attendee Status"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:862
msgid "_Update"
msgstr ""
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Start time:"
-msgstr ""
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1044
-msgid "End time:"
-msgstr ""
-
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1064
-#: ../plugins/itip-formatter/itip-view.c:1118
+#: ../plugins/itip-formatter/itip-view.c:1073
+#: ../plugins/itip-formatter/itip-view.c:1127
msgid "Comment:"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:1103
+#: ../plugins/itip-formatter/itip-view.c:1112
msgid "Send _reply to sender"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1142
msgid "Send _updates to attendees"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:1142
+#: ../plugins/itip-formatter/itip-view.c:1151
msgid "_Apply to all instances"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:1151
+#: ../plugins/itip-formatter/itip-view.c:1160
msgid "Show time as _free"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1163
msgid "_Preserve my reminder"
msgstr ""
#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1160
+#: ../plugins/itip-formatter/itip-view.c:1169
msgid "_Inherit reminder"
msgstr ""
-#: ../plugins/itip-formatter/itip-view.c:1914
+#: ../plugins/itip-formatter/itip-view.c:1933
msgid "_Memos:"
msgstr ""
@@ -17354,48 +17432,48 @@
msgstr[0] ""
msgstr[1] ""
-#: ../plugins/mail-notification/mail-notification.c:520
-#: ../plugins/mail-notification/mail-notification.c:525
+#: ../plugins/mail-notification/mail-notification.c:521
+#: ../plugins/mail-notification/mail-notification.c:526
msgid "New email"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:588
+#: ../plugins/mail-notification/mail-notification.c:590
msgid "Show icon in _notification area"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:591
+#: ../plugins/mail-notification/mail-notification.c:593
msgid "B_link icon in notification area"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:593
+#: ../plugins/mail-notification/mail-notification.c:595
msgid "Popup _message together with the icon"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:774
+#: ../plugins/mail-notification/mail-notification.c:776
msgid "_Play sound when new messages arrive"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:780
+#: ../plugins/mail-notification/mail-notification.c:782
msgid "_Beep"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:781
+#: ../plugins/mail-notification/mail-notification.c:783
msgid "Play _sound file"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:792
+#: ../plugins/mail-notification/mail-notification.c:794
msgid "Specify _filename:"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:793
+#: ../plugins/mail-notification/mail-notification.c:795
msgid "Select sound file"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:794
+#: ../plugins/mail-notification/mail-notification.c:796
msgid "Pl_ay"
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:853
msgid "Notify new messages for _Inbox only"
msgstr ""
@@ -18288,11 +18366,11 @@
msgid "No title"
msgstr ""
-#: ../plugins/templates/templates.c:709
+#: ../plugins/templates/templates.c:732
msgid "Save as _Template"
msgstr ""
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:734
msgid "Save as Template"
msgstr ""
@@ -19311,7 +19389,7 @@
msgstr ""
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:658
msgid "Certificate already exists"
msgstr ""
@@ -21001,54 +21079,54 @@
msgid "Type of View"
msgstr ""
-#: ../widgets/misc/e-attachment.c:990
+#: ../widgets/misc/e-attachment.c:991
msgid "Attached message"
msgstr ""
#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1773 ../widgets/misc/e-attachment.c:2313
+#: ../widgets/misc/e-attachment.c:1774 ../widgets/misc/e-attachment.c:2331
#: ../widgets/misc/e-attachment-store.c:636
msgid "attachment.dat"
msgstr ""
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2619
+#: ../widgets/misc/e-attachment.c:1823 ../widgets/misc/e-attachment.c:2637
msgid "A load operation is already in progress"
msgstr ""
-#: ../widgets/misc/e-attachment.c:1830 ../widgets/misc/e-attachment.c:2627
+#: ../widgets/misc/e-attachment.c:1831 ../widgets/misc/e-attachment.c:2645
msgid "A save operation is already in progress"
msgstr ""
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1924
#, c-format
msgid "Could not load '%s'"
msgstr ""
-#: ../widgets/misc/e-attachment.c:1926
+#: ../widgets/misc/e-attachment.c:1927
#, c-format
msgid "Could not load the attachment"
msgstr ""
-#: ../widgets/misc/e-attachment.c:2190
+#: ../widgets/misc/e-attachment.c:2208
#, c-format
msgid "Could not open '%s'"
msgstr ""
-#: ../widgets/misc/e-attachment.c:2193
+#: ../widgets/misc/e-attachment.c:2211
#, c-format
msgid "Could not open the attachment"
msgstr ""
-#: ../widgets/misc/e-attachment.c:2635
+#: ../widgets/misc/e-attachment.c:2653
msgid "Attachment contents not loaded"
msgstr ""
-#: ../widgets/misc/e-attachment.c:2712
+#: ../widgets/misc/e-attachment.c:2730
#, c-format
msgid "Could not save '%s'"
msgstr ""
-#: ../widgets/misc/e-attachment.c:2715
+#: ../widgets/misc/e-attachment.c:2733
#, c-format
msgid "Could not save the attachment"
msgstr ""
@@ -21094,11 +21172,14 @@
msgstr ""
#: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
+msgid "Hide Attachment _Bar"
msgstr ""
#: ../widgets/misc/e-attachment-paned.c:89
-#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show Attachment _Bar"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-paned.c:631
msgid "Show _Attachment Bar"
msgstr ""
@@ -21431,51 +21512,51 @@
msgid "Column width"
msgstr ""
-#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:359
-#: ../widgets/misc/e-search-bar.c:503 ../widgets/misc/e-search-bar.c:505
-#: ../widgets/misc/e-search-bar.c:1021
+#: ../widgets/misc/e-search-bar.c:92 ../widgets/misc/e-search-bar.c:353
+#: ../widgets/misc/e-search-bar.c:497 ../widgets/misc/e-search-bar.c:499
+#: ../widgets/misc/e-search-bar.c:1015
msgid "Search"
msgstr ""
-#: ../widgets/misc/e-search-bar.c:359 ../widgets/misc/e-search-bar.c:503
-#: ../widgets/misc/e-search-bar.c:505
+#: ../widgets/misc/e-search-bar.c:353 ../widgets/misc/e-search-bar.c:497
+#: ../widgets/misc/e-search-bar.c:499
msgid "Click here to change the search type"
msgstr ""
-#: ../widgets/misc/e-search-bar.c:637
+#: ../widgets/misc/e-search-bar.c:631
msgid "_Search"
msgstr ""
-#: ../widgets/misc/e-search-bar.c:643
+#: ../widgets/misc/e-search-bar.c:637
msgid "_Find Now"
msgstr ""
-#: ../widgets/misc/e-search-bar.c:644
+#: ../widgets/misc/e-search-bar.c:638
msgid "_Clear"
msgstr ""
-#: ../widgets/misc/e-search-bar.c:899
+#: ../widgets/misc/e-search-bar.c:893
msgid "Item ID"
msgstr ""
-#: ../widgets/misc/e-search-bar.c:906 ../widgets/text/e-text.c:3555
+#: ../widgets/misc/e-search-bar.c:900 ../widgets/text/e-text.c:3555
#: ../widgets/text/e-text.c:3556
msgid "Text"
msgstr ""
#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1053
+#: ../widgets/misc/e-search-bar.c:1047
msgid "Sho_w: "
msgstr ""
-#: ../widgets/misc/e-search-bar.c:1072
+#: ../widgets/misc/e-search-bar.c:1066
msgid "Sear_ch: "
msgstr ""
#. To Translators: The " in " label is part of the Quick Search Bar, example:
#. Search: | | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1088
+#: ../widgets/misc/e-search-bar.c:1082
msgid " i_n "
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/f-spot.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/f-spot.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/f-spot.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-17 18:17+0200\n"
+"POT-Creation-Date: 2015-05-07 22:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -235,6 +235,118 @@
"be used as the transparent color when viewing images."
msgstr ""
+#: ../lib/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
+#, csharp-format
+msgid "Hide <i>{0}</i>"
+msgstr ""
+
+#. Translators: {0} is substituted with the application name
+#: ../lib/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
+#, csharp-format
+msgid "{0} Encountered a Fatal Error"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
+msgid "Error Details"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
+msgid "An unhandled exception was thrown: "
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
+msgid "Assembly Version Information"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:64
+msgid "Assembly Name"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:216
+msgid "Version"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:61
+msgid "bytes"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:62
+msgid "KB"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:63
+msgid "MB"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/FileSizeQueryValueEntry.cs:64
+msgid "GB"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:86
+msgid "Condition:"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:104
+msgid "_Match"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:111
+msgid "all"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:112
+msgid "any"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryBox.cs:117
+msgid "of the following:"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:58
+msgid "_Limit to"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/QueryLimitBox.cs:85
+msgid "selected by"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/RelativeTimeSpanQueryValueEntry.cs:42
+msgid "ago"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:59
+msgid "seconds"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:60
+msgid "minutes"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:61
+msgid "hours"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:62
+msgid "days"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:63
+msgid "weeks"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:64
+msgid "months"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Query.Gui/TimeSpanQueryValueEntry.cs:65
+msgid "years"
+msgstr ""
+
+#: ../lib/Hyena/Hyena.Gui/Hyena.Widgets/RatingMenuItem.cs:50
+msgid "Rating:"
+msgstr ""
+
#: ../lib/Mono.Google/Mono.Google/CaptchaException.cs:58
msgid "url"
msgstr ""
@@ -1543,10 +1655,6 @@
msgid "Name"
msgstr ""
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:216
-msgid "Version"
-msgstr ""
-
#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:219
msgid "Date"
msgstr ""
@@ -1859,7 +1967,7 @@
msgid "<b>_White Balance</b>"
msgstr ""
-#. Translators: this string means 'source of import'
+#. Translators: this string means
#: ../src/Clients/MainApp/ui/import.ui.h:3
msgid "Import _from:"
msgstr ""
@@ -2339,14 +2447,6 @@
msgid "<b>Transparent Parts</b>"
msgstr ""
-#: ../src/Core/FSpot.Gui/FSpot.Transitions/DissolveTransition.cs:28
-msgid "Dissolve"
-msgstr ""
-
-#: ../src/Core/FSpot.Gui/FSpot.Transitions/PushTransition.cs:26
-msgid "Push"
-msgstr ""
-
#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:119
msgid "Page Setup"
msgstr ""
@@ -2905,10 +3005,6 @@
msgid "<b>Style</b>"
msgstr ""
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:87
-msgid "Gallery"
-msgstr ""
-
#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:117
msgid "Select Export Folder"
msgstr ""
@@ -3667,10 +3763,6 @@
msgid "Make F-Spot my screensaver"
msgstr ""
-#: ../src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs:27
-msgid "Cover"
-msgstr ""
-
#: ../tools/f-spot-screensaver.desktop.in.h:1
msgid "F-Spot photos"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-control-center-2.0.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-control-center-2.0.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-control-center-2.0.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:33+0100\n"
+"POT-Creation-Date: 2015-05-06 19:53+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -48,26 +48,6 @@
"appropriate network proxy configuration."
msgstr ""
-#: ../gnome-control-center.schemas.in.h:7
-msgid "Minimum monitor width"
-msgstr ""
-
-#: ../gnome-control-center.schemas.in.h:8
-msgid ""
-"The minimum monitor width in pixel. This is used for avoiding too low "
-"monitor resolution that doesn't fit with the desktop."
-msgstr ""
-
-#: ../gnome-control-center.schemas.in.h:9
-msgid "Minimum monitor height"
-msgstr ""
-
-#: ../gnome-control-center.schemas.in.h:10
-msgid ""
-"The minimum monitor height in pixel. This is used for avoiding too low "
-"monitor resolution that doesn't fit with the desktop."
-msgstr ""
-
#: ../capplets/about-me/eel-alert-dialog.c:114
msgid "Image/label border"
msgstr ""
@@ -595,26 +575,21 @@
"using your fingerprint reader."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:171
-#: ../capplets/about-me/gnome-about-me-password.c:546
-msgid "Your password has been changed."
-msgstr ""
-
-#: ../capplets/about-me/gnome-about-me-password.c:176
+#: ../capplets/about-me/gnome-about-me-password.c:161
msgid "Child exited unexpectedly"
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:313
+#: ../capplets/about-me/gnome-about-me-password.c:296
#, c-format
msgid "Could not shutdown backend_stdin IO channel: %s"
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:326
+#: ../capplets/about-me/gnome-about-me-password.c:309
#, c-format
msgid "Could not shutdown backend_stdout IO channel: %s"
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:425
+#: ../capplets/about-me/gnome-about-me-password.c:408
msgid "Authenticated!"
msgstr ""
@@ -624,100 +599,85 @@
#.
#. Update status message and auth state
#. Authentication failure
-#: ../capplets/about-me/gnome-about-me-password.c:491
-#: ../capplets/about-me/gnome-about-me-password.c:581
+#: ../capplets/about-me/gnome-about-me-password.c:474
+#: ../capplets/about-me/gnome-about-me-password.c:550
msgid ""
"Your password has been changed since you initially authenticated! Please re-"
"authenticate."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:493
+#: ../capplets/about-me/gnome-about-me-password.c:476
msgid "That password was incorrect."
msgstr ""
+#: ../capplets/about-me/gnome-about-me-password.c:523
+msgid "Your password has been changed."
+msgstr ""
+
#. What does this indicate?
#. * "Authentication information cannot be recovered?" from libpam?
-#: ../capplets/about-me/gnome-about-me-password.c:556
+#: ../capplets/about-me/gnome-about-me-password.c:533
#, c-format
msgid "System error: %s."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:559
+#: ../capplets/about-me/gnome-about-me-password.c:536
msgid "The password is too short."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:564
+#: ../capplets/about-me/gnome-about-me-password.c:539
msgid "The password is too simple."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:569
+#: ../capplets/about-me/gnome-about-me-password.c:542
msgid "The old and new passwords are too similar."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:571
+#: ../capplets/about-me/gnome-about-me-password.c:544
msgid "The new password must contain numeric or special character(s)."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:574
+#: ../capplets/about-me/gnome-about-me-password.c:547
msgid "The old and new passwords are the same."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:576
-msgid "The password of this user is too recent to change."
-msgstr ""
-
-#: ../capplets/about-me/gnome-about-me-password.c:578
-msgid "The password has been used before,try another one!"
-msgstr ""
-
#. translators: Unable to launch <program>: <error message>
-#: ../capplets/about-me/gnome-about-me-password.c:851
+#: ../capplets/about-me/gnome-about-me-password.c:818
#, c-format
msgid "Unable to launch %s: %s"
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:855
+#: ../capplets/about-me/gnome-about-me-password.c:822
msgid "Unable to launch backend"
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:856
+#: ../capplets/about-me/gnome-about-me-password.c:823
msgid "A system error has occurred"
msgstr ""
#. Update status message
-#: ../capplets/about-me/gnome-about-me-password.c:876
+#: ../capplets/about-me/gnome-about-me-password.c:843
msgid "Checking password..."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:963
+#: ../capplets/about-me/gnome-about-me-password.c:930
msgid "Click <b>Change password</b> to change your password."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:966
+#: ../capplets/about-me/gnome-about-me-password.c:933
msgid "Please type your password in the <b>New password</b> field."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:969
+#: ../capplets/about-me/gnome-about-me-password.c:936
#: ../capplets/about-me/gnome-about-me-password.ui.h:9
msgid ""
"Please type your password again in the <b>Retype new password</b> field."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:972
+#: ../capplets/about-me/gnome-about-me-password.c:939
msgid "The two passwords are not equal."
msgstr ""
-#: ../capplets/about-me/gnome-about-me-password.c:1046
-msgid ""
-"<b>How to create a good password</b>\n"
-"\n"
-"A good password should:\n"
-"\n"
-"- Not be too short (8 letters or more).\n"
-"- Not be based on common words.\n"
-"- Contain many different letters and digits."
-msgstr ""
-
#: ../capplets/about-me/gnome-about-me-password.ui.h:1
msgid "Change password"
msgstr ""
@@ -751,10 +711,6 @@
msgstr ""
#: ../capplets/about-me/gnome-about-me-password.ui.h:10
-msgid "How to create a good password</a>"
-msgstr ""
-
-#: ../capplets/about-me/gnome-about-me-password.ui.h:11
msgid "Change pa_ssword"
msgstr ""
@@ -886,7 +842,7 @@
msgstr ""
#: ../capplets/appearance/appearance-main.c:143
-#: ../capplets/default-applications/gnome-da-capplet.c:959
+#: ../capplets/default-applications/gnome-da-capplet.c:907
#: ../capplets/mouse/gnome-mouse-properties.c:540
msgid "page"
msgstr ""
@@ -961,7 +917,7 @@
msgstr ""
#: ../capplets/appearance/appearance-themes.c:1045
-#: ../capplets/default-applications/gnome-da-capplet.c:690
+#: ../capplets/default-applications/gnome-da-capplet.c:646
msgid "Custom"
msgstr ""
@@ -1728,20 +1684,20 @@
msgid "Error saving configuration: %s"
msgstr ""
-#: ../capplets/default-applications/gnome-da-capplet.c:721
+#: ../capplets/default-applications/gnome-da-capplet.c:677
msgid "Could not load the main interface"
msgstr ""
-#: ../capplets/default-applications/gnome-da-capplet.c:723
+#: ../capplets/default-applications/gnome-da-capplet.c:679
msgid "Please make sure that the applet is properly installed"
msgstr ""
#. TRANSLATORS: don't translate the terms in brackets
-#: ../capplets/default-applications/gnome-da-capplet.c:958
+#: ../capplets/default-applications/gnome-da-capplet.c:906
msgid "Specify the name of the page to show (internet|multimedia|system|a11y)"
msgstr ""
-#: ../capplets/default-applications/gnome-da-capplet.c:963
+#: ../capplets/default-applications/gnome-da-capplet.c:911
msgid "- GNOME Default Applications"
msgstr ""
@@ -1958,102 +1914,98 @@
msgstr ""
#: ../capplets/default-applications/gnome-default-applications.xml.in.h:29
-msgid "GroupWise"
-msgstr ""
-
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:30
msgid "Debian Terminal Emulator"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:31
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:30
msgid "GNOME Terminal"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:32
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:31
msgid "Terminator"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:33
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:32
msgid "Standard XTerminal"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:34
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:33
msgid "NXterm"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:35
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:34
msgid "RXVT"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:36
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:35
msgid "aterm"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:37
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:36
msgid "ETerm"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:38
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:37
msgid "Konsole"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:39
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:38
msgid "Banshee Music Player"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:40
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:39
msgid "Muine Music Player"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:41
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:40
msgid "Rhythmbox Music Player"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:42
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:41
msgid "Totem Movie Player"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:43
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:42
msgid "Listen"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:44
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:43
msgid "Orca"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:45
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:44
msgid "Orca with Magnifier"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:46
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:45
msgid "Linux Screen Reader"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:47
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:46
msgid "Linux Screen Reader with Magnifier"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:48
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:47
msgid "Gnopernicus"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:49
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:48
msgid "Gnopernicus with Magnifier"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:50
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:49
msgid "GNOME Magnifier without Screen Reader"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:51
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:50
msgid "KDE Magnifier without Screen Reader"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:52
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:51
msgid "GNOME OnScreen Keyboard"
msgstr ""
-#: ../capplets/default-applications/gnome-default-applications.xml.in.h:53
+#: ../capplets/default-applications/gnome-default-applications.xml.in.h:52
msgid "Dasher"
msgstr ""
@@ -2062,11 +2014,11 @@
msgstr ""
#: ../capplets/display/display-capplet.ui.h:2
-msgid "_Mirror screens"
+msgid "Drag the monitors to set their place"
msgstr ""
#: ../capplets/display/display-capplet.ui.h:3
-msgid "<i>Note: may limit resolution options</i>"
+msgid "_Mirror screens"
msgstr ""
#: ../capplets/display/display-capplet.ui.h:4
@@ -2074,11 +2026,12 @@
msgstr ""
#: ../capplets/display/display-capplet.ui.h:5
-msgid "Panel icon"
+#: ../capplets/display/xrandr-capplet.c:440
+msgid "Monitor"
msgstr ""
#: ../capplets/display/display-capplet.ui.h:6
-msgid "_Show displays in panel"
+msgid "Include _panel"
msgstr ""
#: ../capplets/display/display-capplet.ui.h:7
@@ -2090,55 +2043,42 @@
msgstr ""
#: ../capplets/display/display-capplet.ui.h:9
-msgid "On"
+msgid "R_otation:"
msgstr ""
#: ../capplets/display/display-capplet.ui.h:10
-msgid "Off"
+msgid "On"
msgstr ""
#: ../capplets/display/display-capplet.ui.h:11
-#: ../capplets/display/xrandr-capplet.c:517
-msgid "Monitor"
+msgid "Off"
msgstr ""
#: ../capplets/display/display-capplet.ui.h:12
-msgid "R_otation:"
+msgid "Panel icon"
msgstr ""
#: ../capplets/display/display-capplet.ui.h:13
-msgid "Include _panel"
+msgid "_Show displays in panel"
msgstr ""
#: ../capplets/display/display-capplet.ui.h:14
-msgid "Drag the monitors to set their place"
-msgstr ""
-
-#: ../capplets/display/display-capplet.ui.h:15
-msgid "<b>Pressure-sensitive tablet</b>"
-msgstr ""
-
-#: ../capplets/display/display-capplet.ui.h:16
-msgid "Ro_tate tablet as well as the monitor"
-msgstr ""
-
-#: ../capplets/display/display-capplet.ui.h:17
-#: ../capplets/display/xrandr-capplet.c:312
-#: ../capplets/display/xrandr-capplet.c:351
+#: ../capplets/display/xrandr-capplet.c:301
+#: ../capplets/display/xrandr-capplet.c:340
msgid "Normal"
msgstr ""
-#: ../capplets/display/display-capplet.ui.h:18
-#: ../capplets/display/xrandr-capplet.c:313
+#: ../capplets/display/display-capplet.ui.h:15
+#: ../capplets/display/xrandr-capplet.c:302
msgid "Left"
msgstr ""
-#: ../capplets/display/display-capplet.ui.h:19
-#: ../capplets/display/xrandr-capplet.c:314
+#: ../capplets/display/display-capplet.ui.h:16
+#: ../capplets/display/xrandr-capplet.c:303
msgid "Right"
msgstr ""
-#: ../capplets/display/display-capplet.ui.h:20
+#: ../capplets/display/display-capplet.ui.h:17
msgid "Upside-down"
msgstr ""
@@ -2150,48 +2090,47 @@
msgid "Change screen resolution"
msgstr ""
-#: ../capplets/display/xrandr-capplet.c:315
+#: ../capplets/display/xrandr-capplet.c:304
msgid "Upside Down"
msgstr ""
-#: ../capplets/display/xrandr-capplet.c:357
+#: ../capplets/display/xrandr-capplet.c:346
#, c-format
msgid "%d Hz"
msgstr ""
-#. Translators: this is the feature where what you see on your laptop's
-#. * screen is the same as your external monitor. Here, "Mirror" is being
-#. * used as an adjective, not as a verb. For example, the Spanish
-#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
-#.
-#: ../capplets/display/xrandr-capplet.c:506
-#: ../capplets/display/xrandr-capplet.c:1652
-msgid "Mirror Screens"
-msgstr ""
-
-#: ../capplets/display/xrandr-capplet.c:508
+#: ../capplets/display/xrandr-capplet.c:432
#, c-format
msgid "Monitor: %s"
msgstr ""
-#: ../capplets/display/xrandr-capplet.c:586
+#: ../capplets/display/xrandr-capplet.c:511
#, c-format
msgid "%d x %d"
msgstr ""
-#: ../capplets/display/xrandr-capplet.c:2070
+#. Translators: this is the feature where what you see on your laptop's
+#. * screen is the same as your external monitor. Here, "Mirror" is being
+#. * used as an adjective, not as a verb. For example, the Spanish
+#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+#.
+#: ../capplets/display/xrandr-capplet.c:1458
+msgid "Mirror Screens"
+msgstr ""
+
+#: ../capplets/display/xrandr-capplet.c:1878
msgid "Could not save the monitor configuration"
msgstr ""
-#: ../capplets/display/xrandr-capplet.c:2081
+#: ../capplets/display/xrandr-capplet.c:1889
msgid "Could not get session bus while applying display configuration"
msgstr ""
-#: ../capplets/display/xrandr-capplet.c:2123
+#: ../capplets/display/xrandr-capplet.c:1931
msgid "Could not detect displays"
msgstr ""
-#: ../capplets/display/xrandr-capplet.c:2374
+#: ../capplets/display/xrandr-capplet.c:2146
msgid "Could not get screen information"
msgstr ""
@@ -2624,7 +2563,7 @@
#: ../capplets/keyboard/gnome-keyboard-properties-xkblt.c:214
#: ../capplets/keyboard/gnome-keyboard-properties-xkbot.c:234
-#: ../capplets/network/gnome-network-properties.c:575
+#: ../capplets/network/gnome-network-properties.c:583
msgid "Default"
msgstr ""
@@ -2844,12 +2783,12 @@
msgid "Set your mouse preferences"
msgstr ""
-#: ../capplets/network/gnome-network-properties.c:693
-#: ../capplets/network/gnome-network-properties.c:844
+#: ../capplets/network/gnome-network-properties.c:701
+#: ../capplets/network/gnome-network-properties.c:852
msgid "New Location..."
msgstr ""
-#: ../capplets/network/gnome-network-properties.c:810
+#: ../capplets/network/gnome-network-properties.c:818
msgid "Location already exists"
msgstr ""
@@ -2870,98 +2809,94 @@
msgstr ""
#: ../capplets/network/gnome-network-properties.ui.h:3
-msgid "<b>Use the s_ystem's proxy settings</b>"
-msgstr ""
-
-#: ../capplets/network/gnome-network-properties.ui.h:4
msgid "<b>Di_rect internet connection</b>"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:5
+#: ../capplets/network/gnome-network-properties.ui.h:4
msgid "<b>_Manual proxy configuration</b>"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:6
+#: ../capplets/network/gnome-network-properties.ui.h:5
msgid "_Use the same proxy for all protocols"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:7
+#: ../capplets/network/gnome-network-properties.ui.h:6
msgid "H_TTP proxy:"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:8
+#: ../capplets/network/gnome-network-properties.ui.h:7
msgid "_Secure HTTP proxy:"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:9
+#: ../capplets/network/gnome-network-properties.ui.h:8
msgid "_FTP proxy:"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:10
+#: ../capplets/network/gnome-network-properties.ui.h:9
msgid "S_ocks host:"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:11
+#: ../capplets/network/gnome-network-properties.ui.h:10
msgid "Port:"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:12
+#: ../capplets/network/gnome-network-properties.ui.h:11
msgid "_Details"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:13
+#: ../capplets/network/gnome-network-properties.ui.h:12
msgid "<b>_Automatic proxy configuration</b>"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:14
+#: ../capplets/network/gnome-network-properties.ui.h:13
msgid "Autoconfiguration _URL:"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:15
+#: ../capplets/network/gnome-network-properties.ui.h:14
msgid "Proxy Configuration"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:16
+#: ../capplets/network/gnome-network-properties.ui.h:15
msgid "Ignore Host List"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:17
+#: ../capplets/network/gnome-network-properties.ui.h:16
msgid "Ignored Hosts"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:18
+#: ../capplets/network/gnome-network-properties.ui.h:17
msgid "_Delete Location"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:19
+#: ../capplets/network/gnome-network-properties.ui.h:18
msgid "HTTP Proxy Details"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:20
+#: ../capplets/network/gnome-network-properties.ui.h:19
msgid "<b>_Use authentication</b>"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:21
+#: ../capplets/network/gnome-network-properties.ui.h:20
msgid "U_sername:"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:22
+#: ../capplets/network/gnome-network-properties.ui.h:21
msgid "_Password:"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:23
+#: ../capplets/network/gnome-network-properties.ui.h:22
msgid "Create New Location"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:24
+#: ../capplets/network/gnome-network-properties.ui.h:23
msgid "_Location name:"
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:25
+#: ../capplets/network/gnome-network-properties.ui.h:24
msgid "The location already exists."
msgstr ""
-#: ../capplets/network/gnome-network-properties.ui.h:26
+#: ../capplets/network/gnome-network-properties.ui.h:25
msgid "C_reate"
msgstr ""
@@ -3067,23 +3002,28 @@
msgid "None"
msgstr ""
-#: ../shell/control-center.c:142
+#: ../shell/control-center.c:49
+#, c-format
+msgid "key not found [%s]\n"
+msgstr ""
+
+#: ../shell/control-center.c:143
msgid "Hide on start (useful to preload the shell)"
msgstr ""
-#: ../shell/control-center.c:181
+#: ../shell/control-center.c:182
msgid "Filter"
msgstr ""
-#: ../shell/control-center.c:181
+#: ../shell/control-center.c:182
msgid "Groups"
msgstr ""
-#: ../shell/control-center.c:181
+#: ../shell/control-center.c:182
msgid "Common Tasks"
msgstr ""
-#: ../shell/control-center.c:184 ../shell/gnomecc.desktop.in.in.h:1
+#: ../shell/control-center.c:185 ../shell/gnomecc.desktop.in.in.h:1
#: ../shell/gnomecc.directory.in.h:1
msgid "Control Center"
msgstr ""
@@ -3091,9 +3031,8 @@
#. Translators: The format of this string is the task name to be displayed (translate that part) followed by a ";" separator then the filename (DONT translate the file name) of a .desktop file to launch. Multiple entries are separated by a ","
#: ../shell/control-center.schemas.in.h:2
msgid ""
-"[Change Password;gnome-about-me.desktop,Change Theme;gtk-theme-selector."
-"desktop,Set Preferred Applications;default-applications.desktop,Add Printer;"
-"gnome-cups-manager.desktop]"
+"[Change Theme;gtk-theme-selector.desktop,Set Preferred Applications;default-"
+"applications.desktop,Add Printer;gnome-cups-manager.desktop]"
msgstr ""
#: ../shell/control-center.schemas.in.h:3
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-docker.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-docker.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-docker.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:36+0100\n"
+"POT-Creation-Date: 2015-05-06 18:08+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,19 +17,19 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/gd-dbus.c:172
+#: ../src/gd-dbus.c:159
msgid "Docked"
msgstr ""
-#: ../src/gd-dbus.c:173
+#: ../src/gd-dbus.c:160
msgid "Your computer has been docked"
msgstr ""
-#: ../src/gd-dbus.c:176
+#: ../src/gd-dbus.c:163
msgid "Undocked"
msgstr ""
-#: ../src/gd-dbus.c:177
+#: ../src/gd-dbus.c:164
msgid "Your computer has been undocked"
msgstr ""
@@ -81,3 +81,15 @@
#: ../src/gd-tray.c:114
msgid "Status: System docked"
msgstr ""
+
+#: ../data/gnome-docker.desktop:3
+msgid "GNOME Docker"
+msgstr ""
+
+#: ../data/gnome-docker.desktop:4
+msgid "GNOME dock station applet"
+msgstr ""
+
+#: ../data/gnome-docker.desktop:5
+msgid "gnome-power-manager"
+msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-main-menu.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-main-menu.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-main-menu.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:36+0100\n"
+"POT-Creation-Date: 2015-05-06 20:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -97,7 +97,7 @@
msgstr ""
#: ../main-menu/etc/GNOME_MainMenu.server.in.in.h:2
-#: ../main-menu/src/main-menu-ui.c:2393 ../main-menu/src/slab-window.glade.h:1
+#: ../main-menu/src/main-menu-ui.c:2386 ../main-menu/src/slab-window.glade.h:1
msgid "GNOME Main Menu"
msgstr ""
@@ -117,6 +117,17 @@
msgid "_About"
msgstr ""
+#: ../main-menu/etc/gnome-screensaver-lock.desktop:3
+#: ../main-menu/src/main-menu-migration.c:192
+#: ../main-menu/etc/system-items.xbel.in.h:2
+msgid "Lock Screen"
+msgstr ""
+
+#: ../main-menu/etc/gnome-screensaver-lock.desktop:6
+#: ../main-menu/src/main-menu-migration.c:194
+msgid "gnome-lockscreen"
+msgstr ""
+
#: ../main-menu/etc/slab.schemas.in.in.h:1
msgid "command to uninstall packages"
msgstr ""
@@ -370,16 +381,7 @@
msgid "Shutdown"
msgstr ""
-#: ../main-menu/src/main-menu-migration.c:192
-#: ../main-menu/etc/system-items.xbel.in.h:2
-msgid "Lock Screen"
-msgstr ""
-
-#: ../main-menu/src/main-menu-migration.c:194
-msgid "gnome-lockscreen"
-msgstr ""
-
-#: ../main-menu/src/main-menu-ui.c:2394
+#: ../main-menu/src/main-menu-ui.c:2387
msgid "The GNOME Main Menu"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-mount.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-mount.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-mount.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 16:23+0100\n"
+"POT-Creation-Date: 2015-05-06 18:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-packagekit.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-packagekit.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-packagekit.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:37+0100\n"
+"POT-Creation-Date: 2015-05-06 20:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -231,107 +231,111 @@
msgstr ""
#. TRANSLATORS: title: refresh the lists of packages
-#: ../data/gpk-application.glade.h:6 ../src/gpk-client.c:2791
+#: ../data/gpk-application.glade.h:6 ../src/gpk-client.c:2775
msgid "Refresh package lists"
msgstr ""
#: ../data/gpk-application.glade.h:7
-msgid "_Filters"
+msgid "gtk-quit"
msgstr ""
#: ../data/gpk-application.glade.h:8
-msgid "_Installed"
+msgid "_Filters"
msgstr ""
#: ../data/gpk-application.glade.h:9
-msgid "Only _installed"
+msgid "_Installed"
msgstr ""
#: ../data/gpk-application.glade.h:10
-msgid "Only _available"
+msgid "Only _installed"
msgstr ""
#: ../data/gpk-application.glade.h:11
-msgid "_No filter"
+msgid "Only _available"
msgstr ""
#: ../data/gpk-application.glade.h:12
-msgid "_Development"
+msgid "_No filter"
msgstr ""
#: ../data/gpk-application.glade.h:13
-msgid "Only _development"
+msgid "_Development"
msgstr ""
#: ../data/gpk-application.glade.h:14
-msgid "Only _end user files"
+msgid "Only _development"
msgstr ""
#: ../data/gpk-application.glade.h:15
-msgid "_Graphical"
+msgid "Only _end user files"
msgstr ""
#: ../data/gpk-application.glade.h:16
-msgid "_Only graphical"
+msgid "_Graphical"
msgstr ""
#: ../data/gpk-application.glade.h:17
-msgid "_Only text"
+msgid "_Only graphical"
msgstr ""
#: ../data/gpk-application.glade.h:18
-msgid "_Free"
+msgid "_Only text"
msgstr ""
#: ../data/gpk-application.glade.h:19
-msgid "_Only free software"
+msgid "_Free"
msgstr ""
#: ../data/gpk-application.glade.h:20
-msgid "Only _non-free software"
+msgid "_Only free software"
msgstr ""
#: ../data/gpk-application.glade.h:21
-msgid "_Architectures"
+msgid "Only _non-free software"
msgstr ""
#: ../data/gpk-application.glade.h:22
-msgid "_Only native architectures"
+msgid "_Architectures"
msgstr ""
#: ../data/gpk-application.glade.h:23
-msgid "_Only non-native architectures"
+msgid "_Only native architectures"
msgstr ""
#: ../data/gpk-application.glade.h:24
-msgid "_Source"
+msgid "_Only non-native architectures"
msgstr ""
#: ../data/gpk-application.glade.h:25
-msgid "_Only sourcecode"
+msgid "_Source"
msgstr ""
#: ../data/gpk-application.glade.h:26
-msgid "Only _non-sourcecode"
+msgid "_Only sourcecode"
msgstr ""
#: ../data/gpk-application.glade.h:27
-msgid "Only show one package, not subpackages"
+msgid "Only _non-sourcecode"
msgstr ""
#: ../data/gpk-application.glade.h:28
-msgid "_Hide subpackages"
+msgid "Only show one package, not subpackages"
msgstr ""
#: ../data/gpk-application.glade.h:29
-msgid "Only show the newest available package"
+msgid "_Hide subpackages"
msgstr ""
#: ../data/gpk-application.glade.h:30
-msgid "Only _newest packages"
+msgid "Only show the newest available package"
msgstr ""
#: ../data/gpk-application.glade.h:31
+msgid "Only _newest packages"
+msgstr ""
+
+#: ../data/gpk-application.glade.h:32
msgid "_Selection"
msgstr ""
@@ -343,68 +347,68 @@
#. TRANSLATORS: button: install a font
#. TRANSLATORS: button: install catalog
#. TRANSLATORS: button: install packages in catalog
-#: ../data/gpk-application.glade.h:32 ../src/gpk-client.c:1103
-#: ../src/gpk-client.c:1561 ../src/gpk-client.c:1672 ../src/gpk-client.c:1859
-#: ../src/gpk-client.c:2196 ../src/gpk-client.c:2505 ../src/gpk-client.c:2592
-#: ../src/gpk-client.c:2662
+#: ../data/gpk-application.glade.h:33 ../src/gpk-client.c:1087
+#: ../src/gpk-client.c:1545 ../src/gpk-client.c:1656 ../src/gpk-client.c:1843
+#: ../src/gpk-client.c:2180 ../src/gpk-client.c:2489 ../src/gpk-client.c:2576
+#: ../src/gpk-client.c:2646
msgid "Install"
msgstr ""
#. TRANSLATORS: title: removing packages
-#: ../data/gpk-application.glade.h:33 ../src/gpk-client.c:1412
+#: ../data/gpk-application.glade.h:34 ../src/gpk-client.c:1396
msgid "Remove"
msgstr ""
-#: ../data/gpk-application.glade.h:34
+#: ../data/gpk-application.glade.h:35
msgid "Visit the project homepage"
msgstr ""
-#: ../data/gpk-application.glade.h:35
+#: ../data/gpk-application.glade.h:36
msgid "Project homepage"
msgstr ""
-#: ../data/gpk-application.glade.h:36
+#: ../data/gpk-application.glade.h:37
msgid "Execute graphical applications"
msgstr ""
-#: ../data/gpk-application.glade.h:37
+#: ../data/gpk-application.glade.h:38
msgid "Run program"
msgstr ""
-#: ../data/gpk-application.glade.h:38
+#: ../data/gpk-application.glade.h:39
msgid "Get file list"
msgstr ""
-#: ../data/gpk-application.glade.h:39
+#: ../data/gpk-application.glade.h:40
msgid "Depends on"
msgstr ""
-#: ../data/gpk-application.glade.h:40
+#: ../data/gpk-application.glade.h:41
msgid "Required by"
msgstr ""
#. TRANSLATORS: context menu to open the offline help file
-#: ../data/gpk-application.glade.h:41 ../src/gpk-check-update.c:261
+#: ../data/gpk-application.glade.h:42 ../src/gpk-check-update.c:258
msgid "_Help"
msgstr ""
-#: ../data/gpk-application.glade.h:42
+#: ../data/gpk-application.glade.h:43
msgid "Help with this software"
msgstr ""
-#: ../data/gpk-application.glade.h:43
+#: ../data/gpk-application.glade.h:44
msgid "_Contents"
msgstr ""
-#: ../data/gpk-application.glade.h:44
+#: ../data/gpk-application.glade.h:45
msgid "About this software"
msgstr ""
-#: ../data/gpk-application.glade.h:45
+#: ../data/gpk-application.glade.h:46
msgid "Fi_nd"
msgstr ""
-#: ../data/gpk-application.glade.h:46
+#: ../data/gpk-application.glade.h:47
msgid "_Cancel"
msgstr ""
@@ -624,8 +628,8 @@
#. TRANSLATORS: program name, a simple app to view pending updates
#. TRANSLATORS: title to pass to to the user if there are not enough privs
-#: ../data/gpk-update-viewer.desktop.in.h:2 ../src/gpk-update-viewer.c:1902
-#: ../src/gpk-update-viewer.c:1917
+#: ../data/gpk-update-viewer.desktop.in.h:2 ../src/gpk-update-viewer.c:1896
+#: ../src/gpk-update-viewer.c:1911
msgid "Software Update Viewer"
msgstr ""
@@ -735,181 +739,181 @@
#. TRANSLATORS: the type of package is a collection (metagroup)
#. TRANSLATORS: this is the update type, e.g. security
-#: ../src/gpk-application.c:1029 ../src/gpk-update-viewer.c:908
+#: ../src/gpk-application.c:994 ../src/gpk-update-viewer.c:902
msgid "Type"
msgstr ""
-#: ../src/gpk-application.c:1029
+#: ../src/gpk-application.c:994
msgid "Collection"
msgstr ""
#. TRANSLATORS: tooltip: go to the web address
-#: ../src/gpk-application.c:1037
+#: ../src/gpk-application.c:1002
#, c-format
msgid "Visit %s"
msgstr ""
#. TRANSLATORS: add an entry to go to the project home page
-#: ../src/gpk-application.c:1042
+#: ../src/gpk-application.c:1007
msgid "Project"
msgstr ""
-#: ../src/gpk-application.c:1042
+#: ../src/gpk-application.c:1007
msgid "Homepage"
msgstr ""
#. TRANSLATORS: the group the package belongs in
-#: ../src/gpk-application.c:1056
+#: ../src/gpk-application.c:1021
msgid "Group"
msgstr ""
#. TRANSLATORS: the licence string for the package
-#: ../src/gpk-application.c:1062
+#: ../src/gpk-application.c:1027
msgid "License"
msgstr ""
#. TRANSLATORS: the size of the meta package
-#: ../src/gpk-application.c:1077
+#: ../src/gpk-application.c:1042
msgid "Size"
msgstr ""
#. TRANSLATORS: the installed size in bytes of the package
-#: ../src/gpk-application.c:1080
+#: ../src/gpk-application.c:1045
msgid "Installed size"
msgstr ""
#. TRANSLATORS: the download size of the package
-#: ../src/gpk-application.c:1083
+#: ../src/gpk-application.c:1048
msgid "Download size"
msgstr ""
#. TRANSLATORS: where the package came from, the software source name
-#: ../src/gpk-application.c:1092
+#: ../src/gpk-application.c:1057
msgid "Source"
msgstr ""
#. TRANSLATORS: no results were found for this search
-#: ../src/gpk-application.c:1242
+#: ../src/gpk-application.c:1207
msgid "No results were found."
msgstr ""
#. TRANSLATORS: be helpful, but this shouldn't happen
-#: ../src/gpk-application.c:1250
+#: ../src/gpk-application.c:1215
msgid "Try entering a package name in the search bar."
msgstr ""
#. TRANSLATORS: tell the user to switch to details search mode
-#: ../src/gpk-application.c:1255
+#: ../src/gpk-application.c:1220
msgid ""
"Try searching package descriptions by clicking the icon next to the search "
"text."
msgstr ""
#. TRANSLATORS: tell the user to try harder
-#: ../src/gpk-application.c:1258
+#: ../src/gpk-application.c:1223
msgid "Try again with a different search term."
msgstr ""
#. TRANSLATORS: title: invlid text in the search bar
-#: ../src/gpk-application.c:1362
+#: ../src/gpk-application.c:1327
msgid "Invalid search text"
msgstr ""
#. TRANSLATORS: message: tell the user that's not allowed
-#: ../src/gpk-application.c:1364
+#: ../src/gpk-application.c:1329
msgid "The search text contains invalid characters"
msgstr ""
#. TRANSLATORS: title: we failed to execute the mthod
-#: ../src/gpk-application.c:1399
+#: ../src/gpk-application.c:1364
msgid "The search could not be completed"
msgstr ""
#. TRANSLATORS: low level failure, details to follow
#. TRANSLATORS: low level failure
-#: ../src/gpk-application.c:1401 ../src/gpk-application.c:1445
+#: ../src/gpk-application.c:1366 ../src/gpk-application.c:1410
msgid "Running the transaction failed"
msgstr ""
#. TRANSLATORS: title: could not get group data
-#: ../src/gpk-application.c:1443
+#: ../src/gpk-application.c:1408
msgid "The group could not be queried"
msgstr ""
#. TRANSLATORS: title: warn the user they are quitting with unapplied changes
-#: ../src/gpk-application.c:1516
+#: ../src/gpk-application.c:1481
msgid "Changes not applied"
msgstr ""
-#: ../src/gpk-application.c:1517
+#: ../src/gpk-application.c:1482
msgid "Close Anyway"
msgstr ""
#. TRANSLATORS: tell the user the problem
-#: ../src/gpk-application.c:1521
+#: ../src/gpk-application.c:1486
msgid "You have made changes that have not yet been applied."
msgstr ""
-#: ../src/gpk-application.c:1522
+#: ../src/gpk-application.c:1487
msgid "These changes will be lost if you close this window."
msgstr ""
#. TRANSLATORS: column for installed status
-#: ../src/gpk-application.c:1789 ../src/gpk-enum.c:929 ../src/gpk-enum.c:988
+#: ../src/gpk-application.c:1754 ../src/gpk-enum.c:929 ../src/gpk-enum.c:988
msgid "Installed"
msgstr ""
#. TRANSLATORS: column for package name
#. TRANSLATORS: column for group name
#. TRANSLATORS: column for the package name
-#: ../src/gpk-application.c:1805 ../src/gpk-application.c:1827
+#: ../src/gpk-application.c:1770 ../src/gpk-application.c:1792
#: ../src/gpk-client-dialog.c:665 ../src/gpk-dialog.c:144
msgid "Name"
msgstr ""
#. TRANSLATORS: entry tooltip: basic search
-#: ../src/gpk-application.c:2076
+#: ../src/gpk-application.c:2041
msgid "Searching by name"
msgstr ""
#. TRANSLATORS: entry tooltip: detailed search
-#: ../src/gpk-application.c:2098
+#: ../src/gpk-application.c:2063
msgid "Searching by description"
msgstr ""
#. TRANSLATORS: entry tooltip: file search
-#: ../src/gpk-application.c:2120
+#: ../src/gpk-application.c:2085
msgid "Searching by file"
msgstr ""
#. TRANSLATORS: context menu item for the search type icon
-#: ../src/gpk-application.c:2146
+#: ../src/gpk-application.c:2111
msgid "Search by name"
msgstr ""
#. TRANSLATORS: context menu item for the search type icon
-#: ../src/gpk-application.c:2156
+#: ../src/gpk-application.c:2121
msgid "Search by description"
msgstr ""
#. TRANSLATORS: context menu item for the search type icon
-#: ../src/gpk-application.c:2166
+#: ../src/gpk-application.c:2131
msgid "Search by file name"
msgstr ""
#. TRANSLATORS: packaging problem, failed to show link
#. TRANSLATORS: normally a packaging error, cannot launch link
-#: ../src/gpk-application.c:2221 ../src/gpk-check-update.c:165
+#: ../src/gpk-application.c:2186 ../src/gpk-check-update.c:162
#: ../src/gpk-watch.c:543
msgid "Failed to show url"
msgstr ""
-#: ../src/gpk-application.c:2260 ../src/gpk-check-update.c:190
+#: ../src/gpk-application.c:2225 ../src/gpk-check-update.c:187
#: ../src/gpk-watch.c:564
msgid "Licensed under the GNU General Public License Version 2"
msgstr ""
-#: ../src/gpk-application.c:2261 ../src/gpk-check-update.c:191
+#: ../src/gpk-application.c:2226 ../src/gpk-check-update.c:188
#: ../src/gpk-watch.c:565
msgid ""
"PackageKit is free software; you can redistribute it and/or\n"
@@ -918,7 +922,7 @@
"of the License, or (at your option) any later version."
msgstr ""
-#: ../src/gpk-application.c:2265 ../src/gpk-check-update.c:195
+#: ../src/gpk-application.c:2230 ../src/gpk-check-update.c:192
#: ../src/gpk-watch.c:569
msgid ""
"PackageKit is distributed in the hope that it will be useful,\n"
@@ -927,7 +931,7 @@
"GNU General Public License for more details."
msgstr ""
-#: ../src/gpk-application.c:2269 ../src/gpk-check-update.c:199
+#: ../src/gpk-application.c:2234 ../src/gpk-check-update.c:196
#: ../src/gpk-watch.c:573
msgid ""
"You should have received a copy of the GNU General Public License\n"
@@ -937,71 +941,71 @@
msgstr ""
#. TRANSLATORS: put your own name here -- you deserve credit!
-#: ../src/gpk-application.c:2275 ../src/gpk-check-update.c:204
+#: ../src/gpk-application.c:2240 ../src/gpk-check-update.c:201
#: ../src/gpk-watch.c:578
msgid "translator-credits"
msgstr ""
#. TRANSLATORS: website label
-#: ../src/gpk-application.c:2300 ../src/gpk-check-update.c:223
+#: ../src/gpk-application.c:2265 ../src/gpk-check-update.c:220
#: ../src/gpk-watch.c:596
msgid "PackageKit Website"
msgstr ""
#. TRANSLATORS: description of application, gpk-application that is
-#: ../src/gpk-application.c:2303
+#: ../src/gpk-application.c:2268
msgid "Package Manager for GNOME"
msgstr ""
#. TRANSLATORS: single column for the package details, not visible at the moment
#. TRANSLATORS: The information about the update, not currently shown
-#: ../src/gpk-application.c:2738 ../src/gpk-update-viewer.c:1122
+#: ../src/gpk-application.c:2703 ../src/gpk-update-viewer.c:1116
msgid "Text"
msgstr ""
#. TRANSLATORS: welcome text if we can click the group list
-#: ../src/gpk-application.c:2761
+#: ../src/gpk-application.c:2726
msgid ""
"Enter a package name and then click find, or click a group to get started."
msgstr ""
#. TRANSLATORS: welcome text if we have to search by name
-#: ../src/gpk-application.c:2764
+#: ../src/gpk-application.c:2729
msgid "Enter a package name and then click find to get started."
msgstr ""
#. TRANSLATORS: title: all of the packages on the system and availble in sources
-#: ../src/gpk-application.c:2796 ../src/gpk-application.c:2867
+#: ../src/gpk-application.c:2761 ../src/gpk-application.c:2832
msgid "All packages"
msgstr ""
#. TRANSLATORS: tooltip: all packages
-#: ../src/gpk-application.c:2798 ../src/gpk-application.c:2869
+#: ../src/gpk-application.c:2763 ../src/gpk-application.c:2834
msgid "Show all packages"
msgstr ""
#. TRANSLATORS: tooltip on the clear button
-#: ../src/gpk-application.c:3165
+#: ../src/gpk-application.c:3130
msgid "Clear current selection"
msgstr ""
#. TRANSLATORS: tooltip on the apply button
-#: ../src/gpk-application.c:3186
+#: ../src/gpk-application.c:3151
msgid "Changes are not applied instantly, this button applies all changes"
msgstr ""
#. TRANSLATORS: tooltip on the homepage button
-#: ../src/gpk-application.c:3208
+#: ../src/gpk-application.c:3173
msgid "Visit home page for selected package"
msgstr ""
#. TRANSLATORS: tooltip on the find button
-#: ../src/gpk-application.c:3358
+#: ../src/gpk-application.c:3323
msgid "Find packages"
msgstr ""
#. TRANSLATORS: tooltip on the cancel button
-#: ../src/gpk-application.c:3365
+#: ../src/gpk-application.c:3330
msgid "Cancel search"
msgstr ""
@@ -1011,20 +1015,20 @@
#: ../src/gpk-install-mime-type.c:49 ../src/gpk-install-package-name.c:50
#: ../src/gpk-install-provide-file.c:49 ../src/gpk-log.c:623
#: ../src/gpk-prefs.c:356 ../src/gpk-repo.c:337 ../src/gpk-service-pack.c:538
-#: ../src/gpk-update-icon.c:214 ../src/gpk-update-viewer.c:1883
+#: ../src/gpk-update-icon.c:128 ../src/gpk-update-viewer.c:1877
msgid "Show extra debugging information"
msgstr ""
#. TRANSLATORS: show the program version
#: ../src/gpk-application-main.c:80 ../src/gpk-backend-status.c:83
-#: ../src/gpk-prefs.c:358 ../src/gpk-update-icon.c:218
-#: ../src/gpk-update-viewer.c:1885
+#: ../src/gpk-prefs.c:358 ../src/gpk-update-icon.c:132
+#: ../src/gpk-update-viewer.c:1879
msgid "Show the program version and exit"
msgstr ""
#. are we running privileged
#. TRANSLATORS: title:
-#: ../src/gpk-application-main.c:111 ../src/gpk-client.c:1670
+#: ../src/gpk-application-main.c:111 ../src/gpk-client.c:1654
msgid "Package installer"
msgstr ""
@@ -1038,52 +1042,47 @@
msgstr ""
#. TRANSLATORS: context menu to open the preferences
-#: ../src/gpk-check-update.c:249
+#: ../src/gpk-check-update.c:246
msgid "_Preferences"
msgstr ""
#. TRANSLATORS: context menu to show the about screen
#. TRANSLATORS: this is the right click menu item
-#: ../src/gpk-check-update.c:269 ../src/gpk-watch.c:626
+#: ../src/gpk-check-update.c:266 ../src/gpk-watch.c:626
msgid "_About"
msgstr ""
#. TRANSLATORS: context menu to execute the update viewer
-#: ../src/gpk-check-update.c:380
+#: ../src/gpk-check-update.c:360
msgid "_Show Updates"
msgstr ""
#. TRANSLATORS: context menu to update any pending updates
-#: ../src/gpk-check-update.c:388
+#: ../src/gpk-check-update.c:368
msgid "_Update System Now"
msgstr ""
-#. TRANSLATORS: context menu to show distro upgrade
-#: ../src/gpk-check-update.c:400
-msgid "Show _Distribution Upgrade"
-msgstr ""
-
#. TRANSLATORS: title in the libnotify popup
-#: ../src/gpk-check-update.c:523
+#: ../src/gpk-check-update.c:486
msgid "Security update available"
msgid_plural "Security updates available"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: message when there are security updates
-#: ../src/gpk-check-update.c:528
+#: ../src/gpk-check-update.c:491
msgid "The following important update is available for your computer:"
msgid_plural "The following important updates are available for your computer:"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: button: only security updates
-#: ../src/gpk-check-update.c:550
+#: ../src/gpk-check-update.c:513
msgid "Install only security updates"
msgstr ""
#. TRANSLATORS: button: all pending updates
-#: ../src/gpk-check-update.c:553
+#: ../src/gpk-check-update.c:516
msgid "Install all updates"
msgstr ""
@@ -1093,37 +1092,37 @@
#. TRANSLATORS: don't show this option again (when finished)
#. add a checkbutton for deps screen
#. TRANSLATORS: don't pop-up the same message twice
-#: ../src/gpk-check-update.c:556 ../src/gpk-check-update.c:1132
-#: ../src/gpk-client.c:312 ../src/gpk-client.c:316 ../src/gpk-client.c:2747
+#: ../src/gpk-check-update.c:519 ../src/gpk-check-update.c:1027
+#: ../src/gpk-client.c:307 ../src/gpk-client.c:311 ../src/gpk-client.c:2731
#: ../src/gpk-dialog.c:287 ../src/gpk-firmware.c:208 ../src/gpk-hardware.c:173
-#: ../src/gpk-update-icon.c:180 ../src/gpk-watch.c:379
+#: ../src/gpk-watch.c:379
msgid "Do not show this again"
msgstr ""
#. TRANSLATORS: policy says update, but we are on battery and so prompt
-#: ../src/gpk-check-update.c:675
+#: ../src/gpk-check-update.c:628
msgid ""
"Automatic updates are not being installed as the computer is running on "
"battery power"
msgstr ""
#. TRANSLATORS: informs user will not install by default
-#: ../src/gpk-check-update.c:677
+#: ../src/gpk-check-update.c:630
msgid "Updates not installed"
msgstr ""
#. TRANSLATORS: hide this warning type forever
-#: ../src/gpk-check-update.c:682
+#: ../src/gpk-check-update.c:635
msgid "Do not show this warning again"
msgstr ""
#. TRANSLATORS: to hell with my battery life, just do it
-#: ../src/gpk-check-update.c:685
+#: ../src/gpk-check-update.c:638
msgid "Install the updates anyway"
msgstr ""
#. TRANSLATORS: we have a notification that won't fit, so append on how many other we are not showing
-#: ../src/gpk-check-update.c:815
+#: ../src/gpk-check-update.c:762
#, c-format
msgid "and %d other security update"
msgid_plural "and %d other security updates"
@@ -1131,7 +1130,7 @@
msgstr[1] ""
#. TRANSLATORS: tooltip: how many updates are waiting to be applied
-#: ../src/gpk-check-update.c:838
+#: ../src/gpk-check-update.c:785
#, c-format
msgid "There is %d update pending"
msgid_plural "There are %d updates pending"
@@ -1139,112 +1138,107 @@
msgstr[1] ""
#. TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9
-#: ../src/gpk-check-update.c:1119
+#: ../src/gpk-check-update.c:1014
msgid "Distribution upgrades available"
msgstr ""
#. TRANSLATORS: provides more information about the upgrade
#. TRANSLATORS: button: a link to the help file
#. TRANSLATORS: button: show the user a button to get more help finding stuff
-#: ../src/gpk-check-update.c:1129 ../src/gpk-client.c:1726
-#: ../src/gpk-client.c:1906 ../src/gpk-client.c:2327 ../src/gpk-client.c:2476
+#: ../src/gpk-check-update.c:1024 ../src/gpk-client.c:1710
+#: ../src/gpk-client.c:1890 ../src/gpk-client.c:2311 ../src/gpk-client.c:2460
msgid "More information"
msgstr ""
#. TRANSLATORS: detailed text about the error
#. TRANSLATORS: The detailed error if the user clicks "more info"
-#: ../src/gpk-client.c:204 ../src/gpk-client.c:206 ../src/gpk-watch.c:281
+#: ../src/gpk-client.c:202 ../src/gpk-watch.c:281
msgid "Error details"
msgstr ""
-#: ../src/gpk-client.c:204 ../src/gpk-client.c:206
+#: ../src/gpk-client.c:202
msgid "Package Manager error details"
msgstr ""
#. TRANSLATORS: we did the update, but some updates were skipped and not applied
-#: ../src/gpk-client.c:272
+#: ../src/gpk-client.c:267
msgid "One package was skipped:"
msgid_plural "Some packages were skipped:"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: system update completed all okay
-#: ../src/gpk-client.c:303
+#: ../src/gpk-client.c:298
msgid "The system update has completed"
msgstr ""
#. TRANSLATORS: restart computer as system packages need update
-#: ../src/gpk-client.c:309
+#: ../src/gpk-client.c:304
msgid "Restart computer now"
msgstr ""
#. TRANSLATORS: list the packages we just installed
-#: ../src/gpk-client.c:359
+#: ../src/gpk-client.c:354
msgid "The following packages were installed:"
msgstr ""
-#: ../src/gpk-client.c:491
-msgid ""
-"To try and manually resolve problems use the YaST \"Online Update\" module"
-msgstr ""
-
#. TRANSLATORS: button: show details about the error
#. TRANSLATORS: This is a link in a libnotify bubble that shows the detailed error
-#: ../src/gpk-client.c:521 ../src/gpk-watch.c:451
+#: ../src/gpk-client.c:505 ../src/gpk-watch.c:451
msgid "Show details"
msgstr ""
#. TRANSLATORS: default fallback error -- this should never happen
-#: ../src/gpk-client.c:629
+#: ../src/gpk-client.c:613
msgid ""
"Unknown error. Please refer to the detailed report and report in your "
"distribution bugtracker."
msgstr ""
#. TRANSLATORS: failed authentication
-#: ../src/gpk-client.c:640
+#: ../src/gpk-client.c:624
msgid "You don't have the necessary privileges to perform this action."
msgstr ""
#. TRANSLATORS: could not start system service
-#: ../src/gpk-client.c:644
+#: ../src/gpk-client.c:628
msgid "The packagekitd service could not be started."
msgstr ""
#. TRANSLATORS: the user tried to query for something invalid
-#: ../src/gpk-client.c:648
+#: ../src/gpk-client.c:632
msgid "The query is not valid."
msgstr ""
#. TRANSLATORS: the user tried to install a file that was not compatable or broken
-#: ../src/gpk-client.c:653
+#: ../src/gpk-client.c:637
msgid "The file is not valid."
msgstr ""
#. TRANSLATORS: this should never happen, low level failure
-#: ../src/gpk-client.c:730 ../src/gpk-client.c:1441 ../src/gpk-client.c:1586
-#: ../src/gpk-client.c:2706 ../src/gpk-client.c:2784 ../src/gpk-client.c:2836
-#: ../src/gpk-client.c:2890 ../src/gpk-client.c:2940 ../src/gpk-client.c:2997
+#: ../src/gpk-client.c:714 ../src/gpk-client.c:1425 ../src/gpk-client.c:1570
+#: ../src/gpk-client.c:2690 ../src/gpk-client.c:2768 ../src/gpk-client.c:2820
+#: ../src/gpk-client.c:2874 ../src/gpk-client.c:2924 ../src/gpk-client.c:2981
msgid "Failed to reset client to perform action"
msgstr ""
#. TRANSLATORS: title: detailed internal error why the file install failed
#. TRANSLATORS: title
-#: ../src/gpk-client.c:743 ../src/gpk-client.c:1940
+#: ../src/gpk-client.c:727 ../src/gpk-client.c:1924
msgid "Failed to install file"
msgid_plural "Failed to install files"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: we have to copy the private files to a public location
-#: ../src/gpk-client.c:990
+#: ../src/gpk-client.c:974
msgid "Do you want to copy this file?"
msgid_plural "Do you want to copy these files?"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: message: explain to the user what we are doing
-#: ../src/gpk-client.c:993
+#: ../src/gpk-client.c:977
msgid ""
"This package file has to be copied from a private directory so it can be "
"installed:"
@@ -1255,99 +1249,99 @@
msgstr[1] ""
#. TRANSLATORS: button: copy file from one directory to another
-#: ../src/gpk-client.c:1003
+#: ../src/gpk-client.c:987
msgid "Copy file"
msgid_plural "Copy files"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: we are about to copy files, which may take a few seconds
-#: ../src/gpk-client.c:1020
+#: ../src/gpk-client.c:1004
msgid "Copying file"
msgid_plural "Copying files"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: tell the user we failed
-#: ../src/gpk-client.c:1058
+#: ../src/gpk-client.c:1042
msgid "The file could not be copied"
msgid_plural "The files could not be copied"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: confirm the user want's to install a local file
-#: ../src/gpk-client.c:1095
+#: ../src/gpk-client.c:1079
msgid "Do you want to install this file?"
msgid_plural "Do you want to install these files?"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: the user cancelled the action
-#: ../src/gpk-client.c:1112
+#: ../src/gpk-client.c:1096
msgid "The file was not installed"
msgid_plural "The files were not installed"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: we couldn't find the file -- very hard to get this
-#: ../src/gpk-client.c:1159
+#: ../src/gpk-client.c:1143
msgid "File was not found!"
msgid_plural "Files were not found!"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: message: explain what went wrong
-#: ../src/gpk-client.c:1163
+#: ../src/gpk-client.c:1147
msgid "The following file was not found:"
msgid_plural "The following files were not found:"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: string is an action, e.g. "wants to install a codec"
-#: ../src/gpk-client.c:1202
+#: ../src/gpk-client.c:1186
#, c-format
msgid "A program %s"
msgstr ""
#. TRANSLATORS: title: installing a local file
-#: ../src/gpk-client.c:1270
+#: ../src/gpk-client.c:1254
msgid "Install local file"
msgid_plural "Install local files"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: installing a local file that is not trusted
-#: ../src/gpk-client.c:1287
+#: ../src/gpk-client.c:1271
msgid "Install untrusted local file"
msgid_plural "Install untrusted local files"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: we have installed the local file OK
-#: ../src/gpk-client.c:1303
+#: ../src/gpk-client.c:1287
msgid "File was installed successfully"
msgid_plural "Files were installed successfully"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: getting a list of other packages that depend on this one
-#: ../src/gpk-client.c:1355
+#: ../src/gpk-client.c:1339
msgid "Finding packages we require"
msgstr ""
#. TRANSLATORS: this is an internal error, and should not be seen
-#: ../src/gpk-client.c:1366 ../src/gpk-client.c:1522 ../src/gpk-client.c:1695
-#: ../src/gpk-client.c:1878 ../src/gpk-client.c:2298 ../src/gpk-client.c:2447
+#: ../src/gpk-client.c:1350 ../src/gpk-client.c:1506 ../src/gpk-client.c:1679
+#: ../src/gpk-client.c:1862 ../src/gpk-client.c:2282 ../src/gpk-client.c:2431
msgid "Failed to reset client used for searching"
msgstr ""
#. TRANSLATORS: we could not work out what other packages have to be removed to remove this package
-#: ../src/gpk-client.c:1376
+#: ../src/gpk-client.c:1360
msgid "Could not work out what packages would also be removed"
msgstr ""
#. TRANSLATORS: title: to remove this package we also have to remove others
-#: ../src/gpk-client.c:1394
+#: ../src/gpk-client.c:1378
#, c-format
msgid "%i additional package also has to be removed"
msgid_plural "%i additional packages also have to be removed"
@@ -1355,7 +1349,7 @@
msgstr[1] ""
#. TRANSLATORS: message: describe in detail why it must happen
-#: ../src/gpk-client.c:1402
+#: ../src/gpk-client.c:1386
#, c-format
msgid "To remove %s other packages that depend on it must also be removed."
msgid_plural ""
@@ -1364,27 +1358,27 @@
msgstr[1] ""
#. TRANSLATORS: title removing packages
-#: ../src/gpk-client.c:1429
+#: ../src/gpk-client.c:1413
msgid "Remove packages"
msgstr ""
#. TRANSLATORS: error: failed to remove the package we tried to remove
-#: ../src/gpk-client.c:1451
+#: ../src/gpk-client.c:1435
msgid "Failed to remove package"
msgstr ""
#. TRANSLATORS: finding a list of packages that we would also need to download
-#: ../src/gpk-client.c:1510
+#: ../src/gpk-client.c:1494
msgid "Finding other packages we require"
msgstr ""
#. TRANSLATORS: error: could not get the extra package list when installing a package
-#: ../src/gpk-client.c:1532
+#: ../src/gpk-client.c:1516
msgid "Could not work out what packages would be also installed"
msgstr ""
#. TRANSLATORS: title: tell the user we have to install additional packages
-#: ../src/gpk-client.c:1545
+#: ../src/gpk-client.c:1529
#, c-format
msgid "%i additional package also has to be installed"
msgid_plural "%i additional packages also have to be installed"
@@ -1392,7 +1386,7 @@
msgstr[1] ""
#. TRANSLATORS: message: explain to the user what we are doing in more detail
-#: ../src/gpk-client.c:1552
+#: ../src/gpk-client.c:1536
#, c-format
msgid "To install %s, an additional package also has to be downloaded."
msgid_plural "To install %s, additional packages also have to be downloaded."
@@ -1400,422 +1394,422 @@
msgstr[1] ""
#. TRANSLATORS: title: installing packages
-#: ../src/gpk-client.c:1576
+#: ../src/gpk-client.c:1560
msgid "Installing packages"
msgstr ""
#. TRANSLATORS: error: failed to install, detailed error follows
#. TRANSLATORS: failed to install, shouldn't be shown
-#: ../src/gpk-client.c:1595 ../src/gpk-client.c:1782
+#: ../src/gpk-client.c:1579 ../src/gpk-client.c:1766
msgid "Failed to install package"
msgstr ""
#. TRANSLATORS: a program needs a package, for instance openoffice-clipart
-#: ../src/gpk-client.c:1665
+#: ../src/gpk-client.c:1649
msgid "An additional package is required"
msgstr ""
#. TRANSLATORS: ask the user if it's okay to search
-#: ../src/gpk-client.c:1668
+#: ../src/gpk-client.c:1652
msgid "Do you want to search for this file now?"
msgstr ""
#. TRANSLATORS: generic confirm, use the application name if we can
-#: ../src/gpk-client.c:1674
+#: ../src/gpk-client.c:1658
msgid "wants to install packages"
msgstr ""
#. TRANSLATORS: title, searching
-#: ../src/gpk-client.c:1685
+#: ../src/gpk-client.c:1669
msgid "Searching for packages"
msgstr ""
#. TRANSLATORS: we failed to find the package, this shouldn't happen
#. TRANSLATORS: the search gave us the wrong result. internal error. barf.
-#: ../src/gpk-client.c:1705 ../src/gpk-client.c:1784
+#: ../src/gpk-client.c:1689 ../src/gpk-client.c:1768
msgid "Incorrect response from search"
msgstr ""
#. TRANSLATORS: couldn't resolve name to package
-#: ../src/gpk-client.c:1719
+#: ../src/gpk-client.c:1703
#, c-format
msgid "Could not find %s"
msgstr ""
#. TRANSLATORS: message: could not find
-#: ../src/gpk-client.c:1723
+#: ../src/gpk-client.c:1707
msgid "The packages could not be found in any software source"
msgstr ""
#. TRANSLATORS: title: package is already installed
-#: ../src/gpk-client.c:1763
+#: ../src/gpk-client.c:1747
#, c-format
msgid "Failed to install %s"
msgstr ""
#. TRANSLATORS: message: package is already installed
-#: ../src/gpk-client.c:1766 ../src/gpk-enum.c:336
+#: ../src/gpk-client.c:1750 ../src/gpk-enum.c:336
msgid "The package is already installed"
msgstr ""
#. TRANSLATORS: a program wants to install a file, e.g. /lib/moo.so
-#: ../src/gpk-client.c:1852
+#: ../src/gpk-client.c:1836
msgid "The following file is required:"
msgstr ""
#. TRANSLATORS: confirm with the user
#. TRANSLATORS: ask for confirmation
-#: ../src/gpk-client.c:1855 ../src/gpk-client.c:2056
+#: ../src/gpk-client.c:1839 ../src/gpk-client.c:2040
msgid "Do you want to search for this now?"
msgid_plural "Do you want to search for these now?"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title
-#: ../src/gpk-client.c:1857
+#: ../src/gpk-client.c:1841
msgid "File installer"
msgstr ""
#. TRANSLATORS: generic confirm, use the application name if we can
-#: ../src/gpk-client.c:1861
+#: ../src/gpk-client.c:1845
msgid "wants to install a file"
msgstr ""
#. TRANSLATORS: searching for the package that provides the file
-#: ../src/gpk-client.c:1871 ../src/gpk-enum.c:1035
+#: ../src/gpk-client.c:1855 ../src/gpk-enum.c:1035
msgid "Searching for file"
msgstr ""
#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../src/gpk-client.c:1888
+#: ../src/gpk-client.c:1872
msgid "Failed to search for file"
msgstr ""
#. TRANSLATORS: failed to fild the package for thefile
-#: ../src/gpk-client.c:1901
+#: ../src/gpk-client.c:1885
msgid "Failed to find package"
msgstr ""
#. TRANSLATORS: nothing found
-#: ../src/gpk-client.c:1903
+#: ../src/gpk-client.c:1887
msgid "The file could not be found in any packages"
msgstr ""
#. TRANSLATORS: we've already got a package that provides this file
-#: ../src/gpk-client.c:1938
+#: ../src/gpk-client.c:1922
#, c-format
msgid "The %s package already provides the file %s"
msgstr ""
#. TRANSLATORS: title, searching for codecs
-#: ../src/gpk-client.c:1983
+#: ../src/gpk-client.c:1967
#, c-format
msgid "Searching for plugin: %s"
msgstr ""
#. TRANSLATORS: title: we need a codec
-#: ../src/gpk-client.c:2035
+#: ../src/gpk-client.c:2019
msgid "An additional plugin is required to play this content"
msgid_plural "Additional plugins are required to play this content"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: we are listing the plugins in a box
-#: ../src/gpk-client.c:2037
+#: ../src/gpk-client.c:2021
msgid "The following plugin is required:"
msgid_plural "The following plugins are required:"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: codec installer
-#: ../src/gpk-client.c:2066
+#: ../src/gpk-client.c:2050
msgid "Plugin installer"
msgstr ""
#. TRANSLATORS: button: search for a codec
#. TRANSLATORS: button: search for mime installer
#. TRANSLATORS: buttton: search for font
-#: ../src/gpk-client.c:2068 ../src/gpk-client.c:2274 ../src/gpk-client.c:2423
+#: ../src/gpk-client.c:2052 ../src/gpk-client.c:2258 ../src/gpk-client.c:2407
msgid "Search"
msgstr ""
#. TRANSLATORS: generic confirm, use the application name if we can
-#: ../src/gpk-client.c:2070
+#: ../src/gpk-client.c:2054
msgid "requires additional plugins"
msgstr ""
#. TRANSLATORS: search for codec
-#: ../src/gpk-client.c:2126
+#: ../src/gpk-client.c:2110
msgid "Searching for plugins"
msgstr ""
#. TRANSLATORS: failed to search for codec
-#: ../src/gpk-client.c:2150
+#: ../src/gpk-client.c:2134
msgid "Failed to search for plugin"
msgstr ""
#. TRANSLATORS: no software sources have the wanted codec
-#: ../src/gpk-client.c:2152
+#: ../src/gpk-client.c:2136
msgid "Could not find plugin in any configured software source"
msgstr ""
-#: ../src/gpk-client.c:2188
+#: ../src/gpk-client.c:2172
msgid "Install the following plugin"
msgid_plural "Install the following plugins"
msgstr[0] ""
msgstr[1] ""
-#: ../src/gpk-client.c:2189
+#: ../src/gpk-client.c:2173
msgid "Do you want to install this package now?"
msgid_plural "Do you want to install these packages now?"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: message: mime type opener required
-#: ../src/gpk-client.c:2267
+#: ../src/gpk-client.c:2251
msgid "An additional program is required to open this type of file:"
msgstr ""
#. TRANSLATORS: message: confirm with the user
-#: ../src/gpk-client.c:2270
+#: ../src/gpk-client.c:2254
msgid "Do you want to search for a program to open this file type now?"
msgstr ""
#. TRANSLATORS: title
-#: ../src/gpk-client.c:2272
+#: ../src/gpk-client.c:2256
msgid "File type installer"
msgstr ""
#. TRANSLATORS: generic confirm, use the application name if we can
-#: ../src/gpk-client.c:2276
+#: ../src/gpk-client.c:2260
msgid "requires a new mime type"
msgstr ""
#. TRANSLATORS: title: searching for mime type handlers
-#: ../src/gpk-client.c:2286
+#: ../src/gpk-client.c:2270
msgid "Searching for file handlers"
msgstr ""
#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../src/gpk-client.c:2309 ../src/gpk-client.c:2458
+#: ../src/gpk-client.c:2293 ../src/gpk-client.c:2442
msgid "Failed to search for provides"
msgstr ""
#. TRANSLATORS: title
-#: ../src/gpk-client.c:2322
+#: ../src/gpk-client.c:2306
msgid "Failed to find software"
msgstr ""
#. TRANSLATORS: nothing found in the software sources that helps
-#: ../src/gpk-client.c:2324
+#: ../src/gpk-client.c:2308
msgid "No new applications can be found to handle this type of file"
msgstr ""
#. TRANSLATORS: this is the list of packages that can open this file
-#: ../src/gpk-client.c:2346
+#: ../src/gpk-client.c:2330
msgid "Applications that can open this type of file"
msgstr ""
#. TRANSLATORS: we failed to install
-#: ../src/gpk-client.c:2352
+#: ../src/gpk-client.c:2336
msgid "Failed to install software"
msgstr ""
#. TRANSLATORS: we didn't select any applications that were returned
-#: ../src/gpk-client.c:2354
+#: ../src/gpk-client.c:2338
msgid "No applications were chosen to be installed"
msgstr ""
#. TRANSLATORS: we need to download a new font package to display a document
-#: ../src/gpk-client.c:2417
+#: ../src/gpk-client.c:2401
msgid "An additional font is required to view this file correctly"
msgstr ""
#. TRANSLATORS: confirm with user
-#: ../src/gpk-client.c:2419
+#: ../src/gpk-client.c:2403
msgid "Do you want to search for a suitable font now?"
msgstr ""
#. TRANSLATORS: title: font installer
-#: ../src/gpk-client.c:2421
+#: ../src/gpk-client.c:2405
msgid "Font installer"
msgstr ""
#. TRANSLATORS: generic confirm, use the application name if we can
-#: ../src/gpk-client.c:2425
+#: ../src/gpk-client.c:2409
msgid "wants to install a font"
msgstr ""
#. TRANSLATORS: title: we are now searching
-#: ../src/gpk-client.c:2435
+#: ../src/gpk-client.c:2419
msgid "Searching for fonts"
msgstr ""
#. TRANSLATORS: title: cannot find in sources
-#: ../src/gpk-client.c:2471
+#: ../src/gpk-client.c:2455
msgid "Failed to find font"
msgstr ""
#. TRANSLATORS: message: tell the user we suck
-#: ../src/gpk-client.c:2473
+#: ../src/gpk-client.c:2457
msgid "No new fonts can be found for this document"
msgstr ""
#. TRANSLATORS: title: show a list of fonts
-#: ../src/gpk-client.c:2500
+#: ../src/gpk-client.c:2484
msgid "Install the following fonts"
msgstr ""
#. TRANSLATORS: confirm
-#: ../src/gpk-client.c:2502
+#: ../src/gpk-client.c:2486
msgid "Do you want to install these packages now?"
msgstr ""
#. TRANSLATORS: finding the package names for a catalog
-#: ../src/gpk-client.c:2544
+#: ../src/gpk-client.c:2528
#, c-format
msgid "Finding package name: %s"
msgstr ""
#. TRANSLATORS: finding a package for a file for a catalog
-#: ../src/gpk-client.c:2547
+#: ../src/gpk-client.c:2531
#, c-format
msgid "Finding file name: %s"
msgstr ""
#. TRANSLATORS: finding a package which can provide a virtual provide
-#: ../src/gpk-client.c:2550
+#: ../src/gpk-client.c:2534
#, c-format
msgid "Finding a package to provide: %s"
msgstr ""
-#: ../src/gpk-client.c:2584
+#: ../src/gpk-client.c:2568
msgid "Do you want to install this catalog?"
msgid_plural "Do you want to install these catalogs?"
msgstr[0] ""
msgstr[1] ""
#. TRANSLATORS: title: install package catalogs, that is, instructions for installing
-#: ../src/gpk-client.c:2604
+#: ../src/gpk-client.c:2588
msgid "Install catalogs"
msgstr ""
#. TRANSLATORS: title: we've already got all these packages installed
-#: ../src/gpk-client.c:2623
+#: ../src/gpk-client.c:2607
msgid "No packages need to be installed"
msgstr ""
#. TRANSLATORS: display a list of packages to install
-#: ../src/gpk-client.c:2641
+#: ../src/gpk-client.c:2625
msgid "The following packages are marked to be installed from the catalog:"
msgstr ""
#. TRANSLATORS: title: allow user to confirm
-#: ../src/gpk-client.c:2658
+#: ../src/gpk-client.c:2642
msgid "Install packages in catalog?"
msgstr ""
#. TRANSLATORS: title: update all pending updates
-#: ../src/gpk-client.c:2713
+#: ../src/gpk-client.c:2697
msgid "System update"
msgstr ""
#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../src/gpk-client.c:2721
+#: ../src/gpk-client.c:2705
msgid "Failed to update system"
msgstr ""
#. do the bubble
#. TRANSLATORS: title: notification when we scheduled an automatic update
-#: ../src/gpk-client.c:2736
+#: ../src/gpk-client.c:2720
msgid "Updates are being installed"
msgstr ""
#. TRANSLATORS: tell the user why the hard disk is grinding...
-#: ../src/gpk-client.c:2738
+#: ../src/gpk-client.c:2722
msgid "Updates are being automatically installed on your computer"
msgstr ""
-#: ../src/gpk-client.c:2744
+#: ../src/gpk-client.c:2728
msgid "Cancel update"
msgstr ""
#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../src/gpk-client.c:2798
+#: ../src/gpk-client.c:2782
msgid "Failed to update package lists"
msgstr ""
#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../src/gpk-client.c:2846
+#: ../src/gpk-client.c:2830
msgid "Failed to get updates"
msgstr ""
#. TRANSLATORS: title: getting the list of updates
-#: ../src/gpk-client.c:2855
+#: ../src/gpk-client.c:2839
msgid "Getting list of updates"
msgstr ""
#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../src/gpk-client.c:2906
+#: ../src/gpk-client.c:2890
msgid "Getting update lists failed"
msgstr ""
#. TRANSLATORS: get if we can go from one distro release to another
-#: ../src/gpk-client.c:2913 ../src/gpk-enum.c:1098
+#: ../src/gpk-client.c:2897 ../src/gpk-enum.c:1098
msgid "Getting distribution upgrade information"
msgstr ""
#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../src/gpk-client.c:2952
+#: ../src/gpk-client.c:2936
msgid "Getting file list failed"
msgstr ""
#. TRANSLATORS: title: getting the files that are contained in a package
-#: ../src/gpk-client.c:2959
+#: ../src/gpk-client.c:2943
msgid "Getting file lists"
msgstr ""
#. TRANSLATORS: we failed to find the package, this shouldn't happen
-#: ../src/gpk-client.c:3007
+#: ../src/gpk-client.c:2991
msgid "Failed to update packages"
msgstr ""
#. TRANSLATORS: title: update specific packages
-#: ../src/gpk-client.c:3014
+#: ../src/gpk-client.c:2998
msgid "Update packages"
msgstr ""
-#: ../src/gpk-client.c:3045
+#: ../src/gpk-client.c:3029
msgid "Signature required"
msgstr ""
#. TRANSLATORS: title: failed to install package GPG signature
-#: ../src/gpk-client.c:3067 ../src/gpk-client.c:3081
+#: ../src/gpk-client.c:3051 ../src/gpk-client.c:3065
msgid "Failed to install signature"
msgstr ""
#. TRANSLATORS: internal error
-#: ../src/gpk-client.c:3069 ../src/gpk-client.c:3115
+#: ../src/gpk-client.c:3053 ../src/gpk-client.c:3099
msgid "The client could not be reset"
msgstr ""
#. TRANSLATORS: method: for some reason we refused this, error follows
-#: ../src/gpk-client.c:3083 ../src/gpk-client.c:3127
+#: ../src/gpk-client.c:3067 ../src/gpk-client.c:3111
msgid "The method failed"
msgstr ""
#. TRANSLATORS: title: failed to accept licence
-#: ../src/gpk-client.c:3113 ../src/gpk-client.c:3125
+#: ../src/gpk-client.c:3097 ../src/gpk-client.c:3109
msgid "Failed to accept license agreement"
msgstr ""
#. TRANSLATORS: title: failed to do initial error
-#: ../src/gpk-client.c:3156
+#: ../src/gpk-client.c:3140
msgid "Failed to install"
msgstr ""
#. TRANSLATORS: we could not requeue the transaction
-#: ../src/gpk-client.c:3158
+#: ../src/gpk-client.c:3142
msgid "The install task could not be repeated"
msgstr ""
@@ -2771,7 +2765,7 @@
msgstr ""
#. TRANSLATORS: this is when (if?) the update was updated
-#: ../src/gpk-enum.c:985 ../src/gpk-update-viewer.c:929
+#: ../src/gpk-enum.c:985 ../src/gpk-update-viewer.c:923
msgid "Updated"
msgstr ""
@@ -2808,7 +2802,7 @@
msgstr ""
#. TRANSLATORS: we are getting the list of updates from the server
-#: ../src/gpk-enum.c:1029 ../src/gpk-update-viewer.c:1508
+#: ../src/gpk-enum.c:1029 ../src/gpk-update-viewer.c:1502
msgid "Getting updates"
msgstr ""
@@ -2829,7 +2823,7 @@
msgstr ""
#. TRANSLATORS: we are refreshing the package lists and the update lists
-#: ../src/gpk-enum.c:1053 ../src/gpk-update-viewer.c:1512
+#: ../src/gpk-enum.c:1053 ../src/gpk-update-viewer.c:1506
msgid "Refreshing package cache"
msgstr ""
@@ -3134,7 +3128,7 @@
msgstr ""
#. TRANSLATORS: this is a list of vendor URLs
-#: ../src/gpk-enum.c:1326 ../src/gpk-update-viewer.c:974
+#: ../src/gpk-enum.c:1326 ../src/gpk-update-viewer.c:968
msgid "Vendor"
msgstr ""
@@ -3146,10 +3140,6 @@
msgid "Unknown group"
msgstr ""
-#: ../src/gpk-error.c:139
-msgid "Start YaST and install updates manually"
-msgstr ""
-
#. TRANSLATORS: we need another package to keep udev quiet
#: ../src/gpk-firmware.c:199
msgid ""
@@ -3183,8 +3173,11 @@
msgid "Install package"
msgstr ""
-#. app-id
-#. xid
+#. TRANSLATORS: the program name that inhibited the suspend
+#: ../src/gpk-inhibit.c:99
+msgid "Software Update Applet"
+msgstr ""
+
#. TRANSLATORS: the reason why we've inhibited it
#: ../src/gpk-inhibit.c:101
msgid "A transaction that cannot be interrupted is running"
@@ -3506,32 +3499,17 @@
msgid "Service pack files"
msgstr ""
-#: ../src/gpk-update-icon.c:170
-msgid "openSUSE Updater"
-msgstr ""
-
-#. body = g_strdup_printf ("%s", _("Driver development is prioritized based on hardware popularity.<br>Please send your system profile to influence this work."));
-#: ../src/gpk-update-icon.c:172
-msgid ""
-"Driver development is prioritized based on hardware popularity. Please send "
-"your system profile to influence this work."
-msgstr ""
-
-#: ../src/gpk-update-icon.c:178
-msgid "Send now"
-msgstr ""
-
-#: ../src/gpk-update-icon.c:216
+#: ../src/gpk-update-icon.c:130
msgid "Exit after a small delay"
msgstr ""
#. TRANSLATORS: program name, a session wide daemon to watch for updates and changing system state
-#: ../src/gpk-update-icon.c:234 ../src/gpk-update-icon.c:236
+#: ../src/gpk-update-icon.c:149 ../src/gpk-update-icon.c:151
msgid "Update Applet"
msgstr ""
#. TRANSLATORS: title to pass to to the user if there are not enough privs
-#: ../src/gpk-update-icon.c:250
+#: ../src/gpk-update-icon.c:165
msgid "Update applet"
msgstr ""
@@ -3555,166 +3533,166 @@
msgstr ""
#. TRANSLATORS: this is the stability status of the update
-#: ../src/gpk-update-viewer.c:914
+#: ../src/gpk-update-viewer.c:908
msgid "State"
msgstr ""
#. TRANSLATORS: this is when the update was issued
-#: ../src/gpk-update-viewer.c:921
+#: ../src/gpk-update-viewer.c:915
msgid "Issued"
msgstr ""
#. TRANSLATORS: this is the package version
-#: ../src/gpk-update-viewer.c:935
+#: ../src/gpk-update-viewer.c:929
msgid "New version"
msgstr ""
#. TRANSLATORS: this is a list of packages that are updated
-#: ../src/gpk-update-viewer.c:942
+#: ../src/gpk-update-viewer.c:936
msgid "Updates"
msgstr ""
#. TRANSLATORS: this is a list of packages that are obsoleted
-#: ../src/gpk-update-viewer.c:950
+#: ../src/gpk-update-viewer.c:944
msgid "Obsoletes"
msgstr ""
#. TRANSLATORS: this is the repository the package has come from
-#: ../src/gpk-update-viewer.c:955
+#: ../src/gpk-update-viewer.c:949
msgid "Repository"
msgstr ""
#. TRANSLATORS: this is the package description
-#: ../src/gpk-update-viewer.c:961
+#: ../src/gpk-update-viewer.c:955
msgid "Description"
msgstr ""
#. TRANSLATORS: this is a list of CVE (security) URLs
-#: ../src/gpk-update-viewer.c:968
+#: ../src/gpk-update-viewer.c:962
msgid "Changes"
msgstr ""
#. TRANSLATORS: this is a list of bugzilla URLs
-#: ../src/gpk-update-viewer.c:978
+#: ../src/gpk-update-viewer.c:972
msgid "Bugzilla"
msgstr ""
#. TRANSLATORS: this is a list of CVE (security) URLs
-#: ../src/gpk-update-viewer.c:982
+#: ../src/gpk-update-viewer.c:976
msgid "CVE"
msgstr ""
#. TRANSLATORS: this is a notice a restart might be required
-#: ../src/gpk-update-viewer.c:990
+#: ../src/gpk-update-viewer.c:984
msgid "Notice"
msgstr ""
#. TRANSLATORS: a column that has how serious the update is
-#: ../src/gpk-update-viewer.c:1076
+#: ../src/gpk-update-viewer.c:1070
msgid "Severity"
msgstr ""
#. TRANSLATORS: a column that has name of the package that will be updated
-#: ../src/gpk-update-viewer.c:1084
+#: ../src/gpk-update-viewer.c:1078
msgid "Software"
msgstr ""
#. TRANSLATORS: less than 60 seconds, a short time
-#: ../src/gpk-update-viewer.c:1247
+#: ../src/gpk-update-viewer.c:1241
msgid "Less than a minute ago"
msgstr ""
-#: ../src/gpk-update-viewer.c:1249
+#: ../src/gpk-update-viewer.c:1243
msgid "Less than an hour ago"
msgstr ""
-#: ../src/gpk-update-viewer.c:1251
+#: ../src/gpk-update-viewer.c:1245
msgid "A few hours ago"
msgstr ""
-#: ../src/gpk-update-viewer.c:1253
+#: ../src/gpk-update-viewer.c:1247
msgid "A few days ago"
msgstr ""
-#: ../src/gpk-update-viewer.c:1254
+#: ../src/gpk-update-viewer.c:1248
msgid "Over a week ago"
msgstr ""
#. TRANSLATORS: some updates the user selected could not be installed
-#: ../src/gpk-update-viewer.c:1358
+#: ../src/gpk-update-viewer.c:1352
msgid "Some updates were not installed"
msgstr ""
#. TRANSLATORS: everything updates okay
-#: ../src/gpk-update-viewer.c:1368
+#: ../src/gpk-update-viewer.c:1362
msgid "System update completed"
msgstr ""
#. TRANSLATORS: either this current user, or another user is already updating the system
-#: ../src/gpk-update-viewer.c:1504
+#: ../src/gpk-update-viewer.c:1498
msgid "A system update is already in progress"
msgstr ""
#. TRANSLATORS: right click menu, select all the updates
-#: ../src/gpk-update-viewer.c:1652
+#: ../src/gpk-update-viewer.c:1646
msgid "Select all"
msgstr ""
#. TRANSLATORS: right click menu, unselect all the updates
-#: ../src/gpk-update-viewer.c:1660
+#: ../src/gpk-update-viewer.c:1654
msgid "Unselect all"
msgstr ""
#. TRANSLATORS: right click option, ignore this package name, not currently used
-#: ../src/gpk-update-viewer.c:1667
+#: ../src/gpk-update-viewer.c:1661
msgid "Ignore this package"
msgstr ""
#. TRANSLATORS: button label, refresh the package lists
-#: ../src/gpk-update-viewer.c:1798
+#: ../src/gpk-update-viewer.c:1792
msgid "Refresh"
msgstr ""
#. TRANSLATORS: button tooltip
-#: ../src/gpk-update-viewer.c:1800
+#: ../src/gpk-update-viewer.c:1794
msgid ""
"Refreshing is not normally required but will retrieve the latest application "
"and update lists"
msgstr ""
#. TRANSLATORS: button label
-#: ../src/gpk-update-viewer.c:1809
+#: ../src/gpk-update-viewer.c:1803
msgid "_Restart computer now"
msgstr ""
#. TRANSLATORS: button label, apply all pending updates the user has selected
-#: ../src/gpk-update-viewer.c:1825
+#: ../src/gpk-update-viewer.c:1819
msgid "_Apply Updates"
msgstr ""
#. TRANSLATORS: button tooltip
-#: ../src/gpk-update-viewer.c:1827
+#: ../src/gpk-update-viewer.c:1821
msgid "Apply the selected updates"
msgstr ""
#. TRANSLATORS: button label, update all packages pending
-#: ../src/gpk-update-viewer.c:1841
+#: ../src/gpk-update-viewer.c:1835
msgid "_Update System"
msgstr ""
#. TRANSLATORS: button tooltip
-#: ../src/gpk-update-viewer.c:1843
+#: ../src/gpk-update-viewer.c:1837
msgid "Apply all updates"
msgstr ""
#. TRANSLATORS: tooltip on the review button
-#: ../src/gpk-update-viewer.c:2024
+#: ../src/gpk-update-viewer.c:2018
msgid "Review the update list"
msgstr ""
#. TRANSLATORS: tooltip on the back button (from the detailed view)
#. TRANSLATORS: tooltip on the back button (from finished view)
-#: ../src/gpk-update-viewer.c:2030 ../src/gpk-update-viewer.c:2036
+#: ../src/gpk-update-viewer.c:2024 ../src/gpk-update-viewer.c:2030
msgid "Back to overview"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-panel-2.0.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-panel-2.0.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-panel-2.0.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:37+0100\n"
+"POT-Creation-Date: 2015-05-06 20:21+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -44,7 +44,7 @@
#: ../applets/wncklet/GNOME_WindowMenuApplet.xml.h:1
#: ../applets/wncklet/GNOME_WorkspaceSwitcherApplet.xml.h:2
#: ../gnome-panel/drawer.c:601 ../gnome-panel/panel-action-button.c:710
-#: ../gnome-panel/panel-context-menu.c:285 ../gnome-panel/panel-menu-bar.c:419
+#: ../gnome-panel/panel-context-menu.c:285 ../gnome-panel/panel-menu-bar.c:345
#: ../gnome-panel/panel-menu-button.c:664
msgid "_Help"
msgstr ""
@@ -68,7 +68,7 @@
msgstr ""
#: ../applets/clock/GNOME_ClockApplet_Factory.server.in.in.h:3
-#: ../applets/clock/clock.c:3734
+#: ../applets/clock/clock.c:3733
msgid "Clock"
msgstr ""
@@ -254,48 +254,48 @@
msgid "Failed to set the system time"
msgstr ""
-#: ../applets/clock/clock.c:2767
+#: ../applets/clock/clock.c:2766
msgid "Custom format"
msgstr ""
-#: ../applets/clock/clock.c:3225
+#: ../applets/clock/clock.c:3224
msgid "Choose Location"
msgstr ""
-#: ../applets/clock/clock.c:3300
+#: ../applets/clock/clock.c:3299
msgid "Edit Location"
msgstr ""
-#: ../applets/clock/clock.c:3446
+#: ../applets/clock/clock.c:3445
msgid "City Name"
msgstr ""
-#: ../applets/clock/clock.c:3450
+#: ../applets/clock/clock.c:3449
msgid "City Time Zone"
msgstr ""
-#: ../applets/clock/clock.c:3630
+#: ../applets/clock/clock.c:3629
msgid "24 hour"
msgstr ""
-#: ../applets/clock/clock.c:3631
+#: ../applets/clock/clock.c:3630
msgid "UNIX time"
msgstr ""
-#: ../applets/clock/clock.c:3632
+#: ../applets/clock/clock.c:3631
msgid "Internet time"
msgstr ""
-#: ../applets/clock/clock.c:3640
+#: ../applets/clock/clock.c:3639
msgid "Custom _format:"
msgstr ""
-#: ../applets/clock/clock.c:3737
+#: ../applets/clock/clock.c:3736
msgid "The Clock displays the current time and date"
msgstr ""
#. Translator credits
-#: ../applets/clock/clock.c:3740 ../applets/fish/fish.c:623
+#: ../applets/clock/clock.c:3739 ../applets/fish/fish.c:623
#: ../applets/notification_area/main.c:155
#: ../applets/wncklet/showdesktop.c:531 ../applets/wncklet/window-list.c:606
#: ../applets/wncklet/window-menu.c:79
@@ -946,7 +946,7 @@
msgid "Area where notification icons appear"
msgstr ""
-#: ../applets/notification_area/main.c:299
+#: ../applets/notification_area/main.c:261
msgid "Panel Notification Area"
msgstr ""
@@ -1232,7 +1232,7 @@
#. FIXME: http://bugzilla.gnome.org/show_bug.cgi?id=165132
#: ../gnome-panel/libpanel-util/panel-error.c:82
#: ../gnome-panel/panel-applet-frame.c:1000
-#: ../gnome-panel/panel-applet-frame.c:1110
+#: ../gnome-panel/panel-applet-frame.c:1088
msgid "Error"
msgstr ""
@@ -1522,12 +1522,12 @@
msgid "Copy a launcher from the applications menu"
msgstr ""
-#: ../gnome-panel/panel-addto.c:142
-msgid "Traditional Main Menu"
+#: ../gnome-panel/panel-addto.c:142 ../gnome-panel/panel-menu-button.c:1082
+msgid "Main Menu"
msgstr ""
#: ../gnome-panel/panel-addto.c:143
-msgid "The traditional GNOME menu"
+msgid "The main GNOME menu"
msgstr ""
#: ../gnome-panel/panel-addto.c:153
@@ -1611,16 +1611,16 @@
msgid "_Reload"
msgstr ""
-#: ../gnome-panel/panel-applet-frame.c:1073
+#: ../gnome-panel/panel-applet-frame.c:1051
#, c-format
msgid "The panel encountered a problem while loading \"%s\"."
msgstr ""
-#: ../gnome-panel/panel-applet-frame.c:1089
+#: ../gnome-panel/panel-applet-frame.c:1067
msgid "Do you want to delete the applet from your configuration?"
msgstr ""
-#: ../gnome-panel/panel-applet-frame.c:1164
+#: ../gnome-panel/panel-applet-frame.c:1141
msgid "Unable to obtain AppletShell interface from control\n"
msgstr ""
@@ -1939,18 +1939,14 @@
msgid "Change desktop appearance and behavior, get help, or log out"
msgstr ""
-#: ../gnome-panel/panel-menu-bar.c:206
+#: ../gnome-panel/panel-menu-bar.c:147
msgid "Applications"
msgstr ""
-#: ../gnome-panel/panel-menu-bar.c:427 ../gnome-panel/panel-menu-button.c:669
+#: ../gnome-panel/panel-menu-bar.c:353 ../gnome-panel/panel-menu-button.c:669
msgid "_Edit Menus"
msgstr ""
-#: ../gnome-panel/panel-menu-button.c:1082
-msgid "Main Menu"
-msgstr ""
-
#: ../gnome-panel/panel-menu-items.c:439
msgid "Bookmarks"
msgstr ""
@@ -2237,7 +2233,7 @@
msgstr ""
#: ../gnome-panel/panel-properties-dialog.c:1067
-#: ../gnome-panel/panel-run-dialog.c:2185
+#: ../gnome-panel/panel-run-dialog.c:2019
#, c-format
msgid "Unable to load file '%s': %s."
msgstr ""
@@ -2348,78 +2344,73 @@
msgid "Rotate image when panel is _vertical"
msgstr ""
-#: ../gnome-panel/panel-recent.c:54
+#: ../gnome-panel/panel-recent.c:78 ../gnome-panel/panel-recent.c:88
#, c-format
-msgid "%s does not exist."
-msgstr ""
-
-#: ../gnome-panel/panel-recent.c:94 ../gnome-panel/panel-recent.c:104
-#, c-format
msgid "Could not open recently used document \"%s\""
msgstr ""
-#: ../gnome-panel/panel-recent.c:106
+#: ../gnome-panel/panel-recent.c:90
#, c-format
msgid "An unknown error occurred while trying to open \"%s\"."
msgstr ""
-#: ../gnome-panel/panel-recent.c:163
+#: ../gnome-panel/panel-recent.c:147
msgid "Clear the Recent Documents list?"
msgstr ""
-#: ../gnome-panel/panel-recent.c:165
+#: ../gnome-panel/panel-recent.c:149
msgid ""
"If you clear the Recent Documents list, you clear the following:\n"
"• All items from the Places → Recent Documents menu item.\n"
"• All items from the recent documents list in all applications."
msgstr ""
-#: ../gnome-panel/panel-recent.c:177
+#: ../gnome-panel/panel-recent.c:161
msgid "Clear Recent Documents"
msgstr ""
-#: ../gnome-panel/panel-recent.c:230
+#: ../gnome-panel/panel-recent.c:196
msgid "Recent Documents"
msgstr ""
-#: ../gnome-panel/panel-recent.c:274
+#: ../gnome-panel/panel-recent.c:235
msgid "Clear Recent Documents..."
msgstr ""
-#: ../gnome-panel/panel-recent.c:276
+#: ../gnome-panel/panel-recent.c:237
msgid "Clear all items from the recent documents list"
msgstr ""
-#: ../gnome-panel/panel-run-dialog.c:401
+#: ../gnome-panel/panel-run-dialog.c:391
#, c-format
msgid "Could not run command '%s'"
msgstr ""
-#: ../gnome-panel/panel-run-dialog.c:454
+#: ../gnome-panel/panel-run-dialog.c:444
#, c-format
msgid "Could not convert '%s' from UTF-8"
msgstr ""
-#: ../gnome-panel/panel-run-dialog.c:1422
+#: ../gnome-panel/panel-run-dialog.c:1256
msgid "Choose a file to append to the command..."
msgstr ""
-#: ../gnome-panel/panel-run-dialog.c:1800
+#: ../gnome-panel/panel-run-dialog.c:1634
#: ../gnome-panel/panel-run-dialog.ui.h:9
msgid "Select an application to view its description."
msgstr ""
-#: ../gnome-panel/panel-run-dialog.c:1838
+#: ../gnome-panel/panel-run-dialog.c:1672
#, c-format
msgid "Will run command: '%s'"
msgstr ""
-#: ../gnome-panel/panel-run-dialog.c:1871
+#: ../gnome-panel/panel-run-dialog.c:1705
#, c-format
msgid "URI list dropped on run dialog had wrong format (%d) or length (%d)\n"
msgstr ""
-#: ../gnome-panel/panel-run-dialog.c:2190
+#: ../gnome-panel/panel-run-dialog.c:2024
msgid "Could not display run dialog"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-pilot-subset.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-pilot-subset.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-pilot-subset.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -1,4 +1,4 @@
-# Subset of gnome-pilot strings needed for desktop integration.
+# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-18 20:49+0200\n"
+"POT-Creation-Date: 2015-05-06 18:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -29,18 +29,1548 @@
msgid "Utility"
msgstr ""
+#: ../applet/pilot-applet.glade.h:1
+msgid "Choose PDA"
+msgstr ""
+
+#: ../applet/pilot-applet.glade.h:2
+msgid "gnome-pilot progress"
+msgstr ""
+
+#: ../applet/pilot-applet.glade.h:3
+msgid "Restore PDA"
+msgstr ""
+
+#: ../applet/pilot-applet.glade.h:4
+msgid "_Directory"
+msgstr ""
+
+#: ../applet/pilot-applet.glade.h:5
+msgid "_PDA ID"
+msgstr ""
+
+#: ../applet/pilot-applet.glade.h:6
+msgid "_Sync cradle"
+msgstr ""
+
+#: ../applet/pilot-applet.glade.h:7 ../capplet/gpilotd-capplet.glade.h:24
+msgid "*"
+msgstr ""
+
+#: ../applet/pilot-applet.glade.h:8
+msgid "GNOME PilotSync Properties"
+msgstr ""
+
+#: ../applet/pilot-applet.glade.h:9
+msgid "_Execute when clicked"
+msgstr ""
+
+#: ../applet/pilot-applet.glade.h:10
+msgid "_Display notices"
+msgstr ""
+
+#: ../applet/pilot.c:168
+#, c-format
+msgid "%s Synchronizing"
+msgstr ""
+
+#: ../applet/pilot.c:173
+msgid "Database %v of %u"
+msgstr ""
+
+#: ../applet/pilot.c:267
+#, c-format
+msgid "Request %ld has been completed\n"
+msgstr ""
+
+#: ../applet/pilot.c:289
+#, c-format
+msgid "%s Synchronizing : %s"
+msgstr ""
+
+#: ../applet/pilot.c:294
+#, c-format
+msgid "%s: Started\n"
+msgstr ""
+
+#: ../applet/pilot.c:309
+#, c-format
+msgid "%s Finished : %s"
+msgstr ""
+
+#: ../applet/pilot.c:314
+#, c-format
+msgid "%s: Ended\n"
+msgstr ""
+
+#: ../applet/pilot.c:340
+msgid "%v of %u records"
+msgstr ""
+
+#: ../applet/pilot.c:419
+msgid ""
+"PDA is currently synchronizing.\n"
+"Please wait for it to finish."
+msgstr ""
+
+#: ../applet/pilot.c:422
+msgid "Not connected. Please restart daemon."
+msgstr ""
+
+#: ../applet/pilot.c:424
+msgid ""
+"Not connected to gpilotd.\n"
+"Please restart daemon."
+msgstr ""
+
+#: ../applet/pilot.c:442
+msgid "gnome-pilot applet"
+msgstr ""
+
+#: ../applet/pilot.c:444
+msgid "Copyright 2000-2006 Free Software Foundation, Inc."
+msgstr ""
+
+#: ../applet/pilot.c:445
+msgid "A PalmOS PDA monitor.\n"
+msgstr ""
+
+#: ../applet/pilot.c:541 ../applet/pilot.c:567
+#, c-format
+msgid "There was an error displaying help: %s"
+msgstr ""
+
+#: ../applet/pilot.c:605
+#, c-format
+msgid "cancelling %d"
+msgstr ""
+
+#: ../applet/pilot.c:657
+#, c-format
+msgid "Restoring %s"
+msgstr ""
+
+#: ../applet/pilot.c:699
+msgid "No directory to restore from."
+msgstr ""
+
+#: ../applet/pilot.c:707
+msgid ""
+"Press synchronize on the cradle to restore\n"
+" or cancel the operation."
+msgstr ""
+
+#: ../applet/pilot.c:716
+msgid "Restore request failed"
+msgstr ""
+
+#: ../applet/pilot.c:754
+msgid ""
+"PDA sync is currently in progress.\n"
+"Are you sure you want to restart daemon?"
+msgstr ""
+
+#: ../applet/pilot.c:764 ../applet/pilot.c:1340
+msgid "Trying to connect to the GnomePilot Daemon"
+msgstr ""
+
+#: ../applet/pilot.c:780
+msgid "There's no last sync on record."
+msgstr ""
+
+#. ensure the label strings are extracted by intltool. This list of
+#. * strings should match the list in the menu_template below
+#.
+#: ../applet/pilot.c:803
+msgid "Restore..."
+msgstr ""
+
+#: ../applet/pilot.c:803
+msgid "Restart"
+msgstr ""
+
+#: ../applet/pilot.c:803
+msgid "Last log..."
+msgstr ""
+
+#: ../applet/pilot.c:804
+msgid "Preferences..."
+msgstr ""
+
+#: ../applet/pilot.c:804
+msgid "Help"
+msgstr ""
+
+#: ../applet/pilot.c:804
+msgid "About"
+msgstr ""
+
+#: ../applet/pilot.c:826
+msgid "Continue"
+msgstr ""
+
+#: ../applet/pilot.c:828
+msgid "Pause Daemon"
+msgstr ""
+
+#: ../applet/pilot.c:848
+msgid "Daemon paused..."
+msgstr ""
+
+#: ../applet/pilot.c:855 ../applet/pilot.c:1009
+msgid "Ready to synchronize"
+msgstr ""
+
+#: ../applet/pilot.c:990
+msgid "Not connected. Restart daemon to reconnect"
+msgstr ""
+
+#: ../applet/pilot.c:1174
+#, c-format
+msgid "Execution of %s failed"
+msgstr ""
+
+#.
+#. if (strstr (file_type (ptr),"text")) {
+#. if (file_size (ptr)>properties.text_limit)
+#. g_message ("installing textfile as Doc (not implemented)");
+#. else
+#. g_message ("installing textfile as Memo (not implemented)");
+#. }
+#.
+#: ../applet/pilot.c:1300
+#, c-format
+msgid "installing \"%s\" to \"%s\""
+msgstr ""
+
+#: ../applet/pilot.c:1310
+msgid "unknown dnd type"
+msgstr ""
+
+#: ../applet/pilot.c:1318
+msgid "destroy gpilot-applet"
+msgstr ""
+
+#: ../applet/pilot.c:1403
+msgid "Cannot find pilot-applet.glade"
+msgstr ""
+
+#: ../applet/pilot.schemas.in.h:1
+msgid "Display notices in popup windows"
+msgstr ""
+
+#: ../applet/pilot.schemas.in.h:2
+msgid "Command to execute when the applet is clicked"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:215 ../capplet/gpilotd-capplet.glade.h:1
+msgid "gnome-pilot Settings"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:383 ../capplet/gnome-pilot-capplet.c:463
+msgid "Name"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:385 ../utils/gpilotd-client.c:44
+msgid "ID"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:387
+msgid "Owner"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:465
+msgid "Type"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:571
+msgid "Conduit"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:573
+msgid "Sync Action"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:783
+#, c-format
+msgid "Are you sure you want to delete PDA `%s'?"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:807
+msgid "_Edit this PDA..."
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:808
+msgid "Edit the currently selected PDA"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:810
+msgid "_Delete this PDA"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:811
+msgid "Delete the currently selected PDA"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:944
+#, c-format
+msgid "Are you sure you want to delete %s device?"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:965
+msgid "_Edit this device..."
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:966
+msgid "Edit the currently selected device"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:968
+msgid "_Delete this device"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:969
+msgid "Delete the currently selected device"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:1131
+#, c-format
+msgid "Unable to instantiate %s conduit."
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:1171
+msgid "_Enable this conduit"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:1172
+msgid "Disable the currently selected conduit"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:1174
+msgid "_Disable this conduit"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:1175
+msgid "Enable the currently selected conduit"
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:1180 ../capplet/gpilotd-capplet.glade.h:11
+msgid "_Settings..."
+msgstr ""
+
+#: ../capplet/gnome-pilot-capplet.c:1181
+msgid "Modify the currently selected conduit's settings"
+msgstr ""
+
+#. < 0) {
+#: ../capplet/gnome-pilot-cdialog.c:210
+msgid "Unable to create PDA settings window. Incorrect conduit configuration."
+msgstr ""
+
+#: ../capplet/gnome-pilot-druid.c:488
+msgid ""
+"Setup did not complete and settings will not\n"
+"be saved. Are you sure you want to quit?"
+msgstr ""
+
+#: ../capplet/gnome-pilot-druid.c:611
+#, c-format
+msgid ""
+"About to send the following data to the PDA.\n"
+"Owner Name: %s\n"
+"PDA ID: %d\n"
+"Please put PDA in %s (%s) and press HotSync button."
+msgstr ""
+
+#: ../capplet/gnome-pilot-druid.c:636
+#, c-format
+msgid ""
+"About to retrieve Owner Name and ID from the PDA.\n"
+"Please put PDA in %s (%s) and press HotSync button."
+msgstr ""
+
+#: ../capplet/gnome-pilot-druid.c:652
+msgid "Failed sending request to gpilotd"
+msgstr ""
+
+#: ../capplet/gnome-pilot-druid.c:803
+#, c-format
+msgid ""
+"Successfully retrieved Owner Name and ID from PDA.\n"
+"Owner Name: %s\n"
+"PDA ID: %d"
+msgstr ""
+
+#: ../capplet/gnome-pilot-pdialog.c:432
+#, c-format
+msgid ""
+"Please put PDA in %s (%s) and press HotSync button or cancel the operation."
+msgstr ""
+
+#: ../capplet/gnome-pilot-pdialog.c:467
+msgid "The request to get PDA ID failed"
+msgstr ""
+
+#: ../capplet/gnome-pilot-pdialog.c:511
+msgid "The request to set PDA ID failed"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:2
+msgid "_Add..."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:3
+msgid "_Edit..."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:4
+msgid "_Delete"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:5
+msgid "_PDAs"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:6
+msgid "De_vices"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:7
+msgid "P_DA:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:8
+msgid "Owner:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:9
+msgid "_Enable"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:10
+msgid "D_isable"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:12
+msgid "Description:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:13
+msgid "C_onduits"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:14
+msgid "Welcome to gnome-pilot!"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:15
+msgid ""
+"You seem to be running gnome-pilot for the first time.\n"
+"The following steps will setup gnome-pilot for syncing. \n"
+"You can always change any options later from\n"
+"PilotLink panel in Gnome Control Center.\n"
+"\n"
+"Press 'Forward' to continue.\n"
+"Press 'Cancel' to exit."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:22
+msgid "Device Settings"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:23
+msgid "Port"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:25
+msgid "/dev/pilot"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:26
+msgid "/dev/ttyUSB0"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:27
+msgid "/dev/ttyUSB1"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:28
+msgid "/dev/ttyS0"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:29
+msgid "/dev/ttyS1"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:30
+msgid "_Name:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:31
+msgid "_Device:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:32
+msgid "S_peed:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:33
+msgid "_Type:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:34
+msgid "_Serial"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:35
+msgid "_USB"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:36
+msgid "_IrDA"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:37
+msgid "Net_work"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:38
+msgid "_Bluetooth"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:39
+msgid "Ti_meout:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:40
+msgid "PDA Identification"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:41
+msgid ""
+"Choose this option if you have used sync software before, even on another "
+"computer"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:42
+msgid "_Yes, I've used sync software with this PDA before."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:43
+msgid "_No, I've never used sync software with this PDA before."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:44
+msgid "Enter Owner Name you want stored on your PDA"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:45
+msgid ""
+"This integer ID identifies your PDA and must be unique between different "
+"PDAs that you use."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:46
+msgid "_PDA ID:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:47
+msgid "_Owner:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:48
+msgid "Owner Name and ID to set on the PDA"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:49
+msgid "Initial Sync"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:50
+msgid "PDA Attributes"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:51
+msgid "The name for your PDA. It is only used for identification."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:52
+msgid "Set the root directory for all PDA files to be stored."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:53
+msgid "CP1252"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:54
+msgid "GB18030"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:55
+msgid "GBK"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:56
+msgid "BIG5"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:57
+msgid "_Local folder:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:58
+msgid "_Name of PDA:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:59
+msgid "C_harset of PDA:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:60
+msgid "Success"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:61
+msgid ""
+"Congratulations, gnome-pilot is configured!\n"
+"\n"
+"You can change gnome-pilot settings at any time from \n"
+"PilotLink and Conduits tabs in control center.\n"
+"\n"
+"You can monitor syncing of gnome-pilot by adding \n"
+"PilotLink applet to your panel."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:68
+msgid "Conduit Settings"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:69
+msgid "<b>Conduit Actions</b>"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:70
+msgid "_Action:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:71
+msgid "_One time action:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:72 ../capplet/util.c:115
+msgid "None"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:73 ../capplet/util.c:74
+#: ../capplet/util.c:438
+msgid "Disabled"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:74
+msgid "<b>Conduit Settings</b>"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:75
+msgid "Choose Device"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:76
+msgid ""
+"Which device should be used for this "
+"operation?</span>\n"
+"\n"
+"Since you have more than one connection device defined for this computer you "
+"need to identify which one is to be used for this operation."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:79
+msgid "Device:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:80
+msgid "PDA Settings"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:81
+msgid "O_wner:"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:82
+msgid "<b>PDA Identification</b>"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:83
+msgid "Get the Owner's name and ID from the PDA"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:84
+msgid "_Get from PDA"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:85
+msgid ""
+"Send the Owner's name and ID to the PDA, overwriting any existing identity"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:86
+msgid "_Send to PDA"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:87
+msgid "<b>PDA Attributes</b>"
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:88
+msgid "Set the character set used on your PDA."
+msgstr ""
+
+#: ../capplet/gpilotd-capplet.glade.h:89
+msgid "I_rDA"
+msgstr ""
+
+#: ../capplet/gpilotd-control-applet.c:81
+msgid "Start druid only"
+msgstr ""
+
+#: ../capplet/gpilotd-control-applet.c:103
+msgid "Error initializing gpilotd capplet"
+msgstr ""
+
+#: ../capplet/gpilotd-control-applet.c:114
+#: ../capplet/gpilotd-control-applet.c:115
+msgid "Error loading PDA state, aborting"
+msgstr ""
+
+#: ../capplet/gpilotd-control-applet.c:122
+#: ../capplet/gpilotd-control-applet.c:123
+msgid "Cannot connect to the GnomePilot Daemon"
+msgstr ""
+
+#: ../capplet/gpilotd-control-applet.c:132
+msgid "Cannot run druid if PDAs or devices already configured"
+msgstr ""
+
#: ../capplet/gpilotd-control-applet.desktop.in.in.h:1
-msgid "Configure PalmOS devices"
+msgid "PalmOS Devices"
msgstr ""
#: ../capplet/gpilotd-control-applet.desktop.in.in.h:2
-msgid "PalmOS Devices"
+msgid "Configure PalmOS devices"
msgstr ""
+#: ../capplet/util.c:81 ../capplet/util.c:440
+msgid "Enabled"
+msgstr ""
+
+#: ../capplet/util.c:238
+msgid "You must have at least one device setup"
+msgstr ""
+
+#: ../capplet/util.c:411
+msgid "Synchronize"
+msgstr ""
+
+#: ../capplet/util.c:412
+msgid "Copy from PDA"
+msgstr ""
+
+#: ../capplet/util.c:413
+msgid "Copy to PDA"
+msgstr ""
+
+#: ../capplet/util.c:414
+msgid "Merge from PDA"
+msgstr ""
+
+#: ../capplet/util.c:415
+msgid "Merge to PDA"
+msgstr ""
+
+#: ../capplet/util.c:418
+msgid "Use conduit settings"
+msgstr ""
+
+#: ../capplet/util.c:426
+msgid "USB"
+msgstr ""
+
+#: ../capplet/util.c:427
+msgid "IrDA"
+msgstr ""
+
+#: ../capplet/util.c:428
+msgid "Network"
+msgstr ""
+
+#: ../capplet/util.c:429
+msgid "Bluetooth"
+msgstr ""
+
+#: ../capplet/util.c:430
+msgid "Serial"
+msgstr ""
+
+#: ../capplet/util.c:478
+msgid ""
+"The specified base directory exists but has the wrong permissions.\n"
+"Please fix or choose another directory"
+msgstr ""
+
+#: ../capplet/util.c:483
+msgid ""
+"The specified base directory exists but is not a directory.\n"
+"Please make it a directory or choose another directory"
+msgstr ""
+
+#: ../capplet/util.c:490
+msgid ""
+"It wasn't possible to create the specified base directory.\n"
+"Please verify the permitions on the specified path or choose another "
+"directory"
+msgstr ""
+
+#: ../capplet/util.c:495
+msgid ""
+"The path specified for the base directory is invalid.\n"
+"Please choose another directory"
+msgstr ""
+
+#: ../capplet/util.c:523
+#, c-format
+msgid ""
+"`%s' is not a valid character set identifier. Please enter a valid "
+"identifier or select from the available options."
+msgstr ""
+
+#: ../capplet/util.c:647
+msgid "Device 'usb:' is only valid for devices of type USB"
+msgstr ""
+
+#: ../capplet/util.c:658
+msgid "Read/Write permissions failed on"
+msgstr ""
+
+#: ../capplet/util.c:660
+msgid "Check the permissions on the device and retry"
+msgstr ""
+
+#: ../capplet/util.c:675 ../gpilotd/gpilotd.c:1332
+#, c-format
+msgid ""
+"Failed to find directory %s or read file %s. Check that usbfs or sysfs is "
+"mounted."
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:243
+msgid "Checking for removed databases"
+msgstr ""
+
+#. I18N note: this is printed when renaming a file %s
+#: ../conduits/backup/backup_conduit.c:250
+#, c-format
+msgid "Renaming %s"
+msgstr ""
+
+#. I18N note: this message follow a "Renaming %s". The
+#. %s is a file name
+#: ../conduits/backup/backup_conduit.c:257
+#, c-format
+msgid "to %s"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:435
+#: ../conduits/backup/backup_conduit.c:439
+#, c-format
+msgid "%s not modified since last sync"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:451
+#: ../conduits/backup/backup_conduit.c:453
+#, c-format
+msgid "Making backup of %s"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:460
+#: ../conduits/backup/backup_conduit.c:462
+#, c-format
+msgid "Could not create backup file %s"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:736
+msgid "Collecting restore information..."
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:860
+msgid "_Backup directory:"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:873
+msgid "Backup directory"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:875
+msgid "O_nly backup changed bases"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:885
+msgid "Only backup changed bases"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:887
+msgid "_Remove local base if deleted on pilot"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:897
+msgid "Remove local base if deleted on pilot"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:899
+msgid "# of old backups to _keep"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:910
+msgid "# of old backups to keep"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:948
+msgid ""
+"The specified backup directory exists but has the wrong permissions.\n"
+"Please fix or choose another directory"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:953
+msgid ""
+"The specified backup directory exists but is not a directory.\n"
+"Please make it a directory or choose another directory"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:960
+msgid ""
+"It wasn't possible to create the specified backup directory.\n"
+"Please verify the permissions on the specified path or choose another "
+"directory"
+msgstr ""
+
+#: ../conduits/backup/backup_conduit.c:965
+msgid ""
+"The path specified for the backup directory is invalid.\n"
+"Please choose another directory"
+msgstr ""
+
+#: ../conduits/file/file_conduit.c:243 ../conduits/file/file_conduit.c:253
+#, c-format
+msgid "Install of %s failed"
+msgstr ""
+
+#: ../conduits/file/file_conduit.c:290
+#, c-format
+msgid "Installing %s from %s..."
+msgstr ""
+
+#: ../conduits/file/file_conduit.c:292
+#, c-format
+msgid "Installing %s..."
+msgstr ""
+
+#: ../conduits/file/gpilot_install_file.c:44
+msgid "Install immediately"
+msgstr ""
+
+#: ../conduits/file/gpilot_install_file.c:45
+msgid "Install delayed"
+msgstr ""
+
+#: ../conduits/file/gpilot_install_file.c:46
+msgid "PDA to install to"
+msgstr ""
+
+#: ../conduits/file/gpilot_install_file.c:46
+msgid "PDA"
+msgstr ""
+
+#: ../conduits/file/gpilot_install_file.c:118
+#: ../conduits/file/gpilot_install_file.c:119
+msgid "Unable to get PDA names"
+msgstr ""
+
+#: ../conduits/file/gpilot_install_file.c:158
+msgid "Following files failed :\n"
+msgstr ""
+
+#: ../conduits/file/gpilot_install_file.c:170
+#, c-format
+msgid "Installing to %s:\n"
+msgstr ""
+
+#: ../conduits/file/gpilot_install_file.c:191
+msgid "No files to install"
+msgstr ""
+
+#: ../conduits/file/gpilot_install_file.c:194
+msgid ""
+"Press synchronize on the cradle to install\n"
+" or cancel the operation."
+msgstr ""
+
#: ../gpilotd/GNOME_Pilot_Daemon.server.in.in.h:1
msgid "Gnome-Pilot daemon"
msgstr ""
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:136
+msgid "deleted PDA record modified locally, not deleting\n"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:137
+msgid "deleted local record modified on PDA, not deleting\n"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:138
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:142
+msgid "merge conflict, PDA and local record swapped\n"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:139
+msgid "archive and change conflict, PDA and local record swapped\n"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:140
+msgid "archive and change conflict, local record sent to PDA\n"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:141
+msgid "archive and change conflict, PDA record saved locally\n"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:423
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:498
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:563
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:592
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:621
+msgid "Conduits initialization failed, aborting operation"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:436
+msgid "Unable to delete all records in PDA database, aborting operation."
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:447
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1025
+msgid "Conduit did not return a record"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:504
+msgid "Unable to delete all records in local database, aborting operation."
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-standard-abs.c:1430
+msgid "Error in conduit, newly added record could not be found"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:487
+msgid "Copy to PDA failed!"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:511
+msgid "Copy from PDA failed!"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:535
+msgid "Merge to PDA failed!"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:559
+msgid "Merge from PDA failed!"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-conduit-sync-abs.c:614
+msgid "Synchronization failed!"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:286
+#, c-format
+msgid "Could not open device %s (%s): reason: \"%s\"."
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:290
+#, c-format
+msgid ""
+"GnomePilot could not open device %s (%s).\n"
+"Reason: \"%s\"."
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:449
+#, c-format
+msgid ""
+"Bluetooth Device [%s]: Unable to bind socket: err %d (check pilot-link was "
+"compiled with bluetooth support)"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:459
+#, c-format
+msgid "Device [%s, %s]: Unable to bind socket: err %d"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:539
+#: ../gpilotd/gnome-pilot-structures.c:590
+#: ../gpilotd/gnome-pilot-structures.c:620
+#: ../gpilotd/gnome-pilot-structures.c:648
+msgid "Unknown device type"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:663
+msgid "Number of devices is configured to 0"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:665
+msgid ""
+"No devices configured.\n"
+"Please run gpilotd-control-applet (use gnomecc)\n"
+"to configure gnome-pilot."
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:686
+msgid "No accessible devices available"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:701
+msgid "Number of PDAs is configured to 0"
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:703
+msgid ""
+"No PDAs configured.\n"
+"Please run gpilotd-control-applet (use gnomecc)\n"
+"to configure gnome-pilot."
+msgstr ""
+
+#: ../gpilotd/gnome-pilot-structures.c:764 ../gpilotd/gpilotd.c:687
+#, c-format
+msgid "No pilot_charset specified. Using `%s'."
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:236
+msgid "Unable to bind to PDA"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:374
+#, c-format
+msgid ""
+"Failed to connect using device `%s', on port `%s'. Check your "
+"configuration, as you requested new-style libusb `usb:' syncing, but have "
+"the old-style `visor' kernel module loaded. You may need to select a "
+"`ttyUSB...' device."
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:389
+#, c-format
+msgid ""
+"Failed to connect using device `%s', on port `%s'. Check your "
+"configuration, as you requested old-style usbserial `ttyUSB' syncing, but do "
+"not have the usbserial `visor' kernel module loaded. You may need to select "
+"a `usb:' device."
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:480
+#, c-format
+msgid "Unknown PDA, no userID/username match %ld"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:487
+msgid "Use gnomecc to configure PDA"
+msgstr ""
+
+#. FIXME: here we should offer to create a profile for the pilot,
+#. bug # 8218
+#: ../gpilotd/gpilotd.c:492
+#, c-format
+msgid ""
+"Unknown PDA - no PDA matches ID %ld\n"
+"Use gnomecc to configure gnome-pilot"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:516
+#, c-format
+msgid "Device %s has %d events"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:529
+msgid "Setting userinfo..."
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:534
+msgid "Sync continues"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:553
+msgid "Getting userinfo..."
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:615
+msgid "NetSync request detected, synchronizing PDA"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:617
+msgid "Bluetooth request detected, synchronizing PDA"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:619
+msgid "HotSync button pressed, synchronizing PDA"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:621
+#, c-format
+msgid "PDA ID is %ld, name is %s, owner is %s"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:631
+#, c-format
+msgid "On host %s\n"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:633
+#, c-format
+msgid "On host %d\n"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:652
+msgid "Synchronization ended"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:655
+msgid "Synchronization ended early"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:701
+#, c-format
+msgid "`%s' is not a recognised iconv charset, using `%s' instead."
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:724
+#, c-format
+msgid ""
+"The base directory %s is invalid.\n"
+"Please fix it or use gnomecc to choose another directory."
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:737
+#, c-format
+msgid ""
+"Unknown PDA - no PDA matches ID %ld\n"
+"Use gpilotd-control-applet to set PDA's ID"
+msgstr ""
+
+#. no ? drop connection then
+#: ../gpilotd/gpilotd.c:788
+msgid "An error occurred while getting the PDA's system data"
+msgstr ""
+
+#. no ? drop connection then
+#: ../gpilotd/gpilotd.c:797
+msgid "An error occurred while getting the PDA's user data"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:802
+#, c-format
+msgid "Completed events for device %s (%s)"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:863
+#, c-format
+msgid "Woke on %s"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:944
+#, c-format
+msgid "Woke on network: %s"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:1504
+#, c-format
+msgid "Watching %s (network)"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:1506
+#, c-format
+msgid "Watching %s (bluetooth)"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:1508
+#, c-format
+msgid "Watching %s (%s)"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:1522
+msgid "Exiting (caught SIGTERM)..."
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:1531
+msgid "Exiting (caught SIGINT)..."
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:1563
+msgid "Unable to create file installation queue directory"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:1613
+msgid "Shutting down devices"
+msgstr ""
+
+#: ../gpilotd/gpilotd.c:1615
+msgid "Rereading configuration..."
+msgstr ""
+
+#: ../gpilotd/manager.c:269
+msgid "non-backup conduit in backup conduit list"
+msgstr ""
+
+#: ../gpilotd/manager.c:277
+#, c-format
+msgid "%s backed up\n"
+msgstr ""
+
+#: ../gpilotd/manager.c:279
+#, c-format
+msgid "%s backup failed\n"
+msgstr ""
+
+#: ../gpilotd/manager.c:305
+msgid "Collecting synchronization info..."
+msgstr ""
+
+#: ../gpilotd/manager.c:427
+#, c-format
+msgid "Synchronizing %s\n"
+msgstr ""
+
+#: ../gpilotd/manager.c:446
+#, c-format
+msgid "Copy to PDA %s\n"
+msgstr ""
+
+#: ../gpilotd/manager.c:464
+#, c-format
+msgid "Copy from PDA %s\n"
+msgstr ""
+
+#: ../gpilotd/manager.c:482
+#, c-format
+msgid "Merge to PDA %s\n"
+msgstr ""
+
+#: ../gpilotd/manager.c:500
+#, c-format
+msgid "Merge from PDA %s\n"
+msgstr ""
+
+#: ../gpilotd/manager.c:528
+#, c-format
+msgid "Conduit %s's first synchronization..."
+msgstr ""
+
+#: ../gpilotd/manager.c:552
+#, c-format
+msgid "unknown syncing action (%d = %s).\n"
+msgstr ""
+
+#: ../gpilotd/manager.c:678
+#, c-format
+msgid "Instantiating %d conduits..."
+msgstr ""
+
+#: ../gpilotd/manager.c:683 ../gpilotd/manager.c:684
+#, c-format
+msgid "Unknown conduit \"%s\" in configure!"
+msgstr ""
+
+#: ../gpilotd/manager.c:693
+#, c-format
+msgid "Loading conduit \"%s\" failed!"
+msgstr ""
+
+#: ../gpilotd/manager.c:694
+#, c-format
+msgid "Loading conduit \"%s\" failed!\n"
+msgstr ""
+
+#: ../gpilotd/manager.c:783
+#, c-format
+msgid "Setting id/owner to %d/%s..."
+msgstr ""
+
+#. FIXME: remove the bloody request, or the user will get this
+#. message every time
+#: ../gpilotd/manager.c:815
+#, c-format
+msgid "Conduit %s requested, but not found"
+msgstr ""
+
+#: ../gpilotd/manager.c:825
+#, c-format
+msgid "Conduit %s cannot be requested"
+msgstr ""
+
+#: ../gpilotd/orbit_daemon_glue.c:1747
+msgid "(unknown DB)"
+msgstr ""
+
+#: ../gpilotd/queue_io.c:96
+msgid "Error in queue, non-existing entry"
+msgstr ""
+
+#: ../gpilotd/queue_io.c:436
+#, c-format
+msgid "fault: no request found for PDA %d, request %d"
+msgstr ""
+
+#: ../libgpilotdCM/gnome-pilot-conduit-management.gob:686
+msgid "module loading not supported, fatal!"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:39
+msgid "Get System Info"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:40
+msgid "Pause daemon"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:41
+msgid "Unpause daemon"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:42
+msgid "Restart daemon"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:43
+msgid "Set user id and name"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:44
+msgid "ID for the PDA"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:45
+msgid "Install file"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:45
+msgid "FILE"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:46
+msgid "Restore directory"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:46
+msgid "DIRECTORY"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:47
+msgid "Run conduit"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:47 ../utils/gpilotdcm-client.c:27
+msgid "CONDUIT"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:48
+msgid "Username to set"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:48
+msgid "USERNAME"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:49
+msgid "Monitor the specified PDA's actions"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:50
+msgid "Monitor all PDAs"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:51
+msgid "list PDAs by login (all for all pilots)"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:51
+msgid "LOGIN"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:52
+msgid "Specify PDA to operate on (defaults to MyPDA)"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:52
+msgid "PILOTNAME"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:53
+msgid "Specify a cradle to operate on (defaults to Cradle0)"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:53
+msgid "CRADLENAME"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:54
+msgid "List the specified PDA's bases"
+msgstr ""
+
+#: ../utils/gpilotd-client.c:359 ../utils/gpilotdcm-client.c:106
+#, c-format
+msgid ""
+"\n"
+"BEWARE!!\n"
+"This is a tool for certain parts of the gnome-pilot package.\n"
+"Unless you know what you're doing, don't use this tool."
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:26
+msgid "lists available conduits"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:27
+msgid "conduit to operate on"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:28
+msgid "list all attributes"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:29
+msgid "specify PDA to operate on"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:29
+msgid "PDA_ID"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:30
+msgid "list attributes"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:31
+msgid "list available conduits and their state"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:32
+msgid "enable specified conduit"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:33
+msgid "disable specified conduit"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:34
+msgid "enable, and set firstsync to slow"
+msgstr ""
+
+#: ../utils/gpilotdcm-client.c:35
+msgid "instantiate and destroy the conduit"
+msgstr ""
+
#: ../applet/gpilot-applet.desktop.in.h:1
msgid "PilotSync"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-power-manager.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-power-manager.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-power-manager.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:38+0100\n"
+"POT-Creation-Date: 2015-05-06 20:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -672,192 +672,179 @@
msgstr ""
#: ../data/gnome-power-manager.schemas.in.h:109
-msgid ""
-"If an information message should be displayed when returning from idle sleep."
-msgstr ""
-
-#: ../data/gnome-power-manager.schemas.in.h:110
msgid "Whether we should show the axis labels in the statistics window"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:111
+#: ../data/gnome-power-manager.schemas.in.h:110
msgid "Whether we should show the axis labels in the statistics window."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:112
+#: ../data/gnome-power-manager.schemas.in.h:111
msgid "Whether we should show the events in the statistics window"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:113
+#: ../data/gnome-power-manager.schemas.in.h:112
msgid "Whether we should show the events in the statistics window."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:114
+#: ../data/gnome-power-manager.schemas.in.h:113
msgid "Whether we should smooth the data in the graph"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:115
+#: ../data/gnome-power-manager.schemas.in.h:114
msgid "Whether we should smooth the data in the graph."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:116
+#: ../data/gnome-power-manager.schemas.in.h:115
msgid "The default graph type to show in the statistics window"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:117
+#: ../data/gnome-power-manager.schemas.in.h:116
msgid "The default graph type to show in the statistics window."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:118
+#: ../data/gnome-power-manager.schemas.in.h:117
msgid "The maximum time displayed on the graph"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:119
+#: ../data/gnome-power-manager.schemas.in.h:118
msgid "The maximum duration of time displayed on the x-axis of the graph."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:120
+#: ../data/gnome-power-manager.schemas.in.h:119
msgid "Percentage considered low"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:121
+#: ../data/gnome-power-manager.schemas.in.h:120
msgid ""
"The percentage of the battery when it is considered low. Only valid when "
"use_time_for_policy is false."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:122
+#: ../data/gnome-power-manager.schemas.in.h:121
msgid "Percentage considered critical"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:123
+#: ../data/gnome-power-manager.schemas.in.h:122
msgid ""
"The percentage of the battery when it is considered critical. Only valid "
"when use_time_for_policy is false."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:124
+#: ../data/gnome-power-manager.schemas.in.h:123
msgid "Percentage action is taken"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:125
+#: ../data/gnome-power-manager.schemas.in.h:124
msgid ""
"The percentage of the battery when the critical action is performed. Only "
"valid when use_time_for_policy is false."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:126
+#: ../data/gnome-power-manager.schemas.in.h:125
msgid "The time remaining when low"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:127
+#: ../data/gnome-power-manager.schemas.in.h:126
msgid ""
"The time remaining in seconds of the battery when it is considered low. Only "
"valid when use_time_for_policy is true."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:128
+#: ../data/gnome-power-manager.schemas.in.h:127
msgid "The time remaining when critical"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:129
+#: ../data/gnome-power-manager.schemas.in.h:128
msgid ""
"The time remaining in seconds of the battery when it is considered critical. "
"Only valid when use_time_for_policy is true."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:130
+#: ../data/gnome-power-manager.schemas.in.h:129
msgid "The time remaining when action is taken"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:131
+#: ../data/gnome-power-manager.schemas.in.h:130
msgid ""
"The time remaining in seconds of the battery when critical action is taken. "
"Only valid when use_time_for_policy is true."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:132
+#: ../data/gnome-power-manager.schemas.in.h:131
msgid "Sleep timeout computer when on battery"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:133
+#: ../data/gnome-power-manager.schemas.in.h:132
msgid ""
"The amount of time in seconds the computer on battery power needs to be "
"inactive before it goes to sleep."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:134
+#: ../data/gnome-power-manager.schemas.in.h:133
msgid "Sleep timeout computer when on AC"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:135
+#: ../data/gnome-power-manager.schemas.in.h:134
msgid ""
"The amount of time in seconds the computer on AC power needs to be inactive "
"before it goes to sleep."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:136
+#: ../data/gnome-power-manager.schemas.in.h:135
msgid "Sleep timeout display when on AC"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:137
+#: ../data/gnome-power-manager.schemas.in.h:136
msgid ""
"The amount of time in seconds before the display goes to sleep when the "
"computer is on AC power."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:138
+#: ../data/gnome-power-manager.schemas.in.h:137
msgid "Sleep timeout display when on battery"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:139
+#: ../data/gnome-power-manager.schemas.in.h:138
msgid ""
"The amount of time in seconds the computer on battery power needs to be "
"inactive before the display goes to sleep."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:140
+#: ../data/gnome-power-manager.schemas.in.h:139
msgid "If sounds should be used"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:141
+#: ../data/gnome-power-manager.schemas.in.h:140
msgid ""
"If sounds should be used when the power is critically low, or inhibit "
"requests have stopped the policy action."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:142
+#: ../data/gnome-power-manager.schemas.in.h:141
msgid "If preferences should be shown"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:143
+#: ../data/gnome-power-manager.schemas.in.h:142
msgid "Allow Suspend and Hibernate in the menu"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:144
+#: ../data/gnome-power-manager.schemas.in.h:143
msgid ""
"If the Suspend and Hibernate options should be allowed in the notification "
"area drop down menu."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:145
+#: ../data/gnome-power-manager.schemas.in.h:144
msgid "When to show the notification icon"
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:146
+#: ../data/gnome-power-manager.schemas.in.h:145
msgid ""
"Display options for the notification icon. Valid options are \"never\", "
"\"critical\", \"charge\", \"present\" and \"always\"."
msgstr ""
-#: ../data/gnome-power-manager.schemas.in.h:147
-msgid "Show up brightness OSD"
-msgstr ""
-
-#: ../data/gnome-power-manager.schemas.in.h:148
-msgid "Show up brightness OSD when brightness increment/decrement."
-msgstr ""
-
#: ../data/gnome-power-preferences.desktop.in.in.h:1
msgid "Power Management"
msgstr ""
@@ -1047,63 +1034,11 @@
msgid "General"
msgstr ""
-#: ../data/gpm-prefs.glade.h:31
-msgid "<b>Automatic Wakeup</b>"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:32
-msgid "Automatically wake up from suspend or hibernate at a given time"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:33
-msgid "Wake up at:"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:34
-msgid ":"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:35
-msgid "Wake up on these days:"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:36
-msgid "Monday"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:37
-msgid "Tuesday"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:38
-msgid "Wednesday"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:39
-msgid "Thursday"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:40
-msgid "Friday"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:41
-msgid "Saturday"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:42
-msgid "Sunday"
-msgstr ""
-
-#: ../data/gpm-prefs.glade.h:43
-msgid "Scheduling"
-msgstr ""
-
-#: ../src/gpm-control.c:283
+#: ../src/gpm-control.c:282
msgid "The message was not sent due to DBUS security rules"
msgstr ""
-#: ../src/gpm-control.c:286
+#: ../src/gpm-control.c:285
msgid "General failure"
msgstr ""
@@ -1161,8 +1096,24 @@
msgid "Computer is running on battery power\n"
msgstr ""
+#: ../src/gpm-engine.c:307
+msgid "Battery discharge time is currently unknown\n"
+msgstr ""
+
+#: ../src/gpm-engine.c:309
+msgid "Battery charge time is currently unknown\n"
+msgstr ""
+
+#: ../src/gpm-engine.c:313
+msgid "Battery discharge time is estimated\n"
+msgstr ""
+
+#: ../src/gpm-engine.c:315
+msgid "Battery charge time is estimated\n"
+msgstr ""
+
#. show a AC icon
-#: ../src/gpm-engine.c:601
+#: ../src/gpm-engine.c:610
msgid "Unable to get data..."
msgstr ""
@@ -1459,320 +1410,320 @@
msgid "Multiple applications have stopped the shutdown from taking place."
msgstr ""
-#: ../src/gpm-main.c:151
+#: ../src/gpm-main.c:150
msgid "Do not daemonize"
msgstr ""
-#: ../src/gpm-main.c:153 ../src/gpm-prefs.c:91 ../src/gpm-statistics.c:91
+#: ../src/gpm-main.c:152 ../src/gpm-prefs.c:91 ../src/gpm-statistics.c:91
msgid "Show extra debugging information"
msgstr ""
-#: ../src/gpm-main.c:155
+#: ../src/gpm-main.c:154
msgid "Show version of installed program and exit"
msgstr ""
-#: ../src/gpm-main.c:157
+#: ../src/gpm-main.c:156
msgid "Exit after a small delay (for debugging)"
msgstr ""
-#: ../src/gpm-main.c:159
+#: ../src/gpm-main.c:158
msgid "Exit after the manager has loaded (for debugging)"
msgstr ""
-#: ../src/gpm-main.c:163
+#: ../src/gpm-main.c:162
msgid "GNOME Power Manager"
msgstr ""
-#: ../src/gpm-manager.c:190
+#: ../src/gpm-manager.c:183
msgid "Request to suspend"
msgstr ""
-#: ../src/gpm-manager.c:193
+#: ../src/gpm-manager.c:186
msgid "Request to hibernate"
msgstr ""
-#: ../src/gpm-manager.c:196
+#: ../src/gpm-manager.c:189
msgid "Request to do policy action"
msgstr ""
-#: ../src/gpm-manager.c:199
+#: ../src/gpm-manager.c:192
msgid "Request to reboot"
msgstr ""
-#: ../src/gpm-manager.c:202
+#: ../src/gpm-manager.c:195
msgid "Request to shutdown"
msgstr ""
-#: ../src/gpm-manager.c:205
+#: ../src/gpm-manager.c:198
msgid "Request to do timeout action"
msgstr ""
#. I want this translated
-#: ../src/gpm-manager.c:216
+#: ../src/gpm-manager.c:209
msgid "Perform action anyway"
msgstr ""
-#: ../src/gpm-manager.c:338 ../src/gpm-manager.c:390
+#: ../src/gpm-manager.c:331 ../src/gpm-manager.c:380
msgid "Action disallowed"
msgstr ""
-#: ../src/gpm-manager.c:339
+#: ../src/gpm-manager.c:332
msgid ""
"Suspend support has been disabled. Contact your administrator for more "
"details."
msgstr ""
-#: ../src/gpm-manager.c:351 ../src/gpm-manager.c:403
+#: ../src/gpm-manager.c:344 ../src/gpm-manager.c:393
msgid "Action forbidden"
msgstr ""
-#: ../src/gpm-manager.c:352
+#: ../src/gpm-manager.c:345
msgid "Suspend is not available on this computer."
msgstr ""
-#: ../src/gpm-manager.c:365 ../src/gpm-manager.c:830
+#: ../src/gpm-manager.c:358 ../src/gpm-manager.c:755
msgid "Suspending computer."
msgstr ""
-#: ../src/gpm-manager.c:391
+#: ../src/gpm-manager.c:381
msgid ""
"Hibernate support has been disabled. Contact your administrator for more "
"details."
msgstr ""
-#: ../src/gpm-manager.c:404
+#: ../src/gpm-manager.c:394
msgid "Hibernate is not available on this computer."
msgstr ""
-#: ../src/gpm-manager.c:418 ../src/gpm-manager.c:857
+#: ../src/gpm-manager.c:407 ../src/gpm-manager.c:770
msgid "Hibernating computer."
msgstr ""
-#: ../src/gpm-manager.c:486
+#: ../src/gpm-manager.c:444
msgid "Doing nothing."
msgstr ""
-#: ../src/gpm-manager.c:511
+#: ../src/gpm-manager.c:457
msgid "Shutting down computer."
msgstr ""
-#: ../src/gpm-manager.c:516
+#: ../src/gpm-manager.c:462
msgid "GNOME interactive logout."
msgstr ""
-#: ../src/gpm-manager.c:830 ../src/gpm-manager.c:857
+#: ../src/gpm-manager.c:755 ../src/gpm-manager.c:770
msgid "System idle."
msgstr ""
-#: ../src/gpm-manager.c:960
+#: ../src/gpm-manager.c:844
msgid "Power Information"
msgstr ""
-#: ../src/gpm-manager.c:977
+#: ../src/gpm-manager.c:861
msgid "The power button has been pressed."
msgstr ""
-#: ../src/gpm-manager.c:989
+#: ../src/gpm-manager.c:873
msgid "The suspend button has been pressed."
msgstr ""
-#: ../src/gpm-manager.c:1001
+#: ../src/gpm-manager.c:885
msgid "The hibernate button has been pressed."
msgstr ""
-#: ../src/gpm-manager.c:1032
+#: ../src/gpm-manager.c:916
msgid "The lid has been closed on ac power."
msgstr ""
-#: ../src/gpm-manager.c:1062
+#: ../src/gpm-manager.c:946
msgid "The lid has been closed on battery power."
msgstr ""
-#: ../src/gpm-manager.c:1163
+#: ../src/gpm-manager.c:1035
msgid ""
"The lid has been closed, and the ac adapter removed (and gconf is okay)."
msgstr ""
-#: ../src/gpm-manager.c:1182
+#: ../src/gpm-manager.c:1054
msgid "Battery is critically low."
msgstr ""
-#: ../src/gpm-manager.c:1272 ../src/gpm-manager.c:1287
+#: ../src/gpm-manager.c:1144 ../src/gpm-manager.c:1159
msgid "User clicked on tray"
msgstr ""
-#: ../src/gpm-manager.c:1497
+#: ../src/gpm-manager.c:1369
msgid "Laptop battery low"
msgstr ""
-#: ../src/gpm-manager.c:1499
+#: ../src/gpm-manager.c:1371
#, c-format
msgid "You have approximately <b>%s</b> of remaining battery life (%.1f%%)"
msgstr ""
-#: ../src/gpm-manager.c:1502
+#: ../src/gpm-manager.c:1374
msgid "UPS low"
msgstr ""
-#: ../src/gpm-manager.c:1504
+#: ../src/gpm-manager.c:1376
#, c-format
msgid "You have approximately <b>%s</b> of remaining UPS backup power (%.1f%%)"
msgstr ""
-#: ../src/gpm-manager.c:1507 ../src/gpm-manager.c:1607
+#: ../src/gpm-manager.c:1379 ../src/gpm-manager.c:1479
msgid "Mouse battery low"
msgstr ""
-#: ../src/gpm-manager.c:1508
+#: ../src/gpm-manager.c:1380
#, c-format
msgid "The wireless mouse attached to this computer is low in power (%.1f%%)"
msgstr ""
-#: ../src/gpm-manager.c:1510 ../src/gpm-manager.c:1612
+#: ../src/gpm-manager.c:1382 ../src/gpm-manager.c:1484
msgid "Keyboard battery low"
msgstr ""
-#: ../src/gpm-manager.c:1511
+#: ../src/gpm-manager.c:1383
#, c-format
msgid ""
"The wireless keyboard attached to this computer is low in power (%.1f%%)"
msgstr ""
-#: ../src/gpm-manager.c:1513 ../src/gpm-manager.c:1617
+#: ../src/gpm-manager.c:1385 ../src/gpm-manager.c:1489
msgid "PDA battery low"
msgstr ""
-#: ../src/gpm-manager.c:1514
+#: ../src/gpm-manager.c:1386
#, c-format
msgid "The PDA attached to this computer is low in power (%.1f%%)"
msgstr ""
-#: ../src/gpm-manager.c:1516 ../src/gpm-manager.c:1622
+#: ../src/gpm-manager.c:1388 ../src/gpm-manager.c:1494
msgid "Cell phone battery low"
msgstr ""
-#: ../src/gpm-manager.c:1517
+#: ../src/gpm-manager.c:1389
#, c-format
msgid "The cell phone attached to this computer is low in power (%.1f%%)"
msgstr ""
-#: ../src/gpm-manager.c:1544
+#: ../src/gpm-manager.c:1416
msgid "a short time"
msgstr ""
-#: ../src/gpm-manager.c:1567 ../src/gpm-manager.c:1653
+#: ../src/gpm-manager.c:1439 ../src/gpm-manager.c:1525
msgid "Laptop battery critically low"
msgstr ""
-#: ../src/gpm-manager.c:1580
+#: ../src/gpm-manager.c:1452
msgid "Plug in your AC adapter to avoid losing data."
msgstr ""
-#: ../src/gpm-manager.c:1583
+#: ../src/gpm-manager.c:1455
#, c-format
msgid "This computer will suspend in %s if the AC is not connected."
msgstr ""
-#: ../src/gpm-manager.c:1586
+#: ../src/gpm-manager.c:1458
#, c-format
msgid "This computer will hibernate in %s if the AC is not connected."
msgstr ""
-#: ../src/gpm-manager.c:1589
+#: ../src/gpm-manager.c:1461
#, c-format
msgid "This computer will shutdown in %s if the AC is not connected."
msgstr ""
-#: ../src/gpm-manager.c:1592
+#: ../src/gpm-manager.c:1464
#, c-format
msgid "You have approximately <b>%s</b> of remaining battery life (%.1f%%). %s"
msgstr ""
-#: ../src/gpm-manager.c:1600 ../src/gpm-manager.c:1685
+#: ../src/gpm-manager.c:1472 ../src/gpm-manager.c:1557
msgid "UPS critically low"
msgstr ""
-#: ../src/gpm-manager.c:1602
+#: ../src/gpm-manager.c:1474
#, c-format
msgid ""
"You have approximately <b>%s</b> of remaining UPS power (%.1f%%). Restore AC "
"power to your computer to avoid losing data."
msgstr ""
-#: ../src/gpm-manager.c:1608
+#: ../src/gpm-manager.c:1480
#, c-format
msgid ""
"The wireless mouse attached to this computer is very low in power (%.1f%%). "
"This device will soon stop functioning if not charged."
msgstr ""
-#: ../src/gpm-manager.c:1613
+#: ../src/gpm-manager.c:1485
#, c-format
msgid ""
"The wireless keyboard attached to this computer is very low in power (%.1f"
"%%). This device will soon stop functioning if not charged."
msgstr ""
-#: ../src/gpm-manager.c:1618
+#: ../src/gpm-manager.c:1490
#, c-format
msgid ""
"The PDA attached to this computer is very low in power (%.1f%%). This device "
"will soon stop functioning if not charged."
msgstr ""
-#: ../src/gpm-manager.c:1623
+#: ../src/gpm-manager.c:1495
#, c-format
msgid ""
"Your cell phone is very low in power (%.1f%%). This device will soon stop "
"functioning if not charged."
msgstr ""
-#: ../src/gpm-manager.c:1660
+#: ../src/gpm-manager.c:1532
msgid ""
"The battery is below the critical level and this computer will <b>power-off"
"b> when the battery becomes completely empty."
msgstr ""
-#: ../src/gpm-manager.c:1665
+#: ../src/gpm-manager.c:1537
msgid ""
"The battery is below the critical level and this computer is about to "
"suspend.<br><b>NOTE:</b> A small amount of power is required to keep your "
"computer in a suspended state."
msgstr ""
-#: ../src/gpm-manager.c:1671
+#: ../src/gpm-manager.c:1543
msgid ""
"The battery is below the critical level and this computer is about to "
"hibernate."
msgstr ""
-#: ../src/gpm-manager.c:1675
+#: ../src/gpm-manager.c:1547
msgid ""
"The battery is below the critical level and this computer is about to "
"shutdown."
msgstr ""
-#: ../src/gpm-manager.c:1692
+#: ../src/gpm-manager.c:1564
msgid ""
"The UPS is below the critical level and this computer will <b>power-off</b> "
"when the UPS becomes completely empty."
msgstr ""
-#: ../src/gpm-manager.c:1697
+#: ../src/gpm-manager.c:1569
msgid ""
"The UPS is below the critical level and this computer is about to hibernate."
msgstr ""
-#: ../src/gpm-manager.c:1701
+#: ../src/gpm-manager.c:1573
msgid ""
"The UPS is below the critical level and this computer is about to shutdown."
msgstr ""
-#: ../src/gpm-manager.c:1828
+#: ../src/gpm-manager.c:1679
msgid "Install problem!"
msgstr ""
-#: ../src/gpm-manager.c:1829
+#: ../src/gpm-manager.c:1680
msgid ""
"The configuration defaults for GNOME Power Manager have not been installed "
"correctly.\n"
@@ -1780,11 +1731,11 @@
msgstr ""
#. save in state
-#: ../src/gpm-notify.c:399
+#: ../src/gpm-notify.c:370
msgid "Battery may be recalled"
msgstr ""
-#: ../src/gpm-notify.c:400
+#: ../src/gpm-notify.c:371
#, c-format
msgid ""
"The battery in your computer may have been recalled by %s and you may be at "
@@ -1793,268 +1744,260 @@
"For more information visit the %s battery recall website."
msgstr ""
-#: ../src/gpm-notify.c:415
+#: ../src/gpm-notify.c:386
msgid "Visit recall website"
msgstr ""
-#: ../src/gpm-notify.c:421 ../src/gpm-notify.c:461 ../src/gpm-notify.c:493
-#: ../src/gpm-notify.c:532 ../src/gpm-notify.c:563 ../src/gpm-notify.c:593
-#: ../src/gpm-notify.c:623 ../src/gpm-notify.c:659
+#: ../src/gpm-notify.c:392 ../src/gpm-notify.c:432 ../src/gpm-notify.c:472
+#: ../src/gpm-notify.c:503 ../src/gpm-notify.c:533 ../src/gpm-notify.c:563
+#: ../src/gpm-notify.c:599
msgid "Do not show me this again"
msgstr ""
-#: ../src/gpm-notify.c:447
+#: ../src/gpm-notify.c:418
msgid "Battery may be broken"
msgstr ""
-#: ../src/gpm-notify.c:448
+#: ../src/gpm-notify.c:419
#, c-format
msgid ""
"Your battery has a very low capacity (%i%%), which means that it may be old "
"or broken."
msgstr ""
-#: ../src/gpm-notify.c:480
-msgid "System resumed from sleep"
-msgstr ""
-
-#: ../src/gpm-notify.c:481
-msgid "The system automatically went to sleep because the system was idle."
-msgstr ""
-
-#: ../src/gpm-notify.c:517
+#: ../src/gpm-notify.c:457
msgid "Sleep warning"
msgstr ""
-#: ../src/gpm-notify.c:518
+#: ../src/gpm-notify.c:458
msgid ""
"Your laptop will not sleep if you shut the lid as a running program has "
"prevented this.\n"
"Some laptops can overheat if they do not sleep when the lid is closed."
msgstr ""
-#: ../src/gpm-notify.c:551
+#: ../src/gpm-notify.c:491
msgid "Battery Charged"
msgstr ""
-#: ../src/gpm-notify.c:552
+#: ../src/gpm-notify.c:492
msgid "Your laptop battery is now fully charged"
msgstr ""
-#: ../src/gpm-notify.c:581
+#: ../src/gpm-notify.c:521
msgid "Battery Discharging"
msgstr ""
-#: ../src/gpm-notify.c:582
+#: ../src/gpm-notify.c:522
msgid "The AC power has been unplugged. The system is now using battery power."
msgstr ""
-#: ../src/gpm-notify.c:611
+#: ../src/gpm-notify.c:551
msgid "UPS Discharging"
msgstr ""
-#: ../src/gpm-notify.c:612
+#: ../src/gpm-notify.c:552
msgid "The AC power has been unplugged. The system is now using backup power."
msgstr ""
-#: ../src/gpm-notify.c:642
+#: ../src/gpm-notify.c:582
msgid "Sleep Problem"
msgstr ""
-#: ../src/gpm-notify.c:644
+#: ../src/gpm-notify.c:584
msgid ""
"Your computer failed to hibernate.\n"
"Check the help file for common problems."
msgstr ""
-#: ../src/gpm-notify.c:647
+#: ../src/gpm-notify.c:587
msgid ""
"Your computer failed to suspend.\n"
"Check the help file for common problems."
msgstr ""
-#: ../src/gpm-notify.c:672
+#: ../src/gpm-notify.c:612
msgid "Visit quirk website"
msgstr ""
-#: ../src/gpm-cell-array.c:1059
+#: ../src/gpm-cell-array.c:1013
#, c-format
msgid ""
"%s fully charged (%.1f%%)\n"
"Provides %s battery runtime\n"
msgstr ""
-#: ../src/gpm-cell-array.c:1063
+#: ../src/gpm-cell-array.c:1017
#, c-format
msgid "%s fully charged (%.1f%%)\n"
msgstr ""
-#: ../src/gpm-cell-array.c:1071
+#: ../src/gpm-cell-array.c:1025
#, c-format
msgid "%s %s remaining (%.1f%%)\n"
msgstr ""
#. don't display "Unknown remaining"
-#: ../src/gpm-cell-array.c:1076
+#: ../src/gpm-cell-array.c:1030
#, c-format
msgid "%s discharging (%.1f%%)\n"
msgstr ""
-#: ../src/gpm-cell-array.c:1088
+#: ../src/gpm-cell-array.c:1042
#, c-format
msgid ""
"%s %s until charged (%.1f%%)\n"
"Provides %s battery runtime\n"
msgstr ""
-#: ../src/gpm-cell-array.c:1095
+#: ../src/gpm-cell-array.c:1049
#, c-format
msgid "%s %s until charged (%.1f%%)\n"
msgstr ""
#. don't display "Unknown remaining"
-#: ../src/gpm-cell-array.c:1100
+#: ../src/gpm-cell-array.c:1054
#, c-format
msgid "%s charging (%.1f%%)\n"
msgstr ""
-#: ../src/gpm-cell-array.c:1107
+#: ../src/gpm-cell-array.c:1061
msgid "Battery state could not be read at this time\n"
msgstr ""
-#: ../src/gpm-cell.c:547
+#: ../src/gpm-cell.c:543
#, c-format
msgid "<b>Product:</b> %s\n"
msgstr ""
-#: ../src/gpm-cell.c:550 ../src/gpm-cell.c:552 ../src/gpm-cell.c:554
-#: ../src/gpm-cell.c:556
+#: ../src/gpm-cell.c:546 ../src/gpm-cell.c:548 ../src/gpm-cell.c:550
+#: ../src/gpm-cell.c:552
#, c-format
msgid "<b>Status:</b> %s\n"
msgstr ""
-#: ../src/gpm-cell.c:550
+#: ../src/gpm-cell.c:546
msgid "Missing"
msgstr ""
-#: ../src/gpm-cell.c:552
+#: ../src/gpm-cell.c:548
msgid "Charged"
msgstr ""
-#: ../src/gpm-cell.c:554
+#: ../src/gpm-cell.c:550
msgid "Charging"
msgstr ""
-#: ../src/gpm-cell.c:556
+#: ../src/gpm-cell.c:552
msgid "Discharging"
msgstr ""
-#: ../src/gpm-cell.c:559
+#: ../src/gpm-cell.c:555
#, c-format
msgid "<b>Percentage charge:</b> %.1f%%\n"
msgstr ""
-#: ../src/gpm-cell.c:562
+#: ../src/gpm-cell.c:558
#, c-format
msgid "<b>Vendor:</b> %s\n"
msgstr ""
-#: ../src/gpm-cell.c:567
+#: ../src/gpm-cell.c:563
msgid "Lithium ion"
msgstr ""
-#: ../src/gpm-cell.c:569
+#: ../src/gpm-cell.c:565
msgid "Lead acid"
msgstr ""
-#: ../src/gpm-cell.c:571
+#: ../src/gpm-cell.c:567
msgid "Lithium polymer"
msgstr ""
-#: ../src/gpm-cell.c:573
+#: ../src/gpm-cell.c:569
msgid "Nickel metal hydride"
msgstr ""
#. Translators: Unknown is related to the Technology of the battery
-#: ../src/gpm-cell.c:576 ../src/gpm-cell-unit.c:260 ../src/gpm-cell-unit.c:276
+#: ../src/gpm-cell.c:572 ../src/gpm-cell-unit.c:260 ../src/gpm-cell-unit.c:276
#: ../src/gpm-statistics-core.c:739
msgid "Unknown"
msgstr ""
-#: ../src/gpm-cell.c:582
+#: ../src/gpm-cell.c:578
#, c-format
msgid "<b>Technology:</b> %s\n"
msgstr ""
-#: ../src/gpm-cell.c:585
+#: ../src/gpm-cell.c:581
#, c-format
msgid "<b>Serial number:</b> %s\n"
msgstr ""
-#: ../src/gpm-cell.c:588
+#: ../src/gpm-cell.c:584
#, c-format
msgid "<b>Model:</b> %s\n"
msgstr ""
-#: ../src/gpm-cell.c:593
+#: ../src/gpm-cell.c:589
#, c-format
msgid "<b>Charge time:</b> %s\n"
msgstr ""
-#: ../src/gpm-cell.c:599
+#: ../src/gpm-cell.c:595
#, c-format
msgid "<b>Discharge time:</b> %s\n"
msgstr ""
#. Translators: Excellent, Good, Fair and Poor are all related to battery Capacity
-#: ../src/gpm-cell.c:606
+#: ../src/gpm-cell.c:602
msgid "Excellent"
msgstr ""
-#: ../src/gpm-cell.c:608
+#: ../src/gpm-cell.c:604
msgid "Good"
msgstr ""
-#: ../src/gpm-cell.c:610
+#: ../src/gpm-cell.c:606
msgid "Fair"
msgstr ""
-#: ../src/gpm-cell.c:612
+#: ../src/gpm-cell.c:608
msgid "Poor"
msgstr ""
#. Translators: %i is a percentage and %s the condition (Excellent, Good, ...)
-#: ../src/gpm-cell.c:615
+#: ../src/gpm-cell.c:611
#, c-format
msgid "<b>Capacity:</b> %i%% (%s)\n"
msgstr ""
-#: ../src/gpm-cell.c:620
+#: ../src/gpm-cell.c:616
#, c-format
msgid "<b>Current charge:</b> %.1f Wh\n"
msgstr ""
-#: ../src/gpm-cell.c:625
+#: ../src/gpm-cell.c:621
#, c-format
msgid "<b>Last full charge:</b> %.1f Wh\n"
msgstr ""
-#: ../src/gpm-cell.c:629
+#: ../src/gpm-cell.c:625
#, c-format
msgid "<b>Design charge:</b> %.1f Wh\n"
msgstr ""
-#: ../src/gpm-cell.c:633
+#: ../src/gpm-cell.c:629
#, c-format
msgid "<b>Charge rate:</b> %.1f W\n"
msgstr ""
-#: ../src/gpm-cell.c:639
+#: ../src/gpm-cell.c:635
#, c-format
msgid "<b>Current charge:</b> %i/7\n"
msgstr ""
-#: ../src/gpm-cell.c:643
+#: ../src/gpm-cell.c:639
#, c-format
msgid "<b>Design charge:</b> %i/7\n"
msgstr ""
@@ -2136,11 +2079,11 @@
msgid "Do nothing"
msgstr ""
-#: ../src/gpm-prefs-core.c:293
+#: ../src/gpm-prefs-core.c:286
msgid "Never"
msgstr ""
-#: ../src/gpm-prefs-core.c:1206
+#: ../src/gpm-prefs-core.c:1047
msgid "Make Default"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-screensaver.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-screensaver.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-screensaver.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:38+0100\n"
+"POT-Creation-Date: 2015-05-06 20:28+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -450,7 +450,7 @@
msgid "The reason for inhibiting the screensaver"
msgstr ""
-#: ../src/gnome-screensaver-command.c:84 ../src/gnome-screensaver-dialog.c:65
+#: ../src/gnome-screensaver-command.c:84 ../src/gnome-screensaver-dialog.c:59
#: ../src/gnome-screensaver.c:56
msgid "Version of this application"
msgstr ""
@@ -488,152 +488,132 @@
msgid "The screensaver is not currently active.\n"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:63
+#: ../src/gnome-screensaver-dialog.c:57
msgid "Show debugging output"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:67
+#: ../src/gnome-screensaver-dialog.c:61
msgid "Show the logout button"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:69
+#: ../src/gnome-screensaver-dialog.c:63
msgid "Command to invoke from the logout button"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:71
+#: ../src/gnome-screensaver-dialog.c:65
msgid "Show the switch user button"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:73
+#: ../src/gnome-screensaver-dialog.c:67
msgid "Message to show in the dialog"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:73 ../src/gnome-screensaver-dialog.c:75
+#: ../src/gnome-screensaver-dialog.c:67 ../src/gnome-screensaver-dialog.c:69
msgid "MESSAGE"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:75
+#: ../src/gnome-screensaver-dialog.c:69
msgid "Not used"
msgstr ""
#. login: is whacked always translate to Username:
-#: ../src/gnome-screensaver-dialog.c:202 ../src/gnome-screensaver-dialog.c:203
-#: ../src/gnome-screensaver-dialog.c:204 ../src/gs-auth-pam.c:698
+#: ../src/gnome-screensaver-dialog.c:179 ../src/gnome-screensaver-dialog.c:180
+#: ../src/gnome-screensaver-dialog.c:181 ../src/gs-auth-pam.c:698
msgid "Username:"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:205 ../src/gnome-screensaver-dialog.c:206
+#: ../src/gnome-screensaver-dialog.c:182 ../src/gnome-screensaver-dialog.c:183
#: ../src/gs-auth-pam.c:166
msgid "Password:"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:207
+#: ../src/gnome-screensaver-dialog.c:184
msgid "You are required to change your password immediately (password aged)"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:208
+#: ../src/gnome-screensaver-dialog.c:185
msgid "You are required to change your password immediately (root enforced)"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:209
+#: ../src/gnome-screensaver-dialog.c:186
msgid "Your account has expired; please contact your system administrator"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:210
+#: ../src/gnome-screensaver-dialog.c:187
msgid "No password supplied"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:211
+#: ../src/gnome-screensaver-dialog.c:188
msgid "Password unchanged"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:212
+#: ../src/gnome-screensaver-dialog.c:189
msgid "Can not get username"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:213
+#: ../src/gnome-screensaver-dialog.c:190
msgid "Retype new UNIX password:"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:214
+#: ../src/gnome-screensaver-dialog.c:191
msgid "Enter new UNIX password:"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:215
+#: ../src/gnome-screensaver-dialog.c:192
msgid "(current) UNIX password:"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:216
+#: ../src/gnome-screensaver-dialog.c:193
msgid "Error while changing NIS password."
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:217
+#: ../src/gnome-screensaver-dialog.c:194
msgid "You must choose a longer password"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:218
+#: ../src/gnome-screensaver-dialog.c:195
msgid "Password has been already used. Choose another."
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:219
+#: ../src/gnome-screensaver-dialog.c:196
msgid "You must wait longer to change your password"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:220
+#: ../src/gnome-screensaver-dialog.c:197
msgid "Sorry, passwords do not match"
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:286
+#: ../src/gnome-screensaver-dialog.c:263
msgid "Checking..."
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:329 ../src/gs-auth-pam.c:457
+#: ../src/gnome-screensaver-dialog.c:305 ../src/gs-auth-pam.c:457
msgid "Authentication failed."
msgstr ""
-#: ../src/gnome-screensaver-dialog.c:412
-msgid "Please enter password or swipe your finger"
-msgstr ""
-
-#: ../src/gnome-screensaver-dialog.c:429
-msgid "Scan didn't quite work. Please try again"
-msgstr ""
-
-#: ../src/gnome-screensaver-dialog.c:434
-msgid "Swipe was too short. Please try again"
-msgstr ""
-
-#: ../src/gnome-screensaver-dialog.c:439
-msgid "Please center your finger on the sensor and try again"
-msgstr ""
-
-#: ../src/gnome-screensaver-dialog.c:444
-msgid "Please remove finger from the sensor and try again"
-msgstr ""
-
-#: ../src/gnome-screensaver-preferences.c:528
+#: ../src/gnome-screensaver-preferences.c:524
msgid "Blank screen"
msgstr ""
-#: ../src/gnome-screensaver-preferences.c:534
+#: ../src/gnome-screensaver-preferences.c:530
msgid "Random"
msgstr ""
-#: ../src/gnome-screensaver-preferences.c:984
+#: ../src/gnome-screensaver-preferences.c:980
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: ../src/gnome-screensaver-preferences.c:987
+#: ../src/gnome-screensaver-preferences.c:983
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: ../src/gnome-screensaver-preferences.c:990
+#: ../src/gnome-screensaver-preferences.c:986
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -641,15 +621,15 @@
msgstr[1] ""
#. hour:minutes:seconds
-#: ../src/gnome-screensaver-preferences.c:996
+#: ../src/gnome-screensaver-preferences.c:992
#, c-format
msgid "%s %s %s"
msgstr ""
#. hour:minutes
#. minutes:seconds
-#: ../src/gnome-screensaver-preferences.c:999
-#: ../src/gnome-screensaver-preferences.c:1007
+#: ../src/gnome-screensaver-preferences.c:995
+#: ../src/gnome-screensaver-preferences.c:1003
#, c-format
msgid "%s %s"
msgstr ""
@@ -657,23 +637,23 @@
#. hour
#. minutes
#. seconds
-#: ../src/gnome-screensaver-preferences.c:1002
+#: ../src/gnome-screensaver-preferences.c:998
+#: ../src/gnome-screensaver-preferences.c:1006
#: ../src/gnome-screensaver-preferences.c:1010
-#: ../src/gnome-screensaver-preferences.c:1014
#, c-format
msgid "%s"
msgstr ""
-#: ../src/gnome-screensaver-preferences.c:1029
+#: ../src/gnome-screensaver-preferences.c:1025
#, c-format
msgid "Never"
msgstr ""
-#: ../src/gnome-screensaver-preferences.c:1482
+#: ../src/gnome-screensaver-preferences.c:1467
msgid "Could not load the main interface"
msgstr ""
-#: ../src/gnome-screensaver-preferences.c:1484
+#: ../src/gnome-screensaver-preferences.c:1469
msgid "Please make sure that the screensaver is properly installed"
msgstr ""
@@ -711,15 +691,15 @@
msgid "No longer permitted to access the system."
msgstr ""
-#: ../src/gs-listener-dbus.c:1853
+#: ../src/gs-listener-dbus.c:1844
msgid "failed to register with the message bus"
msgstr ""
-#: ../src/gs-listener-dbus.c:1863
+#: ../src/gs-listener-dbus.c:1854
msgid "not connected to the message bus"
msgstr ""
-#: ../src/gs-listener-dbus.c:1872
+#: ../src/gs-listener-dbus.c:1863
msgid "screensaver already running in this session"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-session-2.0.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-session-2.0.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-session-2.0.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:38+0100\n"
+"POT-Creation-Date: 2015-05-06 20:31+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -62,7 +62,7 @@
msgid "No description"
msgstr ""
-#: ../capplet/main.c:37 ../gnome-session/main.c:420
+#: ../capplet/main.c:37 ../gnome-session/main.c:437
msgid "Version of this application"
msgstr ""
@@ -359,85 +359,58 @@
msgid "Cancel"
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:242
+#: ../gnome-session/gsm-logout-dialog.c:274
#, c-format
msgid "You will be automatically logged out in %d second."
msgid_plural "You will be automatically logged out in %d seconds."
msgstr[0] ""
msgstr[1] ""
-#: ../gnome-session/gsm-logout-dialog.c:250
+#: ../gnome-session/gsm-logout-dialog.c:282
#, c-format
msgid "This system will be automatically shut down in %d second."
msgid_plural "This system will be automatically shut down in %d seconds."
msgstr[0] ""
msgstr[1] ""
-#: ../gnome-session/gsm-logout-dialog.c:286
+#: ../gnome-session/gsm-logout-dialog.c:314
#, c-format
msgid "You are currently logged in as \"%s\"."
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:483
-msgid "Log Out of the Session"
+#: ../gnome-session/gsm-logout-dialog.c:380
+msgid "Log out of this system now?"
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:489 ../gnome-session/gsm-util.c:372
-msgid "_Log Out"
-msgstr ""
-
-#: ../gnome-session/gsm-logout-dialog.c:490
-msgid "Ends your session and logs you out."
-msgstr ""
-
-#: ../gnome-session/gsm-logout-dialog.c:496
+#: ../gnome-session/gsm-logout-dialog.c:386
msgid "_Switch User"
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:497
-msgid ""
-"Suspends your session, allowing another user to log in and use the computer."
+#: ../gnome-session/gsm-logout-dialog.c:395
+msgid "_Log Out"
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:508
-msgid "Shut Down the Computer"
+#: ../gnome-session/gsm-logout-dialog.c:401
+msgid "Shut down this system now?"
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:515
-msgid "_Shut Down"
+#: ../gnome-session/gsm-logout-dialog.c:407
+msgid "S_uspend"
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:516
-msgid "Ends your session and turns off the computer."
+#: ../gnome-session/gsm-logout-dialog.c:413
+msgid "_Hibernate"
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:529
+#: ../gnome-session/gsm-logout-dialog.c:419
msgid "_Restart"
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:530
-msgid "Ends your session and restarts the computer."
+#: ../gnome-session/gsm-logout-dialog.c:429
+msgid "_Shut Down"
msgstr ""
-#: ../gnome-session/gsm-logout-dialog.c:543
-msgid "S_uspend"
-msgstr ""
-
-#: ../gnome-session/gsm-logout-dialog.c:544
-msgid ""
-"Suspends your session quickly, using minimal power while the computer stands "
-"by."
-msgstr ""
-
-#: ../gnome-session/gsm-logout-dialog.c:554
-msgid "_Hibernate"
-msgstr ""
-
-#: ../gnome-session/gsm-logout-dialog.c:555
-msgid "Suspends your session, using no power until the computer is restarted."
-msgstr ""
-
-#: ../gnome-session/gsm-manager.c:1180 ../gnome-session/gsm-manager.c:1892
+#: ../gnome-session/gsm-manager.c:1208 ../gnome-session/gsm-manager.c:1900
msgid "Not responding"
msgstr ""
@@ -445,64 +418,40 @@
msgid "This program is blocking log out."
msgstr ""
-#: ../gnome-session/gsm-xsmp-server.c:235
+#: ../gnome-session/gsm-xsmp-server.c:234
msgid ""
"Refusing new client connection because the session is currently being shut "
"down\n"
msgstr ""
-#: ../gnome-session/gsm-xsmp-server.c:358
-msgid "ICE Auth Lock Timeout"
-msgstr ""
-
-#: ../gnome-session/gsm-xsmp-server.c:361
-msgid "Unknown ICE Auth Lock Error"
-msgstr ""
-
-#: ../gnome-session/gsm-xsmp-server.c:405
-msgid "Unable to read ICE authority file"
-msgstr ""
-
-#: ../gnome-session/gsm-xsmp-server.c:413
-msgid "Unable to write to ICE authority file"
-msgstr ""
-
-#: ../gnome-session/gsm-xsmp-server.c:506
+#: ../gnome-session/gsm-xsmp-server.c:489
#, c-format
msgid "Could not create ICE listening socket: %s"
msgstr ""
-#: ../gnome-session/gsm-xsmp-server.c:560
-msgid "Could not update ICEauthority file"
-msgstr ""
-
#. Oh well, no X for you!
-#: ../gnome-session/gsm-util.c:356
+#: ../gnome-session/gsm-util.c:354
#, c-format
msgid "Unable to start login session (and unable to connect to the X server)"
msgstr ""
-#: ../gnome-session/gsm-util.c:574
-msgid "Cannot find help."
-msgstr ""
-
-#: ../gnome-session/main.c:416
+#: ../gnome-session/main.c:433
msgid "Override standard autostart directories"
msgstr ""
-#: ../gnome-session/main.c:417
+#: ../gnome-session/main.c:434
msgid "GConf key used to lookup default session"
msgstr ""
-#: ../gnome-session/main.c:418
+#: ../gnome-session/main.c:435
msgid "Enable debugging code"
msgstr ""
-#: ../gnome-session/main.c:419
+#: ../gnome-session/main.c:436
msgid "Do not load user-specified applications"
msgstr ""
-#: ../gnome-session/main.c:440
+#: ../gnome-session/main.c:457
msgid " - the GNOME session manager"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/gnome-utils-2.0.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/gnome-utils-2.0.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/gnome-utils-2.0.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:39+0100\n"
+"POT-Creation-Date: 2015-05-06 20:46+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/krb5-ticket-watcher.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/krb5-ticket-watcher.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/krb5-ticket-watcher.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:39+0100\n"
+"POT-Creation-Date: 2015-05-06 18:10+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/libgnomedb-3.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/libgnomedb-3.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/libgnomedb-3.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 16:25+0100\n"
+"POT-Creation-Date: 2015-05-06 18:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -741,7 +741,7 @@
msgstr ""
#: ../libgnomedb/gnome-db-data-import.c:239
-msgid "Semicolon"
+msgid "Semi column"
msgstr ""
#: ../libgnomedb/gnome-db-data-import.c:246
@@ -1476,7 +1476,7 @@
msgstr ""
#: ../libgnomedb/plugins/gnome-db-entry-pict.c:400
-msgid "Empty Data"
+msgid "Empty Adata"
msgstr ""
#: ../libgnomedb/plugins/gnome-db-entry-pict-spec_string.xml.in.h:2
Modified: branches/SLE11-SP4/lcn/50-pot/libgnomesu.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/libgnomesu.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/libgnomesu.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:39+0100\n"
+"POT-Creation-Date: 2015-05-06 18:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/libslab.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/libslab.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/libslab.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:39+0100\n"
+"POT-Creation-Date: 2015-05-06 21:26+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -35,149 +35,140 @@
msgid "Uninstall"
msgstr ""
-#: ../libslab/application-tile.c:784 ../libslab/document-tile.c:746
+#: ../libslab/application-tile.c:784 ../libslab/document-tile.c:721
msgid "Remove from Favorites"
msgstr ""
-#: ../libslab/application-tile.c:786 ../libslab/document-tile.c:748
+#: ../libslab/application-tile.c:786 ../libslab/document-tile.c:723
msgid "Add to Favorites"
msgstr ""
-#: ../libslab/application-tile.c:877
+#: ../libslab/application-tile.c:871
msgid "Remove from Startup Programs"
msgstr ""
-#: ../libslab/application-tile.c:879
+#: ../libslab/application-tile.c:873
msgid "Add to Startup Programs"
msgstr ""
-#: ../libslab/app-shell.c:755
+#: ../libslab/app-shell.c:754
#, c-format
msgid "Your filter \"%s\" does not match any items."
msgstr ""
-#: ../libslab/app-shell.c:757
+#: ../libslab/app-shell.c:756
msgid "No matches found."
msgstr ""
-#: ../libslab/app-shell.c:910
+#: ../libslab/app-shell.c:905
msgid "Other"
msgstr ""
-#: ../libslab/bookmark-agent.c:1112
+#: ../libslab/bookmark-agent.c:1077
msgid "New Spreadsheet"
msgstr ""
-#: ../libslab/bookmark-agent.c:1117
+#: ../libslab/bookmark-agent.c:1082
msgid "New Document"
msgstr ""
-#: ../libslab/bookmark-agent.c:1170
+#: ../libslab/bookmark-agent.c:1135
msgid "Home"
msgstr ""
-#: ../libslab/bookmark-agent.c:1175
+#: ../libslab/bookmark-agent.c:1140
msgid "Documents"
msgstr ""
-#: ../libslab/bookmark-agent.c:1181
+#: ../libslab/bookmark-agent.c:1146
msgid "Desktop"
msgstr ""
-#: ../libslab/bookmark-agent.c:1188
+#: ../libslab/bookmark-agent.c:1153
msgid "File System"
msgstr ""
-#: ../libslab/bookmark-agent.c:1192
+#: ../libslab/bookmark-agent.c:1157
msgid "Network Servers"
msgstr ""
-#: ../libslab/bookmark-agent.c:1221
+#: ../libslab/bookmark-agent.c:1186
msgid "Search"
msgstr ""
#. make open with default action
#: ../libslab/directory-tile.c:171
+#, c-format
msgid "<b>Open</b>"
msgstr ""
#. make rename action
-#: ../libslab/directory-tile.c:190 ../libslab/document-tile.c:236
+#: ../libslab/directory-tile.c:190 ../libslab/document-tile.c:234
msgid "Rename..."
msgstr ""
#: ../libslab/directory-tile.c:204 ../libslab/directory-tile.c:213
-#: ../libslab/document-tile.c:250 ../libslab/document-tile.c:259
+#: ../libslab/document-tile.c:248 ../libslab/document-tile.c:257
msgid "Send To..."
msgstr ""
#. make move to trash action
-#: ../libslab/directory-tile.c:228 ../libslab/document-tile.c:285
+#: ../libslab/directory-tile.c:228 ../libslab/document-tile.c:283
msgid "Move to Trash"
msgstr ""
#: ../libslab/directory-tile.c:238 ../libslab/directory-tile.c:457
-#: ../libslab/document-tile.c:295 ../libslab/document-tile.c:862
+#: ../libslab/document-tile.c:293 ../libslab/document-tile.c:837
msgid "Delete"
msgstr ""
-#: ../libslab/directory-tile.c:533 ../libslab/document-tile.c:1024
+#: ../libslab/directory-tile.c:533 ../libslab/document-tile.c:985
#, c-format
msgid "Are you sure you want to permanently delete \"%s\"?"
msgstr ""
-#: ../libslab/directory-tile.c:534 ../libslab/document-tile.c:1025
+#: ../libslab/directory-tile.c:534 ../libslab/document-tile.c:986
msgid "If you delete an item, it is permanently lost."
msgstr ""
-#: ../libslab/document-tile.c:195
+#: ../libslab/document-tile.c:193
#, c-format
msgid "Open with \"%s\""
msgstr ""
-#: ../libslab/document-tile.c:209
+#: ../libslab/document-tile.c:207
msgid "Open with Default Application"
msgstr ""
-#: ../libslab/document-tile.c:220
+#: ../libslab/document-tile.c:218
msgid "Open in File Manager"
msgstr ""
-#. clean item from menu
-#: ../libslab/document-tile.c:304
-msgid "Remove from recent menu"
-msgstr ""
-
-#. clean all the items from menu
-#: ../libslab/document-tile.c:312
-msgid "Purge all the recent items"
-msgstr ""
-
-#: ../libslab/document-tile.c:642
+#: ../libslab/document-tile.c:617
msgid "?"
msgstr ""
-#: ../libslab/document-tile.c:649
+#: ../libslab/document-tile.c:624
msgid "%l:%M %p"
msgstr ""
-#: ../libslab/document-tile.c:657
+#: ../libslab/document-tile.c:632
msgid "Today %l:%M %p"
msgstr ""
-#: ../libslab/document-tile.c:667
+#: ../libslab/document-tile.c:642
msgid "Yesterday %l:%M %p"
msgstr ""
-#: ../libslab/document-tile.c:679
+#: ../libslab/document-tile.c:654
msgid "%a %l:%M %p"
msgstr ""
-#: ../libslab/document-tile.c:687
+#: ../libslab/document-tile.c:662
msgid "%b %d %l:%M %p"
msgstr ""
-#: ../libslab/document-tile.c:689
+#: ../libslab/document-tile.c:664
msgid "%b %d %Y"
msgstr ""
@@ -191,5 +182,6 @@
msgstr ""
#: ../libslab/system-tile.c:140
+#, c-format
msgid "Remove from System Items"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/limal-apparmor-control.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/limal-apparmor-control.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/limal-apparmor-control.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: translation@suse.de\n"
-"POT-Creation-Date: 2013-03-13 21:40+0100\n"
+"POT-Creation-Date: 2015-05-06 18:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/limal-ca-mgm.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/limal-ca-mgm.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/limal-ca-mgm.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: translation@suse.de\n"
-"POT-Creation-Date: 2013-03-13 21:40+0100\n"
+"POT-Creation-Date: 2015-05-06 18:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -35,7 +35,7 @@
#: ../src/BasicConstraintsExtension.cpp:187 ../src/BitExtensions.cpp:134
#: ../src/BitExtensions.cpp:247 ../src/BitExtensions.cpp:374
#: ../src/BitExtensions.cpp:482 ../src/CA.cpp:1582
-#: ../src/CertificateIssueData.cpp:219
+#: ../src/CertificateIssueData.cpp:235
#: ../src/CertificatePoliciesExtension.cpp:169
#: ../src/CertificatePoliciesExtension.cpp:264
#: ../src/CertificatePoliciesExtension.cpp:425
@@ -48,7 +48,7 @@
#: ../src/ExtendedKeyUsageExt.cpp:77 ../src/ExtendedKeyUsageExt.cpp:229
#: ../src/IssuerAlternativeNameExtension.cpp:98
#: ../src/IssuerAlternativeNameExtension.cpp:224
-#: ../src/RequestGenerationData.cpp:248 ../src/StringExtensions.cpp:122
+#: ../src/RequestGenerationData.cpp:264 ../src/StringExtensions.cpp:122
#: ../src/StringExtensions.cpp:199 ../src/StringExtensions.cpp:287
#: ../src/StringExtensions.cpp:357 ../src/StringExtensions.cpp:441
#: ../src/StringExtensions.cpp:511 ../src/StringExtensions.cpp:594
@@ -345,8 +345,8 @@
msgid "Invalid serial %1."
msgstr ""
-#: ../src/CertificateData_Priv.cpp:206 ../src/CRLData_Priv.cpp:463
-#: ../src/DNObject_Priv.cpp:81 ../src/RequestData_Priv.cpp:369
+#: ../src/CertificateData_Priv.cpp:206 ../src/CRLData_Priv.cpp:479
+#: ../src/DNObject_Priv.cpp:81 ../src/RequestData_Priv.cpp:385
msgid "Cannot create a memory BIO."
msgstr ""
@@ -386,12 +386,12 @@
msgstr ""
#. %1 is the unsupported signature algorithm string
-#: ../src/CertificateData_Priv.cpp:488 ../src/CRLData_Priv.cpp:424
-#: ../src/RequestData_Priv.cpp:276
+#: ../src/CertificateData_Priv.cpp:504 ../src/CRLData_Priv.cpp:440
+#: ../src/RequestData_Priv.cpp:292
msgid "Unsupported signature algorithm %1."
msgstr ""
-#: ../src/CertificateIssueData.cpp:211
+#: ../src/CertificateIssueData.cpp:227
msgid "Invalid CertificateIssueData object."
msgstr ""
@@ -422,15 +422,15 @@
msgid "Invalid CertificatePoliciesExt object."
msgstr ""
-#: ../src/CRLData.cpp:223
+#: ../src/CRLData.cpp:235
msgid "Entry not found."
msgstr ""
-#: ../src/CRLData_Priv.cpp:491
+#: ../src/CRLData_Priv.cpp:507
msgid "Cannot parse CRL."
msgstr ""
-#: ../src/CRLData_Priv.cpp:504
+#: ../src/CRLData_Priv.cpp:520
msgid "Error parsing the CRL."
msgstr ""
@@ -675,15 +675,15 @@
msgid "Cannot create the file."
msgstr ""
-#: ../src/RequestData_Priv.cpp:396
+#: ../src/RequestData_Priv.cpp:412
msgid "Cannot parse the request."
msgstr ""
-#: ../src/RequestData_Priv.cpp:409
+#: ../src/RequestData_Priv.cpp:425
msgid "Error while parsing the request."
msgstr ""
-#: ../src/RequestGenerationData.cpp:240
+#: ../src/RequestGenerationData.cpp:256
msgid "Invalid RequestGenerationData object."
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/limal-nfs-server.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/limal-nfs-server.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/limal-nfs-server.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: translation@suse.de\n"
-"POT-Creation-Date: 2013-03-13 21:40+0100\n"
+"POT-Creation-Date: 2015-05-06 18:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/limal-runlevel.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/limal-runlevel.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/limal-runlevel.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: translation@suse.de\n"
-"POT-Creation-Date: 2013-03-13 21:40+0100\n"
+"POT-Creation-Date: 2015-05-06 18:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/limal.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/limal.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/limal.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: translation@suse.de\n"
-"POT-Creation-Date: 2013-03-13 21:39+0100\n"
+"POT-Creation-Date: 2015-05-06 18:11+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/linphone.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/linphone.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/linphone.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:40+0100\n"
+"POT-Creation-Date: 2015-05-06 18:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -49,559 +49,559 @@
msgid "Help"
msgstr ""
-#: ../gtk/interface.c:238
+#: ../gtk/interface.c:236
msgid "Enter sip address or phone number here"
msgstr ""
-#: ../gtk/interface.c:239 ../gtk/interface.c:1400 ../gtk/interface.c:2337
-#: ../gtk/interface.c:2359 ../gtk/interface.c:2499
+#: ../gtk/interface.c:237 ../gtk/interface.c:1398 ../gtk/interface.c:2335
+#: ../gtk/interface.c:2357 ../gtk/interface.c:2497
msgid "sip:"
msgstr ""
-#: ../gtk/interface.c:241 ../gtk/interface.c:2514
+#: ../gtk/interface.c:239 ../gtk/interface.c:2512
msgid "Sip address:"
msgstr ""
-#: ../gtk/interface.c:249
+#: ../gtk/interface.c:247
msgid "Shows the address book"
msgstr ""
-#: ../gtk/interface.c:263
+#: ../gtk/interface.c:261
msgid "..."
msgstr ""
-#: ../gtk/interface.c:271 ../gtk/interface.c:2521
+#: ../gtk/interface.c:269 ../gtk/interface.c:2519
msgid "Proxy to use:"
msgstr ""
-#: ../gtk/interface.c:280
+#: ../gtk/interface.c:278
msgid ""
"Call or\n"
"answer"
msgstr ""
-#: ../gtk/interface.c:285
+#: ../gtk/interface.c:283
msgid ""
"Hangup\n"
"or refuse"
msgstr ""
-#: ../gtk/interface.c:290
+#: ../gtk/interface.c:288
msgid "Or chat !"
msgstr ""
-#: ../gtk/interface.c:312
+#: ../gtk/interface.c:310
msgid "Show more..."
msgstr ""
-#: ../gtk/interface.c:334
+#: ../gtk/interface.c:332
msgid "Playback level:"
msgstr ""
-#: ../gtk/interface.c:345
+#: ../gtk/interface.c:343
msgid "Recording level:"
msgstr ""
-#: ../gtk/interface.c:356
+#: ../gtk/interface.c:354
msgid "Ring level:"
msgstr ""
-#: ../gtk/interface.c:367
+#: ../gtk/interface.c:365
msgid "Sound"
msgstr ""
-#: ../gtk/interface.c:384
+#: ../gtk/interface.c:382
msgid "Enable video"
msgstr ""
-#: ../gtk/interface.c:389
+#: ../gtk/interface.c:387
msgid "Video"
msgstr ""
-#: ../gtk/interface.c:394
+#: ../gtk/interface.c:392
msgid "Controls"
msgstr ""
-#: ../gtk/interface.c:412
+#: ../gtk/interface.c:410
msgid "Reachable"
msgstr ""
-#: ../gtk/interface.c:423
+#: ../gtk/interface.c:421
msgid "Busy, I'll be back in "
msgstr ""
-#: ../gtk/interface.c:432
+#: ../gtk/interface.c:430
msgid "The other party will be informed that you'll be back in X minutes"
msgstr ""
-#: ../gtk/interface.c:433
+#: ../gtk/interface.c:431
msgid "5"
msgstr ""
-#: ../gtk/interface.c:435
+#: ../gtk/interface.c:433
msgid "mn"
msgstr ""
-#: ../gtk/interface.c:440 ../coreapi/presence.c:138
+#: ../gtk/interface.c:438 ../coreapi/presence.c:138
msgid "Away"
msgstr ""
-#: ../gtk/interface.c:446
+#: ../gtk/interface.c:444
msgid "Do not disturb"
msgstr ""
-#: ../gtk/interface.c:452
+#: ../gtk/interface.c:450
msgid "Moved temporarily"
msgstr ""
-#: ../gtk/interface.c:458
+#: ../gtk/interface.c:456
msgid "Alternative service"
msgstr ""
-#: ../gtk/interface.c:468
+#: ../gtk/interface.c:466
msgid "URL:"
msgstr ""
-#: ../gtk/interface.c:477
+#: ../gtk/interface.c:475
msgid "Presence"
msgstr ""
-#: ../gtk/interface.c:494
+#: ../gtk/interface.c:492
msgid "Press digits to send DTMFs."
msgstr ""
-#: ../gtk/interface.c:503
+#: ../gtk/interface.c:501
msgid ""
" 3\n"
"def"
msgstr ""
-#: ../gtk/interface.c:509
+#: ../gtk/interface.c:507
msgid ""
" 2\n"
"abc"
msgstr ""
-#: ../gtk/interface.c:515
+#: ../gtk/interface.c:513
msgid "1"
msgstr ""
-#: ../gtk/interface.c:521
+#: ../gtk/interface.c:519
msgid ""
" 4\n"
"ghi"
msgstr ""
-#: ../gtk/interface.c:527
+#: ../gtk/interface.c:525
msgid ""
" 5\n"
"jkl"
msgstr ""
-#: ../gtk/interface.c:533
+#: ../gtk/interface.c:531
msgid ""
" 6\n"
"mno"
msgstr ""
-#: ../gtk/interface.c:539
+#: ../gtk/interface.c:537
msgid ""
" 7\n"
"pqrs"
msgstr ""
-#: ../gtk/interface.c:545
+#: ../gtk/interface.c:543
msgid ""
" 8\n"
"tuv"
msgstr ""
-#: ../gtk/interface.c:551
+#: ../gtk/interface.c:549
msgid ""
" 9\n"
"wxyz"
msgstr ""
-#: ../gtk/interface.c:557
+#: ../gtk/interface.c:555
msgid "*"
msgstr ""
-#: ../gtk/interface.c:563
+#: ../gtk/interface.c:561
msgid "0"
msgstr ""
-#: ../gtk/interface.c:569
+#: ../gtk/interface.c:567
msgid "#"
msgstr ""
-#: ../gtk/interface.c:575
+#: ../gtk/interface.c:573
msgid "DTMF"
msgstr ""
-#: ../gtk/interface.c:592
+#: ../gtk/interface.c:590
msgid "My online friends"
msgstr ""
-#: ../gtk/interface.c:851 ../gtk/interface.c:3031
+#: ../gtk/interface.c:849 ../gtk/interface.c:3029
msgid "Linphone"
msgstr ""
-#: ../gtk/interface.c:852 ../gtk/interface.c:3032
+#: ../gtk/interface.c:850 ../gtk/interface.c:3030
msgid ""
"C: 2001\n"
"Made in Old Europe"
msgstr ""
-#: ../gtk/interface.c:853 ../gtk/interface.c:3033
+#: ../gtk/interface.c:851 ../gtk/interface.c:3031
msgid ""
"Linphone is a web-phone.\n"
"It is compatible with SIP and RTP protocols."
msgstr ""
-#: ../gtk/interface.c:856
+#: ../gtk/interface.c:854
msgid "http://www.linphone.org"
msgstr ""
-#: ../gtk/interface.c:1030
+#: ../gtk/interface.c:1028
msgid "Parameters"
msgstr ""
-#: ../gtk/interface.c:1063
+#: ../gtk/interface.c:1061
msgid "Use IPv6 network (if available)"
msgstr ""
-#: ../gtk/interface.c:1066
+#: ../gtk/interface.c:1064
msgid ""
"Toggle this if you are on an ipv6 network and you wish linphone to use it."
msgstr ""
-#: ../gtk/interface.c:1068
+#: ../gtk/interface.c:1066
msgid "Global"
msgstr ""
-#: ../gtk/interface.c:1083
+#: ../gtk/interface.c:1081
msgid ""
"These options is only for users in a private network, behind a gateway. If "
"you are not in this situation, then leave this empty."
msgstr ""
-#: ../gtk/interface.c:1093
+#: ../gtk/interface.c:1091
msgid "No firewall"
msgstr ""
-#: ../gtk/interface.c:1101
+#: ../gtk/interface.c:1099
msgid "Use this STUN server to guess firewall address :"
msgstr ""
-#: ../gtk/interface.c:1109
+#: ../gtk/interface.c:1107
msgid "Specify firewall address manually:"
msgstr ""
-#: ../gtk/interface.c:1129
+#: ../gtk/interface.c:1127
msgid "NAT traversal options (experimental)"
msgstr ""
-#: ../gtk/interface.c:1158
+#: ../gtk/interface.c:1156
msgid "Number of buffered miliseconds (jitter compensation):"
msgstr ""
-#: ../gtk/interface.c:1166
+#: ../gtk/interface.c:1164
msgid "RTP port used for audio:"
msgstr ""
-#: ../gtk/interface.c:1173
+#: ../gtk/interface.c:1171
msgid "RTP properties"
msgstr ""
-#: ../gtk/interface.c:1191
+#: ../gtk/interface.c:1189
msgid "Use SIP INFO message instead of RTP rfc2833 for DTMF transmitting"
msgstr ""
-#: ../gtk/interface.c:1194
+#: ../gtk/interface.c:1192
msgid "RTP-RFC2833 is the recommended way."
msgstr ""
-#: ../gtk/interface.c:1196
+#: ../gtk/interface.c:1194
msgid "Other"
msgstr ""
-#: ../gtk/interface.c:1201
+#: ../gtk/interface.c:1199
msgid "Network"
msgstr ""
-#: ../gtk/interface.c:1227
+#: ../gtk/interface.c:1225
msgid "Playback sound device:"
msgstr ""
-#: ../gtk/interface.c:1242 ../gtk/propertybox.c:628 ../gtk/propertybox.c:653
+#: ../gtk/interface.c:1240 ../gtk/propertybox.c:628 ../gtk/propertybox.c:653
msgid "micro"
msgstr ""
-#: ../gtk/interface.c:1243 ../gtk/propertybox.c:631 ../gtk/propertybox.c:654
+#: ../gtk/interface.c:1241 ../gtk/propertybox.c:631 ../gtk/propertybox.c:654
msgid "line"
msgstr ""
-#: ../gtk/interface.c:1252
+#: ../gtk/interface.c:1250
msgid "Capture sound device:"
msgstr ""
-#: ../gtk/interface.c:1272
+#: ../gtk/interface.c:1270
msgid "Recording source:"
msgstr ""
-#: ../gtk/interface.c:1279
+#: ../gtk/interface.c:1277
msgid "Ring sound device"
msgstr ""
-#: ../gtk/interface.c:1287
+#: ../gtk/interface.c:1285
msgid "Ring sound:"
msgstr ""
-#: ../gtk/interface.c:1307
+#: ../gtk/interface.c:1305
msgid "Enable echo-canceler (cancels the echo heard by the remote party)"
msgstr ""
-#: ../gtk/interface.c:1321
+#: ../gtk/interface.c:1319
msgid "Choose file"
msgstr ""
-#: ../gtk/interface.c:1341
+#: ../gtk/interface.c:1339
msgid "Listen"
msgstr ""
-#: ../gtk/interface.c:1345
+#: ../gtk/interface.c:1343
msgid "Sound properties"
msgstr ""
-#: ../gtk/interface.c:1349
+#: ../gtk/interface.c:1347
msgid "Sound device"
msgstr ""
-#: ../gtk/interface.c:1367
+#: ../gtk/interface.c:1365
msgid "Run sip user agent on port:"
msgstr ""
-#: ../gtk/interface.c:1376
+#: ../gtk/interface.c:1374
msgid "It is strongly recommended to use port 5060."
msgstr ""
-#: ../gtk/interface.c:1378
+#: ../gtk/interface.c:1376
msgid "SIP port"
msgstr ""
-#: ../gtk/interface.c:1395
+#: ../gtk/interface.c:1393
msgid "Your sip address:"
msgstr ""
-#: ../gtk/interface.c:1409
+#: ../gtk/interface.c:1407
msgid "@"
msgstr ""
-#: ../gtk/interface.c:1418
+#: ../gtk/interface.c:1416
msgid "Automatically guess a valid hostname"
msgstr ""
-#: ../gtk/interface.c:1422
+#: ../gtk/interface.c:1420
msgid "Identity"
msgstr ""
-#: ../gtk/interface.c:1469
+#: ../gtk/interface.c:1467
msgid "Add proxy/registrar"
msgstr ""
-#: ../gtk/interface.c:1490 ../gtk/interface.c:2116
+#: ../gtk/interface.c:1488 ../gtk/interface.c:2114
msgid "Edit"
msgstr ""
-#: ../gtk/interface.c:1511
+#: ../gtk/interface.c:1509
msgid "Remove"
msgstr ""
-#: ../gtk/interface.c:1515
+#: ../gtk/interface.c:1513
msgid "Remote services"
msgstr ""
-#: ../gtk/interface.c:1545
+#: ../gtk/interface.c:1543
msgid "Clear all stored authentication information (username,password...)"
msgstr ""
-#: ../gtk/interface.c:1549
+#: ../gtk/interface.c:1547
msgid "Authentication information"
msgstr ""
-#: ../gtk/interface.c:1553
+#: ../gtk/interface.c:1551
msgid "SIP"
msgstr ""
-#: ../gtk/interface.c:1576
+#: ../gtk/interface.c:1574
msgid "List of audio codecs, in order of preference:"
msgstr ""
-#: ../gtk/interface.c:1597
+#: ../gtk/interface.c:1595
msgid "Audio codecs"
msgstr ""
-#: ../gtk/interface.c:1610
+#: ../gtk/interface.c:1608
msgid "Video Codecs"
msgstr ""
-#: ../gtk/interface.c:1646
+#: ../gtk/interface.c:1644
msgid "Enable"
msgstr ""
-#: ../gtk/interface.c:1667
+#: ../gtk/interface.c:1665
msgid "Disable"
msgstr ""
-#: ../gtk/interface.c:1675
+#: ../gtk/interface.c:1673
msgid "Upload bandwidth (kbit/sec):"
msgstr ""
-#: ../gtk/interface.c:1683
+#: ../gtk/interface.c:1681
msgid "Download bandwidth (kbit/sec):"
msgstr ""
-#: ../gtk/interface.c:1710
+#: ../gtk/interface.c:1708
msgid ""
"Note: Codecs in red are not usable regarding to your connection type to the "
"internet."
msgstr ""
-#: ../gtk/interface.c:1722
+#: ../gtk/interface.c:1720
msgid "No information availlable"
msgstr ""
-#: ../gtk/interface.c:1729
+#: ../gtk/interface.c:1727
msgid "Codec information"
msgstr ""
-#: ../gtk/interface.c:1733
+#: ../gtk/interface.c:1731
msgid "Audio and video codecs"
msgstr ""
-#: ../gtk/interface.c:1738
+#: ../gtk/interface.c:1736
msgid "Codecs"
msgstr ""
-#: ../gtk/interface.c:2046
+#: ../gtk/interface.c:2044
msgid "Address Book"
msgstr ""
-#: ../gtk/interface.c:2142
+#: ../gtk/interface.c:2140
msgid "Select"
msgstr ""
-#: ../gtk/interface.c:2201
+#: ../gtk/interface.c:2199
msgid "Information"
msgstr ""
-#: ../gtk/interface.c:2219
+#: ../gtk/interface.c:2217
msgid ""
"User is not reachable at the moment but he invites you to contact him using "
"the following alternate ressource:"
msgstr ""
-#: ../gtk/interface.c:2226
+#: ../gtk/interface.c:2224
msgid "None."
msgstr ""
-#: ../gtk/interface.c:2287 ../gtk/interface.c:2396
+#: ../gtk/interface.c:2285 ../gtk/interface.c:2394
msgid "Proxy/Registrar configuration box"
msgstr ""
-#: ../gtk/interface.c:2317
+#: ../gtk/interface.c:2315
msgid "Route (optional):"
msgstr ""
-#: ../gtk/interface.c:2339
+#: ../gtk/interface.c:2337
msgid "SIP Proxy:"
msgstr ""
-#: ../gtk/interface.c:2346
+#: ../gtk/interface.c:2344
msgid "SIP Identity:"
msgstr ""
-#: ../gtk/interface.c:2361
+#: ../gtk/interface.c:2359
msgid "Registration Period:"
msgstr ""
-#: ../gtk/interface.c:2376
+#: ../gtk/interface.c:2374
msgid "Send registration:"
msgstr ""
-#: ../gtk/interface.c:2383
+#: ../gtk/interface.c:2381
msgid "Publish presence information:"
msgstr ""
-#: ../gtk/interface.c:2468
+#: ../gtk/interface.c:2466
msgid "Edit contact information"
msgstr ""
-#: ../gtk/interface.c:2507
+#: ../gtk/interface.c:2505
msgid "Name:"
msgstr ""
-#: ../gtk/interface.c:2528
+#: ../gtk/interface.c:2526
msgid "Subscribe policy:"
msgstr ""
-#: ../gtk/interface.c:2535
+#: ../gtk/interface.c:2533
msgid "Send subscription (see person's online status)"
msgstr ""
-#: ../gtk/interface.c:2539
+#: ../gtk/interface.c:2537
msgid "Contact information"
msgstr ""
-#: ../gtk/interface.c:2610
+#: ../gtk/interface.c:2608
msgid "New incoming subscription"
msgstr ""
-#: ../gtk/interface.c:2630
+#: ../gtk/interface.c:2628
msgid "You have received a new subscription..."
msgstr ""
-#: ../gtk/interface.c:2657
+#: ../gtk/interface.c:2655
msgid "Refuse"
msgstr ""
-#: ../gtk/interface.c:2678 ../gtk/addressbook.c:57
+#: ../gtk/interface.c:2676 ../gtk/addressbook.c:57
msgid "Accept"
msgstr ""
-#: ../gtk/interface.c:2731
+#: ../gtk/interface.c:2729
msgid "Authentication requested"
msgstr ""
-#: ../gtk/interface.c:2757
+#: ../gtk/interface.c:2755
msgid "Authentication required for realm"
msgstr ""
-#: ../gtk/interface.c:2793
+#: ../gtk/interface.c:2791
msgid "userid:"
msgstr ""
-#: ../gtk/interface.c:2801
+#: ../gtk/interface.c:2799
msgid "password:"
msgstr ""
-#: ../gtk/interface.c:2809
+#: ../gtk/interface.c:2807
msgid "username:"
msgstr ""
-#: ../gtk/interface.c:2817
+#: ../gtk/interface.c:2815
msgid "realm:"
msgstr ""
-#: ../gtk/interface.c:2878
+#: ../gtk/interface.c:2876
msgid "Linphone - Call history"
msgstr ""
-#: ../gtk/interface.c:2945
+#: ../gtk/interface.c:2943
msgid "Chat Room"
msgstr ""
-#: ../gtk/interface.c:2973
+#: ../gtk/interface.c:2971
msgid "Text:"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/login.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/login.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/login.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:40+0100\n"
+"POT-Creation-Date: 2015-05-06 18:12+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/nautilus-open-terminal.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/nautilus-open-terminal.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/nautilus-open-terminal.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:41+0100\n"
+"POT-Creation-Date: 2015-05-06 21:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/nautilus-sendto.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/nautilus-sendto.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/nautilus-sendto.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:41+0100\n"
+"POT-Creation-Date: 2015-05-06 21:41+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/nautilus-share.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/nautilus-share.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/nautilus-share.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:41+0100\n"
+"POT-Creation-Date: 2015-05-06 21:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -71,31 +71,27 @@
msgid "Another share has the same name"
msgstr ""
-#: ../src/nautilus-share.c:703
+#: ../src/nautilus-share.c:669
msgid "There was an error while getting the sharing information"
msgstr ""
-#: ../src/nautilus-share.c:806
+#: ../src/nautilus-share.c:769
msgid "Modify _Share"
msgstr ""
-#: ../src/nautilus-share.c:808
+#: ../src/nautilus-share.c:771
msgid "Create _Share"
msgstr ""
-#: ../src/nautilus-share.c:816
-msgid "Start Yast"
-msgstr ""
-
-#: ../src/nautilus-share.c:1076
+#: ../src/nautilus-share.c:1029
msgid "Share"
msgstr ""
-#: ../src/nautilus-share.c:1176
+#: ../src/nautilus-share.c:1129
msgid "Sharing Options"
msgstr ""
-#: ../src/nautilus-share.c:1177
+#: ../src/nautilus-share.c:1130
msgid "Share this Folder"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/pam-config.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/pam-config.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/pam-config.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-13 21:41+0100\n"
+"POT-Creation-Date: 2015-05-06 18:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/pam_krb5.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/pam_krb5.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/pam_krb5.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -9,7 +9,7 @@
"Project-Id-Version: pam_krb5 2.3.1\n"
"Report-Msgid-Bugs-To: http://git.fedorahosted.org/git/?p=pam_krb5.git;a=blob;"
"f=AUTHORS;hb=HEAD\n"
-"POT-Creation-Date: 2013-03-13 21:41+0100\n"
+"POT-Creation-Date: 2015-05-06 18:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,21 +18,21 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/auth.c:288
+#: src/auth.c:286
msgid "Password: "
msgstr ""
-#: src/password.c:272
+#: src/password.c:262
#, c-format
msgid "%s%sPassword: "
msgstr ""
-#: src/password.c:364
+#: src/password.c:354
#, c-format
msgid "New %s%sPassword: "
msgstr ""
-#: src/password.c:367
+#: src/password.c:357
#, c-format
msgid "Repeat New %s%sPassword: "
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/pidgin-sipe.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/pidgin-sipe.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/pidgin-sipe.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 15:48+0100\n"
+"POT-Creation-Date: 2015-05-06 18:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/pidgin.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/pidgin.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/pidgin.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 15:57+0100\n"
+"POT-Creation-Date: 2015-05-06 18:15+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -138,7 +138,7 @@
#: ../finch/gntstatus.c:487 ../finch/gntstatus.c:612
#: ../finch/plugins/gnthistory.c:182 ../libpurple/account.c:1172
#: ../libpurple/account.c:1514 ../libpurple/account.c:1549
-#: ../libpurple/conversation.c:1293 ../libpurple/conversation.c:2120
+#: ../libpurple/conversation.c:1293 ../libpurple/conversation.c:2128
#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:473
#: ../libpurple/protocols/gg/gg.c:615 ../libpurple/protocols/gg/gg.c:744
#: ../libpurple/protocols/gg/gg.c:821
@@ -202,9 +202,9 @@
#: ../libpurple/protocols/silc10/ops.c:1910
#: ../libpurple/protocols/silc10/silc.c:761
#: ../libpurple/protocols/silc10/silc.c:967
-#: ../libpurple/protocols/yahoo/libymsg.c:1289
-#: ../libpurple/protocols/yahoo/libymsg.c:4201
-#: ../libpurple/protocols/yahoo/libymsg.c:4212
+#: ../libpurple/protocols/yahoo/libymsg.c:1371
+#: ../libpurple/protocols/yahoo/libymsg.c:4427
+#: ../libpurple/protocols/yahoo/libymsg.c:4438
#: ../libpurple/protocols/yahoo/yahoo_aliases.c:589
#: ../libpurple/protocols/yahoo/yahoo_aliases.c:600
#: ../pidgin/gtkaccount.c:1873 ../pidgin/gtkaccount.c:2430
@@ -364,9 +364,7 @@
msgid "Error adding buddy"
msgstr ""
-#: ../finch/gntblist.c:677 ../libpurple/protocols/irc/irc.c:1016
-#: ../libpurple/protocols/irc/msgs.c:366
-#: ../libpurple/protocols/jabber/jabber.c:1261
+#: ../finch/gntblist.c:677 ../libpurple/protocols/jabber/jabber.c:1261
#: ../libpurple/protocols/jabber/jabber.c:1263
#: ../libpurple/protocols/oscar/oscar.c:4372
#: ../libpurple/protocols/silc/buddy.c:1554
@@ -412,7 +410,7 @@
#: ../libpurple/protocols/silc10/buddy.c:1036
#: ../libpurple/protocols/silc10/buddy.c:1083
#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/libymsg.c:4009 ../pidgin/gtkblist.c:7005
+#: ../libpurple/protocols/yahoo/libymsg.c:4235 ../pidgin/gtkblist.c:7005
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:451
msgid "Add Buddy"
msgstr ""
@@ -645,7 +643,7 @@
#: ../libpurple/protocols/msnp9/state.c:32
#: ../libpurple/protocols/novell/novell.c:2847
#: ../libpurple/protocols/oscar/oscar.c:3501
-#: ../libpurple/protocols/yahoo/libymsg.c:3723
+#: ../libpurple/protocols/yahoo/libymsg.c:3949
#: ../libpurple/protocols/yahoo/yahoo_profile.c:711 ../pidgin/gtkblist.c:3666
#: ../pidgin/gtkblist.c:4142 ../pidgin/gtkprefs.c:2655
msgid "Idle"
@@ -725,9 +723,9 @@
#: ../libpurple/protocols/silc10/ops.c:1297
#: ../libpurple/protocols/silc10/ops.c:1909
#: ../libpurple/protocols/silc10/silc.c:760
-#: ../libpurple/protocols/yahoo/libymsg.c:1288
-#: ../libpurple/protocols/yahoo/libymsg.c:4200
-#: ../libpurple/protocols/yahoo/libymsg.c:4211
+#: ../libpurple/protocols/yahoo/libymsg.c:1370
+#: ../libpurple/protocols/yahoo/libymsg.c:4426
+#: ../libpurple/protocols/yahoo/libymsg.c:4437
#: ../libpurple/protocols/yahoo/yahoo_aliases.c:588
#: ../libpurple/protocols/yahoo/yahoo_aliases.c:599 ../pidgin/gtkcertmgr.c:193
#: ../pidgin/gtkdialogs.c:776 ../pidgin/gtkdialogs.c:915
@@ -819,7 +817,7 @@
msgid "By Log Size"
msgstr ""
-#: ../finch/gntblist.c:3066 ../libpurple/conversation.c:2107
+#: ../finch/gntblist.c:3066 ../libpurple/conversation.c:2115
#: ../pidgin/gtknotify.c:1588
msgid "Buddy"
msgstr ""
@@ -1165,7 +1163,7 @@
msgstr ""
#: ../finch/gntdebug.c:272 ../pidgin/gtkconv.c:995 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:533 ../pidgin/gtkutils.c:3650
+#: ../pidgin/gtkft.c:533 ../pidgin/gtkutils.c:3646
msgid "Unable to open file."
msgstr ""
@@ -1242,7 +1240,7 @@
#: ../libpurple/protocols/oscar/oscar.c:3292
#: ../libpurple/protocols/sametime/sametime.c:3337
#: ../libpurple/protocols/sametime/sametime.c:4229
-#: ../libpurple/protocols/yahoo/libymsg.c:3883 ../pidgin/gtkblist.c:3710
+#: ../libpurple/protocols/yahoo/libymsg.c:4109 ../pidgin/gtkblist.c:3710
#: ../pidgin/gtkblist.c:3724 ../pidgin/gtkblist.c:3726
#: ../pidgin/gtksavedstatuses.c:1017 ../pidgin/gtksavedstatuses.c:1168
msgid "Status"
@@ -1455,7 +1453,7 @@
msgid "IM"
msgstr ""
-#: ../finch/gntnotify.c:460 ../libpurple/conversation.c:2119
+#: ../finch/gntnotify.c:460 ../libpurple/conversation.c:2127
#: ../libpurple/protocols/sametime/sametime.c:3547
msgid "Invite"
msgstr ""
@@ -2019,14 +2017,14 @@
#. not independent
#. Attributes - each status can have a message.
#: ../finch/gntstatus.c:185 ../finch/gntstatus.c:566 ../finch/gntstatus.c:578
-#: ../libpurple/conversation.c:2112
+#: ../libpurple/conversation.c:2120
#: ../libpurple/protocols/bonjour/bonjour.c:281
#: ../libpurple/protocols/bonjour/bonjour.c:288
#: ../libpurple/protocols/bonjour/bonjour.c:370
#: ../libpurple/protocols/gg/gg.c:1142 ../libpurple/protocols/gg/gg.c:1796
#: ../libpurple/protocols/gg/gg.c:1812 ../libpurple/protocols/gg/gg.c:1822
#: ../libpurple/protocols/gg/gg.c:1828 ../libpurple/protocols/gg/gg.c:1837
-#: ../libpurple/protocols/gg/gg.c:1842 ../libpurple/protocols/irc/irc.c:247
+#: ../libpurple/protocols/gg/gg.c:1842 ../libpurple/protocols/irc/irc.c:274
#: ../libpurple/protocols/jabber/jabber.c:2131
#: ../libpurple/protocols/jabber/jabber.c:2147
#: ../libpurple/protocols/jabber/jabber.c:2163
@@ -2054,8 +2052,8 @@
#: ../libpurple/protocols/silc/buddy.c:1566
#: ../libpurple/protocols/silc10/buddy.c:1571
#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/libymsg.c:4715
-#: ../libpurple/protocols/yahoo/libymsg.c:4721
+#: ../libpurple/protocols/yahoo/libymsg.c:4941
+#: ../libpurple/protocols/yahoo/libymsg.c:4947
#: ../libpurple/protocols/zephyr/zephyr.c:2342 ../pidgin/gtknotify.c:1608
#: ../pidgin/gtksavedstatuses.c:544 ../pidgin/gtksavedstatuses.c:1032
msgid "Message"
@@ -2294,7 +2292,7 @@
#: ../libpurple/protocols/oscar/oscar.c:6141
#: ../libpurple/protocols/qq/qq.c:250 ../libpurple/protocols/qq/qq.c:257
#: ../libpurple/protocols/qq/qq.c:419
-#: ../libpurple/protocols/yahoo/libymsg.c:3725 ../libpurple/status.c:161
+#: ../libpurple/protocols/yahoo/libymsg.c:3951 ../libpurple/status.c:161
#: ../pidgin/gtkblist.c:3710 ../pidgin/gtkblist.c:4119
#: ../pidgin/gtkdocklet.c:566 ../pidgin/gtkstatusbox.c:1109
#: ../pidgin/plugins/themeedit-icon.c:67
@@ -2428,7 +2426,7 @@
#: ../libpurple/protocols/jabber/buddy.c:773
#: ../libpurple/protocols/jabber/buddy.c:1917
#: ../libpurple/protocols/jabber/buddy.c:1934
-#: ../libpurple/protocols/msn/oim.c:731
+#: ../libpurple/protocols/msn/oim.c:732
#: ../libpurple/protocols/novell/novell.c:2853
#: ../libpurple/protocols/qq/group_info.c:126
#: ../libpurple/protocols/qq/qq.c:313 ../pidgin/gtkft.c:164
@@ -2609,9 +2607,9 @@
#: ../libpurple/protocols/oscar/family_chatnav.c:65
#: ../libpurple/protocols/oscar/oscar.c:154
#: ../libpurple/protocols/oscar/oscar.c:155
-#: ../libpurple/protocols/yahoo/libymsg.c:1808
-#: ../libpurple/protocols/yahoo/libymsg.c:1817
-#: ../libpurple/protocols/yahoo/libymsg.c:2155
+#: ../libpurple/protocols/yahoo/libymsg.c:1951
+#: ../libpurple/protocols/yahoo/libymsg.c:1960
+#: ../libpurple/protocols/yahoo/libymsg.c:2326
msgid "Unknown error"
msgstr ""
@@ -2642,42 +2640,42 @@
msgid "_Send Message"
msgstr ""
-#: ../libpurple/conversation.c:1696
+#: ../libpurple/conversation.c:1704
#, c-format
msgid "%s entered the room."
msgstr ""
-#: ../libpurple/conversation.c:1699
+#: ../libpurple/conversation.c:1707
#, c-format
msgid "%s [<I>%s</I>] entered the room."
msgstr ""
-#: ../libpurple/conversation.c:1809
+#: ../libpurple/conversation.c:1817
#, c-format
msgid "You are now known as %s"
msgstr ""
-#: ../libpurple/conversation.c:1829
+#: ../libpurple/conversation.c:1837
#, c-format
msgid "%s is now known as %s"
msgstr ""
-#: ../libpurple/conversation.c:1904
+#: ../libpurple/conversation.c:1912
#, c-format
msgid "%s left the room."
msgstr ""
-#: ../libpurple/conversation.c:1907
+#: ../libpurple/conversation.c:1915
#, c-format
msgid "%s left the room (%s)."
msgstr ""
-#: ../libpurple/conversation.c:2104 ../libpurple/conversation.c:2115
+#: ../libpurple/conversation.c:2112 ../libpurple/conversation.c:2123
msgid "Invite to chat"
msgstr ""
#. Put our happy label in it.
-#: ../libpurple/conversation.c:2116 ../pidgin/gtkconv.c:898
+#: ../libpurple/conversation.c:2124 ../pidgin/gtkconv.c:898
msgid ""
"Please enter the name of the user you wish to invite, along with an optional "
"invite message."
@@ -4359,7 +4357,7 @@
#: ../libpurple/protocols/mxit/roster.c:54
#: ../libpurple/protocols/novell/novell.c:2838
#: ../libpurple/protocols/qq/qq.c:403
-#: ../libpurple/protocols/yahoo/libymsg.c:3727 ../libpurple/status.c:162
+#: ../libpurple/protocols/yahoo/libymsg.c:3953 ../libpurple/status.c:162
#: ../pidgin/gtkdocklet.c:550 ../pidgin/gtkstatusbox.c:1105
#: ../pidgin/plugins/themeedit-icon.c:63
msgid "Available"
@@ -4369,16 +4367,16 @@
#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
#. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1083 ../libpurple/protocols/irc/irc.c:562
-#: ../libpurple/protocols/irc/msgs.c:360
+#: ../libpurple/protocols/gg/gg.c:1083 ../libpurple/protocols/irc/irc.c:595
+#: ../libpurple/protocols/irc/msgs.c:427
#: ../libpurple/protocols/jabber/buddy.c:1927
#: ../libpurple/protocols/mxit/roster.c:55
#: ../libpurple/protocols/novell/novell.c:2841
#: ../libpurple/protocols/oscar/oscar.c:782 ../libpurple/protocols/qq/qq.c:260
#: ../libpurple/protocols/qq/qq.c:407 ../libpurple/protocols/silc/buddy.c:1489
#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/yahoo/libymsg.c:4606
-#: ../libpurple/protocols/yahoo/libymsg.c:4693 ../libpurple/status.c:165
+#: ../libpurple/protocols/yahoo/libymsg.c:4832
+#: ../libpurple/protocols/yahoo/libymsg.c:4919 ../libpurple/status.c:165
#: ../pidgin/gtkdocklet.c:554 ../pidgin/gtkprefs.c:2691
#: ../pidgin/gtkstatusbox.c:1106 ../pidgin/plugins/themeedit-icon.c:64
msgid "Away"
@@ -4480,7 +4478,7 @@
#. 1. connect to server
#. connect to the server
-#: ../libpurple/protocols/gg/gg.c:1960 ../libpurple/protocols/irc/irc.c:334
+#: ../libpurple/protocols/gg/gg.c:1960 ../libpurple/protocols/irc/irc.c:361
#: ../libpurple/protocols/jabber/jabber.c:1582
#: ../libpurple/protocols/msn/session.c:389
#: ../libpurple/protocols/msnp9/session.c:351
@@ -4489,7 +4487,7 @@
#: ../libpurple/protocols/oscar/oscar.c:1680
#: ../libpurple/protocols/sametime/sametime.c:3801
#: ../libpurple/protocols/simple/simple.c:1949
-#: ../libpurple/protocols/yahoo/libymsg.c:3535
+#: ../libpurple/protocols/yahoo/libymsg.c:3761
#: ../libpurple/protocols/zephyr/zephyr.c:1582 ../pidgin/gtkstatusbox.c:719
msgid "Connecting"
msgstr ""
@@ -4585,9 +4583,9 @@
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:345
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1154
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1859
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1940
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1219
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1969
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2066
msgid "File Transfer Failed"
msgstr ""
@@ -4620,8 +4618,8 @@
#.
#. TODO: what to do here - do we really have to disconnect?
#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/irc/irc.c:125 ../libpurple/protocols/irc/irc.c:167
-#: ../libpurple/protocols/irc/irc.c:660 ../libpurple/protocols/irc/irc.c:691
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:174
+#: ../libpurple/protocols/irc/irc.c:693 ../libpurple/protocols/irc/irc.c:724
#: ../libpurple/protocols/jabber/bosh.c:959
#: ../libpurple/protocols/jabber/bosh.c:1012
#: ../libpurple/protocols/jabber/jabber.c:332
@@ -4636,8 +4634,8 @@
#: ../libpurple/protocols/sametime/sametime.c:412
#: ../libpurple/protocols/sametime/sametime.c:1770
#: ../libpurple/protocols/simple/simple.c:433
-#: ../libpurple/protocols/yahoo/libymsg.c:3058
-#: ../libpurple/protocols/yahoo/libymsg.c:3212
+#: ../libpurple/protocols/yahoo/libymsg.c:3284
+#: ../libpurple/protocols/yahoo/libymsg.c:3438
#: ../libpurple/protocols/yahoo/ycht.c:476 ../libpurple/proxy.c:888
#: ../libpurple/proxy.c:1471 ../libpurple/proxy.c:1585
#: ../libpurple/proxy.c:1820 ../libpurple/proxy.c:1896
@@ -4645,33 +4643,33 @@
msgid "Lost connection with server: %s"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:262
+#: ../libpurple/protocols/irc/irc.c:289
msgid "View MOTD"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:274 ../libpurple/protocols/silc/chat.c:34
+#: ../libpurple/protocols/irc/irc.c:301 ../libpurple/protocols/silc/chat.c:34
#: ../libpurple/protocols/silc10/chat.c:33
msgid "_Channel:"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:280
+#: ../libpurple/protocols/irc/irc.c:307
#: ../libpurple/protocols/jabber/chat.c:62 ../pidgin/gtkaccount.c:585
msgid "_Password:"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:313
+#: ../libpurple/protocols/irc/irc.c:340
msgid "IRC nick and server may not contain whitespace"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:344
+#: ../libpurple/protocols/irc/irc.c:371
#: ../libpurple/protocols/jabber/bosh.c:913
#: ../libpurple/protocols/jabber/jabber.c:924
#: ../libpurple/protocols/novell/novell.c:2217
-#: ../libpurple/protocols/yahoo/libymsg.c:1967
+#: ../libpurple/protocols/yahoo/libymsg.c:2110
msgid "SSL support unavailable"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:357
+#: ../libpurple/protocols/irc/irc.c:384
#: ../libpurple/protocols/jabber/bosh.c:919
#: ../libpurple/protocols/jabber/jabber.c:654
#: ../libpurple/protocols/jabber/jabber.c:760
@@ -4692,39 +4690,39 @@
#: ../libpurple/protocols/silc/silc.c:451
#: ../libpurple/protocols/simple/simple.c:482
#: ../libpurple/protocols/simple/simple.c:1852
-#: ../libpurple/protocols/yahoo/libymsg.c:3265
-#: ../libpurple/protocols/yahoo/libymsg.c:3453
-#: ../libpurple/protocols/yahoo/libymsg.c:3569
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1940
-#: ../libpurple/protocols/yahoo/yahoochat.c:1460
-#: ../libpurple/protocols/yahoo/yahoochat.c:1486
+#: ../libpurple/protocols/yahoo/libymsg.c:3491
+#: ../libpurple/protocols/yahoo/libymsg.c:3679
+#: ../libpurple/protocols/yahoo/libymsg.c:3795
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:2066
+#: ../libpurple/protocols/yahoo/yahoochat.c:1536
+#: ../libpurple/protocols/yahoo/yahoochat.c:1562
#: ../libpurple/protocols/yahoo/ycht.c:549
#: ../libpurple/protocols/yahoo/ycht.c:585
msgid "Unable to connect"
msgstr ""
#. this is a regular connect, error out
-#: ../libpurple/protocols/irc/irc.c:453
+#: ../libpurple/protocols/irc/irc.c:475
#: ../libpurple/protocols/myspace/myspace.c:2176
#: ../libpurple/protocols/oscar/flap_connection.c:468
#: ../libpurple/protocols/sametime/sametime.c:1795
#: ../libpurple/protocols/simple/simple.c:452
#: ../libpurple/protocols/simple/simple.c:1736
-#: ../libpurple/protocols/yahoo/libymsg.c:3147
-#: ../libpurple/protocols/yahoo/libymsg.c:3173
+#: ../libpurple/protocols/yahoo/libymsg.c:3373
+#: ../libpurple/protocols/yahoo/libymsg.c:3399
#, c-format
msgid "Unable to connect: %s"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:669 ../libpurple/protocols/irc/irc.c:700
+#: ../libpurple/protocols/irc/irc.c:702 ../libpurple/protocols/irc/irc.c:733
#: ../libpurple/protocols/jabber/jabber.c:561
#: ../libpurple/protocols/jabber/jabber.c:608
#: ../libpurple/protocols/myspace/myspace.c:2092
#: ../libpurple/protocols/oscar/flap_connection.c:461
#: ../libpurple/protocols/qq/qq_network.c:400
#: ../libpurple/protocols/sametime/sametime.c:1762
-#: ../libpurple/protocols/yahoo/libymsg.c:3065
-#: ../libpurple/protocols/yahoo/libymsg.c:3219
+#: ../libpurple/protocols/yahoo/libymsg.c:3291
+#: ../libpurple/protocols/yahoo/libymsg.c:3445
#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:877
#: ../libpurple/proxy.c:1459 ../libpurple/proxy.c:1573
#: ../libpurple/proxy.c:1809 ../libpurple/proxy.c:1884
@@ -4732,20 +4730,20 @@
msgid "Server closed the connection"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:836
+#: ../libpurple/protocols/irc/irc.c:869
#: ../libpurple/protocols/silc/chat.c:1404
#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1543
+#: ../libpurple/protocols/yahoo/yahoochat.c:1619
msgid "Users"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:839
+#: ../libpurple/protocols/irc/irc.c:872
#: ../libpurple/protocols/sametime/sametime.c:3448
#: ../libpurple/protocols/silc/chat.c:1407
#: ../libpurple/protocols/silc/ops.c:1409
#: ../libpurple/protocols/silc10/chat.c:1429
#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1552
+#: ../libpurple/protocols/yahoo/yahoochat.c:1628
msgid "Topic"
msgstr ""
@@ -4757,17 +4755,17 @@
#. *< id
#. *< name
#. *< version
-#: ../libpurple/protocols/irc/irc.c:978
+#: ../libpurple/protocols/irc/irc.c:1016
msgid "IRC Protocol Plugin"
msgstr ""
#. * summary
-#: ../libpurple/protocols/irc/irc.c:979
+#: ../libpurple/protocols/irc/irc.c:1017
msgid "The IRC Protocol Plugin that Sucks Less"
msgstr ""
#. host to connect to
-#: ../libpurple/protocols/irc/irc.c:1004 ../libpurple/protocols/irc/msgs.c:373
+#: ../libpurple/protocols/irc/irc.c:1042 ../libpurple/protocols/irc/msgs.c:456
#: ../libpurple/protocols/msn/msn.c:2778
#: ../libpurple/protocols/msnp9/msn.c:2327
#: ../libpurple/protocols/oscar/oscar.c:7267
@@ -4781,7 +4779,7 @@
msgstr ""
#. port to connect to
-#: ../libpurple/protocols/irc/irc.c:1007 ../libpurple/protocols/msn/msn.c:2783
+#: ../libpurple/protocols/irc/irc.c:1045 ../libpurple/protocols/msn/msn.c:2783
#: ../libpurple/protocols/msnp9/msn.c:2332
#: ../libpurple/protocols/oscar/oscar.c:7270
#: ../libpurple/protocols/sametime/sametime.c:5810
@@ -4790,15 +4788,19 @@
msgid "Port"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:1010
+#: ../libpurple/protocols/irc/irc.c:1048
msgid "Encodings"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:1013
+#: ../libpurple/protocols/irc/irc.c:1051
msgid "Auto-detect incoming UTF-8"
msgstr ""
-#: ../libpurple/protocols/irc/irc.c:1019 ../libpurple/protocols/irc/msgs.c:367
+#: ../libpurple/protocols/irc/irc.c:1054 ../libpurple/protocols/irc/msgs.c:445
+msgid "Ident name"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:1057 ../libpurple/protocols/irc/msgs.c:433
#: ../libpurple/protocols/silc/silc.c:1245
#: ../libpurple/protocols/silc10/silc.c:945
msgid "Real name"
@@ -4808,158 +4810,179 @@
#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
#.
-#: ../libpurple/protocols/irc/irc.c:1027
+#: ../libpurple/protocols/irc/irc.c:1065
msgid "Use SSL"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:188
+#: ../libpurple/protocols/irc/irc.c:1069
+msgid "Authenticate with SASL"
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:1073
+msgid "Allow plaintext SASL auth over unencrypted connection"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:261
msgid "Bad mode"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:211
+#: ../libpurple/protocols/irc/msgs.c:279
#, c-format
msgid "Ban on %s by %s, set %s ago"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:215
+#: ../libpurple/protocols/irc/msgs.c:283
#, c-format
msgid "Ban on %s"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:230
+#: ../libpurple/protocols/irc/msgs.c:298
msgid "End of ban list"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:244
+#: ../libpurple/protocols/irc/msgs.c:311
#, c-format
msgid "You are banned from %s."
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:245
+#: ../libpurple/protocols/irc/msgs.c:312
msgid "Banned"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:262
+#: ../libpurple/protocols/irc/msgs.c:326
#, c-format
msgid "Cannot ban %s: banlist is full"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:351
+#: ../libpurple/protocols/irc/msgs.c:418
msgid " <i>(ircop)</i>"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:352
+#: ../libpurple/protocols/irc/msgs.c:419
msgid " <i>(identified)</i>"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:353
+#: ../libpurple/protocols/irc/msgs.c:420
#: ../libpurple/protocols/oscar/oscar.c:4175
#: ../libpurple/protocols/silc/ops.c:1438
#: ../libpurple/protocols/silc10/ops.c:1414
msgid "Nick"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:379
+#: ../libpurple/protocols/irc/msgs.c:439
+msgid "Login name"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:451
+msgid "Host name"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:462
#: ../libpurple/protocols/silc/ops.c:1284
#: ../libpurple/protocols/silc10/ops.c:1272
msgid "Currently on"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:384
+#: ../libpurple/protocols/irc/msgs.c:467
msgid "Idle for"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:387
+#: ../libpurple/protocols/irc/msgs.c:470
msgid "Online since"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:391
+#: ../libpurple/protocols/irc/msgs.c:474
msgid "<b>Defining adjective:</b>"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:391
+#: ../libpurple/protocols/irc/msgs.c:474
msgid "Glorious"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:479
+#: ../libpurple/protocols/irc/msgs.c:605
#, c-format
msgid "%s has changed the topic to: %s"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:481
+#: ../libpurple/protocols/irc/msgs.c:607
#, c-format
msgid "%s has cleared the topic."
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:489
+#: ../libpurple/protocols/irc/msgs.c:615
#, c-format
msgid "The topic for %s is: %s"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:507
+#: ../libpurple/protocols/irc/msgs.c:647
#, c-format
+msgid "Topic for %s set by %s at %s on %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:661
+#, c-format
msgid "Unknown message '%s'"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:508
+#: ../libpurple/protocols/irc/msgs.c:662
msgid "Unknown message"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:508
+#: ../libpurple/protocols/irc/msgs.c:662
msgid "The IRC server received a message it did not understand."
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:529
+#: ../libpurple/protocols/irc/msgs.c:683
#, c-format
msgid "Users on %s: %s"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:636
+#: ../libpurple/protocols/irc/msgs.c:791
msgid "Time Response"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:637
+#: ../libpurple/protocols/irc/msgs.c:792
msgid "The IRC server's local time is:"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:648
+#: ../libpurple/protocols/irc/msgs.c:802
msgid "No such channel"
msgstr ""
#. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:659
+#: ../libpurple/protocols/irc/msgs.c:813
msgid "no such channel"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:662
+#: ../libpurple/protocols/irc/msgs.c:816
msgid "User is not logged in"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:667
+#: ../libpurple/protocols/irc/msgs.c:821
msgid "No such nick or channel"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:687
+#: ../libpurple/protocols/irc/msgs.c:841
msgid "Could not send"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:743
+#: ../libpurple/protocols/irc/msgs.c:892
#, c-format
msgid "Joining %s requires an invitation."
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:744
+#: ../libpurple/protocols/irc/msgs.c:893
msgid "Invitation only"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:860
+#: ../libpurple/protocols/irc/msgs.c:1016
#: ../libpurple/protocols/jabber/presence.c:895
#, c-format
msgid "You have been kicked by %s: (%s)"
msgstr ""
#. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:865
+#: ../libpurple/protocols/irc/msgs.c:1021
#: ../libpurple/protocols/jabber/presence.c:902
#: ../libpurple/protocols/silc/ops.c:730
#: ../libpurple/protocols/silc10/ops.c:720
@@ -4967,23 +4990,24 @@
msgid "Kicked by %s (%s)"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:888
+#: ../libpurple/protocols/irc/msgs.c:1044
#, c-format
msgid "mode (%s %s) by %s"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:978 ../libpurple/protocols/irc/msgs.c:979
+#: ../libpurple/protocols/irc/msgs.c:1134
+#: ../libpurple/protocols/irc/msgs.c:1135
#: ../libpurple/protocols/jabber/jabber.c:2629
msgid "Invalid nickname"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:980
+#: ../libpurple/protocols/irc/msgs.c:1136
msgid ""
"Your selected nickname was rejected by the server. It probably contains "
"invalid characters."
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:985
+#: ../libpurple/protocols/irc/msgs.c:1141
msgid ""
"Your selected account name was rejected by the server. It probably contains "
"invalid characters."
@@ -4992,255 +5016,293 @@
#. We only want to do the following dance if the connection
#. has not been successfully completed. If it has, just
#. notify the user that their /nick command didn't go.
-#: ../libpurple/protocols/irc/msgs.c:1001
+#: ../libpurple/protocols/irc/msgs.c:1154
#, c-format
msgid "The nickname \"%s\" is already being used."
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1003
-#: ../libpurple/protocols/irc/msgs.c:1004
+#: ../libpurple/protocols/irc/msgs.c:1156
+#: ../libpurple/protocols/irc/msgs.c:1157
msgid "Nickname in use"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1048
+#: ../libpurple/protocols/irc/msgs.c:1197
msgid "Cannot change nick"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1048
+#: ../libpurple/protocols/irc/msgs.c:1197
msgid "Could not change nick"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1073
+#: ../libpurple/protocols/irc/msgs.c:1221
#, c-format
msgid "You have parted the channel%s%s"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1117
+#: ../libpurple/protocols/irc/msgs.c:1260
msgid "Error: invalid PONG from server"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1119
+#: ../libpurple/protocols/irc/msgs.c:1262
#, c-format
msgid "PING reply -- Lag: %lu seconds"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1210
+#: ../libpurple/protocols/irc/msgs.c:1349
#, c-format
msgid "Cannot join %s: Registration is required."
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1211
+#: ../libpurple/protocols/irc/msgs.c:1350
#: ../libpurple/protocols/silc/ops.c:1109
#: ../libpurple/protocols/silc10/ops.c:1128
msgid "Cannot join channel"
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1245
+#: ../libpurple/protocols/irc/msgs.c:1380
msgid "Nick or channel is temporarily unavailable."
msgstr ""
-#: ../libpurple/protocols/irc/msgs.c:1257
+#: ../libpurple/protocols/irc/msgs.c:1391
#, c-format
msgid "Wallops from %s"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/msgs.c:1493
+#: ../libpurple/protocols/irc/msgs.c:1616
+#, c-format
+msgid "Failed to initialize SASL authentication: %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1514
+msgid "SASL authentication failed: No worthy authentication mechanisms found."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1520
+#: ../libpurple/protocols/irc/msgs.c:1656
+#, c-format
+msgid "SASL authentication failed: %s"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1567
+msgid ""
+"SASL authentication failed: Server does not support SASL authentication."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1576
+msgid "SASL authentication failed: Initializing SASL failed."
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1706
+#: ../libpurple/protocols/irc/msgs.c:1749
+msgid "Incorrect Password"
+msgstr ""
+
+#: ../libpurple/protocols/irc/msgs.c:1733
+msgid "SASL authentication failed: No worthy mechanisms found"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:141
msgid "action <action to perform>: Perform an action."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:142
+msgid "authserv: Send a command to authserv"
+msgstr ""
+
+#: ../libpurple/protocols/irc/parse.c:143
msgid ""
"away [message]: Set an away message, or use no message to return from being "
"away."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:144
msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:145
msgid "chanserv: Send a command to chanserv"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:146
msgid ""
"deop <nick1> [nick2] ...: Remove channel operator status from "
"someone. You must be a channel operator to do this."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:147
msgid ""
"devoice <nick1> [nick2] ...: Remove channel voice status from "
"someone, preventing them from speaking if the channel is moderated (+m). You "
"must be a channel operator to do this."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:148
msgid ""
"invite <nick> [room]: Invite someone to join you in the specified "
"channel, or the current channel."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:131
+#: ../libpurple/protocols/irc/parse.c:149
msgid ""
"j <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:150
msgid ""
"join <room1>[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:151
msgid ""
"kick <nick> [message]: Remove someone from a channel. You must be a "
"channel operator to do this."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:152
msgid ""
"list: Display a list of chat rooms on the network. <i>Warning, some servers "
"may disconnect you upon doing this.</i>"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:153
msgid "me <action to perform>: Perform an action."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:154
msgid "memoserv: Send a command to memoserv"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:155
msgid ""
"mode <+|-><A-Za-z> <nick|channel>: Set or unset a channel "
"or user mode."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:156
msgid ""
"msg <nick> <message>: Send a private message to a user (as "
"opposed to a channel)."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:157
msgid "names [channel]: List the users currently in a channel."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:158
#: ../libpurple/protocols/jabber/jabber.c:3303
msgid "nick <new nickname>: Change your nickname."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:159
msgid "nickserv: Send a command to nickserv"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:160
msgid "notice <target<: Send a notice to a user or channel."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:161
msgid ""
"op <nick1> [nick2] ...: Grant channel operator status to someone. You "
"must be a channel operator to do this."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:162
msgid ""
"operwall <message>: If you don't know what this is, you probably "
"can't use it."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:163
msgid "operserv: Send a command to operserv"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:164
msgid ""
"part [room] [message]: Leave the current channel, or a specified channel, "
"with an optional message."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:165
msgid ""
"ping [nick]: Asks how much lag a user (or the server if no user specified) "
"has."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:166
msgid ""
"query <nick> <message>: Send a private message to a user (as "
"opposed to a channel)."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:149
+#: ../libpurple/protocols/irc/parse.c:167
msgid "quit [message]: Disconnect from the server, with an optional message."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:150
+#: ../libpurple/protocols/irc/parse.c:168
msgid "quote [...]: Send a raw command to the server."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:151
+#: ../libpurple/protocols/irc/parse.c:169
msgid ""
"remove <nick> [message]: Remove someone from a room. You must be a "
"channel operator to do this."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:152
+#: ../libpurple/protocols/irc/parse.c:170
msgid "time: Displays the current local time at the IRC server."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:153
+#: ../libpurple/protocols/irc/parse.c:171
msgid "topic [new topic]: View or change the channel topic."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:154
+#: ../libpurple/protocols/irc/parse.c:172
msgid "umode <+|-><A-Za-z>: Set or unset a user mode."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:155
+#: ../libpurple/protocols/irc/parse.c:173
msgid "version [nick]: send CTCP VERSION request to a user"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:156
+#: ../libpurple/protocols/irc/parse.c:174
msgid ""
"voice <nick1> [nick2] ...: Grant channel voice status to someone. You "
"must be a channel operator to do this."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:157
+#: ../libpurple/protocols/irc/parse.c:175
msgid ""
"wallops <message>: If you don't know what this is, you probably can't "
"use it."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:158
+#: ../libpurple/protocols/irc/parse.c:176
msgid "whois [server] <nick>: Get information on a user."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:159
+#: ../libpurple/protocols/irc/parse.c:177
msgid "whowas <nick>: Get information on a user that has logged off."
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:554
+#: ../libpurple/protocols/irc/parse.c:573
#, c-format
msgid "Reply time from %s: %lu seconds"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:555
+#: ../libpurple/protocols/irc/parse.c:574
msgid "PONG"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:555
+#: ../libpurple/protocols/irc/parse.c:574
msgid "CTCP PING reply"
msgstr ""
-#: ../libpurple/protocols/irc/parse.c:667
-#: ../libpurple/protocols/irc/parse.c:674
+#: ../libpurple/protocols/irc/parse.c:690
+#: ../libpurple/protocols/irc/parse.c:697
msgid "Disconnected."
msgstr ""
@@ -5261,7 +5323,7 @@
msgid "execute"
msgstr ""
-#: ../libpurple/protocols/jabber/auth.c:64 ../libpurple/util.c:4270
+#: ../libpurple/protocols/jabber/auth.c:64 ../libpurple/util.c:4310
msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
msgstr ""
@@ -5719,7 +5781,7 @@
#: ../libpurple/protocols/jabber/chat.c:44
#: ../libpurple/protocols/oscar/oscar.c:5847
-#: ../libpurple/protocols/yahoo/yahoochat.c:1092
+#: ../libpurple/protocols/yahoo/yahoochat.c:1168
msgid "_Room:"
msgstr ""
@@ -6125,8 +6187,8 @@
#: ../libpurple/protocols/oscar/oscar.c:7001
#: ../libpurple/protocols/silc/silc.c:1329
#: ../libpurple/protocols/silc10/silc.c:1029
-#: ../libpurple/protocols/yahoo/libymsg.c:4065
-#: ../libpurple/protocols/yahoo/libymsg.c:4221
+#: ../libpurple/protocols/yahoo/libymsg.c:4291
+#: ../libpurple/protocols/yahoo/libymsg.c:4447
msgid "Set User Info..."
msgstr ""
@@ -6394,7 +6456,7 @@
#: ../libpurple/protocols/jabber/jabber.c:2907
#: ../libpurple/protocols/jabber/jabber.c:2924
-#: ../libpurple/protocols/yahoo/libymsg.c:5141
+#: ../libpurple/protocols/yahoo/libymsg.c:5367
#, c-format
msgid "Buzzing %s..."
msgstr ""
@@ -6402,12 +6464,12 @@
#. Yahoo only supports one attention command: the 'buzz'.
#. This is index number YAHOO_BUZZ.
#: ../libpurple/protocols/jabber/jabber.c:2923
-#: ../libpurple/protocols/yahoo/libymsg.c:5140
+#: ../libpurple/protocols/yahoo/libymsg.c:5366
msgid "Buzz"
msgstr ""
#: ../libpurple/protocols/jabber/jabber.c:2924
-#: ../libpurple/protocols/yahoo/libymsg.c:5141
+#: ../libpurple/protocols/yahoo/libymsg.c:5367
#, c-format
msgid "%s has buzzed you!"
msgstr ""
@@ -7147,27 +7209,27 @@
msgid "Non-IM Contacts"
msgstr ""
-#: ../libpurple/protocols/msn/msg.c:1016
+#: ../libpurple/protocols/msn/msg.c:1018
#, c-format
msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
msgstr ""
-#: ../libpurple/protocols/msn/msg.c:1022
+#: ../libpurple/protocols/msn/msg.c:1024
#, c-format
msgid "%s sent a wink, but it could not be saved"
msgstr ""
-#: ../libpurple/protocols/msn/msg.c:1041
+#: ../libpurple/protocols/msn/msg.c:1043
#, c-format
msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
msgstr ""
-#: ../libpurple/protocols/msn/msg.c:1047
+#: ../libpurple/protocols/msn/msg.c:1049
#, c-format
msgid "%s sent a voice clip, but it could not be saved"
msgstr ""
-#: ../libpurple/protocols/msn/msg.c:1183
+#: ../libpurple/protocols/msn/msg.c:1185
#, c-format
msgid "%s sent you a voice chat invite, which is not yet supported."
msgstr ""
@@ -7278,19 +7340,19 @@
msgstr ""
#: ../libpurple/protocols/msn/msn.c:852 ../libpurple/protocols/msnp9/msn.c:586
-#: ../libpurple/protocols/yahoo/libymsg.c:3899
+#: ../libpurple/protocols/yahoo/libymsg.c:4125
#: ../libpurple/protocols/yahoo/yahoo_aliases.c:548
msgid "Home Phone Number"
msgstr ""
#: ../libpurple/protocols/msn/msn.c:856 ../libpurple/protocols/msnp9/msn.c:590
-#: ../libpurple/protocols/yahoo/libymsg.c:3900
+#: ../libpurple/protocols/yahoo/libymsg.c:4126
#: ../libpurple/protocols/yahoo/yahoo_aliases.c:549
msgid "Work Phone Number"
msgstr ""
#: ../libpurple/protocols/msn/msn.c:860 ../libpurple/protocols/msnp9/msn.c:594
-#: ../libpurple/protocols/yahoo/libymsg.c:3901
+#: ../libpurple/protocols/yahoo/libymsg.c:4127
#: ../libpurple/protocols/yahoo/yahoo_aliases.c:550
msgid "Mobile Phone Number"
msgstr ""
@@ -7298,8 +7360,8 @@
#: ../libpurple/protocols/msn/msn.c:883 ../libpurple/protocols/msn/state.c:38
#: ../libpurple/protocols/msnp9/msn.c:613
#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/libymsg.c:3703
-#: ../libpurple/protocols/yahoo/libymsg.c:4725
+#: ../libpurple/protocols/yahoo/libymsg.c:3929
+#: ../libpurple/protocols/yahoo/libymsg.c:4951
msgid "Be Right Back"
msgstr ""
@@ -7313,21 +7375,21 @@
#: ../libpurple/protocols/silc/silc.c:58
#: ../libpurple/protocols/silc10/buddy.c:1500
#: ../libpurple/protocols/silc10/silc.c:48
-#: ../libpurple/protocols/yahoo/libymsg.c:3705
-#: ../libpurple/protocols/yahoo/libymsg.c:4728
+#: ../libpurple/protocols/yahoo/libymsg.c:3931
+#: ../libpurple/protocols/yahoo/libymsg.c:4954
#: ../pidgin/plugins/themeedit-icon.c:66
msgid "Busy"
msgstr ""
#: ../libpurple/protocols/msn/msn.c:894 ../libpurple/protocols/msnp9/msn.c:621
-#: ../libpurple/protocols/yahoo/libymsg.c:3713
-#: ../libpurple/protocols/yahoo/libymsg.c:4740
+#: ../libpurple/protocols/yahoo/libymsg.c:3939
+#: ../libpurple/protocols/yahoo/libymsg.c:4966
msgid "On the Phone"
msgstr ""
#: ../libpurple/protocols/msn/msn.c:899 ../libpurple/protocols/msnp9/msn.c:625
-#: ../libpurple/protocols/yahoo/libymsg.c:3717
-#: ../libpurple/protocols/yahoo/libymsg.c:4746
+#: ../libpurple/protocols/yahoo/libymsg.c:3943
+#: ../libpurple/protocols/yahoo/libymsg.c:4972
msgid "Out to Lunch"
msgstr ""
@@ -7794,7 +7856,7 @@
#. Unknown error!
#: ../libpurple/protocols/msn/notification.c:905
#: ../libpurple/protocols/msn/notification.c:951
-#: ../libpurple/protocols/yahoo/libymsg.c:1923
+#: ../libpurple/protocols/yahoo/libymsg.c:2066
#, c-format
msgid "Unknown error (%d)"
msgstr ""
@@ -7828,7 +7890,7 @@
msgstr[0] ""
msgstr[1] ""
-#: ../libpurple/protocols/msn/oim.c:406
+#: ../libpurple/protocols/msn/oim.c:407
msgid ""
"Message was not sent because the system is unavailable. This normally "
"happens when the user is blocked or does not exist."
@@ -7838,29 +7900,29 @@
msgid "Message was not sent because messages are being sent too quickly."
msgstr ""
-#: ../libpurple/protocols/msn/oim.c:415
+#: ../libpurple/protocols/msn/oim.c:414
msgid "Message was not sent because an unknown encoding error occurred."
msgstr ""
-#: ../libpurple/protocols/msn/oim.c:419
+#: ../libpurple/protocols/msn/oim.c:420
msgid "Message was not sent because an unknown error occurred."
msgstr ""
-#: ../libpurple/protocols/msn/oim.c:671
+#: ../libpurple/protocols/msn/oim.c:672
#, c-format
msgid ""
"%s (There was an error receiving this message. Converting the encoding from "
"%s to UTF-8 failed.)"
msgstr ""
-#: ../libpurple/protocols/msn/oim.c:686
+#: ../libpurple/protocols/msn/oim.c:687
#, c-format
msgid ""
"%s (There was an error receiving this message. The charset was %s, but it "
"was not valid UTF-8.)"
msgstr ""
-#: ../libpurple/protocols/msn/oim.c:690
+#: ../libpurple/protocols/msn/oim.c:691
#, c-format
msgid ""
"%s (There was an error receiving this message. The charset was missing, but "
@@ -7899,7 +7961,7 @@
#: ../libpurple/protocols/msnp9/session.c:307
#: ../libpurple/protocols/novell/novell.c:2032
#: ../libpurple/protocols/oscar/flap_connection.c:457
-#: ../libpurple/protocols/yahoo/libymsg.c:163
+#: ../libpurple/protocols/yahoo/libymsg.c:169
msgid "You have signed on from another location"
msgstr ""
@@ -9153,7 +9215,7 @@
#: ../libpurple/protocols/qq/qq_base.c:415
#: ../libpurple/protocols/qq/qq_base.c:1100
#: ../libpurple/protocols/simple/simple.c:1127
-#: ../libpurple/protocols/yahoo/libymsg.c:1897
+#: ../libpurple/protocols/yahoo/libymsg.c:2040
msgid "Incorrect password"
msgstr ""
@@ -9845,7 +9907,7 @@
#: ../libpurple/protocols/oscar/oscar.c:786 ../libpurple/protocols/qq/qq.c:263
#: ../libpurple/protocols/qq/qq.c:411
-#: ../libpurple/protocols/yahoo/libymsg.c:3721 ../libpurple/status.c:164
+#: ../libpurple/protocols/yahoo/libymsg.c:3947 ../libpurple/status.c:164
#: ../pidgin/gtkdocklet.c:562 ../pidgin/gtkstatusbox.c:1108
msgid "Invisible"
msgstr ""
@@ -9927,8 +9989,8 @@
#. the username does not exist
#: ../libpurple/protocols/oscar/oscar.c:1965
#: ../libpurple/protocols/qq/qq_base.c:1109
-#: ../libpurple/protocols/yahoo/libymsg.c:1907
-#: ../libpurple/protocols/yahoo/libymsg.c:2159
+#: ../libpurple/protocols/yahoo/libymsg.c:2050
+#: ../libpurple/protocols/yahoo/libymsg.c:2330
msgid "Username does not exist"
msgstr ""
@@ -9992,7 +10054,7 @@
#: ../libpurple/protocols/oscar/oscar.c:2845
#: ../libpurple/protocols/oscar/oscar.c:2972
#: ../libpurple/protocols/oscar/oscar.c:5814
-#: ../libpurple/protocols/yahoo/libymsg.c:1287
+#: ../libpurple/protocols/yahoo/libymsg.c:1369
msgid "No reason given."
msgstr ""
@@ -10911,7 +10973,7 @@
#: ../libpurple/protocols/qq/buddy_opt.c:625
#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/yahoo/libymsg.c:1286
+#: ../libpurple/protocols/yahoo/libymsg.c:1368
msgid "Authorization denied message:"
msgstr ""
@@ -13888,66 +13950,66 @@
msgid "Yahoo! JAPAN Protocol Plugin"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:876
+#: ../libpurple/protocols/yahoo/libymsg.c:930
#, c-format
msgid "%s has sent you a webcam invite, which is not yet supported."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:941
+#: ../libpurple/protocols/yahoo/libymsg.c:1006
msgid "Your SMS was not delivered"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:1082
+#: ../libpurple/protocols/yahoo/libymsg.c:1152
msgid "Your Yahoo! message did not get sent."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:1186
+#: ../libpurple/protocols/yahoo/libymsg.c:1268
#, c-format
msgid "Yahoo! system message for %s:"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:1304
+#: ../libpurple/protocols/yahoo/libymsg.c:1386
#, c-format
msgid ""
"%s has (retroactively) denied your request to add them to your list for the "
"following reason: %s."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:1307
+#: ../libpurple/protocols/yahoo/libymsg.c:1389
#, c-format
msgid "%s has (retroactively) denied your request to add them to your list."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:1309
+#: ../libpurple/protocols/yahoo/libymsg.c:1391
msgid "Add buddy rejected"
msgstr ""
#. Some error in the received stream
-#: ../libpurple/protocols/yahoo/libymsg.c:1803
-#: ../libpurple/protocols/yahoo/libymsg.c:1889
+#: ../libpurple/protocols/yahoo/libymsg.c:1946
+#: ../libpurple/protocols/yahoo/libymsg.c:2032
msgid "Received invalid data"
msgstr ""
#. security lock from too many failed login attempts
-#: ../libpurple/protocols/yahoo/libymsg.c:1902
+#: ../libpurple/protocols/yahoo/libymsg.c:2045
msgid ""
"Account locked: Too many failed login attempts. Logging into the Yahoo! "
"website may fix this."
msgstr ""
#. indicates a lock of some description
-#: ../libpurple/protocols/yahoo/libymsg.c:1913
+#: ../libpurple/protocols/yahoo/libymsg.c:2056
msgid ""
"Account locked: Unknown reason. Logging into the Yahoo! website may fix "
"this."
msgstr ""
#. username or password missing
-#: ../libpurple/protocols/yahoo/libymsg.c:1918
+#: ../libpurple/protocols/yahoo/libymsg.c:2061
msgid "Username or password missing"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2021
+#: ../libpurple/protocols/yahoo/libymsg.c:2176
#, c-format
msgid ""
"The Yahoo server has requested the use of an unrecognized authentication "
@@ -13955,174 +14017,174 @@
"Check %s for updates."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2025
+#: ../libpurple/protocols/yahoo/libymsg.c:2180
msgid "Failed Yahoo! Authentication"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2106
+#: ../libpurple/protocols/yahoo/libymsg.c:2271
#, c-format
msgid ""
"You have tried to ignore %s, but the user is on your buddy list. Clicking "
"\"Yes\" will remove and ignore the buddy."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2109
+#: ../libpurple/protocols/yahoo/libymsg.c:2274
msgid "Ignore buddy?"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2181
+#: ../libpurple/protocols/yahoo/libymsg.c:2352
msgid "Invalid username or password"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2185
+#: ../libpurple/protocols/yahoo/libymsg.c:2356
msgid ""
"Your account has been locked due to too many failed login attempts. Please "
"try logging into the Yahoo! website."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2192
+#: ../libpurple/protocols/yahoo/libymsg.c:2363
#, c-format
msgid "Unknown error 52. Reconnecting should fix this."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2196
+#: ../libpurple/protocols/yahoo/libymsg.c:2367
msgid ""
"Error 1013: The username you have entered is invalid. The most common cause "
"of this error is entering your email address instead of your Yahoo! ID."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2202
+#: ../libpurple/protocols/yahoo/libymsg.c:2373
#, c-format
msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2291
+#: ../libpurple/protocols/yahoo/libymsg.c:2467
#, c-format
msgid "Unable to add buddy %s to group %s to the server list on account %s."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2294
+#: ../libpurple/protocols/yahoo/libymsg.c:2470
msgid "Unable to add buddy to server list"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:2889
+#: ../libpurple/protocols/yahoo/libymsg.c:3115
#, c-format
msgid "[ Audible %s/%s/%s.swf ] %s"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3235
+#: ../libpurple/protocols/yahoo/libymsg.c:3461
msgid "Received unexpected HTTP response from server"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3291
+#: ../libpurple/protocols/yahoo/libymsg.c:3517
#, c-format
msgid "Lost connection with %s: %s"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3316
+#: ../libpurple/protocols/yahoo/libymsg.c:3542
#, c-format
msgid "Unable to establish a connection with %s: %s"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3707
-#: ../libpurple/protocols/yahoo/libymsg.c:4731
+#: ../libpurple/protocols/yahoo/libymsg.c:3933
+#: ../libpurple/protocols/yahoo/libymsg.c:4957
msgid "Not at Home"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3709
-#: ../libpurple/protocols/yahoo/libymsg.c:4734
+#: ../libpurple/protocols/yahoo/libymsg.c:3935
+#: ../libpurple/protocols/yahoo/libymsg.c:4960
msgid "Not at Desk"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3711
-#: ../libpurple/protocols/yahoo/libymsg.c:4737
+#: ../libpurple/protocols/yahoo/libymsg.c:3937
+#: ../libpurple/protocols/yahoo/libymsg.c:4963
msgid "Not in Office"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3715
-#: ../libpurple/protocols/yahoo/libymsg.c:4743
+#: ../libpurple/protocols/yahoo/libymsg.c:3941
+#: ../libpurple/protocols/yahoo/libymsg.c:4969
msgid "On Vacation"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3719
-#: ../libpurple/protocols/yahoo/libymsg.c:4749
+#: ../libpurple/protocols/yahoo/libymsg.c:3945
+#: ../libpurple/protocols/yahoo/libymsg.c:4975
msgid "Stepped Out"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3819
-#: ../libpurple/protocols/yahoo/libymsg.c:3851
+#: ../libpurple/protocols/yahoo/libymsg.c:4045
+#: ../libpurple/protocols/yahoo/libymsg.c:4077
msgid "Not on server list"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3868
-#: ../libpurple/protocols/yahoo/libymsg.c:3946
+#: ../libpurple/protocols/yahoo/libymsg.c:4094
+#: ../libpurple/protocols/yahoo/libymsg.c:4172
msgid "Appear Online"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3871
-#: ../libpurple/protocols/yahoo/libymsg.c:3967
+#: ../libpurple/protocols/yahoo/libymsg.c:4097
+#: ../libpurple/protocols/yahoo/libymsg.c:4193
msgid "Appear Permanently Offline"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3889
+#: ../libpurple/protocols/yahoo/libymsg.c:4115
msgid "Presence"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3952
+#: ../libpurple/protocols/yahoo/libymsg.c:4178
msgid "Appear Offline"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:3961
+#: ../libpurple/protocols/yahoo/libymsg.c:4187
msgid "Don't Appear Permanently Offline"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4020
+#: ../libpurple/protocols/yahoo/libymsg.c:4246
msgid "Join in Chat"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4026
+#: ../libpurple/protocols/yahoo/libymsg.c:4252
msgid "Initiate Conference"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4054
+#: ../libpurple/protocols/yahoo/libymsg.c:4280
msgid "Presence Settings"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4059
+#: ../libpurple/protocols/yahoo/libymsg.c:4285
msgid "Start Doodling"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4198
+#: ../libpurple/protocols/yahoo/libymsg.c:4424
msgid "Select the ID you want to activate"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4209
+#: ../libpurple/protocols/yahoo/libymsg.c:4435
msgid "Join whom in chat?"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4225
+#: ../libpurple/protocols/yahoo/libymsg.c:4451
msgid "Activate ID..."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4229
+#: ../libpurple/protocols/yahoo/libymsg.c:4455
msgid "Join User in Chat..."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4234
+#: ../libpurple/protocols/yahoo/libymsg.c:4460
msgid "Open Inbox"
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4259
-#: ../libpurple/protocols/yahoo/libymsg.c:4354
+#: ../libpurple/protocols/yahoo/libymsg.c:4485
+#: ../libpurple/protocols/yahoo/libymsg.c:4580
msgid "Can't send SMS. Unable to obtain mobile carrier."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4289
-#: ../libpurple/protocols/yahoo/libymsg.c:4418
+#: ../libpurple/protocols/yahoo/libymsg.c:4515
+#: ../libpurple/protocols/yahoo/libymsg.c:4644
msgid "Can't send SMS. Unknown mobile carrier."
msgstr ""
-#: ../libpurple/protocols/yahoo/libymsg.c:4409
+#: ../libpurple/protocols/yahoo/libymsg.c:4635
msgid "Getting mobile carrier to send the SMS."
msgstr ""
@@ -14135,19 +14197,19 @@
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:167
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:247
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1251
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1316
msgid "Unable to connect."
msgstr ""
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:346
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1155
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1860
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1220
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1970
msgid "Unable to establish file descriptor."
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1760
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1855
#, c-format
msgid "%s is trying to send you a group of %d files.\n"
msgstr ""
@@ -14233,73 +14295,73 @@
msgid "The user's profile is empty."
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:255
+#: ../libpurple/protocols/yahoo/yahoochat.c:270
#, c-format
msgid "%s has declined to join."
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:478
+#: ../libpurple/protocols/yahoo/yahoochat.c:508
msgid "Failed to join chat"
msgstr ""
#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:481
+#: ../libpurple/protocols/yahoo/yahoochat.c:511
msgid "Unknown room"
msgstr ""
#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:484
+#: ../libpurple/protocols/yahoo/yahoochat.c:514
msgid "Maybe the room is full"
msgstr ""
#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:487
+#: ../libpurple/protocols/yahoo/yahoochat.c:517
msgid "Not available"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:491
+#: ../libpurple/protocols/yahoo/yahoochat.c:521
msgid ""
"Unknown error. You may need to logout and wait five minutes before being "
"able to rejoin a chatroom"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:574
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
#, c-format
msgid "You are now chatting in %s."
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:763
+#: ../libpurple/protocols/yahoo/yahoochat.c:839
msgid "Failed to join buddy in chat"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:764
+#: ../libpurple/protocols/yahoo/yahoochat.c:840
msgid "Maybe they're not in a chat?"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:1460
-#: ../libpurple/protocols/yahoo/yahoochat.c:1486
+#: ../libpurple/protocols/yahoo/yahoochat.c:1536
+#: ../libpurple/protocols/yahoo/yahoochat.c:1562
msgid "Fetching the room list failed."
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:1546
+#: ../libpurple/protocols/yahoo/yahoochat.c:1622
msgid "Voices"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:1549
+#: ../libpurple/protocols/yahoo/yahoochat.c:1625
msgid "Webcams"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:1560
-#: ../libpurple/protocols/yahoo/yahoochat.c:1631
+#: ../libpurple/protocols/yahoo/yahoochat.c:1636
+#: ../libpurple/protocols/yahoo/yahoochat.c:1707
msgid "Connection problem"
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:1560
-#: ../libpurple/protocols/yahoo/yahoochat.c:1631
+#: ../libpurple/protocols/yahoo/yahoochat.c:1636
+#: ../libpurple/protocols/yahoo/yahoochat.c:1707
msgid "Unable to fetch room list."
msgstr ""
-#: ../libpurple/protocols/yahoo/yahoochat.c:1623
+#: ../libpurple/protocols/yahoo/yahoochat.c:1699
msgid "User Rooms"
msgstr ""
@@ -14522,19 +14584,19 @@
msgid "%s is now known as %s.\n"
msgstr ""
-#: ../libpurple/server.c:813
+#: ../libpurple/server.c:821
#, c-format
msgid ""
"%s has invited %s to the chat room %s:\n"
"%s"
msgstr ""
-#: ../libpurple/server.c:818
+#: ../libpurple/server.c:826
#, c-format
msgid "%s has invited %s to the chat room %s\n"
msgstr ""
-#: ../libpurple/server.c:822
+#: ../libpurple/server.c:830
msgid "Accept chat invitation?"
msgstr ""
@@ -14630,104 +14692,104 @@
#. * change this to "%X %x" if they want the time to be shown first,
#. * followed by the date.
#.
-#: ../libpurple/util.c:735
+#: ../libpurple/util.c:743
#, c-format
msgid "%x %X"
msgstr ""
-#: ../libpurple/util.c:3411
+#: ../libpurple/util.c:3427
msgid "Calculating..."
msgstr ""
-#: ../libpurple/util.c:3414
+#: ../libpurple/util.c:3430
msgid "Unknown."
msgstr ""
-#: ../libpurple/util.c:3440
+#: ../libpurple/util.c:3456
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: ../libpurple/util.c:3452
+#: ../libpurple/util.c:3468
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: ../libpurple/util.c:3460
+#: ../libpurple/util.c:3476
#, c-format
msgid "%s, %d hour"
msgid_plural "%s, %d hours"
msgstr[0] ""
msgstr[1] ""
-#: ../libpurple/util.c:3466
+#: ../libpurple/util.c:3482
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: ../libpurple/util.c:3474
+#: ../libpurple/util.c:3490
#, c-format
msgid "%s, %d minute"
msgid_plural "%s, %d minutes"
msgstr[0] ""
msgstr[1] ""
-#: ../libpurple/util.c:3480
+#: ../libpurple/util.c:3496
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: ../libpurple/util.c:3758
+#: ../libpurple/util.c:3774
#, c-format
msgid "Could not open %s: Redirected too many times"
msgstr ""
-#: ../libpurple/util.c:3808 ../libpurple/util.c:4286
+#: ../libpurple/util.c:3824 ../libpurple/util.c:4326
#, c-format
msgid "Unable to connect to %s"
msgstr ""
-#: ../libpurple/util.c:3946
+#: ../libpurple/util.c:3964
#, c-format
msgid "Error reading from %s: response too long (%d bytes limit)"
msgstr ""
-#: ../libpurple/util.c:4015
+#: ../libpurple/util.c:4031 ../libpurple/util.c:4051
#, c-format
msgid ""
"Unable to allocate enough memory to hold the contents from %s. The web "
"server may be trying something malicious."
msgstr ""
-#: ../libpurple/util.c:4050
+#: ../libpurple/util.c:4085
#, c-format
msgid "Error reading from %s: %s"
msgstr ""
-#: ../libpurple/util.c:4142
+#: ../libpurple/util.c:4177
#, c-format
msgid "Error writing to %s: %s"
msgstr ""
-#: ../libpurple/util.c:4173 ../libpurple/util.c:4203 ../libpurple/util.c:4268
+#: ../libpurple/util.c:4208 ../libpurple/util.c:4238 ../libpurple/util.c:4308
#, c-format
msgid "Unable to connect to %s: %s"
msgstr ""
-#: ../libpurple/util.c:5125
+#: ../libpurple/util.c:5165
#, c-format
msgid " - %s"
msgstr ""
-#: ../libpurple/util.c:5131
+#: ../libpurple/util.c:5171
#, c-format
msgid " (%s)"
msgstr ""
@@ -15656,7 +15718,7 @@
msgstr ""
#: ../pidgin/gtkblist.c:8034 ../pidgin/gtkconv.c:3430
-#: ../pidgin/gtkimhtml.c:1840
+#: ../pidgin/gtkimhtml.c:1854
msgid "No actions available"
msgstr ""
@@ -16587,8 +16649,8 @@
msgid ""
"Help from other Pidgin users:</font> support@pidgin.im</a><br/>This is a <b>public</b> "
-"mailing list! (http://pidgin.im/pipermail/support/\">archive</a>)"
-"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"mailing list! (http://pidgin.im/pipermail/support/\">archive"
+"a>)<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
"primary language is <b>English</b>. You are welcome to post in another "
"language, but the responses may be less helpful.<br/><br/>"
msgstr ""
@@ -16823,25 +16885,25 @@
msgid "<b>Sending As:</b>"
msgstr ""
-#: ../pidgin/gtkft.c:488 ../pidgin/gtkutils.c:3608
+#: ../pidgin/gtkft.c:488 ../pidgin/gtkutils.c:3602
msgid "There is no application configured to open this type of file."
msgstr ""
-#: ../pidgin/gtkft.c:493 ../pidgin/gtkutils.c:3613
+#: ../pidgin/gtkft.c:493 ../pidgin/gtkutils.c:3608
msgid "An error occurred while opening the file."
msgstr ""
-#: ../pidgin/gtkft.c:530 ../pidgin/gtkutils.c:3648
+#: ../pidgin/gtkft.c:530 ../pidgin/gtkutils.c:3644
#, c-format
msgid "Error launching %s: %s"
msgstr ""
-#: ../pidgin/gtkft.c:539 ../pidgin/gtkutils.c:3656
+#: ../pidgin/gtkft.c:539 ../pidgin/gtkutils.c:3652
#, c-format
msgid "Error running %s"
msgstr ""
-#: ../pidgin/gtkft.c:540 ../pidgin/gtkutils.c:3657
+#: ../pidgin/gtkft.c:540 ../pidgin/gtkutils.c:3653
#, c-format
msgid "Process returned error code %d"
msgstr ""
@@ -16879,125 +16941,125 @@
msgid "File transfer _details"
msgstr ""
-#: ../pidgin/gtkimhtml.c:962
+#: ../pidgin/gtkimhtml.c:976
msgid "Paste as Plain _Text"
msgstr ""
-#: ../pidgin/gtkimhtml.c:979 ../pidgin/gtkimhtmltoolbar.c:1334
+#: ../pidgin/gtkimhtml.c:993 ../pidgin/gtkimhtmltoolbar.c:1334
msgid "_Reset formatting"
msgstr ""
-#: ../pidgin/gtkimhtml.c:987
+#: ../pidgin/gtkimhtml.c:1001
msgid "Disable _smileys in selected text"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1580
+#: ../pidgin/gtkimhtml.c:1594
msgid "Hyperlink color"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1581
+#: ../pidgin/gtkimhtml.c:1595
msgid "Color to draw hyperlinks."
msgstr ""
-#: ../pidgin/gtkimhtml.c:1584
+#: ../pidgin/gtkimhtml.c:1598
msgid "Hyperlink visited color"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1585
+#: ../pidgin/gtkimhtml.c:1599
msgid "Color to draw hyperlink after it has been visited (or activated)."
msgstr ""
-#: ../pidgin/gtkimhtml.c:1588
+#: ../pidgin/gtkimhtml.c:1602
msgid "Hyperlink prelight color"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1589
+#: ../pidgin/gtkimhtml.c:1603
msgid "Color to draw hyperlinks when mouse is over them."
msgstr ""
-#: ../pidgin/gtkimhtml.c:1592 ../pidgin/plugins/pidginrc.c:57
+#: ../pidgin/gtkimhtml.c:1606 ../pidgin/plugins/pidginrc.c:57
msgid "Sent Message Name Color"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1593
+#: ../pidgin/gtkimhtml.c:1607
msgid "Color to draw the name of a message you sent."
msgstr ""
-#: ../pidgin/gtkimhtml.c:1596 ../pidgin/plugins/pidginrc.c:58
+#: ../pidgin/gtkimhtml.c:1610 ../pidgin/plugins/pidginrc.c:58
msgid "Received Message Name Color"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1611
msgid "Color to draw the name of a message you received."
msgstr ""
-#: ../pidgin/gtkimhtml.c:1600
+#: ../pidgin/gtkimhtml.c:1614
msgid "\"Attention\" Name Color"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1601
+#: ../pidgin/gtkimhtml.c:1615
msgid "Color to draw the name of a message you received containing your name."
msgstr ""
-#: ../pidgin/gtkimhtml.c:1604 ../pidgin/plugins/pidginrc.c:60
+#: ../pidgin/gtkimhtml.c:1618 ../pidgin/plugins/pidginrc.c:60
msgid "Action Message Name Color"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1605
+#: ../pidgin/gtkimhtml.c:1619
msgid "Color to draw the name of an action message."
msgstr ""
-#: ../pidgin/gtkimhtml.c:1608
+#: ../pidgin/gtkimhtml.c:1622
msgid "Action Message Name Color for Whispered Message"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1609
+#: ../pidgin/gtkimhtml.c:1623
msgid "Color to draw the name of a whispered action message."
msgstr ""
-#: ../pidgin/gtkimhtml.c:1612
+#: ../pidgin/gtkimhtml.c:1626
msgid "Whisper Message Name Color"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1613
+#: ../pidgin/gtkimhtml.c:1627
msgid "Color to draw the name of a whispered message."
msgstr ""
-#: ../pidgin/gtkimhtml.c:1622
+#: ../pidgin/gtkimhtml.c:1636
msgid "Typing notification color"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1623
+#: ../pidgin/gtkimhtml.c:1637
msgid "The color to use for the typing notification"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1626
+#: ../pidgin/gtkimhtml.c:1640
msgid "Typing notification font"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1627
+#: ../pidgin/gtkimhtml.c:1641
msgid "The font to use for the typing notification"
msgstr ""
-#: ../pidgin/gtkimhtml.c:1630 ../pidgin/gtkimhtml.c:1631
+#: ../pidgin/gtkimhtml.c:1644 ../pidgin/gtkimhtml.c:1645
msgid "Enable typing notification"
msgstr ""
-#: ../pidgin/gtkimhtml.c:3757
+#: ../pidgin/gtkimhtml.c:3771
msgid ""
"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
"\n"
"Defaulting to PNG."
msgstr ""
-#: ../pidgin/gtkimhtml.c:3760
+#: ../pidgin/gtkimhtml.c:3774
msgid ""
"Unrecognized file type\n"
"\n"
"Defaulting to PNG."
msgstr ""
-#: ../pidgin/gtkimhtml.c:3792
+#: ../pidgin/gtkimhtml.c:3806
#, c-format
msgid ""
"<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -17005,7 +17067,7 @@
"%s"
msgstr ""
-#: ../pidgin/gtkimhtml.c:3795
+#: ../pidgin/gtkimhtml.c:3809
#, c-format
msgid ""
"Error saving image\n"
@@ -17013,15 +17075,15 @@
"%s"
msgstr ""
-#: ../pidgin/gtkimhtml.c:3880 ../pidgin/gtkimhtml.c:3892
+#: ../pidgin/gtkimhtml.c:3894 ../pidgin/gtkimhtml.c:3906
msgid "Save Image"
msgstr ""
-#: ../pidgin/gtkimhtml.c:3937
+#: ../pidgin/gtkimhtml.c:3951
msgid "_Save Image..."
msgstr ""
-#: ../pidgin/gtkimhtml.c:3947
+#: ../pidgin/gtkimhtml.c:3961
msgid "_Add Custom Smiley..."
msgstr ""
@@ -18525,24 +18587,24 @@
msgid "_Copy Email Address"
msgstr ""
-#: ../pidgin/gtkutils.c:3694
+#: ../pidgin/gtkutils.c:3691
msgid "_Open File"
msgstr ""
-#: ../pidgin/gtkutils.c:3702 ../pidgin/gtkutils.c:3705
+#: ../pidgin/gtkutils.c:3699 ../pidgin/gtkutils.c:3702
msgid "Open _Containing Directory"
msgstr ""
-#: ../pidgin/gtkutils.c:3753 ../pidgin/gtkwhiteboard.c:771
+#: ../pidgin/gtkutils.c:3750 ../pidgin/gtkwhiteboard.c:771
#: ../pidgin/gtkwhiteboard.c:790
msgid "Save File"
msgstr ""
-#: ../pidgin/gtkutils.c:3774 ../pidgin/gtkutils.c:3777
+#: ../pidgin/gtkutils.c:3771 ../pidgin/gtkutils.c:3774
msgid "_Play Sound"
msgstr ""
-#: ../pidgin/gtkutils.c:3784
+#: ../pidgin/gtkutils.c:3781
msgid "_Save File"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/sabayon.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/sabayon.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/sabayon.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 15:48+0100\n"
+"POT-Creation-Date: 2015-05-06 21:50+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/shared-mime-info.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/shared-mime-info.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/shared-mime-info.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 15:48+0100\n"
+"POT-Creation-Date: 2015-05-06 21:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
Modified: branches/SLE11-SP4/lcn/50-pot/tomboy.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/tomboy.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/tomboy.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 15:49+0100\n"
+"POT-Creation-Date: 2015-05-06 22:00+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -1388,7 +1388,7 @@
msgid "Ser_vice:"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:438 ../Tomboy/PreferencesDialog.cs:1023
+#: ../Tomboy/PreferencesDialog.cs:438 ../Tomboy/PreferencesDialog.cs:1031
msgid "Not configurable"
msgstr ""
@@ -1405,103 +1405,103 @@
msgid "Get More Add-Ins..."
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:558
+#: ../Tomboy/PreferencesDialog.cs:566
msgid "_Enable"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:564
+#: ../Tomboy/PreferencesDialog.cs:572
msgid "_Disable"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:695
+#: ../Tomboy/PreferencesDialog.cs:703
msgid "Not Implemented"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:709
+#: ../Tomboy/PreferencesDialog.cs:717
#, csharp-format
msgid "{0} Preferences"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:848
+#: ../Tomboy/PreferencesDialog.cs:856
msgid "Choose Note Font"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:892
+#: ../Tomboy/PreferencesDialog.cs:900
msgid "Other Synchronization Options"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:898
+#: ../Tomboy/PreferencesDialog.cs:906
msgid ""
"When a conflict is detected between a local note and a note on the "
"configured synchronization server:"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:905
+#: ../Tomboy/PreferencesDialog.cs:913
msgid "Always ask me what to do."
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:909
+#: ../Tomboy/PreferencesDialog.cs:917
msgid "Rename my local note."
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:913
+#: ../Tomboy/PreferencesDialog.cs:921
msgid "Replace my local note with the server's update."
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1059
+#: ../Tomboy/PreferencesDialog.cs:1067
msgid "WARNING: Are you sure?"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1061
+#: ../Tomboy/PreferencesDialog.cs:1069
msgid ""
"Clearing your synchronization settings is not recommended. You may be "
"forced to synchronize all of your notes again when you save new settings."
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1074
+#: ../Tomboy/PreferencesDialog.cs:1082
msgid "Resetting Synchronization Settings"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1076
+#: ../Tomboy/PreferencesDialog.cs:1084
msgid ""
"You have disabled the configured synchronization service. Your "
"synchronization settings will now be cleared. You may be forced to "
"synchronize all of your notes again when you save new settings"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1154
+#: ../Tomboy/PreferencesDialog.cs:1162
msgid "Success! You're connected!"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1156
+#: ../Tomboy/PreferencesDialog.cs:1164
msgid ""
"Tomboy is ready to synchronize your notes. Would you like to synchronize "
"them now?"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1179
+#: ../Tomboy/PreferencesDialog.cs:1187
msgid ""
"Sorry, but something went wrong. Please check your information and try "
"again. The ~/.tomboy.log might be useful too."
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1188
+#: ../Tomboy/PreferencesDialog.cs:1196
msgid "Error connecting :("
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1264
+#: ../Tomboy/PreferencesDialog.cs:1272
msgid "Version:"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1271
+#: ../Tomboy/PreferencesDialog.cs:1279
msgid "Author:"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1278
+#: ../Tomboy/PreferencesDialog.cs:1286
msgid "Copyright:"
msgstr ""
-#: ../Tomboy/PreferencesDialog.cs:1284
+#: ../Tomboy/PreferencesDialog.cs:1292
msgid "Add-in Dependencies:"
msgstr ""
Modified: branches/SLE11-SP4/lcn/50-pot/vmx-manager.pot
===================================================================
--- branches/SLE11-SP4/lcn/50-pot/vmx-manager.pot 2015-05-07 17:53:13 UTC (rev 91629)
+++ branches/SLE11-SP4/lcn/50-pot/vmx-manager.pot 2015-05-07 20:15:31 UTC (rev 91630)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-14 15:49+0100\n"
+"POT-Creation-Date: 2015-05-06 18:14+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"