Merge branch 'backport' into work

Conflicts:

	openbox/actions/desktop.c
	openbox/actions/if.c

2 files changed, 90 insertions, 67 deletions

diff --git a/po/ja.po b/po/ja.po
index c5758cad..ca74039f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2004 Mikael Magnusson
 # This file is distributed under the same license as the Openbox package.
 # Yukihiro Nakai <nakai@gnome.gr.jp>, 2003.
-# Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>, 2007.
+# Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>, 2007, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Openbox 3.4.3\n"
+"Project-Id-Version: Openbox 3.4.7\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
 "POT-Creation-Date: 2008-02-28 23:00+0100\n"
-"PO-Revision-Date: 2007-06-07 14:49+0200\n"
+"PO-Revision-Date: 2008-03-02 17:18+0100\n"
 "Last-Translator: Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,11 +25,11 @@ msgstr ""
 
 #: openbox/actions/execute.c:124
 msgid "No"
-msgstr ""
+msgstr "いいえ"
 
 #: openbox/actions/execute.c:125
 msgid "Yes"
-msgstr ""
+msgstr "はい"
 
 #: openbox/actions/execute.c:137
 #, c-format
@@ -43,27 +43,27 @@ msgstr "\"%s\"の実行に失敗しました: %s"
 
 #: openbox/actions/exit.c:46 openbox/client.c:3444
 msgid "Cancel"
-msgstr ""
+msgstr "キャンセル"
 
 #: openbox/actions/exit.c:47
 msgid "Exit"
-msgstr ""
+msgstr "終了"
 
 #: openbox/actions/exit.c:50
 msgid "Are you sure you want to exit Openbox?"
-msgstr ""
+msgstr "Openbox を終了してもよろしいですか？"
 
 #: openbox/client.c:1996
 msgid "Unnamed Window"
-msgstr ""
+msgstr "名称未設定"
 
 #: openbox/client.c:2010 openbox/client.c:2042
 msgid "Killing..."
-msgstr ""
+msgstr "強制終了中..."
 
 #: openbox/client.c:2012 openbox/client.c:2044
 msgid "Not Responding"
-msgstr ""
+msgstr "応答なし"
 
 #: openbox/client.c:3433
 #, c-format
@@ -71,21 +71,22 @@ msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to force it "
 "to exit by sending the %s signal?"
 msgstr ""
+"ウィンドウ \"%s\" は応答していないようです。%s 信号を送り強制終了しますか？"
 
 #: openbox/client.c:3435
 msgid "End Process"
-msgstr ""
+msgstr "プロセスを終了する"
 
 #: openbox/client.c:3439
 #, c-format
 msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to disconnect "
 "it from the X server?"
-msgstr ""
+msgstr "ウィンドウ \"%s\" は応答していないようです。Xサーバから切断しますか？"
 
 #: openbox/client.c:3441
 msgid "Disconnect"
-msgstr ""
+msgstr "切断する"
 
 #: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91
 msgid "Go there..."
@@ -121,7 +122,7 @@ msgstr "階層(_L)"
 
 #: openbox/client_menu.c:375
 msgid "Always on _top"
-msgstr "常に最上位にする(_T)"
+msgstr "常に最上層にする(_T)"
 
 #: openbox/client_menu.c:376
 msgid "_Normal"
@@ -129,7 +130,7 @@ msgstr "通常(_N)"
 
 #: openbox/client_menu.c:377
 msgid "Always on _bottom"
-msgstr "常に最下位にする(_B)"
+msgstr "常に最下層にする(_B)"
 
 #: openbox/client_menu.c:379
 msgid "_Send to desktop"
@@ -153,7 +154,7 @@ msgstr "サイズの変更(_Z)"
 
 #: openbox/client_menu.c:401
 msgid "Ico_nify"
-msgstr "アイコン化(_N)"
+msgstr "最小化(_N)"
 
 #: openbox/client_menu.c:405
 msgid "Ma_ximize"
@@ -163,7 +164,6 @@ msgstr "最大化(_X)"
 msgid "_Roll up/down"
 msgstr "巻き上げ/展開(_R)"
 
