[Xfce4-commits] l10n: Updates to Japanese (ja) translation

2009-10-02 Thread Transifex 
Updating branch refs/heads/master
 to 1c6871b75726f75ce3e81df72834c1966e3493e6 (commit)
   from 7b30e48becd6838269fd28a35886d852ac17388f (commit)

commit 1c6871b75726f75ce3e81df72834c1966e3493e6
Author: Masato Hashimoto 
Date:   Sat Oct 3 06:06:55 2009 +

l10n: Updates to Japanese (ja) translation

Transmitted-via: Transifex (translations.xfce.org)

 po/ja.po |9 -
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 406300d..2476796 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-clipman-plugin 0.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-30 17:49+0200\n"
-"PO-Revision-Date: 2009-07-04 22:32+0900\n"
+"POT-Creation-Date: 2009-10-03 15:04+0900\n"
+"PO-Revision-Date: 2009-10-03 15:02+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
@@ -151,9 +151,8 @@ msgstr ""
 "チェックマークをつけると、新しい Xfce 
セッション開始時に履歴が復元されます"
 
 #: ../panel-plugin/settings-dialog.glade.h:18
-#, fuzzy
 msgid "Ignore s_elections"
-msgstr "選択領域と同期をとる(_S)"
+msgstr "選択領域を無視する(_E)"
 
 #: ../panel-plugin/settings-dialog.glade.h:19
 msgid "Name:"
@@ -181,7 +180,7 @@ msgstr "選択領域と同期をとる(_S)"
 
 #: ../panel-plugin/settings-dialog.glade.h:25
 msgid "The pattern is always anchored within the special characters ^$"
-msgstr ""
+msgstr "パターンには常に特殊文字 ^$ が適用されます"
 
 #: ../panel-plugin/settings-dialog.glade.h:26
 msgid ""
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Japanese (ja) translation

2009-10-02 Thread Transifex 
Updating branch refs/heads/master
 to bfdff74842cd3526b1a8b9f328841477f595e0c1 (commit)
   from 6b7f3c147d2076f4dbfdfbe263d24b5dd4ce1a42 (commit)

commit bfdff74842cd3526b1a8b9f328841477f595e0c1
Author: Masato Hashimoto 
Date:   Sat Oct 3 06:04:19 2009 +

l10n: Updates to Japanese (ja) translation

Transmitted-via: Transifex (translations.xfce.org)

 po/ja.po |  196 ++
 1 files changed, 83 insertions(+), 113 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index 59ecccb..51b77da 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.18\n"
 "Report-Msgid-Bugs-To: xfce-i...@xfce.org\n"
-"POT-Creation-Date: 2009-09-27 23:47+0200\n"
-"PO-Revision-Date: 2009-08-17 21:41+0900\n"
+"POT-Creation-Date: 2009-10-03 14:39+0900\n"
+"PO-Revision-Date: 2009-10-03 14:39+0900\n"
 "Last-Translator: Masato Hashimoto \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
@@ -45,67 +45,59 @@ msgstr "ファイル(_F)"
 
 #: ../src/main_window.c:265
 msgid "_Open"
-msgstr ""
+msgstr "開く(_O)"
 
 #: ../src/main_window.c:265
-#, fuzzy
 msgid "Open an image"
-msgstr "画像を開く"
+msgstr "画像を開きます"
 
 #: ../src/main_window.c:266
-#, fuzzy
 msgid "Open _Folder"
-msgstr "フォルダを開く(_P)"
+msgstr "フォルダを開く(_F)"
 
 #: ../src/main_window.c:266
-#, fuzzy
 msgid "Open a folder"
-msgstr "フォルダを開く"
+msgstr "フォルダを開きます"
 
 #: ../src/main_window.c:267
 msgid "_Save copy"
-msgstr ""
+msgstr "コピーを保存(_S)"
 
 #: ../src/main_window.c:267
 msgid "Save a copy of the image"
-msgstr ""
+msgstr "画像のコピーを保存します。"
 
 #: ../src/main_window.c:268
 msgid "_Print"
-msgstr ""
+msgstr "印刷(_P)"
 
 #: ../src/main_window.c:268
 msgid "Print the image"
-msgstr ""
+msgstr "画像を印刷します。"
 
 #: ../src/main_window.c:269
-#, fuzzy
 msgid "_Close"
-msgstr "全て閉じる(_A)"
+msgstr "閉じる(_C)"
 
 #: ../src/main_window.c:269
 msgid "Close this image"
-msgstr ""
+msgstr "画像を閉じます。"
 
 #: ../src/main_window.c:270
-#, fuzzy
 msgid "_Close All"
 msgstr "全て閉じる(_A)"
 
 #: ../src/main_window.c:270
-#, fuzzy
 msgid "Close all images"
-msgstr "全て閉じる(_A)"
+msgstr "画像を全て閉じます"
 
 #: ../src/main_window.c:271
-#, fuzzy
 msgid "_Quit"
-msgstr "編集(_E)"
+msgstr "終了(_Q)"
 
 #: ../src/main_window.c:271
-#, fuzzy
 msgid "Quit Ristretto"
-msgstr "Ristretto"
+msgstr "Ristretto を終了します"
 
 #. Edit Menu
 #: ../src/main_window.c:273
@@ -113,23 +105,20 @@ msgid "_Edit"
 msgstr "編集(_E)"
 
 #: ../src/main_window.c:274
-#, fuzzy
 msgid "_Open with..."
-msgstr "アプリケーションで開く..."
+msgstr "アプリケーションで開く(_O)..."
 
 #: ../src/main_window.c:275
-#, fuzzy
 msgid "_Sorting"
-msgstr "拡大/縮小(_Z)"
+msgstr "並び替え(_S)"
 
 #: ../src/main_window.c:276
 msgid "_Delete"
-msgstr ""
+msgstr "削除(_D)"
 
 #: ../src/main_window.c:277
-#, fuzzy
 msgid "_Preferences"
-msgstr "画像ビューア設定"
+msgstr "設定(_P)"
 
 #. View Menu
 #: ../src/main_window.c:279
@@ -138,14 +127,13 @@ msgstr "表示(_V)"
 
 #: ../src/main_window.c:280
 msgid "_Fullscreen"
-msgstr ""
+msgstr "全画面化(_F)"
 
 #: ../src/main_window.c:281
 msgid "_Leave Fullscreen"
-msgstr ""
+msgstr "元に戻す(_L)"
 
 #: ../src/main_window.c:282
-#, fuzzy
 msgid "_Set as Wallpaper"
 msgstr "壁紙に設定(_S)"
 
@@ -155,25 +143,23 @@ msgid "_Zooming"
 msgstr "拡大/縮小(_Z)"
 
 #: ../src/main_window.c:285
-#, fuzzy
 msgid "Zoom _In"
-msgstr "拡大/縮小(_Z)"
+msgstr "拡大(_I)"
 
 #: ../src/main_window.c:286
 msgid "Zoom _Out"
-msgstr ""
+msgstr "縮小(_O)"
 
 #: ../src/main_window.c:287
 msgid "Zoom _Fit"
-msgstr ""
+msgstr "ウィンドウに合わせる(_F)"
 
 #: ../src/main_window.c:288
 msgid "_Normal Size"
-msgstr ""
+msgstr "標準サイズ(_N)"
 
 #. Rotation submenu
 #: ../src/main_window.c:290
-#, fuzzy
 msgid "_Rotation"
 msgstr "回転(_R)"
 
@@ -192,19 +178,19 @@ msgstr "移動(_G)"
 
 #: ../src/main_window.c:295
 msgid "_Forward"
-msgstr ""
+msgstr "進む(_F)"
 
 #: ../src/main_window.c:296
 msgid "_Back"
-msgstr ""
+msgstr "戻る(_B)"
 
 #: ../src/main_window.c:297
 msgid "_First"
-msgstr ""
+msgstr "先頭(_F)"
 
 #: ../src/main_window.c:298
 msgid "_Last"
-msgstr ""
+msgstr "最後(_L)"
 
 #. Help Menu
 #: ../src/main_window.c:300
@@ -213,92 +199,88 @@ msgstr "ヘルプ(_H)"
 
 #: ../src/main_window.c:302
 msgid "_Contents"
-msgstr ""
+msgstr "目次(_C)"
 
 #: ../src/main_window.c:304
 msgid "Display ristretto user manual"
-msgstr ""
+msgstr "Ristretto ユーザマニュアルを表示します。"
 
 #: ../src/main_window.c:307
 msgid "_About"
-msgstr ""
+msgstr "情報(_A)"
 
 #: ../src/main_window.c:309
 msgid "Display information about ristretto"
