[git] GPA - branch, master, updated. gpa-0.9.0-19-g30752eb
by Werner Koch
cvs at cvs.gnupg.org
Mon Dec 12 12:11:04 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Assistant".
The branch, master has been updated
via 30752eb091f9005c36f90780e50336cddd8a4e93 (commit)
via 1ce38d7852212236f7e50a33dd00678bcc735e70 (commit)
from 900315491024da55f3dd8ad4ca8b61a2b87efcdd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 30752eb091f9005c36f90780e50336cddd8a4e93
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 12 11:11:06 2011 +0100
Fix wrong setting of the expire date.
* src/gpadatebutton.c (update_widgets): Fix month base.
(day_selected_cb): Ditto. Fixes Debian#625513.
--
g_date and gtk_calendar use different bases for the month. g_date
uses 1..12 whereas gtk_calendar uses the Unix standard of 0..11.
diff --git a/src/gpadatebutton.c b/src/gpadatebutton.c
index 264f12b..6ea1a09 100644
--- a/src/gpadatebutton.c
+++ b/src/gpadatebutton.c
@@ -14,7 +14,7 @@
* License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
@@ -28,12 +28,12 @@
#include <gtk/gtk.h>
#include "gpadatebutton.h"
-#include "i18n.h"
+#include "i18n.h"
/* Object's class definition. */
-struct _GpaDateButtonClass
+struct _GpaDateButtonClass
{
GtkButtonClass parent_class;
@@ -53,7 +53,7 @@ struct _GpaDateButton
GtkWidget *label;
guint current_year;
- guint current_month;
+ guint current_month; /* 1..12 ! */
guint current_day;
int ignore_next_selection;
@@ -69,7 +69,7 @@ static void gpa_date_button_finalize (GObject *object);
-/************************************************************
+/************************************************************
******************* Implementation *********************
************************************************************/
@@ -81,14 +81,14 @@ update_widgets (GpaDateButton *self)
if (!self->current_day && !self->current_month && !self->current_year)
*buf = 0;
else
- snprintf (buf, sizeof buf, "%04d-%02d-%02d",
- self->current_year, self->current_month+1, self->current_day);
-
+ snprintf (buf, sizeof buf, "%04d-%02d-%02d",
+ self->current_year, self->current_month, self->current_day);
+
gtk_label_set_text (GTK_LABEL (self->label), *buf? buf : _("(not set)"));
if (self->calendar && *buf)
{
gtk_calendar_select_month (GTK_CALENDAR (self->calendar),
- self->current_month, self->current_year);
+ self->current_month-1, self->current_year);
gtk_calendar_select_day (GTK_CALENDAR (self->calendar),
self->current_day);
}
@@ -103,7 +103,7 @@ destroy_cb (GtkWidget *widget, gpointer user_data)
GpaDateButton *self = GPA_DATE_BUTTON (user_data);
self->dialog = NULL;
-}
+}
static void
@@ -121,6 +121,7 @@ day_selected_cb (GtkWidget *widget, gpointer user_data)
&self->current_year,
&self->current_month,
&self->current_day);
+ self->current_month++;
update_widgets (self);
g_signal_emit_by_name (self, "date-set");
@@ -147,11 +148,11 @@ create_widgets (GpaDateButton *self)
update_widgets (self);
gtk_widget_show (self->label);
gtk_container_add (GTK_CONTAINER (self), self->label);
-}
+}
-/************************************************************
+/************************************************************
****************** Object Management ********************
************************************************************/
@@ -161,12 +162,12 @@ gpa_date_button_clicked (GtkButton *button)
{
GpaDateButton *self = GPA_DATE_BUTTON (button);
- if (!self->dialog)
+ if (!self->dialog)
{
self->dialog = gtk_dialog_new ();
gtk_window_set_decorated (GTK_WINDOW (self->dialog), FALSE);
gtk_window_set_modal (GTK_WINDOW (self->dialog), TRUE);
-
+
g_signal_connect (self->dialog, "destroy",
G_CALLBACK (destroy_cb), self);
g_signal_connect_swapped (self->dialog, "response",
@@ -184,7 +185,7 @@ gpa_date_button_clicked (GtkButton *button)
gtk_widget_show_all (self->dialog);
}
-
+
update_widgets (self);
gtk_window_present (GTK_WINDOW (self->dialog));
}
@@ -194,11 +195,11 @@ static void
gpa_date_button_class_init (void *class_ptr, void *class_data)
{
GpaDateButtonClass *klass = class_ptr;
-
+
(void)class_data;
parent_class = g_type_class_peek_parent (klass);
-
+
G_OBJECT_CLASS (klass)->finalize = gpa_date_button_finalize;
GTK_BUTTON_CLASS (klass)->clicked = gpa_date_button_clicked;
@@ -225,7 +226,7 @@ gpa_date_button_init (GTypeInstance *instance, void *class_ptr)
static void
gpa_date_button_finalize (GObject *object)
-{
+{
GpaDateButton *self = GPA_DATE_BUTTON (object);
(void)self;
@@ -238,7 +239,7 @@ GType
gpa_date_button_get_type (void)
{
static GType this_type = 0;
-
+
if (!this_type)
{
static const GTypeInfo this_info =
@@ -253,17 +254,17 @@ gpa_date_button_get_type (void)
0, /* n_preallocs */
gpa_date_button_init
};
-
+
this_type = g_type_register_static (GTK_TYPE_BUTTON,
"GpaDateButton",
&this_info, 0);
}
-
+
return this_type;
}
-/************************************************************
+/************************************************************
********************** Public API ************************
************************************************************/
GtkWidget *
diff --git a/src/gpgmetools.c b/src/gpgmetools.c
index 8c2b3c0..dd3e8d6 100644
--- a/src/gpgmetools.c
+++ b/src/gpgmetools.c
@@ -98,7 +98,7 @@ gpa_gpgme_warning_ext (gpg_error_t err, const char *desc)
else
arg = gpgme_strerror (err);
- message = g_strdup_printf
+ message = g_strdup_printf
(_("The GPGME library returned an unexpected\n"
"error. The error was:\n\n"
"\t%s\n\n"
@@ -130,7 +130,7 @@ gpa_gpgme_new (void)
if (! cms_hack)
gpgme_set_passphrase_cb (ctx, gpa_passphrase_cb, NULL);
-
+
return ctx;
}
@@ -168,9 +168,9 @@ check_overwriting (const char *filename, GtkWidget *parent)
/* If the file exists, ask before overwriting. */
if (g_file_test (filename, G_FILE_TEST_EXISTS))
{
- GtkWidget *msgbox = gtk_message_dialog_new
+ GtkWidget *msgbox = gtk_message_dialog_new
(GTK_WINDOW(parent), GTK_DIALOG_MODAL,
- GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE,
_("The file %s already exists.\n"
"Do you want to overwrite it?"), filename);
gtk_dialog_add_buttons (GTK_DIALOG (msgbox),
@@ -195,7 +195,7 @@ FILE *
gpa_fopen (const char *filename, GtkWidget *parent)
{
FILE *target;
-
+
if (!check_overwriting (filename, parent))
return NULL;
target = g_fopen (filename, "w");
@@ -303,7 +303,7 @@ dos_to_unix (gchar *str, gsize *len)
inserted). */
gchar *src;
gchar *dst;
-
+
src = str;
dst = str;
while (*src)
@@ -412,7 +412,7 @@ build_genkey_parms (gpa_keygen_para_t *params)
/* Build the expiration date string if needed */
if (g_date_valid (¶ms->expire))
- expire = g_strdup_printf ("Expire-Date: %04d-%02d-%02d\n",
+ expire = g_strdup_printf ("Expire-Date: %04d-%02d-%02d\n",
g_date_get_year (¶ms->expire),
g_date_get_month (¶ms->expire),
g_date_get_day (¶ms->expire));
@@ -430,7 +430,7 @@ build_genkey_parms (gpa_keygen_para_t *params)
"%%ask-passphrase\n"
"</GnupgKeyParms>\n",
key_algo,
- params->keysize,
+ params->keysize,
subkeys? subkeys : "",
name? name:"",
email? email : "",
@@ -469,7 +469,7 @@ static const gchar *
get_gpg_path (void)
{
gpgme_engine_info_t engine;
-
+
gpgme_get_engine_info (&engine);
while (engine)
{
@@ -486,7 +486,7 @@ static const gchar *
get_gpgsm_path (void)
{
gpgme_engine_info_t engine;
-
+
gpgme_get_engine_info (&engine);
while (engine)
{
@@ -503,7 +503,7 @@ static const gchar *
get_gpgconf_path (void)
{
gpgme_engine_info_t engine;
-
+
gpgme_get_engine_info (&engine);
while (engine)
{
@@ -532,10 +532,10 @@ get_gpg_connect_agent_path (void)
#else
# define NEWNAME "gpg-connect-agent"
#endif
-
+
fname = g_malloc (strlen (gpgconf) + strlen (NEWNAME) + 1);
strcpy (fname, gpgconf);
-#ifdef G_OS_WIN32
+#ifdef G_OS_WIN32
for (p=fname; *p; p++)
if (*p == '\\')
*p = '/';
@@ -562,17 +562,17 @@ gpa_backup_key (const gchar *fpr, const char *filename)
gchar *err;
FILE *file;
gint ret_code;
- gchar *header_argv[] =
+ gchar *header_argv[] =
{
NULL, "--batch", "--no-tty", "--fingerprint", (gchar*) fpr, NULL
};
- gchar *pub_argv[] =
+ gchar *pub_argv[] =
{
NULL, "--batch", "--no-tty", "--armor", "--export", (gchar*) fpr, NULL
};
- gchar *sec_argv[] =
+ gchar *sec_argv[] =
{
- NULL, "--batch", "--no-tty", "--armor", "--export-secret-key",
+ NULL, "--batch", "--no-tty", "--armor", "--export-secret-key",
(gchar*) fpr, NULL
};
const gchar *path;
@@ -670,7 +670,7 @@ gpa_key_ownertrust_string (gpgme_key_t key)
if (key->protocol == GPGME_PROTOCOL_CMS)
return "";
- switch (key->owner_trust)
+ switch (key->owner_trust)
{
case GPGME_VALIDITY_UNKNOWN:
case GPGME_VALIDITY_UNDEFINED:
@@ -699,7 +699,7 @@ gpa_key_validity_string (gpgme_key_t key)
{
if (!key->uids)
return _("Unknown");
- switch (key->uids->validity)
+ switch (key->uids->validity)
{
case GPGME_VALIDITY_UNKNOWN:
case GPGME_VALIDITY_UNDEFINED:
@@ -726,7 +726,7 @@ gpa_key_validity_string (gpgme_key_t key)
static GtkWidget *
passphrase_question_label (const char *uid_hint,
- const char *passphrase_info,
+ const char *passphrase_info,
int prev_was_bad)
{
GtkWidget *label;
@@ -775,7 +775,7 @@ passphrase_question_label (const char *uid_hint,
/* This is the function called by GPGME when it wants a passphrase. */
gpg_error_t
gpa_passphrase_cb (void *hook, const char *uid_hint,
- const char *passphrase_info,
+ const char *passphrase_info,
int prev_was_bad, int fd)
{
GtkWidget * dialog;
@@ -785,7 +785,7 @@ gpa_passphrase_cb (void *hook, const char *uid_hint,
GtkWidget * pixmap;
GtkResponseType response;
gchar *passphrase;
-
+
dialog = gtk_dialog_new_with_buttons (_("Enter Passphrase"),
NULL, GTK_DIALOG_MODAL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -797,7 +797,7 @@ gpa_passphrase_cb (void *hook, const char *uid_hint,
-1);
hbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox,
TRUE, FALSE, 10);
pixmap = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION,
GTK_ICON_SIZE_DIALOG);
@@ -819,7 +819,7 @@ gpa_passphrase_cb (void *hook, const char *uid_hint,
/* Run the dialog */
gtk_widget_show_all (dialog);
response = gtk_dialog_run (GTK_DIALOG (dialog));
- passphrase = g_strdup_printf ("%s\n",
+ passphrase = g_strdup_printf ("%s\n",
gtk_entry_get_text (GTK_ENTRY (entry)));
gtk_widget_destroy (dialog);
if (response == GTK_RESPONSE_OK)
@@ -831,7 +831,7 @@ gpa_passphrase_cb (void *hook, const char *uid_hint,
if (WriteFile ((HANDLE) _get_osfhandle (fd), passphrase,
passphrase_len, &res, NULL) == 0
|| res < passphrase_len)
- {
+ {
g_free (passphrase);
return gpg_error (gpg_err_code_from_errno (EIO));
}
@@ -866,10 +866,10 @@ static gchar *
string_to_utf8 (const gchar *string)
{
const char *s;
-
+
if (!string)
return NULL;
-
+
/* Due to a bug in old and not so old PGP versions user IDs have
been copied verbatim into the key. Thus many users with Umlauts
et al. in their name will see their names garbled. Although this
@@ -885,7 +885,7 @@ string_to_utf8 (const gchar *string)
|| ((*s & 0xf8) == 0xf0)
|| ((*s & 0xfc) == 0xf8)
|| ((*s & 0xfe) == 0xfc)) )
- {
+ {
/* Possible utf-8 character followed by continuation byte.
Although this might still be Latin-1 we better assume that it
is valid utf-8. */
@@ -1133,7 +1133,7 @@ gpa_gpgme_copy_keyarray (gpgme_key_t *keys)
for (idx=0; keys[idx]; idx++)
;
idx++;
- newarray = g_new (gpgme_key_t, idx);
+ newarray = g_new (gpgme_key_t, idx);
for (idx=0; keys[idx]; idx++)
{
gpgme_key_ref (keys[idx]);
@@ -1152,7 +1152,7 @@ gpa_gpgme_release_keyarray (gpgme_key_t *keys)
if (keys)
{
int idx;
-
+
for (idx=0; keys[idx]; idx++)
gpgme_key_unref (keys[idx]);
g_free (keys);
@@ -1240,7 +1240,7 @@ compare_version_strings (const char *my_version,
if (my_major > rq_major
|| (my_major == rq_major && my_minor > rq_minor)
- || (my_major == rq_major && my_minor == rq_minor
+ || (my_major == rq_major && my_minor == rq_minor
&& my_micro > rq_micro)
|| (my_major == rq_major && my_minor == rq_minor
&& my_micro == rq_micro && strcmp (my_plvl, rq_plvl) >= 0))
@@ -1265,14 +1265,14 @@ gpa_switch_to_gpg2 (void)
newname = xmalloc (strlen (oldname) + 1 + 1);
strcpy (newname, oldname);
#ifdef G_OS_WIN32
-# define OLD_NAME "gpg.exe"
-# define NEW_NAME "gpg2.exe"
+# define OLD_NAME "gpg.exe"
+# define NEW_NAME "gpg2.exe"
for (p=newname; *p; p++)
if (*p == '\\')
*p = '/';
#else
-# define OLD_NAME "gpg"
-# define NEW_NAME "gpg2"
+# define OLD_NAME "gpg"
+# define NEW_NAME "gpg2"
#endif /*G_OS_WIN32*/
p = strrchr (newname, '/');
if (p)
@@ -1298,7 +1298,7 @@ int
is_gpg_version_at_least (const char *need_version)
{
gpgme_engine_info_t engine;
-
+
gpgme_get_engine_info (&engine);
while (engine)
{
@@ -1311,7 +1311,7 @@ is_gpg_version_at_least (const char *need_version)
/* Structure used to communicate with gpg_simple_stderr_cb. */
-struct gpg_simple_stderr_parm_s
+struct gpg_simple_stderr_parm_s
{
gboolean (*cb)(void *opaque, char *line);
void *cb_arg;
@@ -1319,8 +1319,8 @@ struct gpg_simple_stderr_parm_s
};
/* Helper for gpa_start_simple_gpg_command. */
-static gboolean
-gpg_simple_stderr_cb (GIOChannel *channel, GIOCondition condition,
+static gboolean
+gpg_simple_stderr_cb (GIOChannel *channel, GIOCondition condition,
void *user_data)
{
struct gpg_simple_stderr_parm_s *parm = user_data;
@@ -1337,7 +1337,7 @@ gpg_simple_stderr_cb (GIOChannel *channel, GIOCondition condition,
line = parm->string->str;
/* We care only about status lines. */
- if (!strncmp (line, "[GNUPG:] ", 9))
+ if (!strncmp (line, "[GNUPG:] ", 9))
{
line += 9;
@@ -1351,7 +1351,7 @@ gpg_simple_stderr_cb (GIOChannel *channel, GIOCondition condition,
*p = 0;
}
- /* Call user callback. */
+ /* Call user callback. */
if (parm->cb && !parm->cb (parm->cb_arg, line))
{
/* User requested EOF. */
@@ -1447,7 +1447,7 @@ gpa_start_simple_gpg_command (gboolean (*cb)(void *opaque, char *line),
parm->cb_arg = cb_arg;
parm->string = g_string_sized_new (200);
- if (!g_spawn_async_with_pipes (NULL, argv, NULL,
+ if (!g_spawn_async_with_pipes (NULL, argv, NULL,
(G_SPAWN_STDOUT_TO_DEV_NULL),
NULL, NULL, NULL,
NULL, NULL, &fd_stderr, NULL))
@@ -1462,14 +1462,14 @@ gpa_start_simple_gpg_command (gboolean (*cb)(void *opaque, char *line),
channel = g_io_channel_win32_new_fd (fd_stderr);
#else
channel = g_io_channel_unix_new (fd_stderr);
-#endif
+#endif
g_io_channel_set_encoding (channel, NULL, NULL);
/* Note that we need a buffered channel, so that we can use the read
line function. */
g_io_channel_set_close_on_unref (channel, TRUE);
/* Create a watch for the channel. */
- if (!g_io_add_watch (channel, (G_IO_IN|G_IO_HUP),
+ if (!g_io_add_watch (channel, (G_IO_IN|G_IO_HUP),
gpg_simple_stderr_cb, parm))
{
g_debug ("error creating watch for gpg command");
@@ -1485,7 +1485,7 @@ gpa_start_simple_gpg_command (gboolean (*cb)(void *opaque, char *line),
/* Try to start the gpg-agent if it has not yet been started.
Starting the agent works in the background. Thus if the function
returns, it is not sure that the agent is now running. */
-void
+void
gpa_start_agent (void)
{
gpa_start_simple_gpg_command (NULL, NULL, GPGME_PROTOCOL_ASSUAN,
@@ -1509,7 +1509,7 @@ gpa_validate_gpg_name (const char *name)
result = _("Name may not start with a digit.");
else if (g_utf8_strlen (name, -1) < 5)
result = _("Name is too short.");
-
+
return result;
}
@@ -1529,7 +1529,7 @@ has_invalid_email_chars (const char *s)
const char *valid_chars=
"01234567890_-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
- for ( ; *s; s++ )
+ for ( ; *s; s++ )
{
if ((*s & 0x80))
continue; /* We only care about ASCII. */
commit 1ce38d7852212236f7e50a33dd00678bcc735e70
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 12 10:25:34 2011 +0100
Bug#1131: Grammar and typo fixes.
* src/gpafileencryptop.c (revoked_key): Grammar fix.
* src/keygenwizard.c (keygen_wizard_email_page): Typo fix.
diff --git a/po/ar.po b/po/ar.po
index a00c8dd..864f216 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -436,7 +436,7 @@ msgstr "Ù…ÙØªØ§Ø Ù…Ù†Ù‚ÙˆØ¶"
msgid "_Close"
msgstr "أ_غلق"
-msgid "The following key has been revoked by it's owner:"
+msgid "The following key has been revoked by its owner:"
msgstr "Ù†Ùقض هذا المÙØªØ§Ø Ù…Ù† Ù‚ÙبÙÙ„ مالكه:"
msgid "And can not be used for encryption."
@@ -1067,13 +1067,12 @@ msgstr ""
msgid "Your Name:"
msgstr "اسمك:"
-#, fuzzy
msgid ""
"Please insert your email address.\n"
"\n"
"Your email address will be part of the new key to make it easier for others "
"to identify keys. If you have several email addresses, you can add further "
-"email adresses later."
+"email addresses later."
msgstr ""
"أدخل عنوان بريدك الإلكتروني.\n"
"\n"
diff --git a/po/cs.po b/po/cs.po
index 85be887..28767d5 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -461,7 +461,8 @@ msgstr "ZneplatnÄ›ný klÃÄ"
msgid "_Close"
msgstr "_ZavÅ™Ãt"
-msgid "The following key has been revoked by it's owner:"
+#, fuzzy
+msgid "The following key has been revoked by its owner:"
msgstr "NásledujÃcà klÃÄ byl zneplatnÄ›n vlastnÃkem:"
msgid "And can not be used for encryption."
diff --git a/po/de.po b/po/de.po
index dd80536..5498861 100644
--- a/po/de.po
+++ b/po/de.po
@@ -412,7 +412,7 @@ msgstr "Zurückgezogener Schlüssel"
msgid "_Close"
msgstr "_Fenster schließen"
-msgid "The following key has been revoked by it's owner:"
+msgid "The following key has been revoked by its owner:"
msgstr "Der folgende Schlüssel wurde vom Besitzer zurückgezogen:"
msgid "And can not be used for encryption."
@@ -1043,7 +1043,7 @@ msgid ""
"\n"
"Your email address will be part of the new key to make it easier for others "
"to identify keys. If you have several email addresses, you can add further "
-"email adresses later."
+"email addresses later."
msgstr ""
"Bitte geben Sie Ihre E-Mail-Adresse an.\n"
"\n"
diff --git a/po/fr.po b/po/fr.po
index f60565c..a080387 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -421,7 +421,7 @@ msgstr "Clef révoquée"
msgid "_Close"
msgstr "_Fermer"
-msgid "The following key has been revoked by it's owner:"
+msgid "The following key has been revoked by its owner:"
msgstr "La clef suivante a été révoquée par son propriétaire :"
msgid "And can not be used for encryption."
@@ -1061,7 +1061,7 @@ msgid ""
"\n"
"Your email address will be part of the new key to make it easier for others "
"to identify keys. If you have several email addresses, you can add further "
-"email adresses later."
+"email addresses later."
msgstr ""
"Veuillez indiquer votre adresse de courriel.\n"
"\n"
diff --git a/po/ru.po b/po/ru.po
index b92c3f3..e76c4bd 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -437,7 +437,7 @@ msgstr "Отзыв ключа"
msgid "_Close"
msgstr "_Закрыть"
-msgid "The following key has been revoked by it's owner:"
+msgid "The following key has been revoked by its owner:"
msgstr "Ключ отозван владельцем:"
msgid "And can not be used for encryption."
diff --git a/po/sv.po b/po/sv.po
index c820a48..84a62f9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -417,7 +417,7 @@ msgstr "Spärrad nyckel"
msgid "_Close"
msgstr "_Stäng"
-msgid "The following key has been revoked by it's owner:"
+msgid "The following key has been revoked by its owner:"
msgstr "Följande nyckel har spärrats av sin ägare:"
msgid "And can not be used for encryption."
@@ -1046,7 +1046,7 @@ msgid ""
"\n"
"Your email address will be part of the new key to make it easier for others "
"to identify keys. If you have several email addresses, you can add further "
-"email adresses later."
+"email addresses later."
msgstr ""
"Ange din e-postadress.\n"
"\n"
diff --git a/po/tr.po b/po/tr.po
index 70ab413..6549dbb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -451,7 +451,7 @@ msgstr "Feshedilmi
msgid "_Close"
msgstr "_Kapat"
-msgid "The following key has been revoked by it's owner:"
+msgid "The following key has been revoked by its owner:"
msgstr "Þu anahtar sahibi tarafýndan feshedilmiþtir:"
msgid "And can not be used for encryption."
diff --git a/src/gpafileencryptop.c b/src/gpafileencryptop.c
index f06170c..dc146aa 100644
--- a/src/gpafileencryptop.c
+++ b/src/gpafileencryptop.c
@@ -41,10 +41,10 @@
#include "gpawidgets.h"
/* Internal functions */
-static void gpa_file_encrypt_operation_done_error_cb (GpaContext *context,
+static void gpa_file_encrypt_operation_done_error_cb (GpaContext *context,
gpg_error_t err,
GpaFileEncryptOperation *op);
-static void gpa_file_encrypt_operation_done_cb (GpaContext *context,
+static void gpa_file_encrypt_operation_done_cb (GpaContext *context,
gpg_error_t err,
GpaFileEncryptOperation *op);
static void gpa_file_encrypt_operation_response_cb (GtkDialog *dialog,
@@ -68,7 +68,7 @@ gpa_file_encrypt_operation_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
GpaFileEncryptOperation *op = GPA_FILE_ENCRYPT_OPERATION (object);
-
+
switch (prop_id)
{
case PROP_FORCE_ARMOR:
@@ -100,7 +100,7 @@ gpa_file_encrypt_operation_set_property (GObject *object, guint prop_id,
static void
gpa_file_encrypt_operation_finalize (GObject *object)
-{
+{
GpaFileEncryptOperation *op = GPA_FILE_ENCRYPT_OPERATION (object);
/* FIXME: The use of RSET is messed up. There is no clear concept
@@ -126,7 +126,7 @@ gpa_file_encrypt_operation_init (GpaFileEncryptOperation *op)
}
static GObject*
-gpa_file_encrypt_operation_constructor
+gpa_file_encrypt_operation_constructor
(GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
@@ -163,7 +163,7 @@ static void
gpa_file_encrypt_operation_class_init (GpaFileEncryptOperationClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
+
parent_class = g_type_class_peek_parent (klass);
object_class->constructor = gpa_file_encrypt_operation_constructor;
@@ -184,7 +184,7 @@ GType
gpa_file_encrypt_operation_get_type (void)
{
static GType file_encrypt_operation_type = 0;
-
+
if (!file_encrypt_operation_type)
{
static const GTypeInfo file_encrypt_operation_info =
@@ -199,12 +199,12 @@ gpa_file_encrypt_operation_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) gpa_file_encrypt_operation_init,
};
-
- file_encrypt_operation_type = g_type_register_static
+
+ file_encrypt_operation_type = g_type_register_static
(GPA_FILE_OPERATION_TYPE, "GpaFileEncryptOperation",
&file_encrypt_operation_info, 0);
}
-
+
return file_encrypt_operation_type;
}
@@ -215,7 +215,7 @@ gpa_file_encrypt_operation_new (GtkWidget *window, GList *files,
gboolean force_armor)
{
GpaFileEncryptOperation *op;
-
+
op = g_object_new (GPA_FILE_ENCRYPT_OPERATION_TYPE,
"window", window,
"input_files", files,
@@ -231,7 +231,7 @@ gpa_file_encrypt_sign_operation_new (GtkWidget *window, GList *files,
gboolean force_armor)
{
GpaFileEncryptOperation *op;
-
+
op = g_object_new (GPA_FILE_ENCRYPT_OPERATION_TYPE,
"window", window,
"input_files", files,
@@ -249,7 +249,7 @@ GpaFileEncryptOperation*
gpa_file_encrypt_operation_new_for_server (GList *files, void *server_ctx)
{
GpaFileEncryptOperation *op;
-
+
op = g_object_new (GPA_FILE_ENCRYPT_OPERATION_TYPE,
"input_files", files,
"server-ctx", server_ctx,
@@ -299,7 +299,7 @@ gpa_file_encrypt_operation_start (GpaFileEncryptOperation *op,
gpa_gpgme_warning (err);
return err;
}
-
+
err = gpgme_data_new (&op->cipher);
if (err)
{
@@ -312,11 +312,11 @@ gpa_file_encrypt_operation_start (GpaFileEncryptOperation *op,
else
{
gchar *plain_filename = file_item->filename_in;
-
- file_item->filename_out = destination_filename
+
+ file_item->filename_out = destination_filename
(plain_filename, gpgme_get_armor (GPA_OPERATION (op)->context->ctx));
/* Open the files */
- op->plain_fd = gpa_open_input (plain_filename, &op->plain,
+ op->plain_fd = gpa_open_input (plain_filename, &op->plain,
GPA_OPERATION (op)->window);
if (op->plain_fd == -1)
/* FIXME: Error value. */
@@ -337,7 +337,7 @@ gpa_file_encrypt_operation_start (GpaFileEncryptOperation *op,
/* Start the operation. */
/* Always trust keys, because any untrusted keys were already
confirmed by the user. */
- if (gpa_file_encrypt_dialog_get_sign
+ if (gpa_file_encrypt_dialog_get_sign
(GPA_FILE_ENCRYPT_DIALOG (op->encrypt_dialog)))
err = gpgme_op_encrypt_sign_start (GPA_OPERATION (op)->context->ctx,
op->rset, GPGME_ENCRYPT_ALWAYS_TRUST,
@@ -365,7 +365,7 @@ gpa_file_encrypt_operation_start (GpaFileEncryptOperation *op,
/* Show and update the progress dialog. */
gtk_widget_show_all (GPA_FILE_OPERATION (op)->progress_dialog);
- gpa_progress_dialog_set_label (GPA_PROGRESS_DIALOG
+ gpa_progress_dialog_set_label (GPA_PROGRESS_DIALOG
(GPA_FILE_OPERATION (op)->progress_dialog),
file_item->direct_name
? file_item->direct_name
@@ -392,7 +392,7 @@ gpa_file_encrypt_operation_next (GpaFileEncryptOperation *op)
static void
-gpa_file_encrypt_operation_done_cb (GpaContext *context,
+gpa_file_encrypt_operation_done_cb (GpaContext *context,
gpg_error_t err,
GpaFileEncryptOperation *op)
{
@@ -434,7 +434,7 @@ gpa_file_encrypt_operation_done_cb (GpaContext *context,
op->cipher_fd = -1;
gtk_widget_hide (GPA_FILE_OPERATION (op)->progress_dialog);
- if (err)
+ if (err)
{
if (! file_item->direct_in)
{
@@ -452,7 +452,7 @@ gpa_file_encrypt_operation_done_cb (GpaContext *context,
g_signal_emit_by_name (GPA_OPERATION (op), "created_file", file_item);
/* Go to the next file in the list and encrypt it */
- GPA_FILE_OPERATION (op)->current = g_list_next
+ GPA_FILE_OPERATION (op)->current = g_list_next
(GPA_FILE_OPERATION (op)->current);
gpa_file_encrypt_operation_next (op);
}
@@ -474,7 +474,7 @@ ignore_key_trust (gpgme_key_t key, GtkWidget *parent)
GtkResponseType response;
dialog = gtk_dialog_new_with_buttons (_("Unknown Key"), GTK_WINDOW(parent),
- GTK_DIALOG_MODAL,
+ GTK_DIALOG_MODAL,
_("_Yes"), GTK_RESPONSE_YES,
_("_No"), GTK_RESPONSE_NO,
NULL);
@@ -500,7 +500,7 @@ ignore_key_trust (gpgme_key_t key, GtkWidget *parent)
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 5);
label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label),
+ gtk_label_set_markup (GTK_LABEL (label),
_("Do you <b>really</b> want to use this key?"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 5);
@@ -523,7 +523,7 @@ revoked_key (gpgme_key_t key, GtkWidget *parent)
GtkWidget *image;
dialog = gtk_dialog_new_with_buttons (_("Revoked Key"), GTK_WINDOW(parent),
- GTK_DIALOG_MODAL,
+ GTK_DIALOG_MODAL,
_("_Close"), GTK_RESPONSE_CLOSE,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
@@ -537,7 +537,7 @@ revoked_key (gpgme_key_t key, GtkWidget *parent)
gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox);
- label = gtk_label_new (_("The following key has been revoked by it's owner:"));
+ label = gtk_label_new (_("The following key has been revoked by its owner:"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 5);
key_info = gpa_key_info_new (key);
@@ -563,7 +563,7 @@ expired_key (gpgme_key_t key, GtkWidget *parent)
gchar *message;
dialog = gtk_dialog_new_with_buttons (_("Revoked Key"), GTK_WINDOW(parent),
- GTK_DIALOG_MODAL,
+ GTK_DIALOG_MODAL,
_("_Close"), GTK_RESPONSE_CLOSE,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
@@ -578,7 +578,7 @@ expired_key (gpgme_key_t key, GtkWidget *parent)
gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox);
message = g_strdup_printf (_("The following key expired on %s:"),
- gpa_expiry_date_string
+ gpa_expiry_date_string
(key->subkeys->expires));
label = gtk_label_new (message);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -615,11 +615,11 @@ set_recipients (GpaFileEncryptOperation *op, GList *recipients)
{
/* Should not happen either because the selection dialog
should have not allowed to select differet keys. */
- gpa_window_error
+ gpa_window_error
(_("The selected certificates are not all of the same type."
" That is, you mixed OpenPGP and X.509 certificates."
" Please make sure to select only certificates of the"
- " same type."),
+ " same type."),
GPA_OPERATION (op)->window);
return FALSE;
}
@@ -648,7 +648,7 @@ set_recipients (GpaFileEncryptOperation *op, GList *recipients)
valid becuase the backend will chekc this. FIXME: It would
be better to ask the backend to check the validity of the key
instead of letting it fail later. */
- else if (valid == GPGME_VALIDITY_FULL
+ else if (valid == GPGME_VALIDITY_FULL
|| valid == GPGME_VALIDITY_ULTIMATE
|| key->protocol == GPGME_PROTOCOL_CMS)
{
@@ -715,17 +715,17 @@ static void gpa_file_encrypt_operation_response_cb (GtkDialog *dialog,
GpaFileEncryptOperation *op = user_data;
gtk_widget_hide (GTK_WIDGET (dialog));
-
+
if (response == GTK_RESPONSE_OK)
{
gboolean success = TRUE;
- gboolean armor = gpa_file_encrypt_dialog_get_armor
+ gboolean armor = gpa_file_encrypt_dialog_get_armor
(GPA_FILE_ENCRYPT_DIALOG (op->encrypt_dialog));
- GList *signers = gpa_file_encrypt_dialog_signers
+ GList *signers = gpa_file_encrypt_dialog_signers
(GPA_FILE_ENCRYPT_DIALOG (op->encrypt_dialog));
GList *recipients = gpa_file_encrypt_dialog_recipients
(GPA_FILE_ENCRYPT_DIALOG (op->encrypt_dialog));
-
+
/* Set the armor value */
gpgme_set_armor (GPA_OPERATION (op)->context->ctx, armor);
/* Set the signers for the context. */
diff --git a/src/keygenwizard.c b/src/keygenwizard.c
index ea55fdb..06ac12a 100644
--- a/src/keygenwizard.c
+++ b/src/keygenwizard.c
@@ -40,7 +40,7 @@
/* The key generation wizard.
-
+
New users should not be overwhelmed by too many options most of which
are not easily explained and will only confuse them. To solve that
problem we use default values for the algorithm and size of the keys
@@ -48,7 +48,7 @@
name and email address in a step by step manner. */
/* Helper functions. */
-
+
/* Return a copy of string with leading and trailing whitespace
stripped. */
static char *
@@ -70,7 +70,7 @@ typedef struct
GtkWidget *final_page;
GtkWidget *backup_page;
GtkWidget *backup_dir_page;
-
+
GpaKeyGenWizardGenerateCb generate;
gpointer generate_data;
} GPAKeyGenWizard;
@@ -157,7 +157,7 @@ name_validate_cb (GtkWidget *widget, gpointer data)
while (*name && g_unichar_isspace (g_utf8_get_char (name)))
name = g_utf8_next_char (name);
gtk_assistant_set_page_complete (GTK_ASSISTANT (wizard->window),
- wizard->name_page,
+ wizard->name_page,
!gpa_validate_gpg_name (name));
return FALSE;
@@ -212,7 +212,7 @@ keygen_wizard_email_page (GPAKeyGenWizard *wizard)
_("Please insert your email address.\n\n"
"Your email address will be part of the new key to make it easier"
" for others to identify keys. If you have several email addresses,"
- " you can add further email adresses later."),
+ " you can add further email addresses later."),
_("Your Email Address:"));
entry = g_object_get_data (G_OBJECT (widget), "gpa_keygen_entry");
@@ -228,7 +228,7 @@ gpa_keygen_wizard_backup_page (GPAKeyGenWizard *wizard)
GtkWidget *vbox;
GtkWidget *description;
GtkWidget *radio;
-
+
vbox = gtk_vbox_new (FALSE, 0);
description = gtk_label_new
@@ -243,7 +243,7 @@ gpa_keygen_wizard_backup_page (GPAKeyGenWizard *wizard)
radio = gtk_radio_button_new_with_mnemonic (NULL, _("Create _backup copy"));
gtk_box_pack_start (GTK_BOX (vbox), radio, FALSE, TRUE, 5);
g_object_set_data (G_OBJECT (vbox), "gpa_keygen_backup", radio);
-
+
radio = gtk_radio_button_new_with_mnemonic_from_widget
(GTK_RADIO_BUTTON (radio), _("Do it _later"));
gtk_box_pack_start (GTK_BOX (vbox), radio, FALSE, TRUE, 5);
@@ -285,10 +285,10 @@ gpa_keygen_wizard_final_page (GPAKeyGenWizard * keygen_wizard)
GtkWidget *widget;
char *desc;
- desc = g_strdup_printf
+ desc = g_strdup_printf
(_("Congratulations!\n\n"
"You have successfully generated a key."
- " The key is indefinitely valid and has a length of %d bits."),
+ " The key is indefinitely valid and has a length of %d bits."),
STANDARD_KEY_LENGTH);
widget = gpa_keygen_wizard_message_page (desc);
g_free (desc);
@@ -364,7 +364,7 @@ keygen_wizard_prepare_cb (GtkAssistant *assistant, GtkWidget *page,
GtkWidget *
-gpa_keygen_wizard_new (GtkWidget *parent,
+gpa_keygen_wizard_new (GtkWidget *parent,
GpaKeyGenWizardGenerateCb generate_action,
gpointer data)
{
@@ -372,7 +372,7 @@ gpa_keygen_wizard_new (GtkWidget *parent,
GtkWidget *window;
GdkPixbuf *genkey_pixbuf;
GdkPixbuf *backup_pixbuf;
-
+
wizard = g_malloc (sizeof (*wizard));
genkey_pixbuf = gpa_create_icon_pixbuf ("wizard_genkey");
-----------------------------------------------------------------------
Summary of changes:
po/ar.po | 5 +--
po/cs.po | 3 +-
po/de.po | 4 +-
po/fr.po | 4 +-
po/ru.po | 2 +-
po/sv.po | 4 +-
po/tr.po | 2 +-
src/gpadatebutton.c | 45 ++++++++++++-----------
src/gpafileencryptop.c | 70 ++++++++++++++++++------------------
src/gpgmetools.c | 94 ++++++++++++++++++++++++------------------------
src/keygenwizard.c | 22 ++++++------
11 files changed, 128 insertions(+), 127 deletions(-)
hooks/post-receive
--
The GNU Privacy Assistant
http://git.gnupg.org
More information about the Gnupg-commits
mailing list