-# not sure about this one
 #: openbox/client_menu.c:411
 msgid "Un/_Decorate"
 msgstr "非/装飾(_D)"
@@ -251,80 +251,86 @@ msgstr "再起動の際新しい実行ファイル\"%s\"の実行に失敗しま
 
 #: openbox/openbox.c:498 openbox/openbox.c:500
 msgid "Copyright (c)"
-msgstr ""
+msgstr "著作権 (c)"
 
 #: openbox/openbox.c:509
 msgid "Syntax: openbox [options]\n"
-msgstr ""
+msgstr "使い方: openbox [オプション]\n"
 
 #: openbox/openbox.c:510
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
+"\n"
+"オプション:\n"
 
 #: openbox/openbox.c:511
 msgid "  --help              Display this help and exit\n"
-msgstr ""
+msgstr "  --help              この使い方を表示して終了します\n"
 
 #: openbox/openbox.c:512
 msgid "  --version           Display the version and exit\n"
-msgstr ""
+msgstr "  --version           バージョンを表示して終了します\n"
 
 #: openbox/openbox.c:513
 msgid "  --replace           Replace the currently running window manager\n"
-msgstr ""
+msgstr "  --replace           現在実行中のウィンドウマネージャを置き換えます\n"
 
 #. TRANSLATORS: if you translate "FILE" here, make sure to keep the "Specify..."
 #. aligned still, if you have to, make a new line with \n and 22 spaces. It's
 #. fine to leave it as FILE though.
 #: openbox/openbox.c:517
 msgid "  --config-file FILE  Specify the path to the config file to use\n"
-msgstr ""
+msgstr "  --config-file FILE  使用する設定ファイルのパスを指定します\n"
 
 #: openbox/openbox.c:518
 msgid "  --sm-disable        Disable connection to the session manager\n"
-msgstr ""
+msgstr "  --sm-disable        セッションマネージャへの接続を止めます\n"
 
 #: openbox/openbox.c:519
 msgid ""
 "\n"
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
+"\n"
+"実行中の Openbox にメッセージを送ります:\n"
 
 #: openbox/openbox.c:520
 msgid "  --reconfigure       Reload Openbox's configuration\n"
-msgstr ""
+msgstr "  --reconfigure       Openbox の設定を再読み込みします\n"
 
 #: openbox/openbox.c:521
 msgid "  --restart           Restart Openbox\n"
-msgstr ""
+msgstr "  --restart           Openbox を再起動します\n"
 
 #: openbox/openbox.c:522
 msgid "  --exit              Exit Openbox\n"
-msgstr ""
+msgstr "  --exit              Openbox を終了します\n"
 
 #: openbox/openbox.c:523
 msgid ""
 "\n"
 "Debugging options:\n"
 msgstr ""
+"\n"
+"デバッグオプション:\n"
 
 #: openbox/openbox.c:524
 msgid "  --sync              Run in synchronous mode\n"
-msgstr ""
+msgstr "  --sync              同期モードで実行します\n"
 
 #: openbox/openbox.c:525
 msgid "  --debug             Display debugging output\n"
-msgstr ""
+msgstr "  --debug             デバッグ情報を表示します\n"
 
 #: openbox/openbox.c:526
 msgid "  --debug-focus       Display debugging output for focus handling\n"
-msgstr ""
+msgstr "  --debug-focus       フォーカスの扱いに関するデバッグ情報を表示します\n"
 
 #: openbox/openbox.c:527
 msgid "  --debug-xinerama    Split the display into fake xinerama screens\n"
-msgstr ""
+msgstr "  --debug-xinerama    偽の xinerama スクリーンに分割表示します\n"
 
 #: openbox/openbox.c:528
 #, c-format
@@ -332,10 +338,12 @@ msgid ""
 "\n"
 "Please report bugs at %s\n"
 msgstr ""
+"\n"
+"バグは %s 宛へ報告して下さい\n"
 
 #: openbox/openbox.c:597
 msgid "--config-file requires an argument\n"