-msgstr ""
+msgstr "Ristretto についての情報を表示します。"
 
 #

[Xfce4-commits] Use MIDORI_NLSPATH instead of NLSPATH

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to ce5a959840fe78c97327a4ff5dd34eefc3a97406 (commit)
   from 93e846bf47e0664fd207036b9950b0c7e92129a5 (commit)

commit ce5a959840fe78c97327a4ff5dd34eefc3a97406
Author: Christian Dywan 
Date:   Sat Oct 3 02:27:51 2009 +0200

Use MIDORI_NLSPATH instead of NLSPATH

A small number of systems uses NLSPATH in a way that breaks
localization in Midori. It is unclear what the correct way is to
use NLSPATH, so we switch to using a prefixed variable.

 midori/main.c |4 ++--
 wscript   |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index dfe9489..60b6ad2 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1612,8 +1612,8 @@ main (intargc,
 
 #if ENABLE_NLS
 setlocale (LC_ALL, "");
-if (g_getenv ("NLSPATH"))
-bindtextdomain (GETTEXT_PACKAGE, g_getenv ("NLSPATH"));
+if (g_getenv ("MIDORI_NLSPATH"))
+bindtextdomain (GETTEXT_PACKAGE, g_getenv ("MIDORI_NLSPATH"));
 else
 #ifdef G_OS_WIN32
 {
diff --git a/wscript b/wscript
index 8c0df74..0019182 100644
--- a/wscript
+++ b/wscript
@@ -524,7 +524,7 @@ def shutdown ():
 pass
 try:
 ext = 'MIDORI_EXTENSION_PATH=' + relfolder + os.sep + 'extensions'
-nls = 'NLSPATH=' + relfolder + os.sep + 'po'
+nls = 'MIDORI_NLSPATH=' + relfolder + os.sep + 'po'
 lang = os.environ['LANG']
 try:
 for lang in os.listdir (folder + os.sep + 'po'):
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Display IDN hostnames decoded in address completion

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to 93e846bf47e0664fd207036b9950b0c7e92129a5 (commit)
   from a51b8f18dcac2ebcbf5ee7742b4551d3b54dbd7e (commit)

commit 93e846bf47e0664fd207036b9950b0c7e92129a5
Author: Christian Dywan 
Date:   Sat Oct 3 02:16:15 2009 +0200

Display IDN hostnames decoded in address completion

 midori/midori-locationaction.c |   10 +-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index ffda445..f19f0d9 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -619,6 +619,7 @@ midori_location_entry_render_text_cb (GtkCellLayout*   
layout,
   GtkTreeIter* iter,
   gpointer data)
 {
+gchar* uri_raw;
 gchar* uri;
 gchar* title;
 gchar* desc;
@@ -632,7 +633,14 @@ midori_location_entry_render_text_cb (GtkCellLayout*   
layout,
 gchar** parts;
 size_t len;
 
-gtk_tree_model_get (model, iter, URI_COL, &uri, TITLE_COL, &title, -1);
+gtk_tree_model_get (model, iter, URI_COL, &uri_raw, TITLE_COL, &title, -1);
+
+#if GLIB_CHECK_VERSION (2, 22, 0)
+uri = g_hostname_to_unicode (uri_raw);
+g_free (uri_raw);
+#else
+uri = uri_raw;
+#endif
 
 desc = desc_uri = desc_title = key = NULL;
 if (G_LIKELY (data))
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Fix a memory leak in the address completion match handling

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to a51b8f18dcac2ebcbf5ee7742b4551d3b54dbd7e (commit)
   from 2b493414d5b096c2f25009d9af471ba4b42177d1 (commit)

commit a51b8f18dcac2ebcbf5ee7742b4551d3b54dbd7e
Author: Christian Dywan 
Date:   Sat Oct 3 02:04:15 2009 +0200

Fix a memory leak in the address completion match handling

 midori/midori-locationaction.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 0270f9c..ffda445 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -733,10 +733,11 @@ midori_location_entry_completion_match_cb 
(GtkEntryCompletion* completion,
 temp = g_utf8_casefold (title, -1);
 match = (strstr (temp, key) != NULL);
 g_free (temp);
-g_free (title);
 }
 }
 
+g_free (title);
+
 return match;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Correct memory handling leading to corruption in adblock

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to 2b493414d5b096c2f25009d9af471ba4b42177d1 (commit)
   from ec810682999df35032d665b8010f846d841d8c6f (commit)

commit 2b493414d5b096c2f25009d9af471ba4b42177d1
Author: Christian Dywan 
Date:   Sat Oct 3 02:03:49 2009 +0200

Correct memory handling leading to corruption in adblock

 extensions/adblock.c |   11 ---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/extensions/adblock.c b/extensions/adblock.c
index 03e2a0b..9def25a 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -74,11 +74,12 @@ adblock_download_notify_status_cb (WebKitDownload* download,
gchar*  path)
 {
 pattern = adblock_parse_file (path);
+g_free (path);
 /* g_object_unref (download); */
 }
 
 static void
-adblock_reload_rules(MidoriExtension* extension)
+adblock_reload_rules (MidoriExtension* extension)
 {
 gchar** filters;
 gchar* folder;
@@ -114,8 +115,10 @@ adblock_reload_rules(MidoriExtension* extension)
 webkit_download_start (download);
 }
 else
+{
 pattern = adblock_parse_file (path);
-g_free (path);
+g_free (path);
+}
 g_free (filename);
 }
 g_strfreev (filters);
@@ -160,11 +163,13 @@ adblock_preferences_model_row_changed_cb (GtkTreeModel*   
 model,
 filters[i++] = filter;
 need_reload = TRUE;
 }
-g_free (filter);
+else
+g_free (filter);
 }
 while (gtk_tree_model_iter_next (model, iter));
 filters[length] = NULL;
 midori_extension_set_string_list (extension, "filters", filters, length);
+g_strfreev (filters);
 if (need_reload)
 adblock_reload_rules (extension);
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Provide default adblock config with easylist

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to ec810682999df35032d665b8010f846d841d8c6f (commit)
   from 18ab34bdc82aa1890f7924c3ab9422739f7ddb3b (commit)

commit ec810682999df35032d665b8010f846d841d8c6f
Author: Christian Dywan 
Date:   Fri Oct 2 23:13:47 2009 +0200

Provide default adblock config with easylist

 data/extensions/adblock/config |2 ++
 wscript|   10 ++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/data/extensions/adblock/config b/data/extensions/adblock/config
new file mode 100644
index 000..8b1daa5
--- /dev/null
+++ b/data/extensions/adblock/config
@@ -0,0 +1,2 @@
+[settings]
+filters=http://adblockplus.mozdev.org/easylist/easylist.txt
diff --git a/wscript b/wscript
index de8d813..8c0df74 100644
--- a/wscript
+++ b/wscript
@@ -454,6 +454,16 @@ def build (bld):
 bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 
'data/speeddial.json')
 bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/mootools.js')
 
+# FIXME: Determine the library naming for other platforms
+if Options.platform == 'linux':
+extensions = os.listdir ('data/extensions')
+for extension in extensions:
+folder = 'lib' + extension + '.so'
+source = 'data/extensions/' + extension +  '/config'
+if os.path.exists (source):
+bld.install_files ('${SYSCONFDIR}/' + APPNAME + \
+   '/extensions/' + folder, source)
+
 if Options.commands['check']:
 bld.add_subdirs ('tests')
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Load extension settings from global config folders

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to 18ab34bdc82aa1890f7924c3ab9422739f7ddb3b (commit)
   from 255018aeaa498e0c0e787c4da932c57c789b54d7 (commit)

commit 18ab34bdc82aa1890f7924c3ab9422739f7ddb3b
Author: Christian Dywan 
Date:   Fri Oct 2 23:07:36 2009 +0200

Load extension settings from global config folders

