diff options
author | Milan Crha <mcrha@redhat.com> | 2008-03-27 19:31:40 +0800 |
---|---|---|
committer | Milan Crha <mcrha@src.gnome.org> | 2008-03-27 19:31:40 +0800 |
commit | b9a0f67d3eeb4bec24be4191cca80952fd8e825c (patch) | |
tree | 5daf4be4442bec68aac7cd162353525a786998d8 | |
parent | 787be15b58456dd80311e913b3d3dc6a67b803f2 (diff) | |
download | gsoc2013-evolution-b9a0f67d3eeb4bec24be4191cca80952fd8e825c.tar gsoc2013-evolution-b9a0f67d3eeb4bec24be4191cca80952fd8e825c.tar.gz gsoc2013-evolution-b9a0f67d3eeb4bec24be4191cca80952fd8e825c.tar.bz2 gsoc2013-evolution-b9a0f67d3eeb4bec24be4191cca80952fd8e825c.tar.lz gsoc2013-evolution-b9a0f67d3eeb4bec24be4191cca80952fd8e825c.tar.xz gsoc2013-evolution-b9a0f67d3eeb4bec24be4191cca80952fd8e825c.tar.zst gsoc2013-evolution-b9a0f67d3eeb4bec24be4191cca80952fd8e825c.zip |
** Fix for bug #511957
2008-03-27 Milan Crha <mcrha@redhat.com>
** Fix for bug #511957
* plugins/groupwise-features/org-gnome-proxy-login-errors.xml:
* plugins/groupwise-features/org-gnome-shared-folder.errors.xml:
* plugins/groupwise-features/org-gnome-proxy-errors.xml:
* plugins/groupwise-features/org-gnome-mail-retract-errors.xml:
Mark messages for translation.
* po/POTFILES.in:
Added plugins/groupwise-features/org-gnome-mail-retract-errors.xml.
svn path=/trunk/; revision=35269
-rw-r--r-- | plugins/groupwise-features/ChangeLog | 10 | ||||
-rw-r--r-- | plugins/groupwise-features/org-gnome-mail-retract-errors.xml | 4 | ||||
-rw-r--r-- | plugins/groupwise-features/org-gnome-proxy-errors.xml | 18 | ||||
-rw-r--r-- | plugins/groupwise-features/org-gnome-proxy-login-errors.xml | 10 | ||||
-rw-r--r-- | plugins/groupwise-features/org-gnome-shared-folder.errors.xml | 23 | ||||
-rw-r--r-- | po/ChangeLog | 7 | ||||
-rw-r--r-- | po/POTFILES.in | 1 |
7 files changed, 45 insertions, 28 deletions
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog index 7e58f91641..f10faa6efb 100644 --- a/plugins/groupwise-features/ChangeLog +++ b/plugins/groupwise-features/ChangeLog @@ -1,5 +1,15 @@ 2008-03-27 Milan Crha <mcrha@redhat.com> + ** Fix for bug #511957 + + * org-gnome-proxy-login-errors.xml: + * org-gnome-shared-folder.errors.xml: + * org-gnome-proxy-errors.xml: + * org-gnome-mail-retract-errors.xml: + Mark messages for translation. + +2008-03-27 Milan Crha <mcrha@redhat.com> + ** Fix for bug #511956 * share-folder.c: (notification_clicked): Mark text for translation. diff --git a/plugins/groupwise-features/org-gnome-mail-retract-errors.xml b/plugins/groupwise-features/org-gnome-mail-retract-errors.xml index 37cc8c8eed..64e2ce2f1e 100644 --- a/plugins/groupwise-features/org-gnome-mail-retract-errors.xml +++ b/plugins/groupwise-features/org-gnome-mail-retract-errors.xml @@ -2,7 +2,7 @@ <error-list domain="org.gnome.evolution.message.retract"> <error id="retract-failure" type="error"> - <primary>Message retract failed</primary> - <secondary>The server did not allow the selected message to be retracted.</secondary> + <_primary>Message retract failed</_primary> + <_secondary>The server did not allow the selected message to be retracted.</_secondary> </error> </error-list> diff --git a/plugins/groupwise-features/org-gnome-proxy-errors.xml b/plugins/groupwise-features/org-gnome-proxy-errors.xml index 013db90209..b32164ccf9 100644 --- a/plugins/groupwise-features/org-gnome-proxy-errors.xml +++ b/plugins/groupwise-features/org-gnome-proxy-errors.xml @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <error-list domain="org.gnome.evolution.proxy"> <error id="invalid-user" type="error"> -<primary>Invalid user</primary> -<secondary> +<_primary>Invalid user</_primary> +<_secondary> Proxy access cannot be given to user "{0}" -</secondary> +</_secondary> </error> <error id="no-user" type="error"> -<primary>Specify User</primary> -<secondary> +<_primary>Specify User</_primary> +<_secondary> You have to specify a valid user name to give proxy rights. -</secondary> +</_secondary> </error> <error id="user-is-proxy" type="error"> -<primary>Specify User</primary> -<secondary> +<_primary>Specify User</_primary> +<_secondary> You have already given proxy permissions to this user. -</secondary> +</_secondary> </error> </error-list> diff --git a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml index 69b3cd562d..2523f51056 100644 --- a/plugins/groupwise-features/org-gnome-proxy-login-errors.xml +++ b/plugins/groupwise-features/org-gnome-proxy-login-errors.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <error-list domain="org.gnome.evolution.proxy-login"> <error id="invalid-user" type="error"> -<primary>Invalid user</primary> -<secondary> +<_primary>Invalid user</_primary> +<_secondary> Proxy login as "{0}" was unsuccessful. Please check Email Id and try again. -</secondary> +</_secondary> </error> <error id="already-loggedin" type="error"> - <primary>Account Already Exists</primary> - <secondary>Account "{0}" already exists. Please check your folder tree.</secondary> + <_primary>Account Already Exists</_primary> + <_secondary>Account "{0}" already exists. Please check your folder tree.</_secondary> </error> </error-list> diff --git a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml index e0d5069d58..3c72eb16e1 100644 --- a/plugins/groupwise-features/org-gnome-shared-folder.errors.xml +++ b/plugins/groupwise-features/org-gnome-shared-folder.errors.xml @@ -1,28 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> <error-list domain="org.gnome.evolution.mail_shared_folder"> + <error id="invalid-user" type="error"> -<primary>Invalid user</primary> -<secondary> +<_primary>Invalid user</_primary> +<_secondary> You cannot share folder with specified user "{0}" -</secondary> +</_secondary> </error> <error id="no-user" type="error"> -<primary>Specify User</primary> -<secondary> +<_primary>Specify User</_primary> +<_secondary> You have to specify a user name whom you want to add to the list -</secondary> +</_secondary> </error> <error id="recurrence" type="question" default="GTK_RESPONSE_YES"> -<primary>This is a recurring meeting</primary> -<secondary>What would you like to {0}?</secondary> +<_primary>This is a recurring meeting</_primary> +<_secondary>What would you like to {0}?</_secondary> <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/> - <button label="This instance" response="GTK_RESPONSE_NO"/> - <button label="All instances" response="GTK_RESPONSE_YES"/> + <button _label="This instance" response="GTK_RESPONSE_NO"/> + <button _label="All instances" response="GTK_RESPONSE_YES"/> </error> - - </error-list> diff --git a/po/ChangeLog b/po/ChangeLog index 9ecc1b27cd..7a403f3f66 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,10 @@ +2008-03-27 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #511957 + + * POTFILES.in: + Added plugins/groupwise-features/org-gnome-mail-retract-errors.xml. + 2008-03-25 Philip Withnall <pwithnall@svn.gnome.org> * en_GB.po: Updated British English translation. diff --git a/po/POTFILES.in b/po/POTFILES.in index abf195dd26..b94511a676 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -331,6 +331,7 @@ plugins/groupwise-features/junk-settings.glade plugins/groupwise-features/mail-retract.c plugins/groupwise-features/org-gnome-compose-send-options.xml plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml +plugins/groupwise-features/org-gnome-mail-retract-errors.xml plugins/groupwise-features/org-gnome-proxy-errors.xml plugins/groupwise-features/org-gnome-proxy-login-errors.xml plugins/groupwise-features/org-gnome-shared-folder.errors.xml |