-msgstr ""
+msgstr "--config-file requires an argument\n"
 
 #: openbox/openbox.c:640
 #, c-format
@@ -367,6 +375,8 @@ msgid ""
 "Openbox is configured for %d desktops, but the current session has %d.  "
 "Overriding the Openbox configuration."
 msgstr ""
+"Openbox は %d 個のデスクトップを設定されましたが, 現在のセッションは %d 個"
+"持っています。 Openbox の設定を無視します。"
 
 #: openbox/screen.c:1180
 #, c-format
@@ -420,7 +430,7 @@ msgstr "Xエラー: %s"
 
 #: openbox/prompt.c:182
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #~ msgid "Invalid use of action \"%s\". Action will be ignored."
 #~ msgstr "アクション\"%s\"の不正な使用です。このアクションは無視されます。"
diff --git a/po/pt.po b/po/pt.po
index eddc8208..a3338e75 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Openbox 3.4.5\n"
 "Report-Msgid-Bugs-To: http://bugzilla.icculus.org\n"
-"POT-Creation-Date: 2008-02-28 23:00+0100\n"
-"PO-Revision-Date: 2008-01-22 22:17+0100\n"
+"POT-Creation-Date: 2008-03-02 19:12+0100\n"
+"PO-Revision-Date: 2008-03-02 19:11+0100\n"
 "Last-Translator: Althaser <Althaser@gmail.com>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,15 @@ msgstr ""
 #: openbox/actions.c:150
 #, c-format
 msgid "Invalid action \"%s\" requested. No such action exists."
-msgstr "Pedido de ac��o \"%s\" inv�lido. N�o existem quaisquer ac��es."
+msgstr "Pedido de ac��o \"%s\" inv�lido. N�o existe quaisquer ac��es."
 
 #: openbox/actions/execute.c:124
 msgid "No"
-msgstr ""
+msgstr "N�o"
 
 #: openbox/actions/execute.c:125
 msgid "Yes"
-msgstr ""
+msgstr "Sim"
 
 #: openbox/actions/execute.c:137
 #, c-format
@@ -39,21 +39,21 @@ msgstr "Falha a converter o caminho \"%s\" do utf8"
 msgid "Failed to execute \"%s\": %s"
 msgstr "Falha a executar \"%s\": %s"
 
-#: openbox/actions/exit.c:46 openbox/client.c:3444
+#: openbox/actions/exit.c:47 openbox/client.c:3444
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
-#: openbox/actions/exit.c:47
+#: openbox/actions/exit.c:48
 msgid "Exit"
-msgstr ""
+msgstr "Sair"
 
-#: openbox/actions/exit.c:50
+#: openbox/actions/exit.c:51
 msgid "Are you sure you want to exit Openbox?"
-msgstr ""
+msgstr "Tem a certeza que deseja sair do Openbox?"
 
 #: openbox/client.c:1996
 msgid "Unnamed Window"
-msgstr ""
+msgstr "Janela sem nome"
 
 #: openbox/client.c:2010 openbox/client.c:2042
 msgid "Killing..."
@@ -69,10 +69,12 @@ msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to force it "
 "to exit by sending the %s signal?"
 msgstr ""
+"A janela \"%s\" parece n�o estar a responder. Pretende for��-la a sair "
+"enviando o sinal %s?"
 
 #: openbox/client.c:3435
 msgid "End Process"
-msgstr ""
+msgstr "Terminar Processo"
 
 #: openbox/client.c:3439
 #, c-format
@@ -80,10 +82,12 @@ msgid ""
 "The window \"%s\" does not seem to be responding.  Do you want to disconnect "
 "it from the X server?"
 msgstr ""
+"A janela \"%s\" parece n�o estar a responder. Pretende deslig�-la do "
+"servidor X?"
 
 #: openbox/client.c:3441
 msgid "Disconnect"
-msgstr ""
+msgstr "Desligar"
 
 #: openbox/client_list_combined_menu.c:87 openbox/client_list_menu.c:91
 msgid "Go there..."