For example, /etc/xdg/midori/extensions/extension_name/config

 midori/main.c |6 +++---
 midori/midori-extension.c |   12 +++-
 midori/sokoke.c   |   11 ---
 midori/sokoke.h   |3 ++-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 738e7f9..dfe9489 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -94,7 +94,7 @@ settings_new_from_file (const gchar* filename,
 {
 if (error->code == G_FILE_ERROR_NOENT)
 {
-gchar* config_file = sokoke_find_config_filename ("config");
+gchar* config_file = sokoke_find_config_filename (NULL, "config");
 g_key_file_load_from_file (key_file, config_file,
G_KEY_FILE_KEEP_COMMENTS, NULL);
 }
@@ -1818,7 +1818,7 @@ main (intargc,
 search_engines = search_engines_new_from_file (config_file, NULL);
 #else
 katze_assign (config_file,
-sokoke_find_config_filename ("search"));
+sokoke_find_config_filename (NULL, "search"));
 search_engines = search_engines_new_from_file (config_file, NULL);
 #endif
 }
@@ -1839,7 +1839,7 @@ main (intargc,
 if (error->code == G_FILE_ERROR_NOENT)
 {
 katze_assign (config_file,
-sokoke_find_config_filename ("bookmarks.xbel"));
+sokoke_find_config_filename (NULL, "bookmarks.xbel"));
 midori_array_from_file (bookmarks, config_file, "xbel", NULL);
 }
 else
diff --git a/midori/midori-extension.c b/midori/midori-extension.c
index ece419f..27ab9df 100644
--- a/midori/midori-extension.c
+++ b/midori/midori-extension.c
@@ -272,11 +272,21 @@ midori_extension_activate_cb (MidoriExtension* extension,
 if (!g_key_file_load_from_file (extension->priv->key_file, config_file,
 G_KEY_FILE_KEEP_COMMENTS, &error))
 {
-if (error->code != G_FILE_ERROR_NOENT)
+if (error->code == G_FILE_ERROR_NOENT)
+{
+gchar* filename = g_object_get_data (G_OBJECT (extension), 
"filename");
+gchar* folder = g_strconcat ("extensions/", filename, NULL);
+katze_assign (config_file,
+sokoke_find_config_filename (folder, "config"));
+g_key_file_load_from_file (extension->priv->key_file, 
config_file,
+   G_KEY_FILE_KEEP_COMMENTS, NULL);
+}
+else
 printf (_("The configuration of the extension '%s' couldn't be 
loaded: %s\n"),
 extension->priv->name, error->message);
 g_error_free (error);
 }
+g_free (config_file);
 }
 
 while (lsettings)
diff --git a/midori/sokoke.c b/midori/sokoke.c
index bc16970..35b95d5 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -963,6 +963,7 @@ sokoke_remove_path (const gchar* path,
 
 /**
  * sokoke_find_config_filename:
+ * @folder: a subfolder
  * @filename: a filename or relative path
  *
  * Looks for the specified filename in the system config
@@ -971,20 +972,24 @@ sokoke_remove_path (const gchar* path,
  * Return value: a full path
  **/
 gchar*
-sokoke_find_config_filename (const gchar* filename)
+sokoke_find_config_filename (const gchar* folder,
+ const gchar* filename)
 {
 const gchar* const* config_dirs = g_get_system_config_dirs ();
 guint i = 0;
 const gchar* config_dir;
 
+if (!folder)
+folder = "";
+
 while ((config_dir = config_dirs[i++]))
 {
-gchar* path = g_build_filename (config_dir, PACKAGE_NAME, filename, 
NULL);
+gchar* path = g_build_filename (config_dir, PACKAGE_NAME, folder, 
filename, NULL);
 if (g_file_test (path, G_FILE_TEST_EXISTS))
 return path;
 g_free (path);
 }
-return g_build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, filename, NULL);
+return g_build_filename (SYSCONFDIR, "xdg", PACKAGE_NAME, folder, 
filename, NULL);
 }
 
 /**
diff --git a/midori/sokoke.h b/midori/sokoke.h
index 9deee90..e2dbb21 100644
--- a/midori/sokoke.h
+++ b/midori/sokoke.h
@@ -152,7 +152,8 @@ sokoke_remove_path  (const gchar*
path,
  gbooleanignore_errors);
 
 gchar*
-sokoke_find_config_filename (const gchar*filename);
+sokoke_find_config_filename (const gchar*folder,
+ const gchar*filename);
 
 gchar*

[Xfce4-commits] Do not add history items for URIs that were visited on the same day

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to 255018aeaa498e0c0e787c4da932c57c789b54d7 (commit)
   from 41385a9e5ee638777fdb0a23610c4ca9aabef76a (commit)

commit 255018aeaa498e0c0e787c4da932c57c789b54d7
Author: Christian Dywan 
Date:   Fri Oct 2 21:29:08 2009 +0200

Do not add history items for URIs that were visited on the same day

 midori/midori-browser.c |   25 ++---
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index d1ef4ff..346e055 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -160,7 +160,7 @@ midori_browser_get_property (GObject*object,
 
 static void
 midori_browser_new_history_item (MidoriBrowser* browser,
- KatzeItem* item);
+ KatzeItem**item);
 
 static void
 _midori_browser_set_toolbar_style (MidoriBrowser* browser,
@@ -559,7 +559,8 @@ midori_view_notify_title_cb (GtkWidget* widget,
 else
 {
 katze_object_assign (item, katze_item_copy (proxy));
-midori_browser_new_history_item (browser, g_object_ref (item));
+midori_browser_new_history_item (browser, &item);
+g_object_ref (item);
 g_object_set_data_full (G_OBJECT (view), "history-item-added",
 item, (GDestroyNotify)g_object_unref);
 }
@@ -4878,31 +4879,33 @@ midori_browser_entry_clear_icon_released_cb 
(GtkIconEntry* entry,
 
 static void
 midori_browser_new_history_item (MidoriBrowser* browser,
- KatzeItem* item)
+ KatzeItem**item)
 {
 KatzeArray* parent;
 gint i;
 gboolean found;
 time_t now;
 gint64 day;
-gint64 pday;
-gint64 newage;
 gchar token[50];
 
 now = time (NULL);
-katze_item_set_added (item, now);
+katze_item_set_added (*item, now);
 day = sokoke_time_t_to_julian (&now);
 
 found = FALSE;
 i = 0;
 while ((parent = katze_array_get_nth_item (browser->history, i++)))
 {
-pday = katze_item_get_added (KATZE_ITEM (parent));
-newage = day - pday;
-if (newage == 0)
+gint64 pday = katze_item_get_added (KATZE_ITEM (parent));
+if (day - pday == 0)
 {
+KatzeItem* _item;
+
 found = TRUE;
-katze_array_add_item (parent, item);
+if ((_item = katze_array_find_uri (parent, katze_item_get_uri 
(*item
+*item = g_object_ref (_item);
+else
+katze_array_add_item (parent, *item);
 }
 }
 if (!found)
@@ -4912,7 +4915,7 @@ midori_browser_new_history_item (MidoriBrowser* browser,
 katze_item_set_added (KATZE_ITEM (parent), day);
 katze_item_set_name (KATZE_ITEM (parent), token);
 katze_array_add_item (browser->history, parent);
-katze_array_add_item (parent, item);
+katze_array_add_item (parent, *item);
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Implement katze_array_find_uri for finding duplicates

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to 41385a9e5ee638777fdb0a23610c4ca9aabef76a (commit)
   from a6ee2320e85fe9b34aa076dc14f52a8258fcc873 (commit)

commit 41385a9e5ee638777fdb0a23610c4ca9aabef76a
Author: Christian Dywan 
Date:   Fri Oct 2 21:27:31 2009 +0200

Implement katze_array_find_uri for finding duplicates

 katze/katze-array.c |   45 -
 katze/katze-array.h |4 
 2 files changed, 48 insertions(+), 1 deletions(-)

diff --git a/katze/katze-array.c b/katze/katze-array.c
index 5df9291..93a3f56 100644
--- a/katze/katze-array.c
+++ b/katze/katze-array.c
@@ -375,7 +375,11 @@ katze_array_find_token (KatzeArray*  array,
 i = 0;
 while ((item = g_list_nth_data (array->items, i++)))
 {
-const gchar* found_token = katze_item_get_token ((KatzeItem*)item);
+const gchar* found_token;
+
+if (!KATZE_IS_ITEM (item))
+continue;
+found_token = ((KatzeItem*)item)->token;
 if (!g_strcmp0 (found_token, token))
 return item;
 }
@@ -383,6 +387,45 @@ katze_array_find_token (KatzeArray*  array,
 }
 
 /**
+ * katze_array_find_uri:
+ * @array: a #KatzeArray
+ * @uri: an URI
+ *
+ * Looks up an item in the array which has the specified URI.
+ *
+ * This function will silently fail if the type of the list
+ * is not based on #GObject and only #KatzeItem children
+ * are checked for their token, any other objects are skipped.
+ *
+ * Return value: an item, or %NULL
+ *
+ * Since: 0.2.0
+ **/
+gpointer
+katze_array_find_uri (KatzeArray*  array,
+  const gchar* uri)
+{
+guint i;
+gpointer item;
+
+if (!katze_array_is_a (array, G_TYPE_OBJECT))
+return NULL;
+
+i = 0;
+while ((item = g_list_nth_data (array->items, i++)))
+{
+const gchar* found_uri;
+
+if (!KATZE_IS_ITEM (item))
+continue;
+found_uri = ((KatzeItem*)item)->uri;
+if (!g_strcmp0 (found_uri, uri))
+return item;
+}
+return NULL;
+}
+
+/**
  * katze_array_get_length:
  * @array: a #KatzeArray
  *
diff --git a/katze/katze-array.h b/katze/katze-array.h
index 89bfea9..af3370d 100644
--- a/katze/katze-array.h
+++ b/katze/katze-array.h
@@ -65,6 +65,10 @@ gpointer
 katze_array_find_token (KatzeArray*   array,
 const gchar*  token);
 
+gpointer
+katze_array_find_uri   (KatzeArray*   array,
+const gchar*  uri);
+
 guint
 katze_array_get_length (KatzeArray*   array);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Add Copy to the refactored context menu

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to a6ee2320e85fe9b34aa076dc14f52a8258fcc873 (commit)
   from e4b09739fa2cc9dbba3bcb5cb4d67af4d1caaf4d (commit)

commit a6ee2320e85fe9b34aa076dc14f52a8258fcc873
Author: Christian Dywan 
Date:   Thu Oct 1 23:56:05 2009 +0200

Add Copy to the refactored context menu

 midori/midori-view.c |   16 
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 109769f..35bcb69 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1449,6 +1449,18 @@ midori_web_view_menu_search_web_activate_cb (GtkWidget*  
widget,
 g_free (uri);
 }
 
+#if WEBKIT_CHECK_VERSION (1, 1, 15)
+static void
+midori_web_view_menu_copy_activate_cb (GtkWidget*  widget,
+   MidoriView* view)
+{
+GdkDisplay* display = gtk_widget_get_display (widget);
+GtkClipboard* clipboard = gtk_clipboard_get_for_display (display,
+GDK_SELECTION_CLIPBOARD);
+gtk_clipboard_set_text (clipboard, view->selected_text, -1);
+}
+#endif
+
 #if !WEBKIT_CHECK_VERSION (1, 1, 3)
 static void
 midori_web_view_menu_save_as_activate_cb (GtkWidget*  widget,
@@ -1758,6 +1770,10 @@ webkit_web_view_populate_popup_cb (WebKitWebView* 
web_view,
 midori_view_insert_menu_item (menu_shell, 0,
 _("_Search the Web"), GTK_STOCK_FIND,
 G_CALLBACK (midori_web_view_menu_search_web_activate_cb), widget);
+gtk_menu_shell_append (menu_shell, gtk_separator_menu_item_new ());
+midori_view_insert_menu_item (menu_shell, -1,
+NULL, GTK_STOCK_COPY,
+G_CALLBACK (midori_web_view_menu_copy_activate_cb), widget);
 #else
 items = gtk_container_get_children (GTK_CONTAINER (menu));
 menuitem = (GtkWidget*)g_list_nth_data (items, 0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] Don't use gtk_action_get_tooltip since it is GTK+ 2.16 only

2009-10-02 Thread Christian Dywan 
Updating branch refs/heads/master
 to e4b09739fa2cc9dbba3bcb5cb4d67af4d1caaf4d (commit)
   from 2d1481699ad7c97171cd31ff95b2a781e8fd9876 (commit)

commit e4b09739fa2cc9dbba3bcb5cb4d67af4d1caaf4d
Author: Christian Dywan 
Date:   Thu Oct 1 23:19:01 2009 +0200

Don't use gtk_action_get_tooltip since it is GTK+ 2.16 only

 midori/midori-browser.c |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 1cbcabb..d1ef4ff 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2524,15 +2524,16 @@ midori_browser_menu_item_select_cb (GtkWidget* 
menuitem,
 MidoriBrowser* browser)
 {
 GtkAction* action = gtk_widget_get_action (menuitem);
-const gchar* tooltip = action ? gtk_action_get_tooltip (action) : NULL;
+gchar* tooltip = action ? katze_object_get_string (action, "tooltip") : 
NULL;
 if (!tooltip)
 {
 /* This is undocumented object data, used by KatzeArrayAction. */
 KatzeItem* item = g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
 if (item)
-tooltip = katze_item_get_uri (item);
+tooltip = g_strdup (katze_item_get_uri (item));
 }
 _midori_browser_set_statusbar_text (browser, tooltip);
+g_free (tooltip);
 }
 
 static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Translation of libxfce4util to Russian.

