Compare commits
11 Commits
wip/matthi
...
cancelatio
Author | SHA1 | Date | |
---|---|---|---|
|
7ce5d53807 | ||
|
809358f3fa | ||
|
152cb78d4d | ||
|
67b2f9bdac | ||
|
f9f34aef79 | ||
|
12382e191a | ||
|
8dc75116e1 | ||
|
153bfe9617 | ||
|
e3a70e1790 | ||
|
87fb4e55ba | ||
|
53c0a2e9e1 |
60
ChangeLog
60
ChangeLog
@@ -1,3 +1,63 @@
|
||||
2006-08-31 Federico Mena Quintero <federico@novell.com>
|
||||
|
||||
* tests/autotestfilesystem.c (run_test): Let the cleanup function
|
||||
be optional.
|
||||
(TestSpec): Replaced the "callback_must_be_called" field with a
|
||||
"callback_type" one. This is an enum that indicates whether the
|
||||
callback must be run, must not be run, or is irrelevant. This
|
||||
lets us run self-contained tests with no auxiliary machinery for
|
||||
callbacks.
|
||||
(tests): Added a test for loading a folder.
|
||||
(test_folder_load): New test function. Tests loading a folder,
|
||||
tests that the returned info matches the files on disk, and that
|
||||
the returned list of files is complete with respect to what is on
|
||||
disk.
|
||||
|
||||
*** BRANCHED TO cancelation-changes ***
|
||||
|
||||
2006-08-23 Federico Mena Quintero <federico@novell.com>
|
||||
|
||||
* gtk/gtkfilesystem.[ch] (_gtk_file_system_create): Renamed to
|
||||
gtk_file_system_create() so that it will get exported and we can
|
||||
use it in the test program.
|
||||
|
||||
* gtk/gtk.symbols: Added gtk_file_system_create.
|
||||
|
||||
* gtk/gtkfilechooserdefault.c (set_file_system_backend): Use
|
||||
gtk_file_system_create().
|
||||
|
||||
* tests/autotestfilesystem.c: New file with automatic tests for
|
||||
the async callbacks and cancelation policy of GtkFileSystem.
|
||||
|
||||
* tests/Makefile.am: Added autotestfilesystem.
|
||||
|
||||
2006-08-23 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtkprinteroptionwidget.[hc]: Fix confusion about
|
||||
names and values in comboboxes, and clean up some
|
||||
coding style issues.
|
||||
|
||||
2006-08-23 Tor Lillqvist <tml@novell.com>
|
||||
|
||||
* gtk/gtkfilesystemwin32.c (gtk_file_system_win32_make_path):
|
||||
Revert unintended translatable string addition. Use same string
|
||||
in GError as in gtkfilesystemunix.c.
|
||||
|
||||
* gtk/gtkfilesystemwin32.c (_gtk_file_system_win32_path_compare):
|
||||
Fix logic at the end of strings.
|
||||
|
||||
* gtk/gtkfilesystemwin32.c: Maintain a hash table of live
|
||||
handles and check that we have no outstanding handles at
|
||||
finalization time. (Copying what Matthias did for
|
||||
gtkfilesystemunix.c)
|
||||
|
||||
2006-08-23 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* gtk/gtkfilesystemunix.c: Maintain a hash table
|
||||
of live handles and check that we have no outstanding
|
||||
handles at finalization time. (Copying what
|
||||
Federico did for gtkfilesystemgnomevfs.c)
|
||||
|
||||
2006-08-22 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* Branch for 2.10
|
||||
|
@@ -1431,6 +1431,7 @@ gtk_file_path_get_type G_GNUC_CONST
|
||||
gtk_file_paths_copy
|
||||
gtk_file_paths_free
|
||||
gtk_file_paths_sort
|
||||
gtk_file_system_create
|
||||
gtk_file_system_cancel_operation
|
||||
gtk_file_system_create_folder
|
||||
gtk_file_system_error_quark
|
||||
|
@@ -4732,7 +4732,7 @@ set_file_system_backend (GtkFileChooserDefault *impl,
|
||||
|
||||
impl->file_system = NULL;
|
||||
if (backend)
|
||||
impl->file_system = _gtk_file_system_create (backend);
|
||||
impl->file_system = gtk_file_system_create (backend);
|
||||
else
|
||||
{
|
||||
GtkSettings *settings = gtk_settings_get_default ();
|
||||
@@ -4741,7 +4741,7 @@ set_file_system_backend (GtkFileChooserDefault *impl,
|
||||
g_object_get (settings, "gtk-file-chooser-backend", &default_backend, NULL);
|
||||
if (default_backend)
|
||||
{
|
||||
impl->file_system = _gtk_file_system_create (default_backend);
|
||||
impl->file_system = gtk_file_system_create (default_backend);
|
||||
g_free (default_backend);
|
||||
}
|
||||
}
|
||||
|
@@ -1364,7 +1364,7 @@ _gtk_file_system_module_create (GtkFileSystemModule *fs_module)
|
||||
|
||||
|
||||
GtkFileSystem *
|
||||
_gtk_file_system_create (const char *file_system_name)
|
||||
gtk_file_system_create (const char *file_system_name)
|
||||
{
|
||||
GSList *l;
|
||||
char *module_path;
|
||||
|
@@ -441,7 +441,7 @@ void gtk_file_paths_free (GSList *paths);
|
||||
|
||||
/* GtkFileSystem modules support */
|
||||
|
||||
GtkFileSystem *_gtk_file_system_create (const char *file_system_name);
|
||||
GtkFileSystem *gtk_file_system_create (const char *file_system_name);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
@@ -18,6 +18,11 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* #define this if you want the program to crash when a file system gets
|
||||
* finalized while async handles are still outstanding.
|
||||
*/
|
||||
#undef HANDLE_ME_HARDER
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "gtkfilesystem.h"
|
||||
@@ -68,6 +73,8 @@ struct _GtkFileSystemUnix
|
||||
struct stat afs_statbuf;
|
||||
struct stat net_statbuf;
|
||||
|
||||
GHashTable *handles;
|
||||
|
||||
guint have_afs : 1;
|
||||
guint have_net : 1;
|
||||
};
|
||||
@@ -339,8 +346,80 @@ gtk_file_system_unix_init (GtkFileSystemUnix *system_unix)
|
||||
system_unix->have_net = TRUE;
|
||||
else
|
||||
system_unix->have_net = FALSE;
|
||||
|
||||
system_unix->handles = g_hash_table_new (g_direct_hash, g_direct_equal);
|
||||
}
|
||||
|
||||
static void
|
||||
check_handle_fn (gpointer key, gpointer value, gpointer data)
|
||||
{
|
||||
GtkFileSystemHandle *handle;
|
||||
int *num_live_handles;
|
||||
|
||||
handle = key;
|
||||
num_live_handles = data;
|
||||
|
||||
(*num_live_handles)++;
|
||||
|
||||
g_warning ("file_system_unix=%p still has handle=%p at finalization which is %s!",
|
||||
handle->file_system,
|
||||
handle,
|
||||
handle->cancelled ? "CANCELLED" : "NOT CANCELLED");
|
||||
}
|
||||
|
||||
static void
|
||||
check_handles_at_finalization (GtkFileSystemUnix *system_unix)
|
||||
{
|
||||
int num_live_handles;
|
||||
|
||||
num_live_handles = 0;
|
||||
|
||||
g_hash_table_foreach (system_unix->handles, check_handle_fn, &num_live_handles);
|
||||
#ifdef HANDLE_ME_HARDER
|
||||
g_assert (num_live_handles == 0);
|
||||
#endif
|
||||
|
||||
g_hash_table_destroy (system_unix->handles);
|
||||
}
|
||||
|
||||
#define GTK_TYPE_FILE_SYSTEM_HANDLE_UNIX (_gtk_file_system_handle_unix_get_type ())
|
||||
|
||||
typedef struct _GtkFileSystemHandle GtkFileSystemHandleUnix;
|
||||
typedef struct _GtkFileSystemHandleClass GtkFileSystemHandleUnixClass;
|
||||
|
||||
G_DEFINE_TYPE (GtkFileSystemHandleUnix, _gtk_file_system_handle_unix, GTK_TYPE_FILE_SYSTEM_HANDLE)
|
||||
|
||||
static void
|
||||
_gtk_file_system_handle_unix_init (GtkFileSystemHandleUnix *handle)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
_gtk_file_system_handle_unix_finalize (GObject *object)
|
||||
{
|
||||
GtkFileSystemHandleUnix *handle;
|
||||
GtkFileSystemUnix *system_unix;
|
||||
|
||||
handle = (GtkFileSystemHandleUnix *)object;
|
||||
|
||||
system_unix = GTK_FILE_SYSTEM_UNIX (GTK_FILE_SYSTEM_HANDLE (handle)->file_system);
|
||||
|
||||
g_assert (g_hash_table_lookup (system_unix->handles, handle) != NULL);
|
||||
g_hash_table_remove (system_unix->handles, handle);
|
||||
|
||||
if (G_OBJECT_CLASS (_gtk_file_system_handle_unix_parent_class)->finalize)
|
||||
G_OBJECT_CLASS (_gtk_file_system_handle_unix_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
_gtk_file_system_handle_unix_class_init (GtkFileSystemHandleUnixClass *class)
|
||||
{
|
||||
GObjectClass *gobject_class = (GObjectClass *) class;
|
||||
|
||||
gobject_class->finalize = _gtk_file_system_handle_unix_finalize;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
gtk_file_system_unix_finalize (GObject *object)
|
||||
{
|
||||
@@ -348,6 +427,8 @@ gtk_file_system_unix_finalize (GObject *object)
|
||||
|
||||
system_unix = GTK_FILE_SYSTEM_UNIX (object);
|
||||
|
||||
check_handles_at_finalization (system_unix);
|
||||
|
||||
/* FIXME: assert that the hash is empty? */
|
||||
g_hash_table_destroy (system_unix->folder_hash);
|
||||
|
||||
@@ -670,11 +751,17 @@ queue_callback (enum callback_types type, gpointer data)
|
||||
static GtkFileSystemHandle *
|
||||
create_handle (GtkFileSystem *file_system)
|
||||
{
|
||||
GtkFileSystemUnix *system_unix;
|
||||
GtkFileSystemHandle *handle;
|
||||
|
||||
handle = g_object_new (GTK_TYPE_FILE_SYSTEM_HANDLE, NULL);
|
||||
system_unix = GTK_FILE_SYSTEM_UNIX (file_system);
|
||||
|
||||
handle = g_object_new (GTK_TYPE_FILE_SYSTEM_HANDLE_UNIX, NULL);
|
||||
handle->file_system = file_system;
|
||||
|
||||
g_assert (g_hash_table_lookup (system_unix->handles, handle) == NULL);
|
||||
g_hash_table_insert (system_unix->handles, handle, handle);
|
||||
|
||||
return handle;
|
||||
}
|
||||
|
||||
|
@@ -19,6 +19,11 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
/* #define this if you want the program to crash when a file system gets
|
||||
* finalized while async handles are still outstanding.
|
||||
*/
|
||||
#undef HANDLE_ME_HARDER
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include "gtkfilesystem.h"
|
||||
@@ -66,6 +71,8 @@ struct _GtkFileSystemWin32
|
||||
guint32 drives; /* bitmask as returned by GetLogicalDrives() */
|
||||
GHashTable *folder_hash;
|
||||
guint timeout;
|
||||
|
||||
GHashTable *handles;
|
||||
};
|
||||
|
||||
/* Icon type, supplemented by MIME type
|
||||
@@ -356,6 +363,77 @@ gtk_file_system_win32_init (GtkFileSystemWin32 *system_win32)
|
||||
* be enough.
|
||||
*/
|
||||
system_win32->timeout = g_timeout_add_full (0, 1000, check_volumes, system_win32, NULL);
|
||||
|
||||
system_win32->handles = g_hash_table_new (g_direct_hash, g_direct_equal);
|
||||
}
|
||||
|
||||
static void
|
||||
check_handle_fn (gpointer key, gpointer value, gpointer data)
|
||||
{
|
||||
GtkFileSystemHandle *handle;
|
||||
int *num_live_handles;
|
||||
|
||||
handle = key;
|
||||
num_live_handles = data;
|
||||
|
||||
(*num_live_handles)++;
|
||||
|
||||
g_warning ("file_system_win32=%p still has handle=%p at finalization which is %s!",
|
||||
handle->file_system,
|
||||
handle,
|
||||
handle->cancelled ? "CANCELLED" : "NOT CANCELLED");
|
||||
}
|
||||
|
||||
static void
|
||||
check_handles_at_finalization (GtkFileSystemWin32 *system_win32)
|
||||
{
|
||||
int num_live_handles;
|
||||
|
||||
num_live_handles = 0;
|
||||
|
||||
g_hash_table_foreach (system_win32->handles, check_handle_fn, &num_live_handles);
|
||||
#ifdef HANDLE_ME_HARDER
|
||||
g_assert (num_live_handles == 0);
|
||||
#endif
|
||||
|
||||
g_hash_table_destroy (system_win32->handles);
|
||||
}
|
||||
|
||||
#define GTK_TYPE_FILE_SYSTEM_HANDLE_WIN32 (_gtk_file_system_handle_win32_get_type ())
|
||||
|
||||
typedef struct _GtkFileSystemHandle GtkFileSystemHandleWin32;
|
||||
typedef struct _GtkFileSystemHandleClass GtkFileSystemHandleWin32Class;
|
||||
|
||||
G_DEFINE_TYPE (GtkFileSystemHandleWin32, _gtk_file_system_handle_win32, GTK_TYPE_FILE_SYSTEM_HANDLE)
|
||||
|
||||
static void
|
||||
_gtk_file_system_handle_win32_init (GtkFileSystemHandleWin32 *handle)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
_gtk_file_system_handle_win32_finalize (GObject *object)
|
||||
{
|
||||
GtkFileSystemHandleWin32 *handle;
|
||||
GtkFileSystemWin32 *system_win32;
|
||||
|
||||
handle = (GtkFileSystemHandleWin32 *)object;
|
||||
|
||||
system_win32 = GTK_FILE_SYSTEM_WIN32 (GTK_FILE_SYSTEM_HANDLE (handle)->file_system);
|
||||
|
||||
g_assert (g_hash_table_lookup (system_win32->handles, handle) != NULL);
|
||||
g_hash_table_remove (system_win32->handles, handle);
|
||||
|
||||
if (G_OBJECT_CLASS (_gtk_file_system_handle_win32_parent_class)->finalize)
|
||||
G_OBJECT_CLASS (_gtk_file_system_handle_win32_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
_gtk_file_system_handle_win32_class_init (GtkFileSystemHandleWin32Class *class)
|
||||
{
|
||||
GObjectClass *gobject_class = (GObjectClass *) class;
|
||||
|
||||
gobject_class->finalize = _gtk_file_system_handle_win32_finalize;
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -367,6 +445,8 @@ gtk_file_system_win32_finalize (GObject *object)
|
||||
|
||||
g_source_remove (system_win32->timeout);
|
||||
|
||||
check_handles_at_finalization (system_win32);
|
||||
|
||||
/* FIXME: assert that the hash is empty? */
|
||||
g_hash_table_destroy (system_win32->folder_hash);
|
||||
|
||||
@@ -779,11 +859,17 @@ queue_callback (enum callback_types type, gpointer data)
|
||||
static GtkFileSystemHandle *
|
||||
create_handle (GtkFileSystem *file_system)
|
||||
{
|
||||
GtkFileSystemWin32 *system_win32;
|
||||
GtkFileSystemHandle *handle;
|
||||
|
||||
handle = g_object_new (GTK_TYPE_FILE_SYSTEM_HANDLE, NULL);
|
||||
system_win32 = GTK_FILE_SYSTEM_WIN32 (file_system);
|
||||
|
||||
handle = g_object_new (GTK_TYPE_FILE_SYSTEM_HANDLE_WIN32, NULL);
|
||||
handle->file_system = file_system;
|
||||
|
||||
g_assert (g_hash_table_lookup (system_win32->handles, handle) == NULL);
|
||||
g_hash_table_insert (system_win32->handles, handle, handle);
|
||||
|
||||
return handle;
|
||||
}
|
||||
|
||||
@@ -1317,13 +1403,17 @@ gtk_file_system_win32_make_path (GtkFileSystem *file_system,
|
||||
|
||||
if ((p = strpbrk (display_name, "<>\"/\\|")))
|
||||
{
|
||||
gchar badchar[2];
|
||||
|
||||
badchar[0] = *p; /* We know it is a single-byte char */
|
||||
badchar[1] = '\0';
|
||||
g_set_error (error,
|
||||
GTK_FILE_SYSTEM_ERROR,
|
||||
GTK_FILE_SYSTEM_ERROR_BAD_FILENAME,
|
||||
_("The name \"%s\" is not valid because it contains the character \"%c\". "
|
||||
_("The name \"%s\" is not valid because it contains the character \"%s\". "
|
||||
"Please use a different name."),
|
||||
display_name,
|
||||
*p);
|
||||
badchar);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -2736,7 +2826,14 @@ _gtk_file_system_win32_path_compare (const gchar *path1,
|
||||
else
|
||||
break;
|
||||
}
|
||||
return *path1 - *path2;
|
||||
if (!*path1 && !*path2)
|
||||
return 0;
|
||||
else if (!*path1)
|
||||
return -1;
|
||||
else if (!*path2)
|
||||
return 1;
|
||||
else
|
||||
return g_unichar_toupper (g_utf8_get_char (path1)) - g_unichar_toupper (g_utf8_get_char (path2));
|
||||
}
|
||||
|
||||
#define __GTK_FILE_SYSTEM_WIN32_C__
|
||||
|
@@ -89,7 +89,7 @@ static void gtk_printer_option_widget_get_property (GObject *object,
|
||||
GValue *value,
|
||||
GParamSpec *pspec);
|
||||
static gboolean gtk_printer_option_widget_mnemonic_activate (GtkWidget *widget,
|
||||
gboolean group_cycling);
|
||||
gboolean group_cycling);
|
||||
|
||||
static void
|
||||
gtk_printer_option_widget_class_init (GtkPrinterOptionWidgetClass *class)
|
||||
@@ -229,8 +229,8 @@ source_changed_cb (GtkPrinterOption *source,
|
||||
}
|
||||
|
||||
void
|
||||
gtk_printer_option_widget_set_source (GtkPrinterOptionWidget *widget,
|
||||
GtkPrinterOption *source)
|
||||
gtk_printer_option_widget_set_source (GtkPrinterOptionWidget *widget,
|
||||
GtkPrinterOption *source)
|
||||
{
|
||||
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
|
||||
|
||||
@@ -256,12 +256,18 @@ gtk_printer_option_widget_set_source (GtkPrinterOptionWidget *widget,
|
||||
g_object_notify (G_OBJECT (widget), "source");
|
||||
}
|
||||
|
||||
enum {
|
||||
NAME_COLUMN,
|
||||
VALUE_COLUMN,
|
||||
N_COLUMNS
|
||||
};
|
||||
|
||||
static void
|
||||
combo_box_set_model (GtkWidget *combo_box)
|
||||
{
|
||||
GtkListStore *store;
|
||||
|
||||
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
|
||||
store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING);
|
||||
gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
|
||||
g_object_unref (store);
|
||||
}
|
||||
@@ -274,7 +280,7 @@ combo_box_set_view (GtkWidget *combo_box)
|
||||
cell = gtk_cell_renderer_text_new ();
|
||||
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
|
||||
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
|
||||
"text", 1,
|
||||
"text", NAME_COLUMN,
|
||||
NULL);
|
||||
}
|
||||
|
||||
@@ -286,7 +292,7 @@ combo_box_entry_new (void)
|
||||
|
||||
combo_box_set_model (combo_box);
|
||||
|
||||
gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo_box), 1);
|
||||
gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo_box), NAME_COLUMN);
|
||||
|
||||
return combo_box;
|
||||
}
|
||||
@@ -304,9 +310,9 @@ combo_box_new (void)
|
||||
}
|
||||
|
||||
static void
|
||||
combo_box_append (GtkWidget *combo,
|
||||
const char *display_text,
|
||||
const char *value)
|
||||
combo_box_append (GtkWidget *combo,
|
||||
const gchar *display_text,
|
||||
const gchar *value)
|
||||
{
|
||||
GtkTreeModel *model;
|
||||
GtkListStore *store;
|
||||
@@ -317,24 +323,27 @@ combo_box_append (GtkWidget *combo,
|
||||
|
||||
gtk_list_store_append (store, &iter);
|
||||
gtk_list_store_set (store, &iter,
|
||||
0, display_text,
|
||||
1, value,
|
||||
NAME_COLUMN, display_text,
|
||||
VALUE_COLUMN, value,
|
||||
-1);
|
||||
}
|
||||
|
||||
struct ComboSet {
|
||||
GtkComboBox *combo;
|
||||
const char *value;
|
||||
const gchar *value;
|
||||
};
|
||||
|
||||
static gboolean
|
||||
set_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
|
||||
set_cb (GtkTreeModel *model,
|
||||
GtkTreePath *path,
|
||||
GtkTreeIter *iter,
|
||||
gpointer data)
|
||||
{
|
||||
struct ComboSet *set_data = data;
|
||||
gboolean found;
|
||||
char *value;
|
||||
|
||||
gtk_tree_model_get (model, iter, 1, &value, -1);
|
||||
gtk_tree_model_get (model, iter, VALUE_COLUMN, &value, -1);
|
||||
found = (strcmp (value, set_data->value) == 0);
|
||||
g_free (value);
|
||||
|
||||
@@ -345,8 +354,8 @@ set_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data
|
||||
}
|
||||
|
||||
static void
|
||||
combo_box_set (GtkWidget *combo,
|
||||
const char *value)
|
||||
combo_box_set (GtkWidget *combo,
|
||||
const gchar *value)
|
||||
{
|
||||
GtkTreeModel *model;
|
||||
GtkListStore *store;
|
||||
@@ -364,24 +373,23 @@ static char *
|
||||
combo_box_get (GtkWidget *combo)
|
||||
{
|
||||
GtkTreeModel *model;
|
||||
char *val;
|
||||
gchar *value;
|
||||
GtkTreeIter iter;
|
||||
|
||||
if (GTK_IS_COMBO_BOX_ENTRY (combo))
|
||||
{
|
||||
val = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo));
|
||||
value = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo));
|
||||
}
|
||||
else
|
||||
{
|
||||
model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
|
||||
|
||||
val = NULL;
|
||||
value = NULL;
|
||||
if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
|
||||
gtk_tree_model_get (model, &iter,
|
||||
1, &val,
|
||||
-1);
|
||||
gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1);
|
||||
}
|
||||
return val;
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
|
||||
@@ -430,7 +438,7 @@ deconstruct_widgets (GtkPrinterOptionWidget *widget)
|
||||
}
|
||||
|
||||
static void
|
||||
check_toggled_cb (GtkToggleButton *toggle_button,
|
||||
check_toggled_cb (GtkToggleButton *toggle_button,
|
||||
GtkPrinterOptionWidget *widget)
|
||||
{
|
||||
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
|
||||
@@ -443,7 +451,7 @@ check_toggled_cb (GtkToggleButton *toggle_button,
|
||||
}
|
||||
|
||||
static void
|
||||
filesave_changed_cb (GtkWidget *w,
|
||||
filesave_changed_cb (GtkWidget *button,
|
||||
GtkPrinterOptionWidget *widget)
|
||||
{
|
||||
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
|
||||
@@ -487,11 +495,11 @@ filesave_changed_cb (GtkWidget *w,
|
||||
emit_changed (widget);
|
||||
}
|
||||
|
||||
static char *
|
||||
filter_numeric (const char *val,
|
||||
gboolean allow_neg,
|
||||
gboolean allow_dec,
|
||||
gboolean *changed_out)
|
||||
static gchar *
|
||||
filter_numeric (const gchar *val,
|
||||
gboolean allow_neg,
|
||||
gboolean allow_dec,
|
||||
gboolean *changed_out)
|
||||
{
|
||||
gchar *filtered_val;
|
||||
int i, j;
|
||||
@@ -530,8 +538,9 @@ filter_numeric (const char *val,
|
||||
|
||||
return filtered_val;
|
||||
}
|
||||
|
||||
static void
|
||||
combo_changed_cb (GtkWidget *combo,
|
||||
combo_changed_cb (GtkWidget *combo,
|
||||
GtkPrinterOptionWidget *widget)
|
||||
{
|
||||
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
|
||||
@@ -582,11 +591,11 @@ combo_changed_cb (GtkWidget *combo,
|
||||
}
|
||||
|
||||
static void
|
||||
entry_changed_cb (GtkWidget *entry,
|
||||
entry_changed_cb (GtkWidget *entry,
|
||||
GtkPrinterOptionWidget *widget)
|
||||
{
|
||||
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
|
||||
const char *value;
|
||||
const gchar *value;
|
||||
|
||||
g_signal_handler_block (priv->source, priv->source_changed_handler);
|
||||
value = gtk_entry_get_text (GTK_ENTRY (entry));
|
||||
@@ -602,7 +611,7 @@ radio_changed_cb (GtkWidget *button,
|
||||
GtkPrinterOptionWidget *widget)
|
||||
{
|
||||
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
|
||||
char *value;
|
||||
gchar *value;
|
||||
|
||||
g_signal_handler_block (priv->source, priv->source_changed_handler);
|
||||
value = g_object_get_data (G_OBJECT (button), "value");
|
||||
@@ -616,7 +625,7 @@ static void
|
||||
select_maybe (GtkWidget *widget,
|
||||
const gchar *value)
|
||||
{
|
||||
char *v = g_object_get_data (G_OBJECT (widget), "value");
|
||||
gchar *v = g_object_get_data (G_OBJECT (widget), "value");
|
||||
|
||||
if (strcmp (value, v) == 0)
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
|
||||
@@ -632,11 +641,11 @@ alternative_set (GtkWidget *box,
|
||||
}
|
||||
|
||||
static GSList *
|
||||
alternative_append (GtkWidget *box,
|
||||
const gchar *label,
|
||||
const gchar *value,
|
||||
alternative_append (GtkWidget *box,
|
||||
const gchar *label,
|
||||
const gchar *value,
|
||||
GtkPrinterOptionWidget *widget,
|
||||
GSList *group)
|
||||
GSList *group)
|
||||
{
|
||||
GtkWidget *button;
|
||||
|
||||
@@ -875,7 +884,7 @@ update_widgets (GtkPrinterOptionWidget *widget)
|
||||
}
|
||||
|
||||
gboolean
|
||||
gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *widget)
|
||||
gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *widget)
|
||||
{
|
||||
return widget->priv->label != NULL;
|
||||
}
|
||||
@@ -886,8 +895,8 @@ gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *widget)
|
||||
return widget->priv->label;
|
||||
}
|
||||
|
||||
const char *
|
||||
gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *widget)
|
||||
const gchar *
|
||||
gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *widget)
|
||||
{
|
||||
GtkPrinterOptionWidgetPrivate *priv = widget->priv;
|
||||
|
||||
|
@@ -50,14 +50,14 @@ struct _GtkPrinterOptionWidgetClass
|
||||
void (*changed) (GtkPrinterOptionWidget *widget);
|
||||
};
|
||||
|
||||
GType gtk_printer_option_widget_get_type (void) G_GNUC_CONST;
|
||||
GType gtk_printer_option_widget_get_type (void) G_GNUC_CONST;
|
||||
|
||||
GtkWidget * gtk_printer_option_widget_new (GtkPrinterOption *source);
|
||||
void gtk_printer_option_widget_set_source (GtkPrinterOptionWidget *setting,
|
||||
GtkPrinterOption *source);
|
||||
gboolean gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *setting);
|
||||
GtkWidget * gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *setting);
|
||||
const char *gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *setting);
|
||||
GtkWidget *gtk_printer_option_widget_new (GtkPrinterOption *source);
|
||||
void gtk_printer_option_widget_set_source (GtkPrinterOptionWidget *setting,
|
||||
GtkPrinterOption *source);
|
||||
gboolean gtk_printer_option_widget_has_external_label (GtkPrinterOptionWidget *setting);
|
||||
GtkWidget *gtk_printer_option_widget_get_external_label (GtkPrinterOptionWidget *setting);
|
||||
const gchar *gtk_printer_option_widget_get_value (GtkPrinterOptionWidget *setting);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
|
12
po/ChangeLog
12
po/ChangeLog
@@ -1,3 +1,15 @@
|
||||
2006-08-24 Leonid Kanter <leon@asplinux.ru>
|
||||
|
||||
* ru.po: Updated Russian translation
|
||||
|
||||
2006-08-24 Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
|
||||
|
||||
* ca.po: Updated Catalan translation.
|
||||
|
||||
2006-08-23 Subhransu Behera <arya_subhransu@yahoo.co.in>
|
||||
|
||||
* or.po: Updated Oriya Translation.
|
||||
|
||||
2006-08-23 Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>
|
||||
|
||||
* ca.po: Updated Catalan translation.
|
||||
|
245
po/ca.po
245
po/ca.po
@@ -11,7 +11,7 @@ msgstr ""
|
||||
"Project-Id-Version: gtk+ 2.8.2\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2006-08-23 00:42+0200\n"
|
||||
"PO-Revision-Date: 2006-08-23 01:12+0200\n"
|
||||
"PO-Revision-Date: 2006-08-24 02:33+0200\n"
|
||||
"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
|
||||
"Language-Team: Catalan <tradgnome@softcatala.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -694,19 +694,16 @@ msgid "Failed to load TIFF image"
|
||||
msgstr "No s'ha pogut carregar la imatge TIFF"
|
||||
|
||||
#: ../gdk-pixbuf/io-tiff.c:704
|
||||
#, fuzzy
|
||||
msgid "Failed to save TIFF image"
|
||||
msgstr "No s'ha pogut obrir la imatge TIFF"
|
||||
msgstr "No s'ha pogut desar la imatge TIFF"
|
||||
|
||||
#: ../gdk-pixbuf/io-tiff.c:742
|
||||
#, fuzzy
|
||||
msgid "Failed to write TIFF data"
|
||||
msgstr "No s'ha pogut obrir la imatge TIFF"
|
||||
msgstr "No s'han pogut escriure dades TIFF"
|
||||
|
||||
#: ../gdk-pixbuf/io-tiff.c:794
|
||||
#, fuzzy
|
||||
msgid "Couldn't write to TIFF file"
|
||||
msgstr "No s'ha pogut escriure al fitxer BMP"
|
||||
msgstr "No s'ha pogut escriure al fitxer TIFF"
|
||||
|
||||
#: ../gdk-pixbuf/io-tiff.c:844
|
||||
msgid "The TIFF image format"
|
||||
@@ -1094,9 +1091,8 @@ msgstr "Alt"
|
||||
#. * And do not translate the part before the |.
|
||||
#.
|
||||
#: ../gtk/gtkaccellabel.c:577
|
||||
#, fuzzy
|
||||
msgid "keyboard label|Super"
|
||||
msgstr "Espai"
|
||||
msgstr ""
|
||||
|
||||
#. This is the text that should appear next to menu accelerators
|
||||
#. * that use the hyper key. If the text on this key isn't typically
|
||||
@@ -1105,9 +1101,8 @@ msgstr "Espai"
|
||||
#. * And do not translate the part before the |.
|
||||
#.
|
||||
#: ../gtk/gtkaccellabel.c:591
|
||||
#, fuzzy
|
||||
msgid "keyboard label|Hyper"
|
||||
msgstr "Inici"
|
||||
msgstr ""
|
||||
|
||||
#. This is the text that should appear next to menu accelerators
|
||||
#. * that use the meta key. If the text on this key isn't typically
|
||||
@@ -1116,9 +1111,8 @@ msgstr "Inici"
|
||||
#. * And do not translate the part before the |.
|
||||
#.
|
||||
#: ../gtk/gtkaccellabel.c:605
|
||||
#, fuzzy
|
||||
msgid "keyboard label|Meta"
|
||||
msgstr "Tab"
|
||||
msgstr ""
|
||||
|
||||
#. do not translate the part before the |
|
||||
#: ../gtk/gtkaccellabel.c:619
|
||||
@@ -1191,9 +1185,9 @@ msgstr "%d"
|
||||
#. * too.
|
||||
#.
|
||||
#: ../gtk/gtkcalendar.c:1671 ../gtk/gtkcalendar.c:2089
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "calendar:week:digits|%d"
|
||||
msgstr "calendar:week_start:1"
|
||||
msgstr "%d"
|
||||
|
||||
#. Translators: This dictates how the year is displayed in
|
||||
#. * gtkcalendar widget. See strftime() manual for the format.
|
||||
@@ -1337,18 +1331,16 @@ msgid "Amount of blue light in the color."
|
||||
msgstr "Quantitat de llum blava en el color."
|
||||
|
||||
#: ../gtk/gtkcolorsel.c:1975
|
||||
#, fuzzy
|
||||
msgid "Op_acity:"
|
||||
msgstr "_Opacitat:"
|
||||
msgstr "Op_acitat:"
|
||||
|
||||
#: ../gtk/gtkcolorsel.c:1983 ../gtk/gtkcolorsel.c:1994
|
||||
msgid "Transparency of the color."
|
||||
msgstr "Transparència del color."
|
||||
|
||||
#: ../gtk/gtkcolorsel.c:2001
|
||||
#, fuzzy
|
||||
msgid "Color _name:"
|
||||
msgstr "_Nom de color:"
|
||||
msgstr "_Nom del color:"
|
||||
|
||||
#: ../gtk/gtkcolorsel.c:2016
|
||||
msgid ""
|
||||
@@ -1359,9 +1351,8 @@ msgstr ""
|
||||
"el nom d'un color (com 'orange')"
|
||||
|
||||
#: ../gtk/gtkcolorsel.c:2046
|
||||
#, fuzzy
|
||||
msgid "_Palette:"
|
||||
msgstr "_Paleta"
|
||||
msgstr "_Paleta:"
|
||||
|
||||
#: ../gtk/gtkcolorsel.c:2075
|
||||
msgid "Color Wheel"
|
||||
@@ -1541,9 +1532,8 @@ msgid "_Browse for other folders"
|
||||
msgstr "Na_vega per unes altres carpetes"
|
||||
|
||||
#: ../gtk/gtkfilechooserdefault.c:4503
|
||||
#, fuzzy
|
||||
msgid "Type a file name"
|
||||
msgstr "El nom del fitxer és invàlid"
|
||||
msgstr "Teclegeu un nom de fitxer"
|
||||
|
||||
#. Create Folder
|
||||
#: ../gtk/gtkfilechooserdefault.c:4540
|
||||
@@ -1551,7 +1541,6 @@ msgid "Create Fo_lder"
|
||||
msgstr "Crea una ca_rpeta"
|
||||
|
||||
#: ../gtk/gtkfilechooserdefault.c:4550
|
||||
#, fuzzy
|
||||
msgid "_Location:"
|
||||
msgstr "_Ubicació:"
|
||||
|
||||
@@ -1568,7 +1557,7 @@ msgid "Cannot change to folder because it is not local"
|
||||
msgstr "No es pot canviar a la carpeta perquè no és local"
|
||||
|
||||
#: ../gtk/gtkfilechooserdefault.c:6814 ../gtk/gtkfilechooserdefault.c:6835
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Shortcut %s already exists"
|
||||
msgstr "La drecera %s ja existeix"
|
||||
|
||||
@@ -1611,17 +1600,17 @@ msgstr[0] "%d octet"
|
||||
msgstr[1] "%d octets"
|
||||
|
||||
#: ../gtk/gtkfilechooserdefault.c:8279
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "%.1f KB"
|
||||
msgstr "%.1f KB"
|
||||
|
||||
#: ../gtk/gtkfilechooserdefault.c:8281
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "%.1f MB"
|
||||
msgstr "%.1f MB"
|
||||
|
||||
#: ../gtk/gtkfilechooserdefault.c:8283
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "%.1f GB"
|
||||
msgstr "%.1f GB"
|
||||
|
||||
@@ -1748,7 +1737,7 @@ msgstr ""
|
||||
"fitxer"
|
||||
|
||||
#: ../gtk/gtkfilesel.c:1537 ../gtk/gtkfilesel.c:1547
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Error deleting file '%s': %s"
|
||||
msgstr "S'ha produït un error en suprimir el fitxer «%s»: %s"
|
||||
|
||||
@@ -1762,23 +1751,19 @@ msgid "Delete File"
|
||||
msgstr "Suprimeix el fitxer"
|
||||
|
||||
#: ../gtk/gtkfilesel.c:1643
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Error renaming file to \"%s\": %s"
|
||||
msgstr ""
|
||||
"S'ha produït un error en canviar el nom del fitxer com a \"%s\": %s\n"
|
||||
"%s"
|
||||
msgstr "S'ha produït un error en canviar el nom del fitxer a «%s»: %s"
|
||||
|
||||
#: ../gtk/gtkfilesel.c:1656
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Error renaming file \"%s\": %s"
|
||||
msgstr ""
|
||||
"S'ha produït un error en canviar el nom del fitxer \"%s\": %s\n"
|
||||
"%s"
|
||||
msgstr "S'ha produït un error en canviar el nom del fitxer «%s»: %s"
|
||||
|
||||
#: ../gtk/gtkfilesel.c:1665
|
||||
#, c-format
|
||||
msgid "Error renaming file \"%s\" to \"%s\": %s"
|
||||
msgstr "S'ha produït un error en canviar el nom del fitxer «%s» com a «%s»: %s"
|
||||
msgstr "S'ha produït un error en canviar el nom del fitxer «%s» a «%s»: %s"
|
||||
|
||||
#: ../gtk/gtkfilesel.c:1712
|
||||
msgid "Rename File"
|
||||
@@ -1819,14 +1804,13 @@ msgid "Couldn't convert filename"
|
||||
msgstr "No s'ha pogut convertir el nom del fitxer"
|
||||
|
||||
#: ../gtk/gtkfilesystem.c:322
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Could not get a stock icon for %s\n"
|
||||
msgstr "No s'ha pogut obtenir una icona d'estoc per a %s"
|
||||
msgstr "No s'ha pogut obtenir una icona d'estoc per a %s\n"
|
||||
|
||||
#: ../gtk/gtkfilesystemmodel.c:745
|
||||
#, fuzzy
|
||||
msgid "Could not obtain root folder"
|
||||
msgstr "No s'ha pogut obtenir una icona d'estoc per a %s"
|
||||
msgstr "No s'ha pogut obtenir la carpeta arrel"
|
||||
|
||||
#: ../gtk/gtkfilesystemmodel.c:1339
|
||||
msgid "(Empty)"
|
||||
@@ -1989,21 +1973,18 @@ msgid "Window"
|
||||
msgstr "Finestra"
|
||||
|
||||
#: ../gtk/gtkinputdialog.c:257
|
||||
#, fuzzy
|
||||
msgid "_Mode:"
|
||||
msgstr "_Mode: "
|
||||
msgstr "_Mode:"
|
||||
|
||||
#. The axis listbox
|
||||
#: ../gtk/gtkinputdialog.c:278
|
||||
#, fuzzy
|
||||
msgid "Axes"
|
||||
msgstr "_Eixos"
|
||||
msgstr "Eixos"
|
||||
|
||||
#. Keys listbox
|
||||
#: ../gtk/gtkinputdialog.c:296
|
||||
#, fuzzy
|
||||
msgid "Keys"
|
||||
msgstr "_Tecles"
|
||||
msgstr "Tecles"
|
||||
|
||||
#: ../gtk/gtkinputdialog.c:521
|
||||
msgid "_X:"
|
||||
@@ -2092,11 +2073,11 @@ msgstr "Mostra les opcions de GTK+"
|
||||
|
||||
#: ../gtk/gtknotebook.c:772
|
||||
msgid "Arrow spacing"
|
||||
msgstr ""
|
||||
msgstr "Espaiat de les fletxes"
|
||||
|
||||
#: ../gtk/gtknotebook.c:773
|
||||
msgid "Scroll arrow spacing"
|
||||
msgstr ""
|
||||
msgstr "Espaiat de les fletxes de desplaçament"
|
||||
|
||||
#: ../gtk/gtknotebook.c:4219 ../gtk/gtknotebook.c:6774
|
||||
#, c-format
|
||||
@@ -2375,14 +2356,12 @@ msgid "Copie_s:"
|
||||
msgstr "Còpie_s:"
|
||||
|
||||
#: ../gtk/gtkprintunixdialog.c:1546
|
||||
#, fuzzy
|
||||
msgid "C_ollate"
|
||||
msgstr "C_rea"
|
||||
msgstr "C_ompagina"
|
||||
|
||||
#: ../gtk/gtkprintunixdialog.c:1554
|
||||
#, fuzzy
|
||||
msgid "_Reverse"
|
||||
msgstr "_Restaura"
|
||||
msgstr "Inve_rteix"
|
||||
|
||||
#: ../gtk/gtkprintunixdialog.c:1571
|
||||
msgid "General"
|
||||
@@ -2463,9 +2442,8 @@ msgid "A_t:"
|
||||
msgstr "_a:"
|
||||
|
||||
#: ../gtk/gtkprintunixdialog.c:2192
|
||||
#, fuzzy
|
||||
msgid "On _hold"
|
||||
msgstr "_Negreta"
|
||||
msgstr "En es_pera"
|
||||
|
||||
#: ../gtk/gtkprintunixdialog.c:2211
|
||||
msgid "Add Cover Page"
|
||||
@@ -2503,7 +2481,7 @@ msgstr "Acabaments"
|
||||
|
||||
#: ../gtk/gtkprintunixdialog.c:2364
|
||||
msgid "Some of the settings in the dialog conflict"
|
||||
msgstr ""
|
||||
msgstr "Alguns paràmetres del diàleg estan en conflicte"
|
||||
|
||||
#: ../gtk/gtkprintunixdialog.c:2387
|
||||
msgid "Print"
|
||||
@@ -2563,12 +2541,12 @@ msgstr "Mostra els recursos _privats"
|
||||
#: ../gtk/gtkrecentchoosermenu.c:424 ../gtk/gtkrecentchoosermenu.c:485
|
||||
#, c-format
|
||||
msgid "No recently used resource found with URI `%s'"
|
||||
msgstr ""
|
||||
msgstr "No hi ha cap recurs emprat recentment amb l'URI «%s»"
|
||||
|
||||
#: ../gtk/gtkrecentchoosermenu.c:509 ../gtk/gtkrecentchoosermenu.c:517
|
||||
#, c-format
|
||||
msgid "This function is not implemented for widgets of class '%s'"
|
||||
msgstr ""
|
||||
msgstr "Aquesta funció no està implementada per a ginys de la classe «%s»"
|
||||
|
||||
#: ../gtk/gtkrecentchoosermenu.c:852
|
||||
#, c-format
|
||||
@@ -3439,37 +3417,37 @@ msgstr "JB9"
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:163
|
||||
msgid "paper size|jis exec"
|
||||
msgstr ""
|
||||
msgstr "jis exec"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:165
|
||||
msgid "paper size|Choukei 2 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre Choukei 2"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:167
|
||||
msgid "paper size|Choukei 3 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre Choukei 3"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:169
|
||||
msgid "paper size|Choukei 4 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre Choukei 4"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:171
|
||||
msgid "paper size|hagaki (postcard)"
|
||||
msgstr ""
|
||||
msgstr "hagaki (postal)"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:173
|
||||
msgid "paper size|kahu Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre kahu"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:175
|
||||
msgid "paper size|kaku2 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre kahu2"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:177
|
||||
@@ -3479,7 +3457,7 @@ msgstr ""
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:179
|
||||
msgid "paper size|you4 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre you4"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:181
|
||||
@@ -3544,32 +3522,32 @@ msgstr "Sobre a2"
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:207
|
||||
msgid "paper size|Arch A"
|
||||
msgstr ""
|
||||
msgstr "Arch A"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:209
|
||||
msgid "paper size|Arch B"
|
||||
msgstr ""
|
||||
msgstr "Arch B"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:211
|
||||
msgid "paper size|Arch C"
|
||||
msgstr ""
|
||||
msgstr "Arch C"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:213
|
||||
msgid "paper size|Arch D"
|
||||
msgstr ""
|
||||
msgstr "Arch D"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:215
|
||||
msgid "paper size|Arch E"
|
||||
msgstr ""
|
||||
msgstr "Arch E"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:217
|
||||
msgid "paper size|b-plus"
|
||||
msgstr ""
|
||||
msgstr "b-plus"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:219
|
||||
@@ -3603,9 +3581,8 @@ msgstr "edp europeu"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:231
|
||||
#, fuzzy
|
||||
msgid "paper size|Executive"
|
||||
msgstr "US Executive"
|
||||
msgstr "Executiu"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:233
|
||||
@@ -3615,17 +3592,17 @@ msgstr "f"
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:235
|
||||
msgid "paper size|FanFold European"
|
||||
msgstr ""
|
||||
msgstr "Paper continu europeu"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:237
|
||||
msgid "paper size|FanFold US"
|
||||
msgstr ""
|
||||
msgstr "Paper continu americà"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:239
|
||||
msgid "paper size|FanFold German Legal"
|
||||
msgstr ""
|
||||
msgstr "Paper continu alemany legal"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:241
|
||||
@@ -3641,23 +3618,22 @@ msgstr ""
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:245
|
||||
msgid "paper size|Index 3x5"
|
||||
msgstr "Index 3x5"
|
||||
msgstr "Índex 3x5"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:247
|
||||
msgid "paper size|Index 4x6 (postcard)"
|
||||
msgstr ""
|
||||
msgstr "Índex 4x6 (postal)"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:249
|
||||
msgid "paper size|Index 4x6 ext"
|
||||
msgstr ""
|
||||
msgstr "Índex 4x6 ext"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:251
|
||||
#, fuzzy
|
||||
msgid "paper size|Index 5x8"
|
||||
msgstr "Índe_x"
|
||||
msgstr "Índex 5x8"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:253
|
||||
@@ -3666,9 +3642,8 @@ msgstr "Factura"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:255
|
||||
#, fuzzy
|
||||
msgid "paper size|Tabloid"
|
||||
msgstr "_Mida del paper:"
|
||||
msgstr "Tabloide"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:257
|
||||
@@ -3703,27 +3678,27 @@ msgstr ""
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:269
|
||||
msgid "paper size|#10 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre #10"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:271
|
||||
msgid "paper size|#11 Eenvelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre #11"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:273
|
||||
msgid "paper size|#12 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre #12"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:275
|
||||
msgid "paper size|#14 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre #14"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:277
|
||||
msgid "paper size|#9 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre #9"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:279
|
||||
@@ -3788,7 +3763,7 @@ msgstr "pa-kai"
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:303
|
||||
msgid "paper size|Postfix Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre Postfix"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:305
|
||||
@@ -3798,58 +3773,57 @@ msgstr "Foto petita"
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:307
|
||||
msgid "paper size|prc1 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre prc1"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:309
|
||||
msgid "paper size|prc10 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre prc10"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:311
|
||||
#, fuzzy
|
||||
msgid "paper size|prc 16k"
|
||||
msgstr "_Mida del paper:"
|
||||
msgstr "prc 16k"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:313
|
||||
msgid "paper size|prc2 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre prc2"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:315
|
||||
msgid "paper size|prc3 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre prc3"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:317
|
||||
msgid "paper size|prc 32k"
|
||||
msgstr ""
|
||||
msgstr "prc 32k"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:319
|
||||
msgid "paper size|prc4 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre prc4"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:321
|
||||
msgid "paper size|prc5 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre prc5"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:323
|
||||
msgid "paper size|prc6 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre prc6"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:325
|
||||
msgid "paper size|prc7 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre prc7"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:327
|
||||
msgid "paper size|prc8 Envelope"
|
||||
msgstr ""
|
||||
msgstr "Sobre prc8"
|
||||
|
||||
#. translators, strip everything up to the first |
|
||||
#: ../gtk/paper_names_offsets.c:329
|
||||
@@ -4070,27 +4044,27 @@ msgstr ""
|
||||
#: ../gtk/gtktextbufferserialize.c:791 ../gtk/gtktextbufferserialize.c:817
|
||||
#, c-format
|
||||
msgid "Both \"id\" and \"name\" were found on the <%s> element"
|
||||
msgstr ""
|
||||
msgstr "S'ha trobat «id» i «name» al l'element <%s>"
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:801 ../gtk/gtktextbufferserialize.c:827
|
||||
#, c-format
|
||||
msgid "The attribute \"%s\" was found twice on the <%s> element"
|
||||
msgstr ""
|
||||
msgstr "S'ha trobat dues vegades l'atribut «%s» a l'element <%s>"
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:841
|
||||
#, c-format
|
||||
msgid "<%s> element has invalid id \"%s\""
|
||||
msgstr ""
|
||||
msgstr "L'element <%s> té un id no vàlid «%s»"
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:851
|
||||
#, c-format
|
||||
msgid "<%s> element has neither a \"name\" nor an \"id\" attribute"
|
||||
msgstr ""
|
||||
msgstr "L'element <%s> no té ni l'atribut «name» ni el «id»"
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:938
|
||||
#, c-format
|
||||
msgid "Attribute \"%s\" repeated twice on the same <%s> element"
|
||||
msgstr ""
|
||||
msgstr "L'atribut «%s» està repetit dues vegades en el mateix element <%s>"
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:956 ../gtk/gtktextbufferserialize.c:981
|
||||
#, c-format
|
||||
@@ -4100,11 +4074,11 @@ msgstr ""
|
||||
#: ../gtk/gtktextbufferserialize.c:1017
|
||||
#, c-format
|
||||
msgid "Tag \"%s\" has not been defined."
|
||||
msgstr ""
|
||||
msgstr "L'etiqueta «%s» no ha estat definida."
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:1029
|
||||
msgid "Anonymous tag found and tags can not be created."
|
||||
msgstr ""
|
||||
msgstr "S'han trobat etiquetes anònimes, i no se n'han pogut crear."
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:1040
|
||||
#, c-format
|
||||
@@ -4120,12 +4094,12 @@ msgstr ""
|
||||
#: ../gtk/gtktextbufferserialize.c:1170
|
||||
#, c-format
|
||||
msgid "\"%s\" is not a valid attribute type"
|
||||
msgstr ""
|
||||
msgstr "«%s» no és un tipus d'atribut vàlid"
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:1178
|
||||
#, c-format
|
||||
msgid "\"%s\" is not a valid attribute name"
|
||||
msgstr ""
|
||||
msgstr "«%s» no és un nom d'atribut vàlid"
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:1188
|
||||
#, c-format
|
||||
@@ -4136,12 +4110,12 @@ msgstr ""
|
||||
#: ../gtk/gtktextbufferserialize.c:1197
|
||||
#, c-format
|
||||
msgid "\"%s\" is not a valid value for attribute \"%s\""
|
||||
msgstr ""
|
||||
msgstr "«%s» no és un valor vàlid per a l'atribut «%s»"
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:1280
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Tag \"%s\" already defined"
|
||||
msgstr "No hi ha opcions definides"
|
||||
msgstr "L'etiqueta «%s» ja està definida"
|
||||
|
||||
#: ../gtk/gtktextbufferserialize.c:1291
|
||||
#, c-format
|
||||
@@ -4180,10 +4154,10 @@ msgstr ""
|
||||
msgid "Failed to write header\n"
|
||||
msgstr "No s'ha pogut escriure la capçalera\n"
|
||||
|
||||
# FIXME
|
||||
#: ../gtk/updateiconcache.c:1122
|
||||
#, fuzzy
|
||||
msgid "Failed to write hash table\n"
|
||||
msgstr "No s'ha pogut escriure la taula \n"
|
||||
msgstr "No s'ha pogut escriure la taula de resum\n"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1128
|
||||
msgid "Failed to write directory index\n"
|
||||
@@ -4194,24 +4168,24 @@ msgid "Failed to rewrite header\n"
|
||||
msgstr "No s'ha pogut reescriure la capçalera\n"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1162
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Failed to write cache file: %s\n"
|
||||
msgstr "No s'ha pogut obrir el fitxer «%s»: «%s»"
|
||||
msgstr "No s'ha pogut escriure el fitxer de memòria cau: %s\n"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1202
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Could not rename %s to %s: %s, removing %s then.\n"
|
||||
msgstr "S'ha produït un error en crear el directori «%s»: %s"
|
||||
msgstr "No s'ha pogut canviar el nom de %s a %s: %s, se suprimirà %s.\n"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1214
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Could not rename %s to %s: %s\n"
|
||||
msgstr "S'ha produït un error en crear el directori «%s»: %s"
|
||||
msgstr "No s'ha pogut canviar el nom de %s a %s: %s\n"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1221
|
||||
#, fuzzy, c-format
|
||||
#, c-format
|
||||
msgid "Could not rename %s back to %s: %s.\n"
|
||||
msgstr "S'ha produït un error en crear el directori «%s»: %s"
|
||||
msgstr "No s'ha pogut tornar a anomenar %s a %s: %s.\n"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1243
|
||||
msgid "Cache file created successfully.\n"
|
||||
@@ -4219,23 +4193,23 @@ msgstr "S'ha creat el fitxer de memòria cau amb èxit.\n"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1282
|
||||
msgid "Overwrite an existing cache, even if uptodate"
|
||||
msgstr ""
|
||||
msgstr "Sobreescriu una memòria cau existent, encara que estigui al dia"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1283
|
||||
msgid "Don't check for the existence of index.theme"
|
||||
msgstr ""
|
||||
msgstr "No comprovis l'existència de index.theme"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1284
|
||||
msgid "Don't include image data in the cache"
|
||||
msgstr ""
|
||||
msgstr "No incloguis dades d'imatges a la memòria cau"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1285
|
||||
msgid "Output a C header file"
|
||||
msgstr ""
|
||||
msgstr "Produeix un fitxer de capçalera C"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1286
|
||||
msgid "Turn off verbose output"
|
||||
msgstr ""
|
||||
msgstr "Desactiva la sortida verbosa"
|
||||
|
||||
#: ../gtk/updateiconcache.c:1314
|
||||
#, c-format
|
||||
@@ -4243,6 +4217,9 @@ msgid ""
|
||||
"No theme index file in '%s'.\n"
|
||||
"If you really want to create an icon cache here, use --ignore-theme-index.\n"
|
||||
msgstr ""
|
||||
"No hi ha el fitxer index de tema a «%s».\n"
|
||||
"Si realment voleu crear una memòria cau d'icones aquí, utilitzeu --ignore-"
|
||||
"theme-index.\n"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Error creating folder \"%s\": %s\n"
|
||||
@@ -4280,14 +4257,6 @@ msgstr ""
|
||||
#~ msgid "Select All"
|
||||
#~ msgstr "Selecciona-ho tot"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "asme_f"
|
||||
#~ msgstr "Nom"
|
||||
|
||||
#, fuzzy
|
||||
#~ msgid "Executive"
|
||||
#~ msgstr "_Executa"
|
||||
|
||||
#~ msgid "shortcut %s already exists"
|
||||
#~ msgstr "La drecera %s ja existeix"
|
||||
|
||||
|
7
po/or.po
7
po/or.po
@@ -12,7 +12,7 @@ msgstr ""
|
||||
"Project-Id-Version: or\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2006-08-17 23:42-0400\n"
|
||||
"PO-Revision-Date: 2006-08-01 10:29+0530\n"
|
||||
"PO-Revision-Date: 2006-08-23 10:41+0530\n"
|
||||
"Last-Translator: Subhransu Behera <arya_subhransu@yahoo.co.in>\n"
|
||||
"Language-Team: Oriya <oriya-group@lists.sarovar.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@@ -2635,9 +2635,8 @@ msgid "Unknown item"
|
||||
msgstr "ଅଜଣା ବସ୍ତୁ"
|
||||
|
||||
#: gtk/gtkrecentchoosermenu.c:984
|
||||
#, fuzzy
|
||||
msgid "No items found"
|
||||
msgstr "'%s' ୟୁ.ଆର.ଆଇ. ପାଇଁ କୌଣସି ବସ୍ତୁ ମିଳିଲା ନାହିଁ"
|
||||
msgstr "କୌଣସି ବସ୍ତୁ ମିଳିଲା ନାହିଁ"
|
||||
|
||||
#: gtk/gtkrecentmanager.c:1058 gtk/gtkrecentmanager.c:1208
|
||||
#: gtk/gtkrecentmanager.c:1218 gtk/gtkrecentmanager.c:1277
|
||||
@@ -4051,7 +4050,7 @@ msgstr "ପାଠ୍ଯ ନିର୍ଦ୍ଦେଶ"
|
||||
#: modules/printbackends/file/gtkprintbackendfile.c:232
|
||||
#, c-format
|
||||
msgid "output.%s"
|
||||
msgstr ""
|
||||
msgstr "%s ନିର୍ଗମ।"
|
||||
|
||||
#: modules/printbackends/file/gtkprintbackendfile.c:457
|
||||
msgid "Print to File"
|
||||
|
@@ -28,6 +28,7 @@ TESTS = floatingtest
|
||||
|
||||
noinst_PROGRAMS = \
|
||||
autotestfilechooser \
|
||||
autotestfilesystem \
|
||||
floatingtest \
|
||||
simple \
|
||||
print-editor \
|
||||
@@ -84,6 +85,7 @@ noinst_PROGRAMS = \
|
||||
testgrouping
|
||||
|
||||
autotestfilechooser_DEPENDENCIES = $(TEST_DEPS)
|
||||
autotestfilesystem_DEPENDENCIES = $(TEST_DEPS)
|
||||
simple_DEPENDENCIES = $(TEST_DEPS)
|
||||
floatingtest_DEPENDENCIES = $(TEST_DEPS)
|
||||
print_editor_DEPENDENCIES = $(TEST_DEPS)
|
||||
@@ -134,6 +136,7 @@ testactions_DEPENDENCIES = $(TEST_DEPS)
|
||||
testgrouping_DEPENDENCIES = $(TEST_DEPS)
|
||||
|
||||
autotestfilechooser_LDADD = $(LDADDS)
|
||||
autotestfilesystem_LDADD = $(LDADDS)
|
||||
simple_LDADD = $(LDADDS)
|
||||
floatingtest_LDADD = $(LDADDS)
|
||||
print_editor_LDADD = $(LDADDS)
|
||||
@@ -193,6 +196,9 @@ testgrouping_LDADD = $(LDADDS)
|
||||
autotestfilechooser_SOURCES = \
|
||||
autotestfilechooser.c
|
||||
|
||||
autotestfilesystem_SOURCES = \
|
||||
autotestfilesystem.c
|
||||
|
||||
testentrycompletion_SOURCES = \
|
||||
prop-editor.c \
|
||||
testentrycompletion.c
|
||||
|
1294
tests/autotestfilesystem.c
Normal file
1294
tests/autotestfilesystem.c
Normal file
File diff suppressed because it is too large
Load Diff
@@ -509,7 +509,9 @@ main (int argc, char **argv)
|
||||
|
||||
dialog = g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG,
|
||||
"action", action,
|
||||
#if 0
|
||||
"file-system-backend", "gtk+",
|
||||
#endif
|
||||
"select-multiple", multiple,
|
||||
NULL);
|
||||
switch (action)
|
||||
|
Reference in New Issue
Block a user