@@ -119,7 +123,7 @@ msgstr "_Camada"
 
 #: openbox/client_menu.c:375
 msgid "Always on _top"
-msgstr "Sempre em _cima"
+msgstr "Sempre no _topo"
 
 #: openbox/client_menu.c:376
 msgid "_Normal"
@@ -135,7 +139,7 @@ msgstr "Enviar para �rea de _trabalho"
 
 #: openbox/client_menu.c:383
 msgid "Client menu"
-msgstr "Menu de clientes"
+msgstr "Menu do cliente"
 
 #: openbox/client_menu.c:393
 msgid "R_estore"
@@ -181,7 +185,7 @@ msgstr "Conflito com tecla de atalho no ficheiro de configura��o"
 #: openbox/menu.c:103 openbox/menu.c:111
 #, c-format
 msgid "Unable to find a valid menu file \"%s\""
-msgstr "Incapaz de encontrar um ficheiro de menu v�lido \"%s\""
+msgstr "Incapaz de encontrar um ficheiro de menu \"%s\" v�lido"
 
 #: openbox/menu.c:171
 #, c-format
@@ -196,7 +200,7 @@ msgstr "Resultado inv�lido do menu de processamento \"%s\""
 #: openbox/menu.c:198
 #, c-format
 msgid "Attempted to access menu \"%s\" but it does not exist"
-msgstr "Tentei aceder ao menu \"%s\" mas ele n�o existe"
+msgstr "Tentou aceder ao menu \"%s\" mas ele n�o existe"
 
 #: openbox/menu.c:368 openbox/menu.c:369
 msgid "More..."
@@ -210,7 +214,7 @@ msgstr "Bot�o inv�lido \"%s\" no atalho do rato"
 #: openbox/mouse.c:379
 #, c-format
 msgid "Invalid context \"%s\" in mouse binding"
-msgstr "Contexto inv�lido \"%s\" no atalho do rato"
+msgstr "Contexto \"%s\" inv�lido no atalho do rato"
 
 #: openbox/openbox.c:134
 #, c-format
@@ -219,11 +223,11 @@ msgstr "Incapaz de mudar para o direct�rio home \"%s\": %s"
 
 #: openbox/openbox.c:154
 msgid "Failed to open the display from the DISPLAY environment variable."
-msgstr "Falha a abrir o ecr� pela vari�vel de ambiente DISPLAY."
+msgstr "Falha a abrir o ecr� da vari�vel de ambiente DISPLAY."
 
 #: openbox/openbox.c:185
 msgid "Failed to initialize the obrender library."
-msgstr "Falha a inicializar a biblioteca obrender"
+msgstr "Falha a iniciar a biblioteca obrender"
 
 #: openbox/openbox.c:196
 msgid "X server does not support locale."
@@ -266,7 +270,7 @@ msgstr ""
 
 #: openbox/openbox.c:511
 msgid "  --help              Display this help and exit\n"
-msgstr "  --help              Mostra este help e sai\n"
+msgstr "  --help              Mostra esta ajuda e sai\n"
 
 #: openbox/openbox.c:512
 msgid "  --version           Display the version and exit\n"
@@ -282,6 +286,9 @@ msgstr "  --replace           Substitui o corrente gestor de janelas\n"
 #: openbox/openbox.c:517
 msgid "  --config-file FILE  Specify the path to the config file to use\n"
 msgstr ""
+" --config-file FICHEIRO\n"
+"                      Especifica o caminho do ficheiro de configura��o para "
+"usar\n"
 
 #: openbox/openbox.c:518
 msgid "  --sm-disable        Disable connection to the session manager\n"
@@ -293,7 +300,7 @@ msgid ""
 "Passing messages to a running Openbox instance:\n"
 msgstr ""
 "\n"
-"Passando mensagens para a solicita��o do Openbox em execu��o\n"
+"Passando mensagens para uma solicita��o do Openbox em execu��o\n"
 
 #: openbox/openbox.c:520
 msgid "  --reconfigure       Reload Openbox's configuration\n"