2009-10-02 Thread Transifex 
Updating branch refs/heads/master
 to c5e460d2aed6c5e721e39ac2ef0bf3138e58a39b (commit)
   from f10b78811b9fe8ee0738697c090496b0814ab195 (commit)

commit c5e460d2aed6c5e721e39ac2ef0bf3138e58a39b
Author: Denis Koryavov 
Date:   Fri Oct 2 10:32:28 2009 +

l10n: Translation of libxfce4util to Russian.

Transmitted-via: Transifex (translations.xfce.org)

 po/ru.po |  144 ++
 1 files changed, 144 insertions(+), 0 deletions(-)

diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 000..3ffbeeb
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,144 @@
+# Translation of libxfce4util to Russian.
+# Copyright (C) 2003-2009 Xfce Development Team.
+# This file is distributed under the same license as the libxfce4util package.
+# Denis Koryavov , 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libxfce4util 4.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-24 10:40+0100\n"
+"PO-Revision-Date: 2009-10-02 10:40+0400\n"
+"Last-Translator: Denis Koryavov \n"
+"Language-Team: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: libxfce4util/xfce-fileutils.c:153
+#, c-format
+msgid "Error creating directory '%s': %s"
+msgstr "Ошибка создания каталога '%s': %s"
+
+#: libxfce4util/xfce-license.c:33
+msgid ""
+" Redistribution and use in source and binary forms, with or without\n"
+" modification, are permitted provided that the following conditions\n"
+" are met:\n"
+"\n"
+" 1. Redistributions of source code must retain the above copyright\n"
+"notice, this list of conditions and the following disclaimer.\n"
+" 2. Redistributions in binary form must reproduce the above copyright\n"
+"notice, this list of conditions and the following disclaimer in the\n"
+"documentation and/or other materials provided with the distribution.\n"
+"\n"
+" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n"
+" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n"
+" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n"
+" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n"
+" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n"
+" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
+" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
+" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
+" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n"
+" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
+msgstr ""
+" Разрешается повторное распространение и 
использование как в виде исходного\n"
+" кода, так и в двоичной форме, с 
изменениями или без, при соблюдении\n"
+" следующих условий:\n"
+"\n"
+"1. При повторном распространении 
исходного кода должно оставаться\n"
+"   указанное выше уведомление об 
авторском праве, этот список условий и\n"
+"   последующий отказ от гарантий.\n"
+"2. При повторном распространении 
двоичного кода должна сохраняться\n"
+"   указанная выше информация об 
авторском праве, этот список условий и\n"
+"   последующий отказ от гарантий в 
документации и/или в других\n"
+"   материалах, поставляемых при 
распространении.\n"
+"\n"
+" ЭТА ПРОГРАММА ПРЕДОСТАВЛЕНА ВЛАДЕЛЬЦАМИ 
АВТОРСКИХ ПРАВ И/ИЛИ ДРУГИМИ\n"
+" СТОРОНАМИ 'КАК ОНА ЕСТЬ' БЕЗ КАКОГО-ЛИБО 
ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО\n"
+" ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, НО НЕ 
ОГРАНИЧИВАЯСЬ ИМИ, ПОДРАЗУМЕВАЕМЫЕ\n"
+" ГАРАНТИИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И 
ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. НИ В\n"
+" КОЕМ СЛУЧАЕ, ЕСЛИ НЕ ТРЕБУЕТСЯ 
СООТВЕТСТВУЮЩИМ ЗАКОНОМ, ИЛИ НЕ 
УСТАНОВЛЕНО\n"
+" В УСТНОЙ ФОРМЕ, НИ ОДИН ВЛАДЕЛЕЦ 
АВТОРСКИХ ПРАВ И НИ ОДНО  ДРУГОЕ ЛИЦО,\n"
+" КОТОРОЕ МОЖЕТ ИЗМЕНЯТЬ И/ИЛИ ПОВТОРНО 
РАСПРОСТРАНЯТЬ ПРОГРАММУ, КАК БЫЛО\n"
+" СКАЗАНО ВЫШЕ, НЕ НЕСЁТ ОТВЕТСТВЕННОСТИ, 
ВКЛЮЧАЯ ЛЮБЫЕ ОБЩИЕ, СЛУЧАЙНЫЕ,\n"
+"

