[Xfce4-commits] Updated NEWS
Updating branch refs/heads/master to a8b69dc3ff321cf11413adc618c29cb2c841db0e (commit) from 80bc8d91b7a98a7785f205a6b7446743236ef8a9 (commit) commit a8b69dc3ff321cf11413adc618c29cb2c841db0e Author: Stefan Ott Date: Sun May 22 04:54:36 2011 +0200 Updated NEWS NEWS |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index b83f704..f8d8ffd 100644 --- a/NEWS +++ b/NEWS @@ -6,8 +6,8 @@ v0.5.1 (UNRELEASED): * You can now have a (more) graphical representation of the signal strength instead of the abused progress bar * The plugin now tries to auto-detect your radio device + * Overhauled the UI, especially the properties dialog * Dropped the ability to import old (< 0.4.0) configuration files - * Small improvements to the tooltip v0.5.0 (19 May 2011): = ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Updated German translation
Updating branch refs/heads/master to 31f20d2e107844dc3aeacb8ffa76bfe7b124228e (commit) from cbd45fd36fc559c8112e16193a03f3160ee2d6f8 (commit) commit 31f20d2e107844dc3aeacb8ffa76bfe7b124228e Author: Stefan Ott Date: Sat May 21 05:26:16 2011 +0200 Updated German translation po/de.po | 191 +- 1 files changed, 115 insertions(+), 76 deletions(-) diff --git a/po/de.po b/po/de.po index 095eacd..fecc9f0 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-19 23:05+0200\n" +"POT-Creation-Date: 2011-05-21 05:12+0200\n" "PO-Revision-Date: 2009-04-14 23:16+0200\n" "Last-Translator: Stefan Ott \n" "Language-Team: German \n" @@ -23,136 +23,178 @@ msgstr "Radio-Plugin" msgid "V4l radio plugin" msgstr "Plugin für V4l-Radioempfänger" -#: ../panel-plugin/xfce4-radio.c:189 +#: ../panel-plugin/xfce4-radio.c:186 +#, c-format msgid "Tuned to station %s" msgstr "Sender %s eingestellt" -#: ../panel-plugin/xfce4-radio.c:194 +#: ../panel-plugin/xfce4-radio.c:191 +#, c-format msgid "Tuned to %s MHz" msgstr "Frequenz %s MHz eingestellt" -#: ../panel-plugin/xfce4-radio.c:239 +#: ../panel-plugin/xfce4-radio.c:236 msgid "- off -" msgstr "- aus -" -#: ../panel-plugin/xfce4-radio.c:246 +#: ../panel-plugin/xfce4-radio.c:243 msgid "Radio is off" msgstr "Das Radio ist ausgeschaltet" -#: ../panel-plugin/xfce4-radio.c:319 +#: ../panel-plugin/xfce4-radio.c:316 msgid "Error opening radio device" msgstr "Fehler beim Öffnen des Geräts" -#: ../panel-plugin/xfce4-radio.c:410 +#: ../panel-plugin/xfce4-radio.c:411 msgid "Tune radio" msgstr "Frequenz wählen" -#: ../panel-plugin/xfce4-radio.c:416 +#: ../panel-plugin/xfce4-radio.c:417 msgid "Frequency [MHz]:" msgstr "Frequenz [MHz]:" -#: ../panel-plugin/xfce4-radio.c:440 +#: ../panel-plugin/xfce4-radio.c:441 msgid "Illegal frequency." msgstr "Ungültige Frequenz" -#: ../panel-plugin/xfce4-radio.c:498 ../panel-plugin/xfce4-radio.c:1137 +#: ../panel-plugin/xfce4-radio.c:496 ../panel-plugin/xfce4-radio.c:1153 msgid "Presets" msgstr "Sender" -#: ../panel-plugin/xfce4-radio.c:530 +#: ../panel-plugin/xfce4-radio.c:528 msgid "Tune to frequency" msgstr "Frequenz wählen" -#: ../panel-plugin/xfce4-radio.c:873 +#: ../panel-plugin/xfce4-radio.c:869 msgid "unnamed" msgstr "Unbenannt" -#: ../panel-plugin/xfce4-radio.c:1041 -msgid "Properties" -msgstr "Einstellungen" +#: ../panel-plugin/xfce4-radio.c:1002 +msgid "Select command" +msgstr "Befehl auswählen" -#: ../panel-plugin/xfce4-radio.c:1136 -msgid "Options" -msgstr "Einstellungen" +#: ../panel-plugin/xfce4-radio.c:1054 +msgid "Radio" +msgstr "Radio" -#: ../panel-plugin/xfce4-radio.c:1155 -msgid "Device" -msgstr "Gerät" +#: ../panel-plugin/xfce4-radio.c:1063 +msgid "Configure the radio plugin" +msgstr "V4l-Radio-Konfiguration" -#: ../panel-plugin/xfce4-radio.c:1171 -msgid "V4L device" -msgstr "V4L-Gerät: " +#: ../panel-plugin/xfce4-radio.c:1164 +msgid "User interface" +msgstr "Bedienung" -#: ../panel-plugin/xfce4-radio.c:1188 -msgid "Synchronize state with the card" -msgstr "Zustand mit der Tuner-Karte abgleichen: " +#: ../panel-plugin/xfce4-radio.c:1172 +msgid "Signal strength" +msgstr "Signalstärke" + +#: ../panel-plugin/xfce4-radio.c:1187 +msgid "Show the signal strength indicator" +msgstr "Signalstärke anzeigen" + +#: ../panel-plugin/xfce4-radio.c:1193 +msgid "Use graphics instead of text labels and progress bars" +msgstr "Grafische Elemente verwenden" -#: ../panel-plugin/xfce4-radio.c:1190 -msgid "yes" -msgstr "ja" +#: ../panel-plugin/xfce4-radio.c:1198 +msgid "Current station" +msgstr "Aktueller Sender" -#: ../panel-plugin/xfce4-radio.c:1208 -msgid "no" -msgstr "nein" +#: ../panel-plugin/xfce4-radio.c:1213 +msgid "Show the current station" +msgstr "Aktuellen Sender anzeigen" -#: ../panel-plugin/xfce4-radio.c:1225 +#: ../panel-plugin/xfce4-radio.c:1219 +msgid "Show preset names instead of frequencies" +msgstr "Sendernamen statt Frequenz anzeigen" + +#: ../panel-plugin/xfce4-radio.c:1224 +msgid "Mouse interaction" +msgstr "Maus-Einstellungen" + +#: ../panel-plugin/xfce4-radio.c:1242 msgid "Mouse scrolling changes" msgstr "Maus-Scrollen ändert " -#: ../panel-plugin/xfce4-radio.c:1236 +#: ../panel-plugin/xfce4-radio.c:1258 msgid "frequency" msgstr "Frequenz" -#: ../panel-plugin/xfce4-radio.c:1241 -msgid "preset" +#: ../panel-plugin/xfce4-radio.c:1260 +msgid "station preset" msgstr "Sender" -#: ../panel-plugin/xfce4-radio.c:1261 -msgid "When radio is off" -msgstr "Bei ausgeschaltenem Radio" - -#: ../panel-plugin/xfce4-radio.c:1276 ../panel-plugin/xfce4-radio.c:1342 -msgid "Show the label" -msgstr "Beschriftung anzeigen" +#: ../panel-plugin/xfce4-radio.c:1270 +msgid "Radio device" +msgstr "Radioempfänger" -#: ../panel-plugin/xfce4-radio.c:1282 -msgid "Show graphics" -msgstr "Grafik anzeigen" +#: .
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-radio-plugin
Updating branch refs/heads/master to 80bc8d91b7a98a7785f205a6b7446743236ef8a9 (commit) from 39136804e6692961d4b8a9d0a1d96a5882fe9589 (commit) commit 80bc8d91b7a98a7785f205a6b7446743236ef8a9 Merge: 3913680 ca80a11 Author: Stefan Ott Date: Sun May 22 04:49:13 2011 +0200 Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-radio-plugin commit ca80a11af47862f6d5500a3c49f25a1086c3c886 Author: Per Kongstad Date: Sat May 21 09:33:51 2011 +0200 l10n: Updated Danish (da) translation to 100% New status: 34 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 58fbf59460d0ba0c2c757e9712498489c80541b8 Author: Per Kongstad Date: Sat May 21 09:33:33 2011 +0200 l10n: Updated Danish (da) translation to 97% New status: 33 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 217 +++--- 1 files changed, 138 insertions(+), 79 deletions(-) diff --git a/po/da.po b/po/da.po index 51cedc5..2bc57b9 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-radio-plugin 0.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-25 23:05+0100\n" +"POT-Creation-Date: 2011-05-21 03:11+0200\n" "PO-Revision-Date: 2009-08-22 17:38+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -15,141 +15,200 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../panel-plugin/xfce4-radio.c:226 +#: ../panel-plugin/radio.desktop.in.in.h:1 +msgid "Radio Plugin" +msgstr "Radio-udvidelsesmodul" + +#: ../panel-plugin/radio.desktop.in.in.h:2 +msgid "V4l radio plugin" +msgstr "V4l radio-udvidelsesmodul" + +#: ../panel-plugin/xfce4-radio.c:191 +#, c-format +msgid "Tuned to station %s" +msgstr "Indstillet til station %s" + +#: ../panel-plugin/xfce4-radio.c:196 +#, c-format +msgid "Tuned to %s MHz" +msgstr "Indstillet til %s MHz" + +#: ../panel-plugin/xfce4-radio.c:241 msgid "- off -" msgstr "- slukket -" -#: ../panel-plugin/xfce4-radio.c:311 +#: ../panel-plugin/xfce4-radio.c:248 +msgid "Radio is off" +msgstr "Radio er slukket" + +#: ../panel-plugin/xfce4-radio.c:321 msgid "Error opening radio device" msgstr "Fejl ved åbning af radioenhed" -#: ../panel-plugin/xfce4-radio.c:394 +#: ../panel-plugin/xfce4-radio.c:416 msgid "Tune radio" msgstr "Indstil radio" -#: ../panel-plugin/xfce4-radio.c:400 +#: ../panel-plugin/xfce4-radio.c:422 msgid "Frequency [MHz]:" msgstr "Frekvens [MHz]:" -#: ../panel-plugin/xfce4-radio.c:424 +#: ../panel-plugin/xfce4-radio.c:446 msgid "Illegal frequency." msgstr "Forbudt frekvens." -#: ../panel-plugin/xfce4-radio.c:481 -#: ../panel-plugin/xfce4-radio.c:1115 +#. Notebook tabs +#: ../panel-plugin/xfce4-radio.c:501 ../panel-plugin/xfce4-radio.c:1160 msgid "Presets" msgstr "Forvalg" -#: ../panel-plugin/xfce4-radio.c:513 +#: ../panel-plugin/xfce4-radio.c:533 msgid "Tune to frequency" msgstr "Indstil til frekvens" -#: ../panel-plugin/xfce4-radio.c:853 +#: ../panel-plugin/xfce4-radio.c:868 msgid "unnamed" msgstr "ikke navngivet" -#: ../panel-plugin/xfce4-radio.c:1019 -msgid "Properties" -msgstr "Egenskaber" +#: ../panel-plugin/xfce4-radio.c:1001 +msgid "Select command" +msgstr "Vælg kommando" -#: ../panel-plugin/xfce4-radio.c:1114 -msgid "Options" -msgstr "Indstillinger" +#: ../panel-plugin/xfce4-radio.c:1058 +msgid "Radio" +msgstr "Radio" -#. Device -#: ../panel-plugin/xfce4-radio.c:1133 -msgid "Device" -msgstr "Enhed" +#: ../panel-plugin/xfce4-radio.c:1067 +msgid "Configure the radio plugin" +msgstr "Indstil udvidelsesmodulet til radio" -#: ../panel-plugin/xfce4-radio.c:1149 -msgid "V4L device" -msgstr "V4L-enhed" +#: ../panel-plugin/xfce4-radio.c:1161 +msgid "User interface" +msgstr "Brugerflade" -#: ../panel-plugin/xfce4-radio.c:1166 -msgid "Synchronize state with the card" -msgstr "Synkronisér tilstand med kortet" +#: ../panel-plugin/xfce4-radio.c:1162 +msgid "Radio device" +msgstr "Radioenhed" -#: ../panel-plugin/xfce4-radio.c:1168 -msgid "yes" -msgstr "ja" +#: ../panel-plugin/xfce4-radio.c:1163 +msgid "Commands" +msgstr "Kommandoer" -#: ../panel-plugin/xfce4-radio.c:1186 -msgid "no" -msgstr "nej" +#. - Signal strength +#: ../panel-plugin/xfce4-radio.c:1185 +msgid "Signal strength" +msgstr "Signalstyrke" + +#: ../panel-plugin/xfce4-radio.c:1201 +msgid "Show the signal strength indicator" +msgstr "Vis signalstyrkeindikatoren" + +#: ../panel-plugin/xfce4-radio.c:1207 +msgid "Use graphics instead of text labels and progress bars" +msgstr "Vis grafik fremfor tekstmærkater og fremgangssøjler" + +#. - Current station +#: ../panel-plugin/xfce4-radio.c:1212 +msgid "Current station" +msgstr "Nuværende station" + +#: ../panel-plugin/xfce4-radio.c:1228 +msgid "Show the current station" +msgstr "Vis nuværende statio
[Xfce4-commits] The radio tuner can now be selected from a combobox
Updating branch refs/heads/master
to 39136804e6692961d4b8a9d0a1d96a5882fe9589 (commit)
from 31f20d2e107844dc3aeacb8ffa76bfe7b124228e (commit)
commit 39136804e6692961d4b8a9d0a1d96a5882fe9589
Author: Stefan Ott
Date: Sat May 21 08:06:26 2011 +0200
The radio tuner can now be selected from a combobox
panel-plugin/xfce4-radio.c | 111 ++-
1 files changed, 98 insertions(+), 13 deletions(-)
diff --git a/panel-plugin/xfce4-radio.c b/panel-plugin/xfce4-radio.c
index ff85e73..84f248e 100644
--- a/panel-plugin/xfce4-radio.c
+++ b/panel-plugin/xfce4-radio.c
@@ -50,6 +50,9 @@
#include
#include
+#include
+#include
+
#define SIGNAL_WIDTH 15
#define SIGNAL_HEIGHT 12
@@ -709,6 +712,48 @@ radio_free(XfcePanelPlugin *plugin, radio_gui *data)
g_source_remove(data->radio_timeout_id);
}
+static GList *
+radio_find_tuners(GList *tuners)
+{
+ DIR *dir;
+ struct dirent *item;
+
+ dir = opendir("/dev");
+ if (dir == NULL)
+ {
+ perror("Could not open the directory");
+ return tuners;
+ }
+ while ((item = readdir(dir)))
+ {
+ if (!strncmp(item->d_name, "radio", 5))
+ {
+ gchar *dev = g_strdup_printf("/dev/%s", item->d_name);
+ tuners = g_list_append(tuners, dev);
+ }
+ }
+ closedir(dir);
+ return tuners;
+}
+
+static gchar *
+radio_tuner_name(const gchar *devname)
+{
+ int fd = open(devname, O_RDWR);
+
+ struct v4l2_capability vcap;
+
+ if (ioctl(fd, VIDIOC_QUERYCAP, &vcap) < 0)
+ {
+ perror("VIDIOC_QUERYCAP");
+ return g_strdup_printf("Invalid tuner (%s)", devname);
+ }
+ else
+ {
+ return g_strdup_printf("%s (%s)", vcap.card, devname);
+ }
+}
+
static radio_gui *
plugin_control_new(XfcePanelPlugin *plugin)
{
@@ -764,10 +809,21 @@ radio_shutdown_command_changed(GtkEditable* editable,
void *pointer)
}
static void
-radio_device_changed(GtkEditable* editable, void *pointer)
+radio_device_changed(GtkEditable* box, void *pointer)
{
radio_gui* data = (radio_gui*) pointer;
- const char* device = gtk_entry_get_text(GTK_ENTRY(editable));
+ GtkComboBox *combo = GTK_COMBO_BOX(box);
+ GtkTreeModel *model = gtk_combo_box_get_model(combo);
+
+ GtkTreeIter iter;
+ gtk_combo_box_get_active_iter(combo, &iter);
+
+ GValue value={0,};
+
+ gtk_tree_model_get_value(model, &iter, 0, &value);
+ const gchar *device = g_value_get_string(&value);
+ printf("dev=%s\n", device);
+
strncpy(data->device, device, MAX_DEVICE_NAME_LENGTH);
}
@@ -1033,7 +1089,7 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
GtkWidget *sync_state; // sync state with the card
GtkWidget *startup_command; // post-down command
GtkWidget *shutdown_command;// post-down command
- GtkWidget *device_entry;// v4l device
+ GtkWidget *radio_dev; // v4l device
GtkWidget *scrolling; // mouse-scrolling action
GtkWidget *preset_box;
GtkWidget *button_box;
@@ -1276,21 +1332,50 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
// - Radio device
hbox = gtk_hbox_new(FALSE, 0);
- label = gtk_label_new(_("Radio device:"));
- device_entry = gtk_entry_new_with_max_length(MAX_DEVICE_NAME_LENGTH);
- gtk_entry_set_text(GTK_ENTRY(device_entry), data->device);
-
- gtk_widget_show(label);
- gtk_widget_show(device_entry);
+ gtk_box_pack_start(GTK_BOX(current_page), hbox, FALSE, FALSE, 9);
gtk_widget_show(hbox);
- gtk_box_pack_start(GTK_BOX(current_page), hbox, FALSE, FALSE, 9);
+ label = gtk_label_new(_("Radio device:"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), device_entry, FALSE, FALSE, 5);
+ gtk_widget_show(label);
+
+ model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+
+ radio_dev = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
+ gtk_box_pack_start(GTK_BOX(hbox), radio_dev, FALSE, FALSE, 5);
+ gtk_widget_show(radio_dev);
+
+ renderer = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(radio_dev), renderer, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(radio_dev), renderer,
+ "text", 1, NULL);
+
+ GList *tuners = NULL, *tuner;
+ tuners = radio_find_tuners(tuners);
+ gchar *devname;
+
+ for (tuner = tuners; tuner; tuner = tuner->next)
+ {
+ devname = tuner->data;
+ gtk_list_store_append(model, &iter);
+
[Xfce4-commits] Did some cleanup in the panel UI. Still not entirely convinced, but we're getting there.
Updating branch refs/heads/master
to cbd45fd36fc559c8112e16193a03f3160ee2d6f8 (commit)
from b32b292bca22496c90c241f50b557f2e82ffc680 (commit)
commit cbd45fd36fc559c8112e16193a03f3160ee2d6f8
Author: Stefan Ott
Date: Sat May 21 05:08:52 2011 +0200
Did some cleanup in the panel UI. Still not entirely convinced, but we're
getting there.
icons/signal.xpm | 26 +-
panel-plugin/xfce4-radio.c | 32 +++-
2 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/icons/signal.xpm b/icons/signal.xpm
index 79a52e1..faebf6c 100644
--- a/icons/signal.xpm
+++ b/icons/signal.xpm
@@ -1,20 +1,20 @@
/* XPM */
static char * signal_xpm[] = {
-"100 12 5 1",
+"60 12 5 1",
" c None",
". c #D4D4D4",
"+ c #00C264",
"@ c #FFB300",
"# c #F4",
-" ... ... ...
+++ ",
-" ... ... ...
+++ ",
-"
",
-"
",
-"
",
-" ... ... @@@
+++ ",
-" ... ... @@@
+++ ",
-"
",
-"
",
-"
",
-" ... ### @@@
+++ ",
-" ... ### @@@
+++ "};
+".+++",
+".+++",
+"",
+"",
+"",
+"..@@@+++",
+"..@@@+++",
+"",
+"",
+"",
+"...###@@@+++",
+"...###@@@+++"};
diff --git a/panel-plugin/xfce4-radio.c b/panel-plugin/xfce4-radio.c
index c41e5dd..ff85e73 100644
--- a/panel-plugin/xfce4-radio.c
+++ b/panel-plugin/xfce4-radio.c
@@ -50,7 +50,7 @@
#include
#include
-#define SIGNAL_WIDTH 25
+#define SIGNAL_WIDTH 15
#define SIGNAL_HEIGHT 12
static void
@@ -597,37 +597,43 @@ mouse_scroll(GtkWidget* src, GdkEventScroll *event,
radio_gui* data)
static void
add_boxes(radio_gui *gui)
{
+ GtkWidget *align = gtk_alignment_new(0.5, 0.5, 1, 1);
+ gtk_container_add(GTK_CONTAINER(gui->ebox), align);
+ gtk_widget_show(align);
+
if (gui->orientation == GTK_ORIENTATION_HORIZONTAL)
{
- gui->outer_box = gtk_hbox_new(FALSE, 0);
+ gui->outer_box = gtk_hbox_new(FALSE, 4);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 0, 4, 4);
}
else
{
gui->outer_box = gtk_vbox_new(FALSE, 0);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(align), 4, 4, 0, 0);
}
gtk_widget_show(gui->outer_box);
- gtk_container_add(GTK_CONTAINER(gui->ebox), gui->outer_box);
+ gtk_container_add(GTK_CONTAINER(align), gui->outer_box);
}
static void
add_signal_bar(radio_gui *gui)
{
- GtkWidget *box;
+ GtkWidget *align = gtk_alignment_new(0, 0, 0, 0);
+ gtk_container_add(GTK_CONTAINER(gui->outer_box), align);
+ gtk_widget_show(align);
if (gui->orientation == GTK_ORIENTATION_HORIZONTAL)
{
- box = gtk_hbox_new(FALSE, 0);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(align),
+ BORDER / 2, BORDER / 2, 0, 0);
}
else
{
- box = gtk_vbox_new(FALSE, 0);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(align),
+ 0, 0, BORDER / 2, BORDER / 2);
}
- gtk_widget_show(box);
- gtk_container_add(GTK_CONTAINER(gui->outer_box), box);
- gtk_container_set_border_width(GTK_CONTAINER(box), BORDER / 2);
-
GtkWidget *signal_bar = gtk_pr
[Xfce4-commits] Some more code cleanup
Updating branch refs/heads/master
to b32b292bca22496c90c241f50b557f2e82ffc680 (commit)
from b30ef213972f9f3b44b512ba77da47f77d0a (commit)
commit b32b292bca22496c90c241f50b557f2e82ffc680
Author: Stefan Ott
Date: Sat May 21 04:11:47 2011 +0200
Some more code cleanup
panel-plugin/xfce4-radio.c | 111 +---
1 files changed, 42 insertions(+), 69 deletions(-)
diff --git a/panel-plugin/xfce4-radio.c b/panel-plugin/xfce4-radio.c
index 80fdb57..c41e5dd 100644
--- a/panel-plugin/xfce4-radio.c
+++ b/panel-plugin/xfce4-radio.c
@@ -41,17 +41,12 @@
#include
#include
-#include
-
#include "xfce4-radio.h"
#include "../icons/signal.xpm"
#include "radio.h"
#include "v4l2.h"
-#include
-#include
-#include
#include
#include
@@ -1020,7 +1015,6 @@ choose_command(GtkWidget *dialog)
static void
radio_plugin_create_options(XfcePanelPlugin *plugin, radio_gui *data)
{
- GtkWidget *table;
GtkWidget *label;
GtkWidget *hbox;
GtkWidget *dialog;
@@ -1038,10 +1032,6 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
GtkWidget *preset_box;
GtkWidget *button_box;
GtkWidget *notebook;
- GtkWidget *label_presets;
- GtkWidget *label_ui_options;
- GtkWidget *label_radio_options;
- GtkWidget *label_commands;
GtkWidget *scrolled_window;
GtkWidget *list_view;
GtkWidget *current_page;
@@ -1147,24 +1137,15 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
gtk_container_set_border_width(GTK_CONTAINER(preset_box), 4);
gtk_widget_show_all(preset_box);
- table = gtk_table_new(4, 2, FALSE);
- gtk_container_set_border_width(GTK_CONTAINER(table), 4);
- gtk_widget_show(table);
-
+ // The tabbed "notebook"
notebook = gtk_notebook_new();
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_TOP);
gtk_notebook_set_show_tabs(GTK_NOTEBOOK(notebook), TRUE);
gtk_container_set_border_width (GTK_CONTAINER (notebook), BORDER-3);
- // Notebook tabs
- label_presets = gtk_label_new(_("Presets"));
- label_ui_options = gtk_label_new(_("User interface"));
- label_radio_options = gtk_label_new(_("Radio device"));
- label_commands = gtk_label_new(_("Commands"));
-
// Add the presets page
- gtk_notebook_append_page
- (GTK_NOTEBOOK(notebook), preset_box, label_presets);
+ label = gtk_label_new(_("Presets"));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), preset_box, label);
gtk_box_pack_start
(GTK_BOX(GTK_DIALOG(dialog)->vbox), notebook, TRUE, TRUE, 0);
gtk_widget_show(notebook);
@@ -1174,8 +1155,8 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
gtk_widget_show(align);
gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 5, 5, 5);
- gtk_notebook_append_page
- (GTK_NOTEBOOK(notebook), align, label_ui_options);
+ label = gtk_label_new(_("User interface"));
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), align, label);
current_page = gtk_vbox_new(FALSE, 0);
gtk_widget_show(current_page);
@@ -1183,83 +1164,79 @@ radio_plugin_create_options(XfcePanelPlugin *plugin,
radio_gui *data)
// - Signal strength
real_frame = gtk_frame_new(_("Signal strength"));
- frame = gtk_alignment_new(0, 0, 0.5, 0.5);
- GtkWidget *ui_options = gtk_vbox_new(FALSE, 0);
-
- gtk_widget_show(frame);
- gtk_widget_show(ui_options);
+ gtk_box_pack_start(GTK_BOX(current_page), real_frame, FALSE, FALSE, 9);
gtk_widget_show(real_frame);
- gtk_alignment_set_padding(GTK_ALIGNMENT(frame), 0, 2, 2, 2);
+ align = gtk_alignment_new(0, 0, 1, 1);
+ gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 2, 2, 2);
+ gtk_container_add(GTK_CONTAINER(real_frame), align);
+ gtk_widget_show(align);
- gtk_box_pack_start(GTK_BOX(current_page), real_frame, FALSE, FALSE, 9);
- gtk_container_add(GTK_CONTAINER(real_frame), frame);
- gtk_container_add(GTK_CONTAINER(frame), ui_options);
+ frame = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(align), frame);
+ gtk_widget_show(frame);
// -- Show the signal strength
show_signal = gtk_check_button_new_with_label
(_("Show the signal strength indicator"));
gtk_widget_show(show_signal);
- gtk_container_add(GTK_CONTAINER(ui_options), show_signal);
+ gtk_container_add(GTK_CONTAINER(frame), show_signal);
// -- Use graphics
graphical_signal_strength = gtk_check_button_new_with_label
(_("Use graphics instead of text labels and progress bars"));
gtk_widget_show(graphical_signal_strength);
- gtk_container_add(GTK_CONTAINER(ui_options), graphical_signal_
[Xfce4-commits] l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
Updating branch refs/heads/master to 44fa0c77b8bd4d2ac5a017c7a3e9d64448fcb381 (commit) from 8e05cde967800ef317867a62de9130dd11d9c73f (commit) commit 44fa0c77b8bd4d2ac5a017c7a3e9d64448fcb381 Author: Sérgio Cipolla Date: Sun May 22 01:56:19 2011 +0200 l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100% New status: 280 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt_BR.po | 51 +-- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 52c4fd7..be2dae9 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: postler 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-26 22:18+\n" +"POT-Creation-Date: 2011-05-21 22:19+\n" "PO-Revision-Date: 2011-04-26 08:59-0300\n" "Last-Translator: Sérgio Cipolla \n" "Language-Team: pt_BR\n" @@ -123,12 +123,12 @@ msgid "Mail folder couldn't be created." msgstr "A pasta de mensagens não pôde ser criada." #: ../postler/postler-accountsetup.vala:64 -msgid "_Header" -msgstr "Cabeçal_ho" +msgid "_Header:" +msgstr "Cabeçal_ho:" #: ../postler/postler-accountsetup.vala:67 -msgid "_Keywords" -msgstr "_Palavras chave" +msgid "_Keywords:" +msgstr "_Palavras chave:" #: ../postler/postler-accountsetup.vala:77 msgid "Firstname Lastname" @@ -870,7 +870,7 @@ msgstr "Falha ao ver a fonte: %s" msgid "(No subject)" msgstr "(Sem assunto)" -#: ../postler/postler-content.vala:717 ../postler/postler-messages.vala:525 +#: ../postler/postler-content.vala:717 ../postler/postler-messages.vala:599 msgid "Unknown" msgstr "Desconhecido" @@ -977,7 +977,7 @@ msgstr "Falha ao escrever arquivo: %s" msgid "Local" msgstr "Local" -#: ../postler/postler-folders.vala:230 ../postler/postler-messages.vala:711 +#: ../postler/postler-folders.vala:230 ../postler/postler-messages.vala:679 #, c-format msgid "Failed to monitor folder \"%s\": %s" msgstr "Falha ao monitorizar a pasta \"%s\": %s" @@ -1038,73 +1038,69 @@ msgstr "_Propriedades da conta" msgid "Saved Search _Properties" msgstr "_Propriedades de pesquisa salvas" -#: ../postler/postler-messages.vala:262 ../postler/postler-messages.vala:1171 +#: ../postler/postler-messages.vala:246 ../postler/postler-messages.vala:1133 msgid "Flagged" msgstr "Assinalada" #. Clickable icons should not display/ mark as read -#: ../postler/postler-messages.vala:270 ../postler/postler-messages.vala:1171 +#: ../postler/postler-messages.vala:254 ../postler/postler-messages.vala:1133 msgid "Status" msgstr "Estado" -#: ../postler/postler-messages.vala:274 +#: ../postler/postler-messages.vala:258 msgid "Subject" msgstr "Assunto" -#: ../postler/postler-messages.vala:282 +#: ../postler/postler-messages.vala:263 msgid "From" msgstr "De" -#: ../postler/postler-messages.vala:284 +#: ../postler/postler-messages.vala:265 msgid "Date" msgstr "Data" -#: ../postler/postler-messages.vala:286 -msgid "Size" -msgstr "Tamanho" - -#: ../postler/postler-messages.vala:399 +#: ../postler/postler-messages.vala:377 #, c-format msgid "Failed to convert \"%s\": %s" msgstr "Falha ao converter \"%s\": %s" -#: ../postler/postler-messages.vala:518 +#: ../postler/postler-messages.vala:597 msgid "No subject" msgstr "Sem assunto" -#: ../postler/postler-messages.vala:627 +#: ../postler/postler-messages.vala:601 #, c-format msgid "Failed to read message \"%s\": %s" msgstr "Falha ao ler a mensagem \"%s\": %s" -#: ../postler/postler-messages.vala:742 +#: ../postler/postler-messages.vala:707 msgid "No messages found" msgstr "Nenhuma mensagem encontrada" -#: ../postler/postler-messages.vala:743 +#: ../postler/postler-messages.vala:708 msgid "Check the spelling or try a different filter." msgstr "Verifique a ortografia ou tente outro filtro." -#: ../postler/postler-messages.vala:757 +#: ../postler/postler-messages.vala:722 #, c-format msgid "Failed to read folder \"%s\"." msgstr "Falha ao ler a pasta \"%s\"." -#: ../postler/postler-messages.vala:977 +#: ../postler/postler-messages.vala:939 #, c-format msgid "Failed to read folder validity: %s" msgstr "Falha ao ler a validez da pasta: %s" -#: ../postler/postler-messages.vala:1030 +#: ../postler/postler-messages.vala:992 msgid "Folders for moving messages couldn't be created." msgstr "Pastas para mover as mensagens não puderam ser criadas." -#: ../postler/postler-messages.vala:1092 +#: ../postler/postler-messages.vala:1054 #, c-format msgid "Failed to delete message \"%s\": %s" msgstr "Falha ao apagar a mensagem \"%s\": %s" -#: ../postler/postler-messages.vala:1094 +#: ../postler/postler-messages.vala:1056 #, c-format msgid "Failed to move message \"%s\": %s" msgstr "Falha ao mover a mensagem \"%s\": %s" @@ -1211,6 +1207,9 @@ msgstr "Imagens externas foram bloqueadas." msgid "Load external _Images" msgstr
[Xfce4-commits] l10n: Updated Swedish (sv) translation to 100%
Updating branch refs/heads/master to 8e5da454b92138371776459957d97bbddbf4297d (commit) from 963ba05af7458d0f7c67efa849cbdcef08e5f8f7 (commit) commit 8e5da454b92138371776459957d97bbddbf4297d Author: Daniel Nylander Date: Sun May 22 00:17:34 2011 +0200 l10n: Updated Swedish (sv) translation to 100% New status: 27 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sv.po | 51 +-- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/po/sv.po b/po/sv.po index d70d652..d43a983 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-notifyd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-21 05:04+\n" +"POT-Creation-Date: 2011-05-21 22:05+\n" "PO-Revision-Date: 2009-12-16 14:30+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../xfce4-notifyd/main.c:50 ../xfce4-notifyd/main.c:60 -#: ../xfce4-notifyd-config/main.c:257 +#: ../xfce4-notifyd-config/main.c:260 msgid "Xfce Notify Daemon" msgstr "Notifieringsdemon för Xfce" @@ -45,45 +45,41 @@ msgstr "En annan xndaemon är redan igång" msgid "image: " msgstr "bild: " -#: ../xfce4-notifyd-config/main.c:196 -msgid "Theme" -msgstr "Tema" - -#: ../xfce4-notifyd-config/main.c:223 +#: ../xfce4-notifyd-config/main.c:120 ../xfce4-notifyd-config/main.c:227 msgid "notify-send \"Notification Preview\" \"This is how notifications will look like\"" msgstr "notify-send \"Förhandsvisning av notifiering\" \"Detta är hur notifieringar kommer att se ut\"" -#: ../xfce4-notifyd-config/main.c:227 +#: ../xfce4-notifyd-config/main.c:124 ../xfce4-notifyd-config/main.c:231 msgid "Notification preview failed" msgstr "Förhandsvisning av notifiering misslyckades" -#: ../xfce4-notifyd-config/main.c:259 +#: ../xfce4-notifyd-config/main.c:262 msgid "Settings daemon is unavailable" msgstr "Inställningsdemonen är inte tillgänglig" -#: ../xfce4-notifyd-config/main.c:310 +#: ../xfce4-notifyd-config/main.c:312 msgid "Display version information" msgstr "Visa versionsinformation" -#: ../xfce4-notifyd-config/main.c:311 +#: ../xfce4-notifyd-config/main.c:313 msgid "Settings manager socket" msgstr "Uttag för inställningshanterare" -#: ../xfce4-notifyd-config/main.c:311 +#: ../xfce4-notifyd-config/main.c:313 msgid "SOCKET_ID" msgstr "SOCKET_ID" -#: ../xfce4-notifyd-config/main.c:321 +#: ../xfce4-notifyd-config/main.c:323 #, c-format msgid "Type '%s --help' for usage." msgstr "Skriv \"%s --help\" för användingshjälp." -#: ../xfce4-notifyd-config/main.c:334 +#: ../xfce4-notifyd-config/main.c:336 #, c-format msgid "Released under the terms of the GNU General Public License, version 2\n" msgstr "Utgiven under villkoren för GNU General Public License, version 2\n" -#: ../xfce4-notifyd-config/main.c:335 +#: ../xfce4-notifyd-config/main.c:337 #, c-format msgid "Please report bugs to %s.\n" msgstr "Rapportera fel till %s.\n" @@ -97,43 +93,46 @@ msgid "Bottom right" msgstr "Nedre höger" #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:3 -#: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:1 -msgid "Customize how notifications appear on your screen" -msgstr "Anpassa hur notifieringar ska visas på din skärm" - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:4 msgid "Default _position:" msgstr "Standard_position:" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:5 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:4 #: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:2 msgid "Notifications" msgstr "Notifieringar" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:5 msgid "Top left" msgstr "Övre vänster" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 msgid "Top right" msgstr "Övre höger" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 msgid "_Disappear after:" msgstr "_Försvinn efter:" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:9 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 msgid "_Opacity:" msgstr "_Opacitet:" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:10 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:9 msgid "_Preview" msgstr "Förhan_dsvisa" +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:10 +msgid "_Theme:" +msgstr "_Tema:" + #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:11 msgid "seconds" msgstr "sekunder" +#: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:1 +msgid "Customize how notifications appear on your screen" +msgstr "Anpassa hur notifieringar ska visas på din skärm" +
[Xfce4-commits] Update translators, week 20.
Updating branch refs/heads/master
to dedb1460ef5a9110b38d532218a1ed60476fd6e8 (commit)
from 011a4be2b74c78b2e3b41827b71e8c471d5b7788 (commit)
commit dedb1460ef5a9110b38d532218a1ed60476fd6e8
Author: Transifex
Date: Sun May 22 00:00:16 2011 +0200
Update translators, week 20.
xfce4-about/translators.h |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/xfce4-about/translators.h b/xfce4-about/translators.h
index 0861afc..c54d857 100644
--- a/xfce4-about/translators.h
+++ b/xfce4-about/translators.h
@@ -24,7 +24,7 @@
#include
#include
-#define TRANSLATORS_H_STAMP "2011-05-15 00:00:15"
+#define TRANSLATORS_H_STAMP "2011-05-22 00:00:15"
#define ATSIGN "@"
#define DOTSIGN "."
@@ -173,6 +173,7 @@ static const TranslatorInfo xfce_translators_eu[] =
static const TranslatorInfo xfce_translators_fa[] =
{
{ "Ehsan Akhlaghi", "esnka" ATSIGN "yahoo" DOTSIGN "com", FALSE },
+ { "Mehdi Esmaeelpour", "ariarat" ATSIGN "gmail" DOTSIGN "com", FALSE },
{ NULL, NULL }
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update translators, week 20.
Updating branch refs/heads/nick/gettext to 169bf430b85e2d101e5dea660994292deb3c0d54 (commit) from e60883049dd93a55c323d26a0b1c84dbbeabe732 (commit) commit 169bf430b85e2d101e5dea660994292deb3c0d54 Author: Transifex Date: Sun May 22 00:00:11 2011 +0200 Update translators, week 20. lib/translators.php |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/translators.php b/lib/translators.php index 793906f..1948c84 100644 --- a/lib/translators.php +++ b/lib/translators.php @@ -4,7 +4,7 @@ * DO NOT EDIT IT MANUALLY! */ -$translators_stamp = "2011-05-15 00:00:11"; +$translators_stamp = "2011-05-22 00:00:10"; $translators = array ( 'Amharic [am]' => array ( @@ -87,6 +87,7 @@ $translators = array ( ), 'Persian [fa]' => array ( 'Ehsan Akhlaghi' => 'esnka'.ATSIGN.'yahoo'.DOTSIGN.'com', +'Mehdi Esmaeelpour' => 'ariarat'.ATSIGN.'gmail'.DOTSIGN.'com', ), 'Finnish [fi]' => array ( 'Jari Rahkonen' => 'jari'.DOTSIGN.'rahkonen'.ATSIGN.'pp1'.DOTSIGN.'inet'.DOTSIGN.'fi', ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update package.list with changes in OpenSUSE repo
Updating branch refs/heads/master to f723b22532ff547ae784d757cb916688923eb960 (commit) from ac8a46c788ccdbff06661f85e204892e717531f6 (commit) commit f723b22532ff547ae784d757cb916688923eb960 Author: Paweł Forysiuk Date: Sat May 21 22:59:12 2011 +0200 Update package.list with changes in OpenSUSE repo win32/x86-mingw32-opensuse/packages.list |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/win32/x86-mingw32-opensuse/packages.list b/win32/x86-mingw32-opensuse/packages.list index 5caff20..169973b 100644 --- a/win32/x86-mingw32-opensuse/packages.list +++ b/win32/x86-mingw32-opensuse/packages.list @@ -42,6 +42,8 @@ mingw32-libgstinterfaces mingw32-libgstreamer mingw32-libidn mingw32-libidn-devel +mingw32-libintl +mingw32-libintl-devel mingw32-libjasper mingw32-libjasper-devel mingw32-libjpeg @@ -59,8 +61,8 @@ mingw32-libtasn1 mingw32-libtasn1-devel mingw32-libtiff mingw32-libtiff-devel -mingw32-libwebkit -mingw32-libwebkit-devel +mingw32-libwebkitgtk +mingw32-libwebkitgtk-devel mingw32-libxml2 mingw32-libxml2-devel mingw32-libxslt ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix path typo when rewriting mingw pkgconfig files
Updating branch refs/heads/master
to ac8a46c788ccdbff06661f85e204892e717531f6 (commit)
from eaf1dac531618438be47d1cf895ba5fd1c7c7f9c (commit)
commit ac8a46c788ccdbff06661f85e204892e717531f6
Author: Paweł Forysiuk
Date: Sat May 21 22:40:48 2011 +0200
Fix path typo when rewriting mingw pkgconfig files
win32/x86-mingw32-opensuse/install.sh |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/win32/x86-mingw32-opensuse/install.sh
b/win32/x86-mingw32-opensuse/install.sh
index 3d54e09..4c669f1 100755
--- a/win32/x86-mingw32-opensuse/install.sh
+++ b/win32/x86-mingw32-opensuse/install.sh
@@ -71,7 +71,7 @@ do
if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw ]
then
# convert pkgconfig files
-if [ -d $BUILD_PATH/usr/i686-w64=mingw32/sys-root/mingw/lib/pkgconfig ]
+if [ -d $BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig ]
then
sed -i -e 's@^prefix=.*@prefix='$INSTALL_PATH'@' -e
's@/usr/i686-w64-mingw32/sys-root/mingw@${prefix}@'
$BUILD_PATH/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/*.pc
fi
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make scripts in win32 executable by default
Updating branch refs/heads/master to eaf1dac531618438be47d1cf895ba5fd1c7c7f9c (commit) from 3a8ce008adc08dcf41664ec09097c00940cc061a (commit) commit eaf1dac531618438be47d1cf895ba5fd1c7c7f9c Author: Paweł Forysiuk Date: Sat May 21 21:40:41 2011 +0200 Make scripts in win32 executable by default 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/win32/makedist/dll-recursive.sh b/win32/makedist/dll-recursive.sh old mode 100644 new mode 100755 diff --git a/win32/makedist/makedist.midori b/win32/makedist/makedist.midori old mode 100644 new mode 100755 diff --git a/win32/x86-mingw32-opensuse/crossconfig.sh b/win32/x86-mingw32-opensuse/crossconfig.sh old mode 100644 new mode 100755 diff --git a/win32/x86-mingw32-opensuse/install.sh b/win32/x86-mingw32-opensuse/install.sh old mode 100644 new mode 100755 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 963ba05af7458d0f7c67efa849cbdcef08e5f8f7 (commit) from f3d574a8f18dd7b48746e2a36e2042797fbfe807 (commit) commit 963ba05af7458d0f7c67efa849cbdcef08e5f8f7 Author: Sergio Marques Date: Sat May 21 20:40:26 2011 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 27 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 73 + 1 files changed, 35 insertions(+), 38 deletions(-) diff --git a/po/pt.po b/po/pt.po index 722f1dc..59c0779 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-notifyd\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-22 21:47+\n" +"POT-Creation-Date: 2011-05-21 16:04+\n" "PO-Revision-Date: 2010-05-27 12:58-\n" "Last-Translator: Sérgio Marques \n" "Language-Team: \n" @@ -19,7 +19,7 @@ msgstr "" "X-Poedit-Country: Portugal\n" #: ../xfce4-notifyd/main.c:50 ../xfce4-notifyd/main.c:60 -#: ../xfce4-notifyd-config/main.c:257 +#: ../xfce4-notifyd-config/main.c:260 msgid "Xfce Notify Daemon" msgstr "Serviço de notificação Xfce" @@ -32,59 +32,55 @@ msgstr "Opção desconhecida \"%s\"\n" msgid "Unable to start notification daemon" msgstr "Incapaz de iniciar o serviço de notificação" -#: ../xfce4-notifyd/xfce-notify-daemon.c:1118 +#: ../xfce4-notifyd/xfce-notify-daemon.c:1134 #, c-format msgid "Unable to connect to D-Bus session bus" msgstr "Incapaz de ligar ao sistema da sessão D-Bus" -#: ../xfce4-notifyd/xfce-notify-daemon.c:1135 +#: ../xfce4-notifyd/xfce-notify-daemon.c:1151 #, c-format msgid "Another notification xndaemon is already running" msgstr "Já está em execução outro serviço de notificações." -#: ../xfce4-notifyd/xfce-notify-window.c:809 +#: ../xfce4-notifyd/xfce-notify-window.c:817 msgid "image: " msgstr "imagem: " -#: ../xfce4-notifyd-config/main.c:196 -msgid "Theme" -msgstr "Tema" - -#: ../xfce4-notifyd-config/main.c:223 +#: ../xfce4-notifyd-config/main.c:120 ../xfce4-notifyd-config/main.c:227 msgid "notify-send \"Notification Preview\" \"This is how notifications will look like\"" msgstr "\"Antevisão da notificação\" \"A notificação irá ser assim\"" -#: ../xfce4-notifyd-config/main.c:227 +#: ../xfce4-notifyd-config/main.c:124 ../xfce4-notifyd-config/main.c:231 msgid "Notification preview failed" msgstr "Falha ao antever a notificação" -#: ../xfce4-notifyd-config/main.c:259 +#: ../xfce4-notifyd-config/main.c:262 msgid "Settings daemon is unavailable" msgstr "As definições do serviço estão indisponíveis" -#: ../xfce4-notifyd-config/main.c:314 +#: ../xfce4-notifyd-config/main.c:312 msgid "Display version information" msgstr "Mostrar informação de versão" -#: ../xfce4-notifyd-config/main.c:315 +#: ../xfce4-notifyd-config/main.c:313 msgid "Settings manager socket" msgstr "\"Socket\" do gestor de definições" -#: ../xfce4-notifyd-config/main.c:315 +#: ../xfce4-notifyd-config/main.c:313 msgid "SOCKET_ID" msgstr "SOCKET_ID" -#: ../xfce4-notifyd-config/main.c:325 +#: ../xfce4-notifyd-config/main.c:323 #, c-format msgid "Type '%s --help' for usage." msgstr "Digite \"%s --help\" para utilização." -#: ../xfce4-notifyd-config/main.c:337 +#: ../xfce4-notifyd-config/main.c:336 #, c-format msgid "Released under the terms of the GNU General Public License, version 2\n" msgstr "Licenciado sob os termos da GNU General Public License, versão 2\n" -#: ../xfce4-notifyd-config/main.c:338 +#: ../xfce4-notifyd-config/main.c:337 #, c-format msgid "Please report bugs to %s.\n" msgstr "Por favor, reporte erros em %s.\n" @@ -98,51 +94,52 @@ msgid "Bottom right" msgstr "Inferior direito" #: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:3 -#: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:1 -msgid "Customize how notifications appear on your screen" -msgstr "Personalizar o modo como as notificações aparecem no monitor " - -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:4 msgid "Default _position:" msgstr "_Posição por omissão:" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:5 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:4 #: ../xfce4-notifyd-config/xfce4-notifyd-config.desktop.in.h:2 msgid "Notifications" msgstr "Notificações" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:5 msgid "Top left" msgstr "Superior esquerdo" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:6 msgid "Top right" msgstr "Superior direito" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:8 +#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:7 msgid "_Disappear after:" msgstr "_Desaparecer após:" -#: ../xfce4-notifyd-config/xfce4-notifyd-config.glade.h:9 -msgid "_Effect:" -msgs
[Xfce4-commits] l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 8e05cde967800ef317867a62de9130dd11d9c73f (commit) from 3718a930e25182f119e1cf5729bd0001c72d3b01 (commit) commit 8e05cde967800ef317867a62de9130dd11d9c73f Author: Sergio Marques Date: Sat May 21 20:39:30 2011 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 280 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 51 +-- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/po/pt.po b/po/pt.po index e056953..30ec52f 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: postler\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-04-22 22:18+\n" +"POT-Creation-Date: 2011-05-21 16:18+\n" "PO-Revision-Date: 2011-01-25 00:39-\n" "Last-Translator: Sérgio Marques \n" "Language-Team: \n" @@ -124,12 +124,12 @@ msgid "Mail folder couldn't be created." msgstr "A pasta de correio não foi criada." #: ../postler/postler-accountsetup.vala:64 -msgid "_Header" -msgstr "Cabeç_halho" +msgid "_Header:" +msgstr "Cabeç_halho:" #: ../postler/postler-accountsetup.vala:67 -msgid "_Keywords" -msgstr "_Palavras chave" +msgid "_Keywords:" +msgstr "_Palavras chave:" #: ../postler/postler-accountsetup.vala:77 msgid "Firstname Lastname" @@ -871,7 +871,7 @@ msgstr "Falha ao ver a fonte: %s" msgid "(No subject)" msgstr "(Sem assunto)" -#: ../postler/postler-content.vala:717 ../postler/postler-messages.vala:525 +#: ../postler/postler-content.vala:717 ../postler/postler-messages.vala:599 msgid "Unknown" msgstr "Desconhecido" @@ -978,7 +978,7 @@ msgstr "Falha ao escrever o ficheiro: %s" msgid "Local" msgstr "Local" -#: ../postler/postler-folders.vala:230 ../postler/postler-messages.vala:711 +#: ../postler/postler-folders.vala:230 ../postler/postler-messages.vala:679 #, c-format msgid "Failed to monitor folder \"%s\": %s" msgstr "Falha ao monitorizar a pasta \"%s\": %s" @@ -1039,73 +1039,69 @@ msgstr "_Propriedades da conta" msgid "Saved Search _Properties" msgstr "_Propriedades da pesquisa gravada" -#: ../postler/postler-messages.vala:262 ../postler/postler-messages.vala:1171 +#: ../postler/postler-messages.vala:246 ../postler/postler-messages.vala:1133 msgid "Flagged" msgstr "Assinalada" #. Clickable icons should not display/ mark as read -#: ../postler/postler-messages.vala:270 ../postler/postler-messages.vala:1171 +#: ../postler/postler-messages.vala:254 ../postler/postler-messages.vala:1133 msgid "Status" msgstr "Estado" -#: ../postler/postler-messages.vala:274 +#: ../postler/postler-messages.vala:258 msgid "Subject" msgstr "Assunto" -#: ../postler/postler-messages.vala:282 +#: ../postler/postler-messages.vala:263 msgid "From" msgstr "De" -#: ../postler/postler-messages.vala:284 +#: ../postler/postler-messages.vala:265 msgid "Date" msgstr "Data" -#: ../postler/postler-messages.vala:286 -msgid "Size" -msgstr "Tamanho" - -#: ../postler/postler-messages.vala:399 +#: ../postler/postler-messages.vala:377 #, c-format msgid "Failed to convert \"%s\": %s" msgstr "Falha ao converter \"%s\": %s" -#: ../postler/postler-messages.vala:518 +#: ../postler/postler-messages.vala:597 msgid "No subject" msgstr "Sem assunto" -#: ../postler/postler-messages.vala:627 +#: ../postler/postler-messages.vala:601 #, c-format msgid "Failed to read message \"%s\": %s" msgstr "Falha ao ler a mensagem \"%s\": %s" -#: ../postler/postler-messages.vala:742 +#: ../postler/postler-messages.vala:707 msgid "No messages found" msgstr "Nenhuma mensagem encontrada" -#: ../postler/postler-messages.vala:743 +#: ../postler/postler-messages.vala:708 msgid "Check the spelling or try a different filter." msgstr "Verifique a ortografia ou tente outro filtro." -#: ../postler/postler-messages.vala:757 +#: ../postler/postler-messages.vala:722 #, c-format msgid "Failed to read folder \"%s\"." msgstr "Falha ao ler a pasta \"%s\"." -#: ../postler/postler-messages.vala:977 +#: ../postler/postler-messages.vala:939 #, c-format msgid "Failed to read folder validity: %s" msgstr "Falha ao validar a pasta: %s" -#: ../postler/postler-messages.vala:1030 +#: ../postler/postler-messages.vala:992 msgid "Folders for moving messages couldn't be created." msgstr "As pastas para movimentação de mensagens não foram criadas." -#: ../postler/postler-messages.vala:1092 +#: ../postler/postler-messages.vala:1054 #, c-format msgid "Failed to delete message \"%s\": %s" msgstr "Falha ao apagar a mensagem \"%s\": %s" -#: ../postler/postler-messages.vala:1094 +#: ../postler/postler-messages.vala:1056 #, c-format msgid "Failed to move message \"%s\": %s" msgstr "Falha ao mover a mensagem \"%s\": %s" @@ -1212,6 +1208,9 @@ msgstr "As imagens externas foram bloqueadas." msgid "Load external _Images" msgstr "Carregar _imagens externas" +#~ msgid "
[Xfce4-commits] l10n: Initial Croatian (hr) translation
Updating branch refs/heads/master
to 8bec8f08075ad984a53f80853861469bb8c8ff58 (commit)
from a311eb137294f255c0762f42a86914a047ca46c4 (commit)
commit 8bec8f08075ad984a53f80853861469bb8c8ff58
Author: Ivica Kolić
Date: Sat May 21 18:41:31 2011 +0200
l10n: Initial Croatian (hr) translation
New status: 32 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{sv.po => hr.po} | 82 +--
1 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/po/sv.po b/po/hr.po
similarity index 64%
copy from po/sv.po
copy to po/hr.po
index 6e04e46..3baaeb8 100644
--- a/po/sv.po
+++ b/po/hr.po
@@ -1,54 +1,55 @@
-# Swedish translation for xfce4-timer-plugin.
-# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the xfce4-timer-plugin
package.
-# Daniel Nylander , 2008, 2009.
+
#
msgid ""
msgstr ""
"Project-Id-Version: xfce4-timer-plugin\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-09-10 21:29+0200\n"
-"PO-Revision-Date: 2009-12-16 17:35+0100\n"
-"Last-Translator: Daniel Nylander \n"
-"Language-Team: Swedish \n"
+"PO-Revision-Date: 2011-05-21 18:39+0100\n"
+"Last-Translator: Ivica Kolić \n"
+"Language-Team: Croatian \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 &&
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Language: Croatian\n"
+"X-Poedit-Country: CROATIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
#: ../src/xfcetimer.c:100
#, c-format
msgid "%dh %dm %ds left"
-msgstr "%dh %dm %ds kvar"
+msgstr "%dh %dm %ds preostalo"
#: ../src/xfcetimer.c:103
#, c-format
msgid "%dm %ds left"
-msgstr "%dm %ds kvar"
+msgstr "%dm %ds preostalo"
#: ../src/xfcetimer.c:105
#, c-format
msgid "%ds left"
-msgstr "%ds kvar"
+msgstr "%ds preostalo"
#: ../src/xfcetimer.c:126
msgid ""
"Beeep! :) \n"
"Time is up!"
msgstr ""
-"Pip! :) \n"
-"Det är dags nu!"
+"Beeep! :) \n"
+"Vrijeme je isteklo!"
#: ../src/xfcetimer.c:424
msgid "Stop timer"
-msgstr "Stoppa tidtagare"
+msgstr "Zaustavi mjerač vremena"
#: ../src/xfcetimer.c:426
msgid "Start timer"
-msgstr "Starta tidtagare"
+msgstr "Pokreni mjerač vremena"
#: ../src/xfcetimer.c:436
msgid "Stop the alarm"
-msgstr "Stoppa alarmet"
+msgstr "Zaustavi alarm"
#: ../src/xfcetimer.c:482
#: ../src/xfcetimer.c:556
@@ -72,24 +73,24 @@ msgstr "%ds"
#: ../src/xfcetimer.c:570
#, c-format
msgid "At %02d:%02d"
-msgstr "Klockan %02d.%02d"
+msgstr "U %02d:%02d"
#: ../src/xfcetimer.c:619
msgid "Name"
-msgstr "Namn"
+msgstr "Ime"
#.
#: ../src/xfcetimer.c:627
msgid "Enter the countdown time"
-msgstr "Ange nedräkningstiden"
+msgstr "Unesite vrijeme odbrojavanja"
#: ../src/xfcetimer.c:629
msgid "Enter the time of alarm (24h format)"
-msgstr "Ange tid för alarmet (24-timmarsformat)"
+msgstr "Unesite vrijeme alarma (format 24 sata)"
#: ../src/xfcetimer.c:640
msgid "h "
-msgstr "h "
+msgstr "h "
#: ../src/xfcetimer.c:645
msgid "m "
@@ -105,7 +106,7 @@ msgid ""
"or\n"
msgstr ""
"\n"
-"eller\n"
+"ili\n"
#. **
#: ../src/xfcetimer.c:673
@@ -114,72 +115,69 @@ msgid ""
"The command to run"
msgstr ""
"\n"
-"Kommandot att köra"
+"Pokrenuti naredbu"
#: ../src/xfcetimer.c:699
msgid "Add new alarm"
-msgstr "Lägg till nytt alarm"
+msgstr "Dodaj novi alarm"
#: ../src/xfcetimer.c:737
msgid "Edit alarm"
-msgstr "Redigera alarm"
+msgstr "Uredi alarm"
#: ../src/xfcetimer.c:1162
msgid "Properties"
-msgstr "Egenskaper"
+msgstr "Svojstva"
#: ../src/xfcetimer.c:1174
msgid "Xfce4 Timer Options"
-msgstr "Alternativ för Xfce4-tidtagare"
+msgstr "Pocije Xfce4 mjerača vremena"
#: ../src/xfcetimer.c:1205
msgid ""
"Timer\n"
"name"
msgstr ""
-"Tidtagar-\n"
-"namn"
+"Ime\n"
+"mjerača vremena"
#: ../src/xfcetimer.c:1210
msgid ""
"Countdown period /\n"
"Alarm time"
msgstr ""
-"Nedräkningsperiod /\n"
-"Alarmtid"
+"Period odbrojavanja /\n"
+"Vrijeme alarma"
#: ../src/xfcetimer.c:1214
msgid "Alarm command"
-msgstr "Alarmkommando"
+msgstr "Naredba alarma"
#: ../src/xfcetimer.c:1257
msgid ""
"Don't display the warning window\n"
"if an alarm command is set"
msgstr ""
-"Visa inte en varning om\n"
-"ett alarmkommando är inställt"
+"Ne prikazuj prozor upozorenja\n"
+"ako naredba alarma nije postavljena"
#: ../src/xfcetimer.c:1264
msgid "Repeat the alarm command:"
-msgstr "Upprepa alarmkommandot:"
+msgstr "Ponovi naredbu alarma"
#: ../src/xfcetimer.c:1271
msgid "Number of repetitions"
-msgstr "Antal upprepningar"
+msgstr "Broj ponavljanja"
#: ../src/xfcetimer.c:1277
msgid " Time interval (sec.)"
-msgstr " Tidsintervall (s)"
+msgstr "Vremenski interval (sec)"
#: ../src/xfce4-timer.desktop.in.in.h:1
msgid "Timer
[Xfce4-commits] Add support to change device properties and mode.
Updating branch refs/heads/nick/pointers
to 0fee2a3377cda39c3e9818de860fe101602428d7 (commit)
from 0f1600035b34cd6a816efc38422b1802d3db1d92 (commit)
commit 0fee2a3377cda39c3e9818de860fe101602428d7
Author: Nick Schermer
Date: Sat May 21 18:39:57 2011 +0200
Add support to change device properties and mode.
Add code to write device properties to input device. The properties
are read from the //Properties/* path in xfconf and
support the string (atom), int and float properties (using doubles,
since xfconf has no float type).
Also add support for changing the input device mode (relative or
absolute), something important for touchpads.
With this in place, each frontend can change device properties in
Xfce, xfsettingsd will take care of setting them and restore them
on login and when the device is attached.
xfsettingsd/pointers.c | 273 +---
1 files changed, 259 insertions(+), 14 deletions(-)
diff --git a/xfsettingsd/pointers.c b/xfsettingsd/pointers.c
index 96edb6f..26f4feb 100644
--- a/xfsettingsd/pointers.c
+++ b/xfsettingsd/pointers.c
@@ -25,6 +25,7 @@
#endif
#include
+#include
#include
#include
#include
@@ -35,6 +36,8 @@
#include
#include
+#include
+
#include "debug.h"
#include "pointers.h"
@@ -42,6 +45,8 @@
#define MAX_DENOMINATOR (100.00)
+#define XFCONF_TYPE_G_VALUE_ARRAY (dbus_g_type_get_collection ("GPtrArray",
G_TYPE_VALUE))
+
/* Xi 1.4 is required */
#define MIN_XI_VERS_MAJOR 1
#define MIN_XI_VERS_MINOR 4
@@ -89,6 +94,15 @@ struct _XfcePointersHelper
#endif
};
+typedef struct
+{
+Display *xdisplay;
+XDevice *device;
+XDeviceInfo *device_info;
+gsizeprop_name_len;
+}
+XfcePointerData;
+
G_DEFINE_TYPE (XfcePointersHelper, xfce_pointers_helper, G_TYPE_OBJECT);
@@ -294,7 +308,7 @@ xfce_pointers_helper_change_button_mapping (XDeviceInfo
*device_info,
}
else
{
-xfsettings_dbg (XFSD_DEBUG_POINTERS, "[%s] new buttonmap not changed",
+xfsettings_dbg (XFSD_DEBUG_POINTERS, "[%s] buttonmap not changed",
device_info->name);
}
@@ -422,6 +436,35 @@ xfce_pointers_helper_change_feedback (XDeviceInfo
*device_info,
+static void
+xfce_pointers_helper_change_mode (XDeviceInfo *device_info,
+ XDevice *device,
+ Display *xdisplay,
+ const gchar *mode_name)
+{
+gint mode;
+
+if (strcmp (mode_name, "RELATIVE") == 0)
+mode = Relative;
+else if (strcmp (mode_name, "ABSOLUTE") == 0)
+mode = Absolute;
+else
+{
+g_warning ("Unknown device mode %s, only RELATIVE and ABSOLUTE are
valid", mode_name);
+return;
+}
+
+gdk_error_trap_push ();
+XSetDeviceMode (xdisplay, device, mode);
+if (gdk_error_trap_pop () != 0)
+g_critical ("Failed to change the device mode");
+
+xfsettings_dbg (XFSD_DEBUG_POINTERS,
+"[%s] Set mode to %s", device_info->name, mode_name);
+}
+
+
+
static gchar *
xfce_pointers_helper_device_xfconf_name (const gchar *name)
{
@@ -457,19 +500,192 @@ xfce_pointers_helper_device_xfconf_name (const gchar
*name)
static void
+xfce_pointers_helper_change_property (XDeviceInfo *device_info,
+ XDevice *device,
+ Display *xdisplay,
+ const gchar *prop_name,
+ const GValue *value)
+{
+Atom *props;
+gint n, n_props;
+Atom prop;
+gchar*atom_name;
+Atom type;
+gint format;
+gulongn_items, bytes_after, i;
+gulongn_succeeds;
+Atom float_atom;
+GPtrArray*array = NULL;
+const GValue *val;
+union {
+guchar *c;
+gshort *s;
+glong *l;
+Atom *a;
+} data;
+
+/* assuming the device property never contained underscores... */
+atom_name = g_strdup (prop_name);
+g_strdelimit (atom_name, "_", ' ');
+prop = XInternAtom (xdisplay, atom_name, True);
+g_free (atom_name);
+
+/* because of the True in XInternAtom we quit here if the property
+ * does not exists on any of the devices */
+if (prop == None)
+return;
+
+gdk_error_trap_push ();
+props = XListDeviceProperties (xdisplay, device, &n_props);
+if (gdk_error_trap_pop () != 0 || props == NULL)
+return;
+
+float_atom = XInternAtom (xdisplay, "FLOAT", False);
+
+for (n = 0; n < n_props; n++)
+{
+/* find the matching property */
+if (props[n] != prop)
+continue;
+
+if (XGetDeviceProperty (xdisplay, device, prop, 0, 1000, False,
+AnyPropertyType, &type, &format,
+
[Xfce4-commits] Remove flush calls around error traps.
Updating branch refs/heads/nick/pointers
to 0f1600035b34cd6a816efc38422b1802d3db1d92 (commit)
from f93df45646446c4e4945dbe89bb1ef7c48e0bc16 (commit)
commit 0f1600035b34cd6a816efc38422b1802d3db1d92
Author: Nick Schermer
Date: Fri May 20 18:37:18 2011 +0200
Remove flush calls around error traps.
xfsettingsd/accessibility.c |9 +++--
xfsettingsd/keyboards.c | 19 ++-
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/xfsettingsd/accessibility.c b/xfsettingsd/accessibility.c
index 85f4d54..5581c4b 100644
--- a/xfsettingsd/accessibility.c
+++ b/xfsettingsd/accessibility.c
@@ -176,8 +176,6 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper
*helper,
gint delay, interval, time_to_max;
gint max_speed, curve;
-/* flush x and trap errors */
-gdk_flush ();
gdk_error_trap_push ();
/* allocate */
@@ -339,12 +337,11 @@ xfce_accessibility_helper_set_xkb
(XfceAccessibilityHelper *helper,
else
{
/* warning */
-g_error ("XkbAllocKeyboard() returned a null pointer");
+g_critical ("XkbAllocKeyboard() returned a null pointer");
}
-/* flush and remove the x error trap */
-gdk_flush ();
-gdk_error_trap_pop ();
+if (gdk_error_trap_pop () != 0)
+ g_critical ("Failed to set keyboard controls");
}
diff --git a/xfsettingsd/keyboards.c b/xfsettingsd/keyboards.c
index f29220d..f5c7edc 100644
--- a/xfsettingsd/keyboards.c
+++ b/xfsettingsd/keyboards.c
@@ -145,19 +145,15 @@ xfce_keyboards_helper_set_auto_repeat_mode
(XfceKeyboardsHelper *helper)
/* load setting */
repeat = xfconf_channel_get_bool (helper->channel, "/Default/KeyRepeat",
TRUE);
-/* flush x and trap errors */
-gdk_flush ();
-gdk_error_trap_push ();
-
/* set key repeat */
values.auto_repeat_mode = repeat ? 1 : 0;
+
+gdk_error_trap_push ();
XChangeKeyboardControl (GDK_DISPLAY (), KBAutoRepeatMode, &values);
+if (gdk_error_trap_pop () != 0)
+g_critical ("Failed to change keyboard repeat mode");
xfsettings_dbg (XFSD_DEBUG_KEYBOARDS, "set auto repeat %s", repeat ? "on"
: "off");
-
-/* flush and remove the x error trap */
-gdk_flush ();
-gdk_error_trap_pop ();
}
@@ -172,8 +168,6 @@ xfce_keyboards_helper_set_repeat_rate (XfceKeyboardsHelper
*helper)
delay = xfconf_channel_get_int (helper->channel,
"/Default/KeyRepeat/Delay", 500);
rate = xfconf_channel_get_int (helper->channel, "/Default/KeyRepeat/Rate",
20);
-/* flush x and trap errors */
-gdk_flush ();
gdk_error_trap_push ();
/* allocate xkb structure */
@@ -198,9 +192,8 @@ xfce_keyboards_helper_set_repeat_rate (XfceKeyboardsHelper
*helper)
XFree (xkb);
}
-/* flush and remove the x error trap */
-gdk_flush ();
-gdk_error_trap_pop ();
+if (gdk_error_trap_pop () != 0)
+g_critical ("Failed to change the keyboard repeat");
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Rework the pointers code a bit.
Updating branch refs/heads/nick/pointers
to f93df45646446c4e4945dbe89bb1ef7c48e0bc16 (commit)
from ae504fe5f2e94bf4e1b39c289afe9030dee8b23b (commit)
commit f93df45646446c4e4945dbe89bb1ef7c48e0bc16
Author: Nick Schermer
Date: Fri May 20 18:23:05 2011 +0200
Rework the pointers code a bit.
Make the code a bit more efficient, easier to understand
and prepare for device properties.
No functional changes.
xfsettingsd/pointers.c | 485 ++--
1 files changed, 267 insertions(+), 218 deletions(-)
diff --git a/xfsettingsd/pointers.c b/xfsettingsd/pointers.c
index 10ff9db..96edb6f 100644
--- a/xfsettingsd/pointers.c
+++ b/xfsettingsd/pointers.c
@@ -1,6 +1,5 @@
-/* $Id$ */
/*
- * Copyright (c) 2008 Nick Schermer
+ * Copyright (c) 2008-2011 Nick Schermer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -59,24 +58,6 @@
-static void xfce_pointers_helper_change_button_mapping_swap
(guchar *buttonmap,
-
gshort num_buttons,
-
gint id_1,
-
gint id_2,
-
gboolean reverse);
-static void xfce_pointers_helper_change_button_mapping
(XDeviceInfo *device_info,
-
XDevice *device,
-
Display *xdisplay,
-
gint right_handed,
-
gint reverse_scrolling);
-static gint xfce_pointers_helper_gcd
(gint num,
-
gint denom);
-static void xfce_pointers_helper_change_feedback
(XDeviceInfo *device_info,
-
XDevice *device,
-
Display *xdisplay,
-
gint threshold,
-
gdouble acceleration);
-static gchar *xfce_pointers_helper_device_xfconf_name
(const gchar *name);
static void xfce_pointers_helper_restore_devices
(XfcePointersHelper *helper,
XID *xid);
static void xfce_pointers_helper_channel_property_changed
(XfconfChannel *channel,
@@ -162,43 +143,39 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
xfce_pointers_helper_restore_devices (helper, NULL);
/* monitor the channel */
-g_signal_connect (G_OBJECT (helper->channel), "property-changed",
G_CALLBACK (xfce_pointers_helper_channel_property_changed), NULL);
+g_signal_connect (G_OBJECT (helper->channel), "property-changed",
+ G_CALLBACK (xfce_pointers_helper_channel_property_changed), NULL);
#ifdef HAS_DEVICE_HOTPLUGGING
-/* flush x and trap errors */
-gdk_flush ();
-gdk_error_trap_push ();
-
-
-if (G_LIKELY (xdisplay))
+if (G_LIKELY (xdisplay != NULL))
{
/* monitor device changes */
+gdk_error_trap_push ();
DevicePresence (xdisplay, helper->device_presence_event_type,
event_class);
XSelectExtensionEvent (xdisplay, RootWindow (xdisplay,
DefaultScreen (xdisplay)), &event_class, 1);
/* add an event filter */
-gdk_window_add_filter (NULL, xfce_pointers_helper_event_filter,
helper);
+if (gdk_error_trap_pop () == 0)
+gdk_window_add_filter (NULL,
xfce_pointers_helper_event_filter, helper);
+else
+g_warning ("Failed to create device filter");
}
-
-/* flush and remove the x error trap */
-gdk_flush ();
-gdk_error_trap_pop ();
#endif
}
}
-static void
+static gboolean
xfce_pointers_helper_change_button_mapping_swap (guchar *buttonmap,
[Xfce4-commits] Creating branch nick/pointers
Updating branch refs/heads/nick/pointers as new branch to 0fee2a3377cda39c3e9818de860fe101602428d7 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/nick/pointers for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add support to change device properties and mode.
Updating branch refs/heads/nick/pointers
to 364e626ef69ff7f97d248195f45b0af73e676694 (commit)
from 0f1600035b34cd6a816efc38422b1802d3db1d92 (commit)
commit 364e626ef69ff7f97d248195f45b0af73e676694
Author: Nick Schermer
Date: Sat May 21 18:33:15 2011 +0200
Add support to change device properties and mode.
Add code to write device properties to input device. The
properties are read from the //Properties/*
path in xfconf and support the string (atom), int and float
properties (using doubles, since xfconf has no float type).
Also add support for changing the input device mode (relative
or absolute), something important for touchpads.
With this in place, each frontend can change device properties
in Xfce, xfsettingsd will take care of setting them and restore
them on login and when the device is attached.
dialogs/mouse-settings/main.c | 44 +++
dialogs/mouse-settings/mouse-dialog.glade | 440 +++--
xfsettingsd/pointers.c| 273 +-
3 files changed, 716 insertions(+), 41 deletions(-)
diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
index 595339b..fa51e33 100644
--- a/dialogs/mouse-settings/main.c
+++ b/dialogs/mouse-settings/main.c
@@ -990,6 +990,23 @@ mouse_settings_device_reset (GtkWidget *button,
+static void
+mouse_settings_touchpad_save (GtkBuilder *builder)
+{
+
+}
+
+
+
+static void
+mouse_settings_touchpad_reset (GtkWidget *button,
+ GtkBuilder *builder)
+{
+
+}
+
+
+
#ifdef HAS_DEVICE_HOTPLUGGING
static GdkFilterReturn
mouse_settings_event_filter (GdkXEvent *xevent,
@@ -1158,6 +1175,33 @@ main (gint argc, gchar **argv)
object = gtk_builder_get_object (builder, "mouse-reset");
g_signal_connect (G_OBJECT (object), "clicked", G_CALLBACK
(mouse_settings_device_reset), builder);
+object = gtk_builder_get_object (builder, "touchpad-type-disable");
+xfconf_g_property_bind (pointers_channel,
"/Touchpad/DisableWhileTyping", G_TYPE_BOOLEAN, G_OBJECT (object), "active");
+
+object = gtk_builder_get_object (builder, "touchpad-tapping");
+g_signal_connect_swapped (G_OBJECT (object), "toggled", G_CALLBACK
(mouse_settings_touchpad_save), builder);
+
+object = gtk_builder_get_object (builder, "touchpad-scroll-no");
+g_signal_connect_swapped (G_OBJECT (object), "toggled", G_CALLBACK
(mouse_settings_touchpad_save), builder);
+
+object = gtk_builder_get_object (builder, "touchpad-scroll-edge");
+g_signal_connect_swapped (G_OBJECT (object), "toggled", G_CALLBACK
(mouse_settings_touchpad_save), builder);
+
+object = gtk_builder_get_object (builder, "touchpad-scroll-two");
+g_signal_connect_swapped (G_OBJECT (object), "toggled", G_CALLBACK
(mouse_settings_touchpad_save), builder);
+
+object = gtk_builder_get_object (builder, "touchpad-scroll-horiz");
+g_signal_connect_swapped (G_OBJECT (object), "toggled", G_CALLBACK
(mouse_settings_touchpad_save), builder);
+
+object = gtk_builder_get_object (builder,
"touchpad-acceleration-scale");
+g_signal_connect_swapped (G_OBJECT (object), "value-changed",
G_CALLBACK (mouse_settings_touchpad_save), builder);
+
+object = gtk_builder_get_object (builder,
"touchpad-threshold-scale");
+g_signal_connect_swapped (G_OBJECT (object), "value-changed",
G_CALLBACK (mouse_settings_touchpad_save), builder);
+
+object = gtk_builder_get_object (builder, "touchpad-reset");
+g_signal_connect (G_OBJECT (object), "clicked", G_CALLBACK
(mouse_settings_touchpad_reset), builder);
+
#ifdef HAVE_XCURSOR
/* populate the themes treeview */
mouse_settings_themes_populate_store (builder);
diff --git a/dialogs/mouse-settings/mouse-dialog.glade
b/dialogs/mouse-settings/mouse-dialog.glade
index c4a0d95..1a8b90a 100644
--- a/dialogs/mouse-settings/mouse-dialog.glade
+++ b/dialogs/mouse-settings/mouse-dialog.glade
@@ -3,7 +3,7 @@
-
+
16
48
24
@@ -15,6 +15,11 @@
False
gtk-revert-to-saved
+
+True
+False
+gtk-revert-to-saved
+
0.10001
10
@@ -145,15 +150,45 @@
6
6
-
-_Right handed
+
True
-True
-False
-False
-True
-True
-True
+False
+
[Xfce4-commits] Remove flush calls around error traps.
Updating branch refs/heads/nick/pointers
to 0f1600035b34cd6a816efc38422b1802d3db1d92 (commit)
from f93df45646446c4e4945dbe89bb1ef7c48e0bc16 (commit)
commit 0f1600035b34cd6a816efc38422b1802d3db1d92
Author: Nick Schermer
Date: Fri May 20 18:37:18 2011 +0200
Remove flush calls around error traps.
xfsettingsd/accessibility.c |9 +++--
xfsettingsd/keyboards.c | 19 ++-
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/xfsettingsd/accessibility.c b/xfsettingsd/accessibility.c
index 85f4d54..5581c4b 100644
--- a/xfsettingsd/accessibility.c
+++ b/xfsettingsd/accessibility.c
@@ -176,8 +176,6 @@ xfce_accessibility_helper_set_xkb (XfceAccessibilityHelper
*helper,
gint delay, interval, time_to_max;
gint max_speed, curve;
-/* flush x and trap errors */
-gdk_flush ();
gdk_error_trap_push ();
/* allocate */
@@ -339,12 +337,11 @@ xfce_accessibility_helper_set_xkb
(XfceAccessibilityHelper *helper,
else
{
/* warning */
-g_error ("XkbAllocKeyboard() returned a null pointer");
+g_critical ("XkbAllocKeyboard() returned a null pointer");
}
-/* flush and remove the x error trap */
-gdk_flush ();
-gdk_error_trap_pop ();
+if (gdk_error_trap_pop () != 0)
+ g_critical ("Failed to set keyboard controls");
}
diff --git a/xfsettingsd/keyboards.c b/xfsettingsd/keyboards.c
index f29220d..f5c7edc 100644
--- a/xfsettingsd/keyboards.c
+++ b/xfsettingsd/keyboards.c
@@ -145,19 +145,15 @@ xfce_keyboards_helper_set_auto_repeat_mode
(XfceKeyboardsHelper *helper)
/* load setting */
repeat = xfconf_channel_get_bool (helper->channel, "/Default/KeyRepeat",
TRUE);
-/* flush x and trap errors */
-gdk_flush ();
-gdk_error_trap_push ();
-
/* set key repeat */
values.auto_repeat_mode = repeat ? 1 : 0;
+
+gdk_error_trap_push ();
XChangeKeyboardControl (GDK_DISPLAY (), KBAutoRepeatMode, &values);
+if (gdk_error_trap_pop () != 0)
+g_critical ("Failed to change keyboard repeat mode");
xfsettings_dbg (XFSD_DEBUG_KEYBOARDS, "set auto repeat %s", repeat ? "on"
: "off");
-
-/* flush and remove the x error trap */
-gdk_flush ();
-gdk_error_trap_pop ();
}
@@ -172,8 +168,6 @@ xfce_keyboards_helper_set_repeat_rate (XfceKeyboardsHelper
*helper)
delay = xfconf_channel_get_int (helper->channel,
"/Default/KeyRepeat/Delay", 500);
rate = xfconf_channel_get_int (helper->channel, "/Default/KeyRepeat/Rate",
20);
-/* flush x and trap errors */
-gdk_flush ();
gdk_error_trap_push ();
/* allocate xkb structure */
@@ -198,9 +192,8 @@ xfce_keyboards_helper_set_repeat_rate (XfceKeyboardsHelper
*helper)
XFree (xkb);
}
-/* flush and remove the x error trap */
-gdk_flush ();
-gdk_error_trap_pop ();
+if (gdk_error_trap_pop () != 0)
+g_critical ("Failed to change the keyboard repeat");
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Rework the pointers code a bit.
Updating branch refs/heads/nick/pointers
to f93df45646446c4e4945dbe89bb1ef7c48e0bc16 (commit)
from ae504fe5f2e94bf4e1b39c289afe9030dee8b23b (commit)
commit f93df45646446c4e4945dbe89bb1ef7c48e0bc16
Author: Nick Schermer
Date: Fri May 20 18:23:05 2011 +0200
Rework the pointers code a bit.
Make the code a bit more efficient, easier to understand
and prepare for device properties.
No functional changes.
xfsettingsd/pointers.c | 485 ++--
1 files changed, 267 insertions(+), 218 deletions(-)
diff --git a/xfsettingsd/pointers.c b/xfsettingsd/pointers.c
index 10ff9db..96edb6f 100644
--- a/xfsettingsd/pointers.c
+++ b/xfsettingsd/pointers.c
@@ -1,6 +1,5 @@
-/* $Id$ */
/*
- * Copyright (c) 2008 Nick Schermer
+ * Copyright (c) 2008-2011 Nick Schermer
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -59,24 +58,6 @@
-static void xfce_pointers_helper_change_button_mapping_swap
(guchar *buttonmap,
-
gshort num_buttons,
-
gint id_1,
-
gint id_2,
-
gboolean reverse);
-static void xfce_pointers_helper_change_button_mapping
(XDeviceInfo *device_info,
-
XDevice *device,
-
Display *xdisplay,
-
gint right_handed,
-
gint reverse_scrolling);
-static gint xfce_pointers_helper_gcd
(gint num,
-
gint denom);
-static void xfce_pointers_helper_change_feedback
(XDeviceInfo *device_info,
-
XDevice *device,
-
Display *xdisplay,
-
gint threshold,
-
gdouble acceleration);
-static gchar *xfce_pointers_helper_device_xfconf_name
(const gchar *name);
static void xfce_pointers_helper_restore_devices
(XfcePointersHelper *helper,
XID *xid);
static void xfce_pointers_helper_channel_property_changed
(XfconfChannel *channel,
@@ -162,43 +143,39 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
xfce_pointers_helper_restore_devices (helper, NULL);
/* monitor the channel */
-g_signal_connect (G_OBJECT (helper->channel), "property-changed",
G_CALLBACK (xfce_pointers_helper_channel_property_changed), NULL);
+g_signal_connect (G_OBJECT (helper->channel), "property-changed",
+ G_CALLBACK (xfce_pointers_helper_channel_property_changed), NULL);
#ifdef HAS_DEVICE_HOTPLUGGING
-/* flush x and trap errors */
-gdk_flush ();
-gdk_error_trap_push ();
-
-
-if (G_LIKELY (xdisplay))
+if (G_LIKELY (xdisplay != NULL))
{
/* monitor device changes */
+gdk_error_trap_push ();
DevicePresence (xdisplay, helper->device_presence_event_type,
event_class);
XSelectExtensionEvent (xdisplay, RootWindow (xdisplay,
DefaultScreen (xdisplay)), &event_class, 1);
/* add an event filter */
-gdk_window_add_filter (NULL, xfce_pointers_helper_event_filter,
helper);
+if (gdk_error_trap_pop () == 0)
+gdk_window_add_filter (NULL,
xfce_pointers_helper_event_filter, helper);
+else
+g_warning ("Failed to create device filter");
}
-
-/* flush and remove the x error trap */
-gdk_flush ();
-gdk_error_trap_pop ();
#endif
}
}
-static void
+static gboolean
xfce_pointers_helper_change_button_mapping_swap (guchar *buttonmap,
[Xfce4-commits] Deleting branch nick/pointers
Deleting branch refs/heads/nick/pointers ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating branch nick/pointers
Updating branch refs/heads/nick/pointers as new branch to 364e626ef69ff7f97d248195f45b0af73e676694 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/nick/pointers for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Initial Croatian (hr) translation
Updating branch refs/heads/master
to 2375e663dfcc190a4b27b250123e5b18c8a8613b (commit)
from 23fd52fce0e3d16faf60e9874ed540a77bd36b2d (commit)
commit 2375e663dfcc190a4b27b250123e5b18c8a8613b
Author: Ivica Kolić
Date: Sat May 21 17:37:40 2011 +0200
l10n: Initial Croatian (hr) translation
New status: 12 messages complete with 0 fuzzies and 4 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{ko.po => hr.po} | 46 +++---
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/po/ko.po b/po/hr.po
similarity index 73%
copy from po/ko.po
copy to po/hr.po
index ee83bd0..035570c 100644
--- a/po/ko.po
+++ b/po/hr.po
@@ -1,36 +1,37 @@
-# Korean translations for xfce4-modemlights-plugin package.
-# Copyright (C) 2005 Andreas J. Guelzow.
+# C roatian translation for xfce4-modemlights-plugin package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the
xfce4-modemlights-plugin package.
-# ByungHyun Choi , 2005.
+# Ivica Kolić , 2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: xfce4-modemlights-plugin 0.1.2\n"
+"Project-Id-Version: xfce4-modemlights-plugin\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-11-08 09:45+0100\n"
-"PO-Revision-Date: 2005-11-03 01:52+0900\n"
-"Last-Translator: ByungHyun Choi \n"
-"Language-Team: xfce4-users-kr-i18n \n"
+"PO-Revision-Date: 2011-05-21 17:37+0200\n"
+"Last-Translator: Ivica Kolić \n"
+"Language-Team: Croatian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
#: ../panel-plugin/panel-plugin.c:183 ../panel-plugin/panel-plugin.c:330
msgid "No connection"
-msgstr "연결되지 않았습니다."
+msgstr "Nema spajanja"
#: ../panel-plugin/panel-plugin.c:191
msgid "Connection Established"
-msgstr "연결"
+msgstr "Veza uspostavljena"
#: ../panel-plugin/panel-plugin.c:200
msgid "Dialing"
-msgstr "전화거는 중"
+msgstr "Biram"
#: ../panel-plugin/panel-plugin.c:517
msgid "Select lock file"
-msgstr "잠금 화일 선택"
+msgstr ""
#: ../panel-plugin/panel-plugin.c:555
msgid ""
@@ -47,7 +48,7 @@ msgstr ""
#: ../panel-plugin/panel-plugin.c:592
msgid "Lockfile:"
-msgstr "잠금 화일:"
+msgstr ""
#: ../panel-plugin/panel-plugin.c:604
msgid ""
@@ -62,38 +63,37 @@ msgstr ""
#: ../panel-plugin/panel-plugin.c:641
msgid "Select icon"
-msgstr "아이콘 선택"
+msgstr "Odaberite ikonu"
#: ../panel-plugin/panel-plugin.c:756
msgid "_Connection Command:"
-msgstr "연결 명령(_C):"
+msgstr "_Naredba spajanja"
#: ../panel-plugin/panel-plugin.c:764
msgid "_Disconnection Command:"
-msgstr "연결종료 명령(_D)"
+msgstr "_Naredba odspajanja"
#: ../panel-plugin/panel-plugin.c:772
msgid "De_vice:"
-msgstr "장치(_v):"
+msgstr "U_ređaj"
#: ../panel-plugin/panel-plugin.c:787
msgid "Icon (Disconnected):"
-msgstr "아이콘(연결 종료):"
+msgstr "Ikona (odspojeno):"
#: ../panel-plugin/panel-plugin.c:795
msgid "Icon (Connecting):"
-msgstr "아이콘(연결 중):"
+msgstr "Ikona (spajam):"
#: ../panel-plugin/panel-plugin.c:803
msgid "Icon (Connected):"
-msgstr "아이콘(연결 완료):"
+msgstr "Ikona (spojeno):"
#: ../panel-plugin/panel-plugin.c:813
#: ../panel-plugin/modemlights.desktop.in.in.h:1
-#, fuzzy
msgid "Modem Lights"
-msgstr "모뎀 LED"
+msgstr "Svjetla modema"
#: ../panel-plugin/modemlights.desktop.in.in.h:2
msgid "Simple PPP connections via modem"
-msgstr ""
+msgstr "Jednostavna PPP spajanja putem modema"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Initial Croatian (hr) translation
Updating branch refs/heads/master to ed77c55ddde255a4b1dc483d77f61590054ef895 (commit) from 2d880fc82e3ad1ead6eb175b90019ef295d9d400 (commit) commit ed77c55ddde255a4b1dc483d77f61590054ef895 Author: Ivica Kolić Date: Sat May 21 13:07:46 2011 +0200 l10n: Initial Croatian (hr) translation New status: 3 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/hr.po | 34 ++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/po/hr.po b/po/hr.po new file mode 100644 index 000..d2c5b0f --- /dev/null +++ b/po/hr.po @@ -0,0 +1,34 @@ +# Croatian translation for xfce4-indicator-plugin package. +# Copyright (C) 2009 Mark Trompell +# This file is distributed under the same license as the xfce4-indicator-plugin package. +# +# +msgid "" +msgstr "" +"Project-Id-Version: xfce-indicator-plugin\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-05-21 10:19+\n" +"PO-Revision-Date: 2011-05-21 13:02+0100\n" +"Last-Translator: Ivica Kolić \n" +"Language-Team: Croatian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Poedit-Language: Croatian\n" +"X-Poedit-Country: CROATIA\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: ../panel-plugin/indicator.c:120 +msgid "No Indicators" +msgstr "Nema indikatora" + +#: ../panel-plugin/indicator.desktop.in.in.h:1 +msgid "An indicator of something that needs your attention on the desktop" +msgstr "Indikator nečega što zahtjeva vašu pozornost na radnoj površini" + +#: ../panel-plugin/indicator.desktop.in.in.h:2 +msgid "Indicator Plugin" +msgstr "Priključak indikatora" + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to ca80a11af47862f6d5500a3c49f25a1086c3c886 (commit) from 58fbf59460d0ba0c2c757e9712498489c80541b8 (commit) commit ca80a11af47862f6d5500a3c49f25a1086c3c886 Author: Per Kongstad Date: Sat May 21 09:33:51 2011 +0200 l10n: Updated Danish (da) translation to 100% New status: 34 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/da.po b/po/da.po index a781f43..2bc57b9 100644 --- a/po/da.po +++ b/po/da.po @@ -75,7 +75,6 @@ msgid "Select command" msgstr "Vælg kommando" #: ../panel-plugin/xfce4-radio.c:1058 -#, fuzzy msgid "Radio" msgstr "Radio" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Danish (da) translation to 97%
Updating branch refs/heads/master to 58fbf59460d0ba0c2c757e9712498489c80541b8 (commit) from b30ef213972f9f3b44b512ba77da47f77d0a (commit) commit 58fbf59460d0ba0c2c757e9712498489c80541b8 Author: Per Kongstad Date: Sat May 21 09:33:33 2011 +0200 l10n: Updated Danish (da) translation to 97% New status: 33 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 218 +++-- 1 files changed, 139 insertions(+), 79 deletions(-) diff --git a/po/da.po b/po/da.po index 51cedc5..a781f43 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-radio-plugin 0.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-25 23:05+0100\n" +"POT-Creation-Date: 2011-05-21 03:11+0200\n" "PO-Revision-Date: 2009-08-22 17:38+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" @@ -15,141 +15,201 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../panel-plugin/xfce4-radio.c:226 +#: ../panel-plugin/radio.desktop.in.in.h:1 +msgid "Radio Plugin" +msgstr "Radio-udvidelsesmodul" + +#: ../panel-plugin/radio.desktop.in.in.h:2 +msgid "V4l radio plugin" +msgstr "V4l radio-udvidelsesmodul" + +#: ../panel-plugin/xfce4-radio.c:191 +#, c-format +msgid "Tuned to station %s" +msgstr "Indstillet til station %s" + +#: ../panel-plugin/xfce4-radio.c:196 +#, c-format +msgid "Tuned to %s MHz" +msgstr "Indstillet til %s MHz" + +#: ../panel-plugin/xfce4-radio.c:241 msgid "- off -" msgstr "- slukket -" -#: ../panel-plugin/xfce4-radio.c:311 +#: ../panel-plugin/xfce4-radio.c:248 +msgid "Radio is off" +msgstr "Radio er slukket" + +#: ../panel-plugin/xfce4-radio.c:321 msgid "Error opening radio device" msgstr "Fejl ved åbning af radioenhed" -#: ../panel-plugin/xfce4-radio.c:394 +#: ../panel-plugin/xfce4-radio.c:416 msgid "Tune radio" msgstr "Indstil radio" -#: ../panel-plugin/xfce4-radio.c:400 +#: ../panel-plugin/xfce4-radio.c:422 msgid "Frequency [MHz]:" msgstr "Frekvens [MHz]:" -#: ../panel-plugin/xfce4-radio.c:424 +#: ../panel-plugin/xfce4-radio.c:446 msgid "Illegal frequency." msgstr "Forbudt frekvens." -#: ../panel-plugin/xfce4-radio.c:481 -#: ../panel-plugin/xfce4-radio.c:1115 +#. Notebook tabs +#: ../panel-plugin/xfce4-radio.c:501 ../panel-plugin/xfce4-radio.c:1160 msgid "Presets" msgstr "Forvalg" -#: ../panel-plugin/xfce4-radio.c:513 +#: ../panel-plugin/xfce4-radio.c:533 msgid "Tune to frequency" msgstr "Indstil til frekvens" -#: ../panel-plugin/xfce4-radio.c:853 +#: ../panel-plugin/xfce4-radio.c:868 msgid "unnamed" msgstr "ikke navngivet" -#: ../panel-plugin/xfce4-radio.c:1019 -msgid "Properties" -msgstr "Egenskaber" +#: ../panel-plugin/xfce4-radio.c:1001 +msgid "Select command" +msgstr "Vælg kommando" -#: ../panel-plugin/xfce4-radio.c:1114 -msgid "Options" -msgstr "Indstillinger" +#: ../panel-plugin/xfce4-radio.c:1058 +#, fuzzy +msgid "Radio" +msgstr "Radio" -#. Device -#: ../panel-plugin/xfce4-radio.c:1133 -msgid "Device" -msgstr "Enhed" +#: ../panel-plugin/xfce4-radio.c:1067 +msgid "Configure the radio plugin" +msgstr "Indstil udvidelsesmodulet til radio" -#: ../panel-plugin/xfce4-radio.c:1149 -msgid "V4L device" -msgstr "V4L-enhed" +#: ../panel-plugin/xfce4-radio.c:1161 +msgid "User interface" +msgstr "Brugerflade" -#: ../panel-plugin/xfce4-radio.c:1166 -msgid "Synchronize state with the card" -msgstr "Synkronisér tilstand med kortet" +#: ../panel-plugin/xfce4-radio.c:1162 +msgid "Radio device" +msgstr "Radioenhed" -#: ../panel-plugin/xfce4-radio.c:1168 -msgid "yes" -msgstr "ja" +#: ../panel-plugin/xfce4-radio.c:1163 +msgid "Commands" +msgstr "Kommandoer" -#: ../panel-plugin/xfce4-radio.c:1186 -msgid "no" -msgstr "nej" +#. - Signal strength +#: ../panel-plugin/xfce4-radio.c:1185 +msgid "Signal strength" +msgstr "Signalstyrke" + +#: ../panel-plugin/xfce4-radio.c:1201 +msgid "Show the signal strength indicator" +msgstr "Vis signalstyrkeindikatoren" + +#: ../panel-plugin/xfce4-radio.c:1207 +msgid "Use graphics instead of text labels and progress bars" +msgstr "Vis grafik fremfor tekstmærkater og fremgangssøjler" + +#. - Current station +#: ../panel-plugin/xfce4-radio.c:1212 +msgid "Current station" +msgstr "Nuværende station" + +#: ../panel-plugin/xfce4-radio.c:1228 +msgid "Show the current station" +msgstr "Vis nuværende station" + +#: ../panel-plugin/xfce4-radio.c:1234 +msgid "Show preset names instead of frequencies" +msgstr "Vis forvalgte navne fremfor frekvenser" + +#. - Mouse +#: ../panel-plugin/xfce4-radio.c:1239 +msgid "Mouse interaction" +msgstr "Samspil med mus" # Fortekst til frekvens og forvalg -#: ../panel-plugin/xfce4-radio.c:1203 +#: ../panel-plugin/xfce4-radio.c:1255 msgid "Mouse scrolling changes" msgstr "Muserulning ændrer" -#: ../panel-plugin/xfce4-radio.c:1214 +#: ../panel-plugin/xfce4-radio.c:1275
[Xfce4-commits] l10n: Initial Croatian (hr) translation
Updating branch refs/heads/master
to 37b27c2f6be394cab983d987a155a80fd6f79213 (commit)
from 9c8513af9168ab8985102e19dc505d8d3f2d4528 (commit)
commit 37b27c2f6be394cab983d987a155a80fd6f79213
Author: Ivica Kolić
Date: Sat May 21 09:01:57 2011 +0200
l10n: Initial Croatian (hr) translation
New status: 36 messages complete with 0 fuzzies and 27 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{ar.po => hr.po} | 144 ---
1 files changed, 80 insertions(+), 64 deletions(-)
diff --git a/po/ar.po b/po/hr.po
similarity index 67%
copy from po/ar.po
copy to po/hr.po
index ca84b0a..0cd69a9 100644
--- a/po/ar.po
+++ b/po/hr.po
@@ -1,22 +1,24 @@
-# SOME DESCRIPTIVE TITLE.
+# Croazian translation of xconf package..
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
+# This file is distributed under the same license as the xconf package.
+# Ivica Kolić , 2011.
+#
msgid ""
msgstr ""
-"Project-Id-Version: xfconf\n"
+"Project-Id-Version: xconf\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-10 16:12+\n"
-"PO-Revision-Date: 2010-12-30 16:58-\n"
-"Last-Translator: كريم أولاد الشلحة \n"
-"Language-Team: Arabic \n"
+"POT-Creation-Date: 2011-05-21 04:13+\n"
+"PO-Revision-Date: 2011-05-21 08:59+0200\n"
+"Last-Translator: Ivica Kolić \n"
+"Language-Team: Croatian \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"X-Poedit-Language: Arabic\n"
-"X-Poedit-Country: MOROCCO\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Language: Croatian\n"
+"X-Poedit-Country: CROATIA\n"
+"X-Poedit-SourceCharset: utf-8\n"
#: ../xfconf/xfconf-cache.c:876
#, c-format
@@ -26,13 +28,13 @@ msgstr ""
#: ../xfconfd/xfconf-backend-perchannel-xml.c:277
#, c-format
msgid "Unable to create configuration directory \"%s\""
-msgstr "غير قادرعلى إنشاء دلبل التكوين \"%s\""
+msgstr "Nije moguće napraviti konfiguracijski direktorij \"%s\""
#: ../xfconfd/xfconf-backend-perchannel-xml.c:322
#: ../xfconfd/xfconf-daemon.c:238
#, c-format
msgid "Permission denied while modifying property \"%s\" on channel \"%s\""
-msgstr "صلاحيات غير كافية لتحرير الخصائص \"%s\" في القناة \"%s\""
+msgstr ""
#: ../xfconfd/xfconf-backend-perchannel-xml.c:387
#: ../xfconfd/xfconf-backend-perchannel-xml.c:469
@@ -40,17 +42,17 @@ msgstr "صلاحيات غير كافية لتحرير الخصائص \"%s\" في
#: ../xfconfd/xfconf-backend-perchannel-xml.c:654
#, c-format
msgid "Property \"%s\" does not exist on channel \"%s\""
-msgstr "خصائص \"%s\" لا توجد في القناة \"%s\""
+msgstr "Svojstvo \"%s\" ne postoji na kanalu \"%s\""
#: ../xfconfd/xfconf-backend-perchannel-xml.c:601
#, c-format
msgid "Unable to remove channel \"%s\": %s"
-msgstr "غير قادر على حذف القناة \"%s\": %s"
+msgstr "Nije moguće ukloniti kanal \"%s\": %s"
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1298
#, c-format
msgid "Invalid type for : \"%s\""
-msgstr "نوع فير موتوق لـ : \"%s\""
+msgstr "Neispravni tip za : \"%s\""
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1314
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1390
@@ -66,18 +68,18 @@ msgstr ""
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1379
#, c-format
msgid "Invalid type for : \"%s\""
-msgstr "نوع غير سليم <القيمة>: \"%s\""
+msgstr ""
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1655
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1904
#, c-format
msgid "Channel \"%s\" does not exist"
-msgstr "القنات \"%s\" غير موجودة"
+msgstr "Kanal \"%s\" ne postoji"
#: ../xfconfd/xfconf-backend-perchannel-xml.c:1962
#, c-format
msgid "Unable to write channel \"%s\": %s"
-msgstr "غير قادر غلى كتابة القنات \"%s\": %s"
+msgstr ""
#: ../xfconfd/xfconf-backend-factory.c:76
#, c-format
@@ -87,27 +89,31 @@ msgstr ""
#: ../xfconfd/xfconf-backend.c:103
#, c-format
msgid "Property names must start with a '/' character"
-msgstr ""
+msgstr "Imena svojstava moraju počinjati sa znakom '/'"
#: ../xfconfd/xfconf-backend.c:112
#, c-format
msgid "The root element ('/') is not a valid property name"
-msgstr ""
+msgstr "Korijenski element ('/') nije valjano ime svojstva"
#: ../xfconfd/xfconf-backend.c:126
#, c-format
-msgid "Property names can only include the ASCII characters A-Z, a-z, 0-9,
'_', '-', '<' and '>', as well as '/' as a separator"
+msgid ""
+"Property names can only include the ASCII characters A-Z, a-z, 0-9, '_', "
+"'-', '<' and '>', as well as '/' as a separator"
msgstr ""
+"Imena svojstava mogu sadržavati samo ASCII znakove A-Z, a-z, 0-9, '_', '-', "
+"'<' i '>'kao i '/' kao razdjelnik"
#: ../xfconfd/xfconf-backend.c:135
#, c-format
msgid "Property names cannot have two or more consecutive '/'