@@ -305,7 +312,7 @@ msgstr "  --restart           Reinicia o Openbox\n"
 
 #: openbox/openbox.c:522
 msgid "  --exit              Exit Openbox\n"
-msgstr " --saida             Sai do Openbox\n"
+msgstr " --sair              Sai do Openbox\n"
 
 #: openbox/openbox.c:523
 msgid ""
@@ -313,7 +320,7 @@ msgid ""
 "Debugging options:\n"
 msgstr ""
 "\n"
-"Op��es de depura��o\n"
+"Op��es de depura��o:\n"
 
 #: openbox/openbox.c:524
 msgid "  --sync              Run in synchronous mode\n"
@@ -344,7 +351,7 @@ msgstr ""
 
 #: openbox/openbox.c:597
 msgid "--config-file requires an argument\n"
-msgstr ""
+msgstr "--config-file requer um argumento\n"
 
 #: openbox/openbox.c:640
 #, c-format
@@ -354,7 +361,7 @@ msgstr "Argumento inv�lido na linha de comandos \"%s\"\n"
 #: openbox/screen.c:102 openbox/screen.c:190
 #, c-format
 msgid "A window manager is already running on screen %d"
-msgstr "O gestor de janelas j� est� em execu��o no ecr� %d"
+msgstr "Um gestor de janelas j� est� em execu��o no ecr� %d"
 
 #: openbox/screen.c:124
 #, c-format
@@ -376,27 +383,33 @@ msgid ""
 "Openbox is configured for %d desktops, but the current session has %d.  "
 "Overriding the Openbox configuration."
 msgstr ""
+"O Openbox est� configurado para %d �reas de trabalho, mas a sess�o corrente "
+"tem %d.  Sobrescrevendo a configura��o do Openbox."
 
 #: openbox/screen.c:1180
 #, c-format
 msgid "desktop %i"
 msgstr "�rea de trabalho %i"
 
-#: openbox/session.c:103
+#: openbox/session.c:104
 #, c-format
 msgid "Unable to make directory \"%s\": %s"
 msgstr "Incapaz de criar o direct�rio \"%s\": %s "
 
-#: openbox/session.c:451
+#: openbox/session.c:452
 #, c-format
 msgid "Unable to save the session to \"%s\": %s"
 msgstr "Incapaz de guardar a sess�o em \"%s\": %s"
 
-#: openbox/session.c:583
+#: openbox/session.c:584
 #, c-format
 msgid "Error while saving the session to \"%s\": %s"
 msgstr "Erro enquanto guardava a sess�o em \"%s\": %s"
 
+#: openbox/session.c:821
+msgid "Not connected to a session manager"
+msgstr ""
+
 #: openbox/startupnotify.c:243
 #, c-format
 msgid "Running %s\n"
@@ -410,7 +423,7 @@ msgstr "Chave modificadora \"%s\" inv�lida no atalho de tecla/rato"
 #: openbox/translate.c:138
 #, c-format
 msgid "Invalid key code \"%s\" in key binding"
-msgstr "C�digo de chave \"%s\" inv�lido na tecla de atalho"
+msgstr "C�digo chave \"%s\" inv�lido na tecla de atalho"
 
 #: openbox/translate.c:145
 #, c-format
@@ -420,7 +433,7 @@ msgstr "Nome de chave \"%s\" inv�lido na tecla de atalho"
 #: openbox/translate.c:151
 #, c-format
 msgid "Requested key \"%s\" does not exist on the display"
-msgstr "Chave pedida \"%s\" n�o existe no ecr�"
+msgstr "Chave requerida \"%s\" n�o existe no ecr�"
 
 #: openbox/xerror.c:40
 #, c-format
@@ -429,7 +442,7 @@ msgstr "Erro no X: %s"
 
 #: openbox/prompt.c:182
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #~ msgid "Invalid use of action \"%s\". Action will be ignored."
 #~ msgstr "Uso inv�lido da ac��o \"%s\". A ac��o ser� ignorada."