[Xfce4-commits] l10n: Russian translation of libxfce4util

2009-10-02 Thread Transifex 
Updating branch refs/heads/xfce-4.6
 to 83be67148464777a8a1ab04e1f475a69600bfea0 (commit)
   from b48ac8bad1754538e7ba0de8db814de7444c4e39 (commit)

commit 83be67148464777a8a1ab04e1f475a69600bfea0
Author: Denis Koryavov 
Date:   Fri Oct 2 10:30:06 2009 +

l10n: Russian translation of libxfce4util

Transmitted-via: Transifex (translations.xfce.org)

 po/ru.po |  144 ++
 1 files changed, 144 insertions(+), 0 deletions(-)

diff --git a/po/ru.po b/po/ru.po
new file mode 100644
index 000..3ffbeeb
--- /dev/null
+++ b/po/ru.po
@@ -0,0 +1,144 @@
+# Translation of libxfce4util to Russian.
+# Copyright (C) 2003-2009 Xfce Development Team.
+# This file is distributed under the same license as the libxfce4util package.
+# Denis Koryavov , 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libxfce4util 4.6\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-24 10:40+0100\n"
+"PO-Revision-Date: 2009-10-02 10:40+0400\n"
+"Last-Translator: Denis Koryavov \n"
+"Language-Team: Russian\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: libxfce4util/xfce-fileutils.c:153
+#, c-format
+msgid "Error creating directory '%s': %s"
+msgstr "Ошибка создания каталога '%s': %s"
+
+#: libxfce4util/xfce-license.c:33
+msgid ""
+" Redistribution and use in source and binary forms, with or without\n"
+" modification, are permitted provided that the following conditions\n"
+" are met:\n"
+"\n"
+" 1. Redistributions of source code must retain the above copyright\n"
+"notice, this list of conditions and the following disclaimer.\n"
+" 2. Redistributions in binary form must reproduce the above copyright\n"
+"notice, this list of conditions and the following disclaimer in the\n"
+"documentation and/or other materials provided with the distribution.\n"
+"\n"
+" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR\n"
+" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES\n"
+" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n"
+" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,\n"
+" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n"
+" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n"
+" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n"
+" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n"
+" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF\n"
+" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
+msgstr ""
+" Разрешается повторное распространение и 
использование как в виде исходного\n"
+" кода, так и в двоичной форме, с 
изменениями или без, при соблюдении\n"
+" следующих условий:\n"
+"\n"
+"1. При повторном распространении 
исходного кода должно оставаться\n"
+"   указанное выше уведомление об 
авторском праве, этот список условий и\n"
+"   последующий отказ от гарантий.\n"
+"2. При повторном распространении 
двоичного кода должна сохраняться\n"
+"   указанная выше информация об 
авторском праве, этот список условий и\n"
+"   последующий отказ от гарантий в 
документации и/или в других\n"
+"   материалах, поставляемых при 
распространении.\n"
+"\n"
+" ЭТА ПРОГРАММА ПРЕДОСТАВЛЕНА ВЛАДЕЛЬЦАМИ 
АВТОРСКИХ ПРАВ И/ИЛИ ДРУГИМИ\n"
+" СТОРОНАМИ 'КАК ОНА ЕСТЬ' БЕЗ КАКОГО-ЛИБО 
ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО\n"
+" ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, НО НЕ 
ОГРАНИЧИВАЯСЬ ИМИ, ПОДРАЗУМЕВАЕМЫЕ\n"
+" ГАРАНТИИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И 
ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. НИ В\n"
+" КОЕМ СЛУЧАЕ, ЕСЛИ НЕ ТРЕБУЕТСЯ 
СООТВЕТСТВУЮЩИМ ЗАКОНОМ, ИЛИ НЕ 
УСТАНОВЛЕНО\n"
+" В УСТНОЙ ФОРМЕ, НИ ОДИН ВЛАДЕЛЕЦ 
АВТОРСКИХ ПРАВ И НИ ОДНО  ДРУГОЕ ЛИЦО,\n"
+" КОТОРОЕ МОЖЕТ ИЗМЕНЯТЬ И/ИЛИ ПОВТОРНО 
РАСПРОСТРАНЯТЬ ПРОГРАММУ, КАК БЫЛО\n"
+" СКАЗАНО ВЫШЕ, НЕ НЕСЁТ ОТВЕТСТВЕННОСТИ, 
ВКЛЮЧАЯ ЛЮБЫЕ ОБЩИЕ, СЛУЧАЙНЫЕ,\n"
+" Ð

[Xfce4-commits] l10n: Added Latvian translation

2009-10-02 Thread Transifex 
Updating branch refs/heads/master
 to 9391c2fdf42099e17d341336700f92579d39b76b (commit)
   from cc216955a0558b8fbf693dfc0b17d136e7d26012 (commit)

commit 9391c2fdf42099e17d341336700f92579d39b76b
Author: Rihards Prieditis 
Date:   Fri Oct 2 10:22:44 2009 +

l10n: Added Latvian translation

Transmitted-via: Transifex (translations.xfce.org)

 po/{pt.po => lv.po} |  261 +--
 1 files changed, 130 insertions(+), 131 deletions(-)

diff --git a/po/pt.po b/po/lv.po
similarity index 62%
copy from po/pt.po
copy to po/lv.po
index f23b05a..62659c6 100644
--- a/po/pt.po
+++ b/po/lv.po
@@ -1,48 +1,50 @@
-# Portuguese translations for gigolo package.
-# Copyright (C) 2009 THE gigolo'S COPYRIGHT HOLDER
+# Copyright (C) 2009 gigolo
 # This file is distributed under the same license as the gigolo package.
-# Nuno Miguel , 2009.
 #
+# RÅ«dolfs Mazurs, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gigolo 0.3.2\n"
+"Project-Id-Version: gigolo\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-04-18 16:27+0200\n"
-"PO-Revision-Date: 2009-08-28 17:42+0100\n"
-"Last-Translator: \n"
-"Language-Team: \n"
+"PO-Revision-Date: 2009-10-02 11:20-\n"
+"Last-Translator: Rihards Priedītis \n"
+"Language-Team: Latviešu \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 
2);\n"
+"X-Poedit-Language: Latvian\n"
+"X-Poedit-Country: Latvia\n"
+"X-Generator: Lokalize 1.0\n"
 
 #: ../src/main.c:46
 msgid "Ignore running instances, enforce opening a new instance"
-msgstr "Ignorar instâncias em execução, forçar a abertura de nova 
instância"
+msgstr "Ignorēt jau palaistās instances, uzspiest atvērt jaunu instanci"
 
 #: ../src/main.c:47
 msgid "Print a list of supported URI schemes"
-msgstr "Mostrar uma lista de esquemas URI suportados"
+msgstr "Izdrukāt sarakstu ar atbalstītajām URI shēmām"
 
 #: ../src/main.c:48
 msgid "Be verbose"
-msgstr "Mostrar detalhes"
+msgstr "Būt detalizētam"
 
 #: ../src/main.c:49
 msgid "Show version information"
-msgstr "Mostrar informação de versão"
+msgstr "Rādīt versijas informāciju"
 
 #: ../src/main.c:80
 msgid "- a simple frontend to easily connect to remote filesystems"
-msgstr "- uma interface simples para ligar facilmente a sistemas de ficheiros 
remotos"
+msgstr "- vienkāršs priekšgals lai viegli pieslēgtos attālinātām failu 
sistēmām"
 
 #: ../src/common.c:73
 msgid "Unix Device"
-msgstr "Dispositivo Unix"
+msgstr "Unix iekārta"
 
 #: ../src/common.c:75
 msgid "Windows Share"
-msgstr "Partilha Windows"
+msgstr "Windows koplietotā mape"
 
 #: ../src/common.c:77
 msgid "FTP"
@@ -66,37 +68,37 @@ msgstr "WebDAV"
 
 #: ../src/common.c:87
 msgid "WebDAV (secure)"
-msgstr "WebDAV (seguro)"
+msgstr "WebDAV (drošs)"
 
 #: ../src/common.c:89
 msgid "Network"
-msgstr "Rede"
+msgstr "TÄ«kls"
 
 #: ../src/common.c:91
 msgid "Custom Location"
-msgstr "Localização personalizada"
+msgstr "Pielāgota vieta"
 
 #: ../src/window.c:275
 #, c-format
 msgid "Connecting to \"%s\""
-msgstr "A ligar a \"%s\""
+msgstr "Pieslēdzas \"%s\""
 
 #: ../src/window.c:443
 #: ../gigolo.desktop.in.h:1
 msgid "A simple frontend to easily connect to remote filesystems"
-msgstr "Uma interface simples para ligar facilmente a sistemas de ficheiros 
remotos"
+msgstr "Vienkāršs priekšgals, lai viegli pieslēgtos attālinātām failu 
sistēmām"
 
 #: ../src/window.c:444
 msgid "Copyright 2008-2009 Enrico Tröger"
-msgstr "Copyright 2008-2009 Enrico Tröger"
+msgstr "Autortiesības 2008-2009 Enrico Tröger"
 
 #: ../src/window.c:447
 msgid "translator-credits"
-msgstr "Nuno Miguel "
+msgstr "RÅ«dolfs Mazurs, Rihards Prieditis"
 
 #: ../src/window.c:479
 msgid "Gigolo can use the following protocols provided by GVfs:"
-msgstr "O Gigolo pode utilizar os seguintes protocolos oferecidos pelo GVfs:"
+msgstr "Gigolo var izmantot sekojošos GVfs atbalstītos protokolus:"
 
 #: ../src/window.c:708
 #: ../src/bookmarkeditdialog.c:189
@@ -105,107 +107,107 @@ msgstr "O Gigolo pode utilizar os seguintes protocolos 
oferecidos pelo GVfs:"
 #: ../src/bookmarkeditdialog.c:232
 #: ../src/bookmarkeditdialog.c:243
 msgid "Error"
-msgstr "Erro"
+msgstr "Kļūda"
 
 #: ../src/window.c:1180
 msgid "_File"
-msgstr "_Ficheiro"
+msgstr "_Fails"
 
 #: ../src/window.c:1181
 msgid "_Edit"
-msgstr "_Editar"
+msgstr "_Rediģēt"
 
 #: ../src/window.c:1182
 msgid "_Actions"
-msgstr "A_cções"
+msgstr "_Darbības"
 
 #: ../src/window.c:1183
 msgid "_View"
-msgstr "_Ver"
+msgstr "_Skats"
 
 #: ../src/window.c:1184
 msgid "_Help"
-msgstr "_Ajuda"
+msgstr "_Palīdzība"
 
 #: ../src/window.c:1188
 #: ../src/browsenetworkpanel.c:439
 #: ../src/browsenetworkpanel.c:481
 msgid "Create _Bookmark"
-msgstr "Criar _marcador"
+msgstr "Izveidot _grāmatzīmi"
 
 #: ../src/window.c:1190

[Xfce4-commits] l10n: Updates to Russian (ru) translation

2009-10-02 Thread Transifex 
Updating branch refs/heads/xfce-4.6
 to 84f3f6887cfa97dd8c05cf0f88516dea34b160fb (commit)
   from d56a6e9b445dc1d7f8f369418e332f092210b128 (commit)

commit 84f3f6887cfa97dd8c05cf0f88516dea34b160fb
Author: Denis Koryavov 
Date:   Fri Oct 2 08:52:51 2009 +

l10n: Updates to Russian (ru) translation

Transmitted-via: Transifex (translations.xfce.org)

 po/ru.po |  384 +++---
 1 files changed, 218 insertions(+), 166 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 43a375d..d24e750 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,18 +4,20 @@
 # Ilya , 2009.
 # Denis Koryavov , 2009
 #
+#: ../xfsettingsd/main.c:127
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce 4-settings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 20:50+0100\n"
+"POT-Creation-Date: 2009-10-02 12:49+0400\n"
 "PO-Revision-Date: 2009-01-31 17:18+0300\n"
 "Last-Translator: Ilya Shestopalov \n"
 "Language-Team: Russian\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"
+"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: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 
@@ -81,8 +83,11 @@ msgid "The amount of time, in milliseconds, required between 
keystrokes"
 msgstr "Время, в миллисекундах, между 
нажатиями клавиш"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16
-msgid "The amount of time, in milliseconds, that must elapse before a 
keystroke will be accepted"
-msgstr "Время, в миллисекундах, которое должно 
пройти перед принятием нажатия клавиши"
+msgid ""
+"The amount of time, in milliseconds, that must elapse before a keystroke "
+"will be accepted"
+msgstr ""
+"Время, в миллисекундах, которое должно 
пройти перед принятием нажатия клавиши"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17
 msgid "The maximum pointer speed after acceleration"
@@ -90,27 +95,42 @@ msgstr "Максимальная скорость 
курсора после ус
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:18
 msgid "The ramp used to reach maximum pointer speed"
-msgstr "Расстояние, которое необходимо пройти 
указателю для достижения максимальной 
скорости"
+msgstr ""
+"Расстояние, которое необходимо пройти 
указателю для достижения максимальной "
+"скорости"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:19
 msgid "The time, in milliseconds, between repeated motion events"
 msgstr "Время, в миллисекундах, между 
повторившимися движениями"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20
-msgid "The time, in milliseconds, between the initial key press and first 
repeated motion event"
-msgstr "Время, в миллисекундах, между началом 
нажатия клавиши и началом движения"
+msgid ""
+"The time, in milliseconds, between the initial key press and first repeated "
+"motion event"
+msgstr ""
+"Время, в миллисекундах, между началом 
нажатия клавиши и началом движения"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21
 msgid "The time, in milliseconds, to get to maximum speed"
 msgstr "Время, в миллисекундах, для достижения 
максимальной скорости"
 
 #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22
-msgid "To help prevent accidental keystrokes, slow keys requires that a key is 
held for a certain minimum amount of time before the keystroke will be accepted"
-msgstr "Чтобы помочь предотвратить случайные 
нажатия клавиш, медленные клавиши требуют 
нажатия клавиши определённого 
минимального времени перед его принятием."
+msgid ""
+"To help prevent accidental keystrokes, slow keys requires that a key is held "
+"for a certain minimum amount of time before the keystroke will be accepted"
+msgstr ""
+"Чтобы помочь предотвратить случайные 
нажатия клавиш, медленные клавиши "
+"требуют нажатия клавиши определённого 
минимального времени перед его "
+"принятием."

[Xfce4-commits] l10n: Updates to Russian (ru) translation

2009-10-02 Thread Transifex 
Updating branch refs/heads/master
 to 8d3176d741f89a888e23f4c0c7ac15fcbe5ed61a (commit)
   from 23050196c94b6d745c4ad6ae54f1fd675fa6ded8 (commit)

commit 8d3176d741f89a888e23f4c0c7ac15fcbe5ed61a
Author: Denis Koryavov 
Date:   Fri Oct 2 08:47:15 2009 +

l10n: Updates to Russian (ru) translation

Transmitted-via: Transifex (translations.xfce.org)

 po/ru.po |  128 +++--
 1 files changed, 57 insertions(+), 71 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 8d15565..031faed 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,44 +1,46 @@
 # Russian translations for xfce4-mixer package.
-# Copyright (C) 2003-2006 The Xfce development team.
+# Copyright (C) 2003-2009 The Xfce development team.
 # This file is distributed under the same license as the xfce4-mixer package.
 # Poul Ionkin , 2003.
 # Anthony Ivanoff , 2004, 2005.
 # Andrey Fedoseev , 2006-2008.
+# Denis Koryavov , 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: xfce4-mixer 4.4.0\n"
+"Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
-"PO-Revision-Date: 2008-01-14 20:00+0600\n"
-"Last-Translator: Andrey Fedoseev \n"
-"Language-Team: Russian \n"
+"POT-Creation-Date: 2009-10-02 12:44+0400\n"
+"PO-Revision-Date: 2009-05-09 15:54+0400\n"
+"Last-Translator: Denis Koryavov \n"
+"Language-Team: Russian\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-Generator: KBabel 1.11.4\n"
 
 #. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
+#: ../panel-plugin/xfce-mixer-plugin.c:274
+#: ../panel-plugin/xfce-mixer-plugin.c:550
 #, c-format
 msgid "%s: %i%%"
-msgstr ""
+msgstr "%s: %i%%"
 
 #: ../panel-plugin/xfce-mixer-plugin.c:346
 msgid "No left-click command defined"
-msgstr ""
+msgstr "Нет предопределенной команды для 
левой кнопки мыши "
 
 #: ../panel-plugin/xfce-mixer-plugin.c:349
 msgid ""
 "No left-click command defined yet. You can change this in the plugin "
 "properties."
 msgstr ""
+"Команда для левой кнопки мыши еще не 
указана. Вы можете указать ее в "
+"свойствах микшера."
 
 #: ../panel-plugin/xfce-mixer-plugin.c:350
 msgid "Properties"
-msgstr ""
+msgstr "Параметры "
 
 #. Generate error message and insert the current command
 #: ../panel-plugin/xfce-mixer-plugin.c:365
@@ -48,134 +50,133 @@ msgid ""
 "command is included in the PATH environment variable or that you are "
 "providing the full path to the command."
 msgstr ""
+"Невозможно выполнить команду  \"%s\". 
Удостоверьтесь, что команда включена в "
+"системную переменную PATH для вашего 
пользователя или, что вы указали полный "
+"путь к команде. "
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
+#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:90
 msgid ""
 "GStreamer was unable to detect any sound devices. Some sound system specific "
 "GStreamer packages may be missing. It may also be a permissions problem."
 msgstr ""
+"Не найдено ни одного звукового устройства 
поддерживаемого звуковой "
+"подсистемой GStreamer. Возможно, у вас 
отсутствуют необходимые для GStreamer "
+"пакеты или неверно настроены права на 
доступ к звуковому устройству. "
 
 #: ../panel-plugin/xfce-plugin-dialog.c:234
 msgid "Mixer Plugin"
-msgstr ""
+msgstr "Регулятор громкости "
 
 #: ../panel-plugin/xfce-plugin-dialog.c:236
 msgid "Configure the mixer track and left-click command"
-msgstr ""
+msgstr "Укажите канал микшера и команду для 
левой кнопки мыши "
 
 #: ../panel-plugin/xfce-plugin-dialog.c:248
-#, fuzzy
 msgid "Sound card"
-msgstr "Звуковая карта:"
+msgstr "Звуковая карта "
 
 #: ../panel-plugin/xfce-plugin-dialog.c:266
 msgid "Mixer track"
-msgstr ""
+msgstr "Канал микшера "
 
 #: ../panel-plugin/xfce-plugin-dialog.c:284
 msgid "Left-click command"
-msgstr ""
+msgstr "Команда для левой кнопки мыши "
 
 #: ../panel-plugin/xfce-plugin-dialog.c:322
-#, fuzzy
 msgid "Select command"
 msgstr "Управляемые каналы"
 
 #: ../panel-plugin/xfce-plugin-dialog.c:330
 msgid "All Files"
-msgstr ""
+msgstr "Все файлы "
 
 #: ../panel-plugin/xfce-plugin-dialog.c:335
 msgid "Executable Files"
-msgstr ""
+msgstr "ЗапускаÐ

[Xfce4-commits] l10n: Updates to Russian (ru) translation

2009-10-02 Thread Transifex 
Updating branch refs/heads/xfce-4.6
 to 7f1e4e32aaa9f93482f9adaf4a2beaa2af9a4bb8 (commit)
   from 21faca5c3827a189d78d8774ac63a5e4d7b47238 (commit)

commit 7f1e4e32aaa9f93482f9adaf4a2beaa2af9a4bb8
Author: Denis Koryavov 
Date:   Fri Oct 2 08:46:14 2009 +

l10n: Updates to Russian (ru) translation

Transmitted-via: Transifex (translations.xfce.org)

 po/ru.po |   46 +++---
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 6292132..031faed 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-mixer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:59+0100\n"
+"POT-Creation-Date: 2009-10-02 12:44+0400\n"
 "PO-Revision-Date: 2009-05-09 15:54+0400\n"
 "Last-Translator: Denis Koryavov \n"
 "Language-Team: Russian\n"
@@ -20,11 +20,11 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #. Set tooltip (e.g. 'Master: 50%')
-#: ../panel-plugin/xfce-mixer-plugin.c:271
-#: ../panel-plugin/xfce-mixer-plugin.c:548
+#: ../panel-plugin/xfce-mixer-plugin.c:274
+#: ../panel-plugin/xfce-mixer-plugin.c:550
 #, c-format
 msgid "%s: %i%%"
-msgstr ""
+msgstr "%s: %i%%"
 
 #: ../panel-plugin/xfce-mixer-plugin.c:346
 msgid "No left-click command defined"
@@ -34,7 +34,9 @@ msgstr "Нет предопределенной 
команды для левой
 msgid ""
 "No left-click command defined yet. You can change this in the plugin "
 "properties."
-msgstr "Команда для левой кнопки мыши еще не 
указана. Вы можете указать ее в свойствах 
микшера."
+msgstr ""
+"Команда для левой кнопки мыши еще не 
указана. Вы можете указать ее в "
+"свойствах микшера."
 
 #: ../panel-plugin/xfce-mixer-plugin.c:350
 msgid "Properties"
@@ -47,13 +49,19 @@ msgid ""
 "Could not execute the command \"%s\". Ensure that either the location of the "
 "command is included in the PATH environment variable or that you are "
 "providing the full path to the command."
-msgstr "Невозможно выполнить команду  \"%s\". 
Удостоверьтесь, что команда включена в 
системную переменную PATH для вашего 
пользователя или, что вы указали полный 
путь к команде. "
+msgstr ""
+"Невозможно выполнить команду  \"%s\". 
Удостоверьтесь, что команда включена в "
+"системную переменную PATH для вашего 
пользователя или, что вы указали полный "
+"путь к команде. "
 
-#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:89
+#: ../panel-plugin/xfce-mixer-plugin.c:398 ../xfce4-mixer/main.c:90
 msgid ""
 "GStreamer was unable to detect any sound devices. Some sound system specific "
 "GStreamer packages may be missing. It may also be a permissions problem."
-msgstr "Не найдено ни одного звукового 
устройства поддерживаемого звуковой 
подсистемой GStreamer. Возможно, у вас 
отсутствуют необходимые для GStreamer пакеты 
или неверно настроены права на доступ к 
звуковому устройству. "
+msgstr ""
+"Не найдено ни одного звукового устройства 
поддерживаемого звуковой "
+"подсистемой GStreamer. Возможно, у вас 
отсутствуют необходимые для GStreamer "
+"пакеты или неверно настроены права на 
доступ к звуковому устройству. "
 
 #: ../panel-plugin/xfce-plugin-dialog.c:234
 msgid "Mixer Plugin"
@@ -105,9 +113,9 @@ msgstr "Скрипты командной оболочки "
 
 #. Set application name
 #: ../panel-plugin/xfce4-mixer-plugin.desktop.in.in.h:1
-#: ../xfce4-mixer/main.c:60 ../xfce4-mixer/xfce-mixer-window.c:165
-#: ../xfce4-mixer/xfce-mixer-window.c:183
-#: ../xfce4-mixer/xfce-mixer-window.c:284
+#: ../xfce4-mixer/main.c:61 ../xfce4-mixer/xfce-mixer-window.c:168
+#: ../xfce4-mixer/xfce-mixer-window.c:197
+#: ../xfce4-mixer/xfce-mixer-window.c:298
 #: ../xfce4-mixer/xfce4-mixer.desktop.in.in.h:2
 msgid "Mixer"
 msgstr "Регулятор громкости "
@@ -116,12 +124,12 @@ msgstr "Регулятор громкости "
 msgid "Volume control for your sound card"
 msgstr "Удобный регулятор громкости для вашей 
звуковой карты "
 
-#: ../libxfce4mixer/libxfce4mixer.c:243
+#: ../libxfce4mixer/libxfce4mixer.c:252
 #, c-format
 msgid "Unknown Volume Control %d"
 msgstr "Неизвестный канал %d"
 
-#: ../xfce4-mixer/main.c:70
+#:

[Xfce4-commits] l10n: Updates to Russian (ru) translation

2009-10-02 Thread Transifex 
Updating branch refs/heads/xfce-4.6
 to 622ebb3ac3867e54c402f46ad88f1beaed163721 (commit)
   from 38c46a11443a34a69e46b04024953a309d666cc0 (commit)

commit 622ebb3ac3867e54c402f46ad88f1beaed163721
Author: Denis Koryavov 
Date:   Fri Oct 2 08:42:19 2009 +

l10n: Updates to Russian (ru) translation

Transmitted-via: Transifex (translations.xfce.org)

 po/ru.po |   19 +++
 1 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 752e18f..b9f6c26 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,17 +6,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Thunar 0.8.1\n"
+"Project-Id-Version: Thunar 1.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-11 00:20+0100\n"
+"POT-Creation-Date: 2009-10-02 12:37+0400\n"
 "PO-Revision-Date: 2009-01-31 16:41+0300\n"
 "Last-Translator: Ilya Shestopalov \n"
 "Language-Team: Russian \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"
+"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"
 
 #. base directory not readable
 #: ../thunar-vfs/thunar-vfs-deep-count-job.c:233
@@ -2599,7 +2599,6 @@ msgid "Go to the videos folder"
 msgstr "Перейти в каталог с видеофайлами"
 
 #: ../thunar/thunar-window.c:308
-#, fuzzy
 msgid "Go to the public folder"
 msgstr "Перейти в каталог шаблонов"
 
@@ -3312,14 +3311,13 @@ msgid "Failed to save actions to disk."
 msgstr "Не удалось сохранить действия на диск."
 
 #: ../plugins/thunar-uca/thunar-uca-chooser.c:463
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure that you want to delete\n"
 "action \"%s\"?"
-msgstr "Вы уверены, что хотите удалить \"%s\"?"
+msgstr "Вы уверены, что хотите удалить 
действие \"%s\"?"
 
 #: ../plugins/thunar-uca/thunar-uca-chooser.c:464
-#, fuzzy
 msgid "If you delete a custom action, it is permanently lost."
 msgstr "Если вы удалите файл, он будет утрачен 
навсегда."
 
@@ -3572,17 +3570,14 @@ msgstr "Открыть папку с помощью 
Thunar"
 msgid "Open the specified folders in Thunar"
 msgstr "Открыть выбранные папки в новых окнах"
 
-#, fuzzy
 #~ msgid "File Manager Settings"
 #~ msgstr "Файловый менеджер"
 
-#, fuzzy
 #~ msgid "Thunar Settings"
 #~ msgstr "Thunar: %s\n"
 
-#, fuzzy
 #~ msgid "%s (%s)"
-#~ msgstr "\"%s\" (%s) %s"
+#~ msgstr "%s (%s)"
 
 #~ msgid "Failed to open the templates folder"
 #~ msgstr "Не удалось открыть каталог с 
шаблонами"
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] l10n: Updates to Russian (ru) translation

2009-10-02 Thread Transifex 
Updating branch refs/heads/master
 to c947e5a26e08c560c3e1ad77fb36424065cc2ec8 (commit)
   from f06b674c4d93431679b7bd51f31a79aa109dc129 (commit)

commit c947e5a26e08c560c3e1ad77fb36424065cc2ec8
Author: Denis Koryavov 
Date:   Fri Oct 2 08:32:53 2009 +

l10n: Updates to Russian (ru) translation

Transmitted-via: Transifex (translations.xfce.org)

 po/ru.po |  222 ++
 1 files changed, 108 insertions(+), 114 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 889bf70..cf679b2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-27 09:02+\n"
+"POT-Creation-Date: 2009-10-02 12:11+0400\n"
 "PO-Revision-Date: 2009-05-20 15:00+0400\n"
 "Last-Translator: Denis Koryavov \n"
 "Language-Team: Russian\n"
@@ -41,20 +41,19 @@ msgid "Actions"
 msgstr "Действия "
 
 #: ../data/interfaces/xfpm-settings.ui.h:7
-#, fuzzy
 msgid "CPU frequency control"
-msgstr "Включить управление частотой 
центрального процессора"
+msgstr "Управление частотой центрального 
процессора"
 
 #: ../data/interfaces/xfpm-settings.ui.h:8
 msgid "Consider the computer on low power at:"
 msgstr "Считать заряд батареи низким при:"
 
 #. Hibernate menu option
-#: ../data/interfaces/xfpm-settings.ui.h:9 ../settings/xfpm-settings.c:775
-#: ../settings/xfpm-settings.c:846 ../settings/xfpm-settings.c:970
-#: ../settings/xfpm-settings.c:1125 ../settings/xfpm-settings.c:1183
-#: ../settings/xfpm-settings.c:1238 ../src/xfpm-tray-icon.c:174
-#: ../src/xfpm-tray-icon.c:266
+#: ../data/interfaces/xfpm-settings.ui.h:9 ../settings/xfpm-settings.c:776
+#: ../settings/xfpm-settings.c:847 ../settings/xfpm-settings.c:971
+#: ../settings/xfpm-settings.c:1126 ../settings/xfpm-settings.c:1184
+#: ../settings/xfpm-settings.c:1239 ../src/xfpm-tray-icon.c:175
+#: ../src/xfpm-tray-icon.c:267
 msgid "Hibernate"
 msgstr "Спящий режим "
 
@@ -67,14 +66,13 @@ msgid "Monitor"
 msgstr "Монитор "
 
 #: ../data/interfaces/xfpm-settings.ui.h:12
-#, fuzzy
 msgid "Monitor power management control"
-msgstr "Включить управление питанием"
+msgstr "Управление питанием монитора"
 
-#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:764
-#: ../settings/xfpm-settings.c:835 ../settings/xfpm-settings.c:959
-#: ../settings/xfpm-settings.c:1114 ../settings/xfpm-settings.c:1172
-#: ../settings/xfpm-settings.c:1227
+#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:765
+#: ../settings/xfpm-settings.c:836 ../settings/xfpm-settings.c:960
+#: ../settings/xfpm-settings.c:1115 ../settings/xfpm-settings.c:1173
+#: ../settings/xfpm-settings.c:1228
 msgid "Nothing"
 msgstr "Ничего не делать"
 
@@ -109,18 +107,18 @@ msgstr "При активации 
энергосберегающих функц
 
 #: ../data/interfaces/xfpm-settings.ui.h:21
 msgid "Show notifications to notify about the battery state"
-msgstr ""
+msgstr "Отображать оповещения о состоянии 
батареи"
 
 #: ../data/interfaces/xfpm-settings.ui.h:22
 msgid "Standby"
 msgstr "Дежурный режим "
 
 #. Suspend menu option
-#: ../data/interfaces/xfpm-settings.ui.h:23 ../settings/xfpm-settings.c:769
-#: ../settings/xfpm-settings.c:840 ../settings/xfpm-settings.c:964
-#: ../settings/xfpm-settings.c:1119 ../settings/xfpm-settings.c:1177
-#: ../settings/xfpm-settings.c:1232 ../src/xfpm-tray-icon.c:205
-#: ../src/xfpm-tray-icon.c:281
+#: ../data/interfaces/xfpm-settings.ui.h:23 ../settings/xfpm-settings.c:770
+#: ../settings/xfpm-settings.c:841 ../settings/xfpm-settings.c:965
+#: ../settings/xfpm-settings.c:1120 ../settings/xfpm-settings.c:1178
+#: ../settings/xfpm-settings.c:1233 ../src/xfpm-tray-icon.c:206
+#: ../src/xfpm-tray-icon.c:282
 msgid "Suspend"
 msgstr "Ждущий режим "
 
@@ -154,89 +152,88 @@ msgstr "Когда нажата клавиша 
перехода в спящий
 
 #: ../data/interfaces/xfpm-settings.ui.h:31
 #: ../settings/xfpm-settings-main.c:118 ../src/xfpm-main.c:192
-#: ../src/xfpm-main.c:276 ../src/xfpm-tray-icon.c:345
+#: ../src/xfpm-main.c:276 ../src/xfpm-tray-icon.c:346
 #: ../src/xfce4-power-manager.desktop.in.h:2
 msgid "Xfce Power Manager"
 msgstr "Менеджер питания Xfce "
 
-#: ../settings/xfpm-settings.c:535 ../settings/xfpm-settings.c:550
-#: ../settings/xfpm-settings.c:577
+#: ../settings/xfpm-settings.c:536 ../settings/xfpm-settings.c:551
+#: ../settings/xfpm-settings.c:578
 msgid "Never"
 msgstr "Никогда "
 
-#: ../settings/xfpm-settings.c:538
+#: ../settings/xfpm-settings.c:539
 msgid "One minute"
 msgstr "Одной минуты "
 
-#: ../settings/xfpm-settings.c:540 ../settings

[Xfce4-commits] Avoid crash if only one client is eligible for cycling

2009-10-02 Thread Olivier Fourdan 
Updating branch refs/heads/master
 to 270d5620a84615f3eaefadea1c73c0fe468b931c (commit)
   from 52a6bca14a2264e5e9145bea7fee777697d043f9 (commit)

commit 270d5620a84615f3eaefadea1c73c0fe468b931c
Author: Olivier Fourdan 
Date:   Fri Oct 2 09:17:15 2009 +0200

Avoid crash if only one client is eligible for cycling

 src/cycle.c |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/cycle.c b/src/cycle.c
index 31b6500..7ab54f4 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -331,6 +331,11 @@ clientCycle (Client * c, XKeyEvent * ev)
 {
 selected = g_list_next (client_list);
 }
+if (!selected)
+{
+/* Only one element in list */
+selected = client_list;
+}
 passdata.wireframe = None;
 
 TRACE ("entering cycle loop");
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits