From omaciel at xfce.org Tue Jul 1 15:19:35 2008 From: omaciel at xfce.org (Og Maciel) Date: Tue, 1 Jul 2008 13:19:35 +0000 (UTC) Subject: [Xfce4-commits] r27188 - xarchiver/trunk/po Message-ID: <20080701131935.88539F29E0@mocha.foo-projects.org> Author: omaciel Date: 2008-07-01 13:19:35 +0000 (Tue, 01 Jul 2008) New Revision: 27188 Modified: xarchiver/trunk/po/ChangeLog xarchiver/trunk/po/pt_BR.po Log: Brazilian Portuguese translation updated Modified: xarchiver/trunk/po/ChangeLog =================================================================== --- xarchiver/trunk/po/ChangeLog 2008-06-29 21:49:32 UTC (rev 27187) +++ xarchiver/trunk/po/ChangeLog 2008-07-01 13:19:35 UTC (rev 27188) @@ -1,3 +1,7 @@ +2008-07-01 Og Maciel + + * pt_BR.po: Brazilian Portuguese translation updated + 2008-06-26 Maximilian Schleiss * gl.po: Galician translation updated (Leandro Regueiro) Modified: xarchiver/trunk/po/pt_BR.po =================================================================== --- xarchiver/trunk/po/pt_BR.po 2008-06-29 21:49:32 UTC (rev 27187) +++ xarchiver/trunk/po/pt_BR.po 2008-07-01 13:19:35 UTC (rev 27188) @@ -11,7 +11,7 @@ "Project-Id-Version: xarchiver 0.4.2rc2\n" "Report-Msgid-Bugs-To: colossus73 at gmail.com\n" "POT-Creation-Date: 2008-06-29 19:14+0200\n" -"PO-Revision-Date: 2008-02-27 21:15-0500\n" +"PO-Revision-Date: 2008-07-01 09:16-0500\n" "Last-Translator: Og Maciel \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" @@ -19,12 +19,18 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/7zip.c:56 ../src/arj.c:47 ../src/rar.c:62 +#: ../src/7zip.c:56 +#: ../src/arj.c:47 +#: ../src/rar.c:62 msgid "Original" msgstr "Original" -#: ../src/7zip.c:56 ../src/arj.c:47 ../src/bzip2.c:97 ../src/gzip.c:89 -#: ../src/rar.c:62 ../src/zip.c:49 +#: ../src/7zip.c:56 +#: ../src/arj.c:47 +#: ../src/bzip2.c:97 +#: ../src/gzip.c:89 +#: ../src/rar.c:62 +#: ../src/zip.c:49 msgid "Compressed" msgstr "Comprimido" @@ -32,13 +38,25 @@ msgid "Attr" msgstr "Atrib." -#: ../src/7zip.c:56 ../src/arj.c:47 ../src/bzip2.c:178 ../src/deb.c:80 -#: ../src/gzip.c:71 ../src/rar.c:62 ../src/tar.c:52 ../src/zip.c:49 +#: ../src/7zip.c:56 +#: ../src/arj.c:47 +#: ../src/bzip2.c:178 +#: ../src/deb.c:80 +#: ../src/gzip.c:71 +#: ../src/rar.c:62 +#: ../src/tar.c:52 +#: ../src/zip.c:49 msgid "Time" msgstr "Hora" -#: ../src/7zip.c:56 ../src/arj.c:47 ../src/bzip2.c:178 ../src/deb.c:80 -#: ../src/gzip.c:71 ../src/rar.c:62 ../src/rpm.c:56 ../src/tar.c:52 +#: ../src/7zip.c:56 +#: ../src/arj.c:47 +#: ../src/bzip2.c:178 +#: ../src/deb.c:80 +#: ../src/gzip.c:71 +#: ../src/rar.c:62 +#: ../src/rpm.c:56 +#: ../src/tar.c:52 #: ../src/zip.c:49 msgid "Date" msgstr "Data" @@ -48,125 +66,101 @@ msgstr "Adicionar arquivos ao pacote" #: ../src/add_dialog.c:56 -#, fuzzy msgid "Selection" -msgstr "A??_o" +msgstr "Sele??o" #: ../src/add_dialog.c:75 msgid "File Paths: " -msgstr "" +msgstr "Caminhos de arquivos:" #: ../src/add_dialog.c:81 msgid "Store full paths" -msgstr "" +msgstr "Salvar caminhos completos" #: ../src/add_dialog.c:87 -#, fuzzy msgid "Do not store paths" -msgstr "N?o adicionar caminhos absolutos" +msgstr "N?o salvar caminhos" #: ../src/add_dialog.c:107 -#, fuzzy msgid "Options" -msgstr "Op??es" +msgstr "Op??es" #: ../src/add_dialog.c:125 msgid "Update and add" -msgstr "" +msgstr "Atualizar e adicionar" #: ../src/add_dialog.c:128 -msgid "" -"This option will add any new files and update any files which have been " -"modified since the archive was last created/modified." -msgstr "" -"Esta op??o ir? adicionar qualquer novo arquivo e atualizar? qualquer arquivo " -"que tenha sido modificado desde a ?ltima vez que o pacote foi criado/" -"modificado." +msgid "This option will add any new files and update any files which have been modified since the archive was last created/modified." +msgstr "Esta op??o ir? adicionar qualquer novo arquivo e atualizar? qualquer arquivo que tenha sido modificado desde a ?ltima vez que o pacote foi criado/modificado." #: ../src/add_dialog.c:134 msgid "Freshen and replace" -msgstr "" +msgstr "Atualizar e substituir" #: ../src/add_dialog.c:137 -msgid "" -"This option affects the archive only if it has been modified more recently " -"than the version already in the archive; unlike the update option it will " -"not add files that are not already in the archive." -msgstr "" -"Esta op??o afeta o pacote somente se ele foi modificado mais recentemente " -"que a vers?o j? no pacote; ao contr?rio da op??o de atualiza??o, isso n?o " -"adicionar? arquivos que n?o est?o no pacote." +msgid "This option affects the archive only if it has been modified more recently than the version already in the archive; unlike the update option it will not add files that are not already in the archive." +msgstr "Esta op??o afeta o pacote somente se ele foi modificado mais recentemente que a vers?o j? no pacote; ao contr?rio da op??o de atualiza??o, isso n?o adicionar? arquivos que n?o est?o no pacote." #: ../src/add_dialog.c:143 -#, fuzzy msgid "Include subdirectories" -msgstr "Descer subdiret?rios" +msgstr "Incluir subdiret?rios" #: ../src/add_dialog.c:150 -#, fuzzy msgid "Create a solid archive" -msgstr "Gerar uma compacta??o s?lida" +msgstr "Criar um pacote s?lido" #: ../src/add_dialog.c:153 -msgid "" -"In a solid archive the files are grouped together featuring a better " -"compression ratio." -msgstr "" -"Em um pacote s?lido, os arquivos s?o agrupados e compactados de uma vez " -"melhorando o n?vel de compress?o" +msgid "In a solid archive the files are grouped together featuring a better compression ratio." +msgstr "Em um pacote s?lido, os arquivos s?o agrupados e compactados de uma vez melhorando o n?vel de compress?o" #: ../src/add_dialog.c:159 -#, fuzzy msgid "Delete files after adding" -msgstr "Remover os arquivos depois de adicionados" +msgstr "Excluir arquivos depois de adicionados" #: ../src/add_dialog.c:164 -#, fuzzy msgid "Actions; " -msgstr "A??_o" +msgstr "A??es;" #: ../src/add_dialog.c:184 msgid "0 = no compression, 5 is default, 9 = best compression but slowest" -msgstr "" -"0 = sem compress?o, 5 ? o padr?o, 9 = melhor compress?o, por?m a mais lenta" +msgstr "0 = sem compress?o, 5 ? o padr?o, 9 = melhor compress?o, por?m a mais lenta" #: ../src/add_dialog.c:191 msgid "0 = no compression, 6 is default, 9 = best compression but slowest" -msgstr "" -"0 = sem compress?o, 6 ? o padr?o, 9 = melhor compress?o, por?m a mais lenta" +msgstr "0 = sem compress?o, 6 ? o padr?o, 9 = melhor compress?o, por?m a mais lenta" #: ../src/add_dialog.c:198 msgid "0 = no compression, 3 is default, 5 = best compression but slowest" -msgstr "" -"0 = sem compress?o, 3 ? o padr?o, 5 = melhor compress?o, por?m a mais lenta" +msgstr "0 = sem compress?o, 3 ? o padr?o, 5 = melhor compress?o, por?m a mais lenta" #: ../src/add_dialog.c:205 msgid "0 = no compression, 1 is default, 4 = fastest but least compression" -msgstr "" -"0 = sem compress?o, 1 ? o padr?o, 4 = mais r?pido, por?m menor compress?o" +msgstr "0 = sem compress?o, 1 ? o padr?o, 4 = mais r?pido, por?m menor compress?o" #: ../src/add_dialog.c:212 msgid "5 = default compression, 7 = max compression" msgstr "5 = compress?o padrao, 7 = compress?o m?xima" #: ../src/add_dialog.c:243 -#, fuzzy msgid "Compression: " -msgstr "N?vel de compress?o:" +msgstr "Compress?o:" -#: ../src/add_dialog.c:262 ../src/extract_dialog.c:219 ../src/interface.c:648 +#: ../src/add_dialog.c:262 +#: ../src/extract_dialog.c:219 +#: ../src/interface.c:648 msgid "Password:" msgstr "Senha:" #: ../src/add_dialog.c:273 msgid "Encryption: " -msgstr "" +msgstr "Criptografia:" #: ../src/add_dialog.c:286 msgid "_Add" msgstr "A_dicionar" -#: ../src/add_dialog.c:362 ../src/main.c:202 +#: ../src/add_dialog.c:362 +#: ../src/main.c:202 msgid "Can't add files to the archive:" msgstr "N?o foi poss?vel adicionar os arquivos:" @@ -174,11 +168,13 @@ msgid "You haven't selected any files to add!" msgstr "Voc? n?o selecionou nenhum arquivo!" -#: ../src/add_dialog.c:370 ../src/interface.c:690 +#: ../src/add_dialog.c:370 +#: ../src/interface.c:690 msgid "You missed the password!" msgstr "Voc? esqueceu a senha!" -#: ../src/add_dialog.c:370 ../src/interface.c:690 +#: ../src/add_dialog.c:370 +#: ../src/interface.c:690 msgid "Please enter it!" msgstr "Por favor, digite-a!" @@ -186,9 +182,14 @@ msgid "Adding files to the archive, please wait..." msgstr "Adicionando arquivos ao pacote, aguarde por favor..." -#: ../src/archive.c:75 ../src/archive.c:270 ../src/window.c:55 -#: ../src/window.c:674 ../src/window.c:687 ../src/window.c:783 -#: ../src/window.c:795 ../src/rpm.c:136 +#: ../src/archive.c:75 +#: ../src/archive.c:270 +#: ../src/window.c:55 +#: ../src/window.c:674 +#: ../src/window.c:687 +#: ../src/window.c:783 +#: ../src/window.c:795 +#: ../src/rpm.c:136 msgid "Operation failed." msgstr "Opera??o falhou." @@ -208,7 +209,10 @@ msgid "An error occurred!" msgstr "Ocorreu um erro!" -#: ../src/arj.c:47 ../src/gzip.c:89 ../src/lha.c:50 ../src/rar.c:62 +#: ../src/arj.c:47 +#: ../src/gzip.c:89 +#: ../src/lha.c:50 +#: ../src/rar.c:62 msgid "Ratio" msgstr "Propor??o" @@ -216,23 +220,40 @@ msgid "Attributes" msgstr "Atributos" -#: ../src/bzip2.c:97 ../src/bzip2.c:178 ../src/deb.c:80 ../src/gzip.c:71 -#: ../src/gzip.c:89 ../src/lha.c:50 ../src/rpm.c:56 ../src/tar.c:52 +#: ../src/bzip2.c:97 +#: ../src/bzip2.c:178 +#: ../src/deb.c:80 +#: ../src/gzip.c:71 +#: ../src/gzip.c:89 +#: ../src/lha.c:50 +#: ../src/rpm.c:56 +#: ../src/tar.c:52 #: ../src/zip.c:49 msgid "Size" msgstr "Tamanho" -#: ../src/bzip2.c:178 ../src/deb.c:80 ../src/gzip.c:71 ../src/rpm.c:56 +#: ../src/bzip2.c:178 +#: ../src/deb.c:80 +#: ../src/gzip.c:71 +#: ../src/rpm.c:56 #: ../src/tar.c:52 msgid "Points to" msgstr "Aponta para" -#: ../src/bzip2.c:178 ../src/deb.c:80 ../src/gzip.c:71 ../src/lha.c:50 -#: ../src/rar.c:62 ../src/tar.c:52 ../src/zip.c:49 +#: ../src/bzip2.c:178 +#: ../src/deb.c:80 +#: ../src/gzip.c:71 +#: ../src/lha.c:50 +#: ../src/rar.c:62 +#: ../src/tar.c:52 +#: ../src/zip.c:49 msgid "Permissions" msgstr "Permiss?es" -#: ../src/bzip2.c:178 ../src/deb.c:80 ../src/gzip.c:71 ../src/tar.c:52 +#: ../src/bzip2.c:178 +#: ../src/deb.c:80 +#: ../src/gzip.c:71 +#: ../src/tar.c:52 msgid "Owner/Group" msgstr "Dono/Grupo" @@ -240,18 +261,19 @@ msgid "An error occurred while accessing the archive." msgstr "Ocorreu um erro enquanto o pacote era acessado." -#: ../src/window.c:56 ../src/rpm.c:139 +#: ../src/window.c:56 +#: ../src/rpm.c:139 msgid "Do you want to view the command line output?" msgstr "Voc? deseja ver a sa?da da linha de comando?" -#: ../src/window.c:86 ../src/window.c:116 +#: ../src/window.c:86 +#: ../src/window.c:116 msgid "Operation completed." msgstr "Opera??o completada." #: ../src/window.c:88 -#, fuzzy msgid "Operation failed!" -msgstr "Opera??o falhou." +msgstr "Opera??o falhou!" #: ../src/window.c:102 msgid "The sfx archive was saved as:" @@ -259,20 +281,20 @@ #: ../src/window.c:119 msgid "Please wait while the content of the archive is being updated..." -msgstr "" -"Por favor, aguarde enquanto o conte?do do pacote est? sendo atualizado..." +msgstr "Por favor, aguarde enquanto o conte?do do pacote est? sendo atualizado..." -#: ../src/window.c:180 ../src/window.c:663 ../src/window.c:736 -#: ../src/window.c:773 ../src/extract_dialog.c:400 +#: ../src/window.c:180 +#: ../src/window.c:663 +#: ../src/window.c:736 +#: ../src/window.c:773 +#: ../src/extract_dialog.c:400 msgid "Operation canceled." msgstr "Opera??o cancelada." #: ../src/window.c:183 #, c-format msgid "Please check \"%s\" since some files could have been already extracted." -msgstr "" -"Por favor, verifique \"%s\" j? que alguns arquivos j? podem terem sido " -"extra?dos." +msgstr "Por favor, verifique \"%s\" j? que alguns arquivos j? podem terem sido extra?dos." #: ../src/window.c:234 msgid "Choose Add to begin creating the archive." @@ -307,7 +329,8 @@ msgid "Testing archive integrity, please wait..." msgstr "Testando integridade do pacote, aguarde por favor..." -#: ../src/window.c:460 ../src/main.c:234 +#: ../src/window.c:460 +#: ../src/main.c:234 msgid "Ready." msgstr "Pronto." @@ -327,11 +350,13 @@ msgid "Converting archive to self-extracting, please wait..." msgstr "Convertendo o pacote para auto-descompact?vel, aguarde por favor..." -#: ../src/window.c:676 ../src/window.c:784 +#: ../src/window.c:676 +#: ../src/window.c:784 msgid "Can't convert the archive to self-extracting:" msgstr "N?o foi poss?vel converter o pacote para auto-descompact?vel:" -#: ../src/window.c:689 ../src/window.c:796 +#: ../src/window.c:689 +#: ../src/window.c:796 msgid "Can't write the unzipsfx module to the archive:" msgstr "N?o foi poss?vel escrever o m?dulo unzipsfx para o pacote:" @@ -353,15 +378,19 @@ msgid "Save the self-extracting archive as" msgstr "Salvar o pacote auto-descompact?vel como" -#: ../src/window.c:909 ../src/interface.c:291 +#: ../src/window.c:909 +#: ../src/interface.c:291 msgid "Open an archive" msgstr "Abrir um pacote" -#: ../src/window.c:922 ../src/extract_dialog.c:83 ../src/new_dialog.c:62 +#: ../src/window.c:922 +#: ../src/extract_dialog.c:83 +#: ../src/new_dialog.c:62 msgid "All files" msgstr "Todos os arquivos" -#: ../src/window.c:927 ../src/new_dialog.c:67 +#: ../src/window.c:927 +#: ../src/new_dialog.c:67 msgid "Only archives" msgstr "Somente pacotes" @@ -392,11 +421,12 @@ #: ../src/window.c:1299 msgid "You didn't set which editor to use!" -msgstr "" +msgstr "Voc? n?o definiu qual editor para usar!" -#: ../src/window.c:1299 ../src/window.c:1855 +#: ../src/window.c:1299 +#: ../src/window.c:1855 msgid "Please go to Preferences->Advanced and set it." -msgstr "" +msgstr "Por favor v? em Prefer?ncias -> Avan?ado e o defina." #: ../src/window.c:1449 msgid "Yes" @@ -418,7 +448,8 @@ msgid "Sorry, I could not perform the operation!" msgstr "Desculpe, n?o foi poss?vel realizar a opera??o!" -#: ../src/window.c:1749 ../src/window.c:1760 +#: ../src/window.c:1749 +#: ../src/window.c:1760 msgid "Can't perform this action:" msgstr "N?o ? poss?vel efetuar esta a??o:" @@ -436,11 +467,11 @@ #: ../src/window.c:1855 msgid "You didn't set which browser to use!" -msgstr "" +msgstr "Voc? n?o definiu qual navegador de web para usar!" #: ../src/window.c:1884 msgid "Failed to launch the application!" -msgstr "" +msgstr "Falha ao iniciar o aplicativo!" #: ../src/window.c:1916 msgid "The password has been reset." @@ -451,9 +482,8 @@ msgstr "Por favor digite a senha primeiro!" #: ../src/window.c:1933 -#, fuzzy msgid "Archive Comment" -msgstr "Janela de coment?rio do pacote" +msgstr "Coment?rio do pacote" #: ../src/extract_dialog.c:42 msgid "Decompress file" @@ -468,19 +498,16 @@ msgstr "Extrair para:" #: ../src/extract_dialog.c:88 -#, fuzzy msgid "Selected files" -msgstr "Sele_cionar tudo" +msgstr "Arquivos selecionados" #: ../src/extract_dialog.c:101 -#, fuzzy msgid "Files: " -msgstr "Arquivos" +msgstr "Arquivos:" #: ../src/extract_dialog.c:112 -#, fuzzy msgid "Files " -msgstr "Arquivos" +msgstr "Arquivo" #: ../src/extract_dialog.c:126 msgid "Overwrite existing files" @@ -491,67 +518,47 @@ msgstr "Extrair arquivos com caminhos completos" #: ../src/extract_dialog.c:139 -msgid "" -"The archive's directory structure is recreated in the extraction directory." -msgstr "" -"A estrutura de diret?rios do pacote ? recriada no diret?rio de extra??o." +msgid "The archive's directory structure is recreated in the extraction directory." +msgstr "A estrutura de diret?rios do pacote ? recriada no diret?rio de extra??o." #: ../src/extract_dialog.c:147 msgid "Touch files" msgstr "Atualizar data" #: ../src/extract_dialog.c:149 -msgid "" -"When this option is used, tar leaves the data modification times of the " -"files it extracts as the times when the files were extracted, instead of " -"setting it to the times recorded in the archive." -msgstr "" -"Quando esta op??o ? usada o tar atualiza as datas de modifica??o dos " -"arquivos para o momento da extra??o ao inv?s de usar as datas contidas no " -"pacote." +msgid "When this option is used, tar leaves the data modification times of the files it extracts as the times when the files were extracted, instead of setting it to the times recorded in the archive." +msgstr "Quando esta op??o ? usada o tar atualiza as datas de modifica??o dos arquivos para o momento da extra??o ao inv?s de usar as datas contidas no pacote." #: ../src/extract_dialog.c:158 msgid "Freshen existing files" msgstr "Recarregar arquivos existentes" #: ../src/extract_dialog.c:159 -msgid "" -"Extract only those files that already exist on disk and that are newer than " -"the disk copies." -msgstr "" -"Extrair apenas os arquivos que j? existem no disco e que s?o mais novos que " -"as c?pias no disco." +msgid "Extract only those files that already exist on disk and that are newer than the disk copies." +msgstr "Extrair apenas os arquivos que j? existem no disco e que s?o mais novos que as c?pias no disco." #: ../src/extract_dialog.c:164 msgid "Update existing files" msgstr "Atualizar arquivos existentes" #: ../src/extract_dialog.c:165 -msgid "" -"This option performs the same function as the freshen one, extracting files " -"that are newer than those with the same name on disk, and in addition it " -"extracts those files that do not already exist on disk." -msgstr "" -"Esta op??o faz a mesma coisa que recarregar, extraindo os arquivos que s?o " -"mais novos que aqueles com o mesmo nome no disco, assim como tamb?m " -"extraindo os arquivos que ainda n?o existem no disco." +msgid "This option performs the same function as the freshen one, extracting files that are newer than those with the same name on disk, and in addition it extracts those files that do not already exist on disk." +msgstr "Esta op??o faz a mesma coisa que recarregar, extraindo os arquivos que s?o mais novos que aqueles com o mesmo nome no disco, assim como tamb?m extraindo os arquivos que ainda n?o existem no disco." #: ../src/extract_dialog.c:172 -#, fuzzy msgid "Options " -msgstr "Op??es" +msgstr "Op??es" #: ../src/extract_dialog.c:178 -#, fuzzy msgid "Directories Tree:" -msgstr "Diret?rios" +msgstr "?rvore de diret?rios:" #: ../src/extract_dialog.c:212 -#, fuzzy msgid "Create New Dir" -msgstr "Cria um novo arquivo" +msgstr "Criar um novo diret?rio" -#: ../src/extract_dialog.c:248 ../src/interface.c:143 +#: ../src/extract_dialog.c:248 +#: ../src/interface.c:143 msgid "_Extract" msgstr "_Extrair" @@ -577,11 +584,9 @@ msgstr "Por favor digite a senha." #: ../src/extract_dialog.c:437 -#, fuzzy, c-format -msgid "" -"You don't have the right permissions to extract the files to the directory " -"\"%s\"." -msgstr "Voc? n?o tem permiss?o para extrair os arquivos para a pasta \"%s\"" +#, c-format +msgid "You don't have the right permissions to extract the files to the directory \"%s\"." +msgstr "Voc? n?o tem as permiss?es apropriadas para extrair os arquivos para o diret?rio \"%s\"." #: ../src/extract_dialog.c:438 msgid "Can't perform extraction!" @@ -601,9 +606,8 @@ msgstr "Hor?rio" #: ../src/interface.c:72 -#, fuzzy msgid "_Archive" -msgstr "pacote" +msgstr "P_acote" #: ../src/interface.c:92 msgid "_Test" @@ -617,7 +621,8 @@ msgid "_Action" msgstr "A??_o" -#: ../src/interface.c:133 ../src/interface.c:339 +#: ../src/interface.c:133 +#: ../src/interface.c:339 msgid "Add" msgstr "Adicionar" @@ -643,7 +648,7 @@ #: ../src/interface.c:215 msgid "Select _by pattern" -msgstr "" +msgstr "Selecionar _por padr?o" #: ../src/interface.c:226 msgid "C_md-line output" @@ -665,7 +670,8 @@ msgid "New" msgstr "Novo" -#: ../src/interface.c:283 ../src/new_dialog.c:50 +#: ../src/interface.c:283 +#: ../src/new_dialog.c:50 msgid "Create a new archive" msgstr "Cria um novo arquivo" @@ -673,15 +679,18 @@ msgid "Open" msgstr "Abrir" -#: ../src/interface.c:299 ../src/interface.c:304 +#: ../src/interface.c:299 +#: ../src/interface.c:304 msgid "Back" msgstr "Voltar" -#: ../src/interface.c:308 ../src/interface.c:313 +#: ../src/interface.c:308 +#: ../src/interface.c:313 msgid "Up" msgstr "Subir" -#: ../src/interface.c:317 ../src/interface.c:322 +#: ../src/interface.c:317 +#: ../src/interface.c:322 msgid "Forward" msgstr "Avan?ar" @@ -694,26 +703,25 @@ msgstr "Root" #: ../src/interface.c:344 -#, fuzzy msgid "Add files" -msgstr "Todos os arquivos" +msgstr "Adicionar arquivos" #: ../src/interface.c:348 msgid "Extract" msgstr "Extrair" #: ../src/interface.c:353 -#, fuzzy msgid "Extract files" -msgstr "Extraindo arquivos para %s" +msgstr "Extrair arquivos" -#: ../src/interface.c:357 ../src/interface.c:752 +#: ../src/interface.c:357 +#: ../src/interface.c:752 msgid "View" msgstr "Ver" #: ../src/interface.c:362 msgid "View file with an external editor/viewer" -msgstr "" +msgstr "Visualizar o arquivo com um editor/visualizador externo" #: ../src/interface.c:370 msgid "Stop" @@ -736,22 +744,20 @@ msgstr "Digite a senha do pacote" #: ../src/interface.c:760 -#, fuzzy msgid "Extract..." -msgstr "Extrair" +msgstr "Extrair..." #: ../src/interface.c:773 msgid "Cut" -msgstr "" +msgstr "Recortar" #: ../src/interface.c:781 msgid "Copy" -msgstr "" +msgstr "Copiar" #: ../src/interface.c:789 -#, fuzzy msgid "Paste" -msgstr "Data" +msgstr "Colar" #: ../src/interface.c:802 msgid "Delete" @@ -759,25 +765,23 @@ #: ../src/interface.c:810 msgid "Rename..." -msgstr "" +msgstr "Renomear..." #: ../src/interface.c:847 msgid "Select by Pattern" -msgstr "" +msgstr "Selecionar por padr?o" #: ../src/interface.c:860 -#, fuzzy msgid "Pattern:" -msgstr "Caminho:" +msgstr "Padr?o:" #: ../src/interface.c:865 msgid "example: *.txt; ac*" -msgstr "" +msgstr "exa]emplo: *.txt; ac*" #: ../src/interface.c:882 -#, fuzzy msgid "_Select" -msgstr "Sele_cionar tudo" +msgstr "_Selecionar" #: ../src/interface.c:954 msgid "Archive Properties Window" @@ -808,9 +812,8 @@ msgstr "Tamanho do conte?do:" #: ../src/interface.c:1014 -#, fuzzy msgid "Comment:" -msgstr "Tem coment?rio:" +msgstr "Coment?rio:" #: ../src/interface.c:1021 msgid "Compression ratio:" @@ -825,21 +828,19 @@ msgstr "N?mero de diret?rios:" #: ../src/main.c:54 -#, fuzzy msgid "Extract archive to the destination directory and quits." -msgstr "Extrai pacote perguntando o diret?rio de destino e sai." +msgstr "Extrai o pacote no diret?rio de destino e sai." #: ../src/main.c:55 -#, fuzzy msgid "destination archive" -msgstr "caminho_de_destino do pacote" +msgstr "pacote de destino" #: ../src/main.c:58 -#, fuzzy msgid "Extract archive by asking the extraction directory and quits." -msgstr "Extrai pacote perguntando o diret?rio de destino e sai." +msgstr "Extrai o pacote perguntando o diret?rio de destino e sai." -#: ../src/main.c:59 ../src/main.c:67 +#: ../src/main.c:59 +#: ../src/main.c:67 msgid "archive" msgstr "pacote" @@ -868,11 +869,14 @@ "xarchiver: %s\n" "Execute xarchiver --help para ver uma lista completa de poss?veis comandos.\n" -#: ../src/main.c:125 ../src/main.c:150 +#: ../src/main.c:125 +#: ../src/main.c:150 msgid "Can't extract files from the archive:" msgstr "N?o ? poss?vel extrair arquivos do pacote:" -#: ../src/main.c:125 ../src/main.c:150 ../src/main.c:202 +#: ../src/main.c:125 +#: ../src/main.c:150 +#: ../src/main.c:202 msgid "You missed the archive name!\n" msgstr "Voc? esqueceu o nome do pacote!\n" @@ -919,13 +923,12 @@ msgstr "Prefer?ncias" #: ../src/pref_dialog.c:57 -#, fuzzy msgid "Archive" -msgstr "pacote" +msgstr "Pacote" #: ../src/pref_dialog.c:63 msgid "Window" -msgstr "" +msgstr "Janela" #: ../src/pref_dialog.c:68 msgid "Advanced" @@ -944,11 +947,11 @@ #: ../src/pref_dialog.c:129 msgid "Store archiver output" -msgstr "" +msgstr "Salvar sa?da do empacotador" #: ../src/pref_dialog.c:132 msgid "It takes a lot of memory with large archives!" -msgstr "" +msgstr "O consumo de mom?ria ? maior com pacotes grandes!" #. label5 = gtk_label_new (_("View archive content as")); #. gtk_table_attach (GTK_TABLE (table1), label5, 0, 1, 0, 1, @@ -991,9 +994,11 @@ #: ../src/pref_dialog.c:211 msgid "Web browser to use:" -msgstr "" +msgstr "Navegador de web para usar:" -#: ../src/pref_dialog.c:218 ../src/pref_dialog.c:231 ../src/pref_dialog.c:244 +#: ../src/pref_dialog.c:218 +#: ../src/pref_dialog.c:231 +#: ../src/pref_dialog.c:244 #: ../src/pref_dialog.c:257 msgid "choose..." msgstr "escolha..." @@ -1003,9 +1008,8 @@ msgstr "Abrir arquivos textos com:" #: ../src/pref_dialog.c:237 -#, fuzzy msgid "Open image files with:" -msgstr "Abrir arquivos textos com:" +msgstr "Abrir arquivos de imagem com:" #: ../src/pref_dialog.c:250 msgid "Preferred temp directory:" @@ -1020,24 +1024,24 @@ msgstr "Salvar geometria da janela" #: ../src/pref_dialog.c:502 -#, fuzzy msgid "Choose the temp directory to use" -msgstr "Escolha o tipo de arquivo a ser criado" +msgstr "Escolha o diret?rio tempor?rio a ser usado" #: ../src/pref_dialog.c:502 -#, fuzzy msgid "Choose the application to use" -msgstr "Escolha o tipo de arquivo a ser criado" +msgstr "Escolha o aplicativo a ser usado" #: ../src/rar.c:62 msgid "CRC" msgstr "CRC" -#: ../src/rar.c:62 ../src/zip.c:49 +#: ../src/rar.c:62 +#: ../src/zip.c:49 msgid "Method" msgstr "M?todo" -#: ../src/rar.c:62 ../src/zip.c:49 +#: ../src/rar.c:62 +#: ../src/zip.c:49 msgid "Version" msgstr "Vers?o" @@ -1066,7 +1070,8 @@ msgid "Can't fseek to position 104:" msgstr "N?o ? poss?vel executar fseek para posi??o 104:" -#: ../src/rpm.c:72 ../src/rpm.c:88 +#: ../src/rpm.c:72 +#: ../src/rpm.c:88 msgid "Can't read data from file:" msgstr "N?o ? poss?vel ler dados do arquivo:" @@ -1104,251 +1109,174 @@ #~ msgid "Choose the files or directories to add to the archive" #~ msgstr "Escolha os arquivos ou diret?rios para adicionar ao pacote" - #~ msgid "Files and directories to add " #~ msgstr "Arquivos e diret?rios para adicionar " - #~ msgid "" #~ "Include everything in the directory recursively \tstarting from the " #~ "current directory." #~ msgstr "" #~ "Incluir tudo no diret?rio recursivamente \tiniciando a partir do " #~ "diret?rio atual." - #~ msgid "Do not add file paths" #~ msgstr "N?o adicionar os caminhos dos arquivos" - #~ msgid "The files path doesn't include the user home directory." #~ msgstr "O caminho dos arquivos n?o inclui o diret?rio pessoal do usu?rio." - #~ msgid "Store just the name of a file without its directory names." #~ msgstr "Guarda somente o nome do arquivo ignorando os nomes dos diret?rios." - #~ msgid "Freshen an existing entry" #~ msgstr "Apenas atualizar arquivos j? existentes" - #~ msgid "Update an existing entry" #~ msgstr "Atualizar uma entrada atual" - #~ msgid "Please select the files you want to add" #~ msgstr "Por favor, selecione os arquivos que deseja adicionar" - #~ msgid "Please select the directories you want to add" #~ msgstr "Por favor, selecione os diret?rios que deseja adicionar" - #~ msgid "Extracting gzip file to %s" #~ msgstr "Extraindo arquivo gzip para %s" - #~ msgid "Extracting bzip2 file to %s" #~ msgstr "Extraindo arquivo bzip2 para %s" - #~ msgid "Decompressing tar file with %s, please wait..." #~ msgstr "Descompactando arquivo tar com %s, aguarde por favor..." - #~ msgid "Recompressing tar file with %s, please wait..." #~ msgstr "Recompactando arquivo tar com %s, aguarde por favor..." - #~ msgid "You are about to delete %d file(s) from the archive." #~ msgstr "Voc? est? prestes a apagar %d arquivo(s) do pacote." - #~ msgid "An error occurred while trying to kill the process:" #~ msgstr "Ocorreu um erro enquanto o processo era terminado:" - #~ msgid "Please select a file, not a directory!" #~ msgstr "Por favor, selecione um arquivo e n?o um diret?rio!" - #~ msgid "An error occurred while extracting the file to be viewed:" #~ msgstr "Ocorreu um erro durante a extra??o do arquivo para visualiza??o:" - #~ msgid "" #~ "An error occurred while converting the file content to the UTF8 encoding:" #~ msgstr "" #~ "Ocorreu um erro durante a convers?o do conte?do do arquivo para a " #~ "codifica??o UTF8:" - #~ msgid "Failed to open link." #~ msgstr "Erro abrindo o link." - #~ msgid "Choose a folder where to extract files" #~ msgstr "Selecione um diret?rio para extrair os arquivos" - #~ msgid "All" #~ msgstr "Tudo" - #~ msgid "Only selected" #~ msgstr "Somente selecionados" - #~ msgid "Files to extract " #~ msgstr "Arquivos a extrair " - #~ msgid "Extracting archive to %s" #~ msgstr "Extraindo pacote para %s" - #~ msgid "Choose the destination folder where to extract the current archive" #~ msgstr "Escolha um diret?rio para extrair o conte?do do pacote atual" - #~ msgid "_File" #~ msgstr "_Arquivo" - #~ msgid "Add files and directories to the current archive" #~ msgstr "Adicionar arquivos e diret?rios ao pacote atual" - #~ msgid "Extract files from the current archive" #~ msgstr "Extrair arquivos do pacote atual" - #~ msgid "View file content in the current archive" #~ msgstr "Ver o conte?do do arquivo no pacote atual" - #~ msgid "" #~ "Extract archive to the directory specified by destination_path and quits." #~ msgstr "" #~ "Extrai o pacote para o diret?rio especificado por caminho_de_destino e " #~ "sai." - #~ msgid "Behaviour" #~ msgstr "Comportamento" - #~ msgid "Save settings for add dialog" #~ msgstr "Salvar configura??es para o di?logo de adicionar" - #~ msgid "Save settings for extract dialog" #~ msgstr "Salvar configura??es para o di?logo de extrair" - #~ msgid "Allow extracting dirs by drag and drop" #~ msgstr "Permitir extra??o de diret?rios atrav?s de arrastar e soltar" - #~ msgid "View archive content as" #~ msgstr "Ver conte?do do arquivo como" - #~ msgid "list" #~ msgstr "lista" - #~ msgid "icon" #~ msgstr "?cone" - #~ msgid "View HTML help with:" #~ msgstr "Ver ajuda no formato HTML com:" - #~ msgid "Firefox" #~ msgstr "Firefox" - #~ msgid "Couldn't remove temporary directory %s" #~ msgstr "N?o foi poss?vel remover diret?rio tempor?rio %s" - #~ msgid "GUA" #~ msgstr "GUA" - #~ msgid "BPMGS" #~ msgstr "BPMGS" - #~ msgid "Symbolic Link" #~ msgstr "Link Simb?lico" - #~ msgid "Please wait while the content of the ISO image is being read..." #~ msgstr "" #~ "Por favor, aguarde enquanto o conte?do do arquivo ISO est? sendo lido." - #~ msgid " bytes" #~ msgstr " bytes" - #~ msgid "Show ISO in_fo" #~ msgstr "Exibir in_forma??es do ISO" - #~ msgid "" #~ "Extract files from the current archive; use the mouse to select files " #~ "individually" #~ msgstr "" #~ "Extrai arquivos (use o mouse para selecionar os arquivos individualmente)" - #~ msgid "SFX" #~ msgstr "SFX" - #~ msgid "Make the current archive self-extracting" #~ msgstr "Fazer o arquivo atual descompactar automaticamente" - #~ msgid "This archive contains password protected files" #~ msgstr "H? arquivos protegidos com senha" - #~ msgid "Can't create directory:" #~ msgstr "Erro ao criar diret?rio:" - #~ msgid "Can't write file \"%s\":" #~ msgstr "Imposs?vel escrever para o arquivo \"%s\":" - #~ msgid "Offset" #~ msgstr "Bloco" - #~ msgid "Rock Ridge version %d" #~ msgstr "Rock Ridge vers?o %d" - #~ msgid "Rock Ridge - unknown version" #~ msgstr "Vers?o desconhecida do Rock Ridge" - #~ msgid "Apple version %d" #~ msgstr "Vers?o do Apple %d" - #~ msgid "Standard ISO without extension" #~ msgstr "ISO padr?o sem extens?es" - #~ msgid "Joliet Level %d" #~ msgstr "Joliet n?vel %d" - #~ msgid "ISO Information Window" #~ msgstr "Informa??es do ISO" - #~ msgid "Filename:" #~ msgstr "Nome do arquivo:" - #~ msgid "Size:" #~ msgstr "Tamanho:" - #~ msgid "Extension:" #~ msgstr "Extens?o:" - #~ msgid "System ID:" #~ msgstr "ID do Sistema:" - #~ msgid "Volume ID:" #~ msgstr "ID do Volume:" - #~ msgid "Publisher:" #~ msgstr "Editor:" - #~ msgid "Preparer:" #~ msgstr "Preparador:" - #~ msgid "Creation date:" #~ msgstr "Data de cria??o:" - #~ msgid "Modified date:" #~ msgstr "Data de modifica??o:" - #~ msgid "Expiration date:" #~ msgstr "Data de expira??o" - #~ msgid "Effective date:" #~ msgstr "Data efetiva:" - #~ msgid "Preferred format for new archives:" #~ msgstr "Formato preferencial para novos arquivos:" - #~ msgid "Show ISO info after loading the archive" #~ msgstr "Mostrar informa??es ISO ap?s carregar o pacote" - #~ msgid "xfce default" #~ msgstr "padr?o do Xfce" - #~ msgid "konqueror" #~ msgstr "Konqueror" - #~ msgid "Preferred view application:" #~ msgstr "Aplica??o de visualiza??o preferida:" - #~ msgid "internal" #~ msgstr "interna" - #~ msgid "Checksum" #~ msgstr "Checksum" - #~ msgid "Error while extracting the cpio archive from the rpm one." #~ msgstr "Erro extraindo arquivo cpio do rpm." + From nick at xfce.org Tue Jul 1 21:46:43 2008 From: nick at xfce.org (Nick Schermer) Date: Tue, 1 Jul 2008 19:46:43 +0000 (UTC) Subject: [Xfce4-commits] r27189 - in xfce4-settings/trunk: . dialogs/mouse-settings Message-ID: <20080701194643.0A766F29E0@mocha.foo-projects.org> Author: nick Date: 2008-07-01 19:46:42 +0000 (Tue, 01 Jul 2008) New Revision: 27189 Modified: xfce4-settings/trunk/ChangeLog xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am xfce4-settings/trunk/dialogs/mouse-settings/main.c Log: * dialogs/mouse-settings/main.c: Destroy the dialog on exit and Xfce4-mouse-settings in the version information. * dialogs/mouse-settings/Makefile.am: Add the G_LOG_DOMAIN for glib warnings, errors and messages in the code. Modified: xfce4-settings/trunk/ChangeLog =================================================================== --- xfce4-settings/trunk/ChangeLog 2008-07-01 13:19:35 UTC (rev 27188) +++ xfce4-settings/trunk/ChangeLog 2008-07-01 19:46:42 UTC (rev 27189) @@ -1,3 +1,10 @@ +2008-07-01 Nick Schermer + + * dialogs/mouse-settings/main.c: Destroy the dialog on exit + and Xfce4-mouse-settings in the version information. + * dialogs/mouse-settings/Makefile.am: Add the G_LOG_DOMAIN + for glib warnings, errors and messages in the code. + 2008-06-29 Jannis Pohlmann * xfce4-settings-manager/xfce-settings-manager-dialog.c: Modified: xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am =================================================================== --- xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am 2008-07-01 13:19:35 UTC (rev 27188) +++ xfce4-settings/trunk/dialogs/mouse-settings/Makefile.am 2008-07-01 19:46:42 UTC (rev 27189) @@ -23,7 +23,8 @@ $(XFCONF_LIBS) INCLUDES = \ - -I${top_srcdir} + -I${top_srcdir} \ + -DG_LOG_DOMAIN=\"Xfce4-mouse-settings\" if MAINTAINER_MODE Modified: xfce4-settings/trunk/dialogs/mouse-settings/main.c =================================================================== --- xfce4-settings/trunk/dialogs/mouse-settings/main.c 2008-07-01 13:19:35 UTC (rev 27188) +++ xfce4-settings/trunk/dialogs/mouse-settings/main.c 2008-07-01 19:46:42 UTC (rev 27189) @@ -537,7 +537,7 @@ /* print version information */ if (G_UNLIKELY (opt_version)) { - g_print ("%s %s (Xfce %s)\n\n", PACKAGE_NAME, PACKAGE_VERSION, xfce_version_string ()); + g_print ("Xfce4-mouse-settings %s (Xfce %s)\n\n", PACKAGE_VERSION, xfce_version_string ()); g_print ("%s\n", "Copyright (c) 2004-2008"); g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved.")); g_print (_("Please report bugs to <%s>."), PACKAGE_BUGREPORT); @@ -565,6 +565,9 @@ /* release the glade xml */ g_object_unref (G_OBJECT (gxml)); + + /* destroy the dialog */ + gtk_widget_destroy (dialog); } /* release the channel */ From nick at xfce.org Tue Jul 1 22:46:06 2008 From: nick at xfce.org (Nick Schermer) Date: Tue, 1 Jul 2008 20:46:06 +0000 (UTC) Subject: [Xfce4-commits] r27190 - in xfce4-settings/trunk: . dialogs/accessibility-settings dialogs/appearance-settings dialogs/keyboard-settings dialogs/mouse-settings Message-ID: <20080701204606.D491FF29E0@mocha.foo-projects.org> Author: nick Date: 2008-07-01 20:46:06 +0000 (Tue, 01 Jul 2008) New Revision: 27190 Modified: xfce4-settings/trunk/ChangeLog xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade Log: * dialogs/accessibility-settings/accessibility-dialog.glade, dialogs/mouse-settings/mouse-dialog.glade, dialogs/appearance-settings/appearance-dialog.glade, dialogs/keyboard-settings/keyboard-dialog.glade: Make labels next to the sliders small italic, like in Xfwm4; Make mnemonic widgets work and some a buch of new ones where possible/suitable; Fix case usage in labels. Modified: xfce4-settings/trunk/ChangeLog =================================================================== --- xfce4-settings/trunk/ChangeLog 2008-07-01 19:46:42 UTC (rev 27189) +++ xfce4-settings/trunk/ChangeLog 2008-07-01 20:46:06 UTC (rev 27190) @@ -1,5 +1,15 @@ 2008-07-01 Nick Schermer + * dialogs/accessibility-settings/accessibility-dialog.glade, + dialogs/mouse-settings/mouse-dialog.glade, + dialogs/appearance-settings/appearance-dialog.glade, + dialogs/keyboard-settings/keyboard-dialog.glade: Make labels next + to the sliders small italic, like in Xfwm4; Make mnemonic widgets + work and some a buch of new ones where possible/suitable; Fix + case usage in labels. + +2008-07-01 Nick Schermer + * dialogs/mouse-settings/main.c: Destroy the dialog on exit and Xfce4-mouse-settings in the version information. * dialogs/mouse-settings/Makefile.am: Add the G_LOG_DOMAIN Modified: xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade =================================================================== --- xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade 2008-07-01 19:46:42 UTC (rev 27189) +++ xfce4-settings/trunk/dialogs/accessibility-settings/accessibility-dialog.glade 2008-07-01 20:46:06 UTC (rev 27190) @@ -1,6 +1,6 @@ - +

@@ -45,7 +45,7 @@ True True - Enable _Sticky Keys + Enable _sticky keys True 0 True @@ -87,7 +87,7 @@ True True - L_ock Mode + L_ock mode True 0 True @@ -133,7 +133,7 @@ True - Sticky keys + Sticky Keys True @@ -165,7 +165,7 @@ True True - Enable Slow _Keys + Enable slow _keys True 0 True @@ -188,9 +188,9 @@ True 0 - Slow Keys _delay: + Slow keys _delay: True - xkb_accessx_mouse_delay_scale + xkb_accessx_slow_delay_scale False @@ -200,11 +200,12 @@ True + 2 True 0 - short + Short True @@ -228,7 +229,7 @@ True 0 - long + Long True @@ -258,7 +259,7 @@ True - Slow keys + Slow Keys True @@ -290,7 +291,7 @@ True True - Enable _Bounce Keys + Enable _bounce keys True 0 True @@ -325,11 +326,12 @@ True + 2 True 0 - short + Short True @@ -353,7 +355,7 @@ True 0 - long + Long True @@ -383,7 +385,7 @@ True - Bounce keys + Bounce Keys True @@ -468,11 +470,12 @@ True + 2 True 0 - short + Short True @@ -496,7 +499,7 @@ True 0 - long + Long True @@ -528,7 +531,7 @@ 0 _Interval: True - xkb_accessx_mouse_delay_scale + xkb_accessx_mouse_interval_scale False @@ -538,11 +541,12 @@ True + 2 True 0 - short + Short True @@ -566,7 +570,7 @@ True 0 - long + Long True @@ -599,7 +603,7 @@ 0 Acceleration _delay: True - xkb_accessx_mouse_delay_scale + xkb_accessx_mouse_acceldelay_scale False @@ -609,11 +613,12 @@ True + 2 True 0 - short + Short True @@ -637,7 +642,7 @@ True 0 - long + Long True @@ -668,9 +673,9 @@ True 0 - Maximum _Speed: + Maximum _speed: True - xkb_accessx_mouse_delay_scale + xkb_accessx_mouse_speed_scale False @@ -680,11 +685,12 @@ True + 2 True 0 - short + Short True @@ -708,7 +714,7 @@ True 0 - long + Long True @@ -745,7 +751,7 @@ True - Mouse emulation + Mouse Emulation True Modified: xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade =================================================================== --- xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade 2008-07-01 19:46:42 UTC (rev 27189) +++ xfce4-settings/trunk/dialogs/appearance-settings/appearance-dialog.glade 2008-07-01 20:46:06 UTC (rev 27190) @@ -1,6 +1,6 @@ - +

@@ -30,12 +30,13 @@ True 6 + 6 True 0 0 - Please select the UI-theme you want to use + Please select the UI-theme you want to use: False @@ -76,6 +77,7 @@ True 6 + 6 True @@ -114,7 +116,7 @@ True - Icon theme + Icon Theme tab @@ -127,7 +129,7 @@ True - _Themes + Themes True @@ -159,7 +161,9 @@ True 0 - Select the default user-interface font: + Select the default user-interface _font: + True + gtk_fontname_button False @@ -218,28 +222,27 @@ 12 6 - + True - 1 - _Subpixel hinting: + True + _Enable antialias True - xft_rgba_combo_box + 0 + True - 2 - 3 - GTK_FILL + 2 - + True 1 2 - 2 - 3 + 1 + 2 @@ -257,27 +260,28 @@ - + True 1 2 - 1 - 2 + 2 + 3 - + True - True - _Enable Antialias + 1 + _Subpixel order: True - 0 - True + xft_rgba_combo_box - 2 + 2 + 3 + GTK_FILL @@ -319,7 +323,8 @@ True True - Custom DPI Settings + Custom _DPI settings + True 0 True @@ -369,7 +374,7 @@ True - _Font + Font True @@ -402,7 +407,9 @@ True 0 - Select the toolbar style: + Select the toolbar _style: + True + gtk_toolbar_style_combo_box False @@ -524,7 +531,7 @@ True - _Behaviour + Behaviour True Modified: xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade =================================================================== --- xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade 2008-07-01 19:46:42 UTC (rev 27189) +++ xfce4-settings/trunk/dialogs/keyboard-settings/keyboard-dialog.glade 2008-07-01 20:46:06 UTC (rev 27190) @@ -1,6 +1,6 @@ - +

@@ -58,7 +58,7 @@ True - Keytheme + Key Theme True @@ -66,10 +66,6 @@ - - False - False -

@@ -94,7 +90,8 @@ True True - Enable key repeat + _Enable key repeat + True 0 True @@ -116,7 +113,9 @@ True 0 - Repeat delay: + _Repeat delay: + True + xkb_key_repeat_delay_scale False @@ -126,10 +125,11 @@ True + 2 True - Short + Short True @@ -152,7 +152,7 @@ True - Long + Long True @@ -172,7 +172,9 @@ True 0 - Repeat speed: + Repeat _speed: + True + xkb_key_repeat_rate_scale False @@ -183,10 +185,11 @@ True + 2 True - Slow + Slow True @@ -208,7 +211,7 @@ True - Fast + Fast True @@ -269,7 +272,8 @@ True True - Show blinking + Show _blinking + True 0 True @@ -291,7 +295,9 @@ True 0 - Blink delay: + Blink _delay: + True + net_cursor_blink_time_scale False @@ -301,10 +307,11 @@ True + 2 True - Short + Short True @@ -326,7 +333,7 @@ True - Long + Long True @@ -412,7 +419,6 @@ True True - True Modified: xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade =================================================================== --- xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade 2008-07-01 19:46:42 UTC (rev 27189) +++ xfce4-settings/trunk/dialogs/mouse-settings/mouse-dialog.glade 2008-07-01 20:46:06 UTC (rev 27190) @@ -1,6 +1,6 @@ - +

@@ -48,7 +48,8 @@ True True - Left handed + _Left handed + True 0 True True @@ -58,7 +59,8 @@ True True - Right handed + _Right handed + True 0 True True @@ -75,7 +77,7 @@ True - Button settings + Button Settings True @@ -83,6 +85,9 @@ + + False +

@@ -103,16 +108,19 @@ True 0 - Acceleration: + _Acceleration: + True + mouse_motion_acceleration True + 2 True - Slow + Slow True @@ -135,7 +143,7 @@ True - Fast + Fast True @@ -155,7 +163,9 @@ True 0 - Threshold: + _Threshold: + True + mouse_motion_threshold 2 @@ -164,10 +174,11 @@ True + 2 True - Low + Low True @@ -180,6 +191,7 @@ True True 1 1 20 1 5 0 + 0 0 False @@ -190,7 +202,7 @@ True - High + High True @@ -213,7 +225,7 @@ True - Motion settings + Motion Settings True @@ -222,6 +234,7 @@ + False 1 @@ -244,16 +257,19 @@ True 0 - Threshold: + Thr_eshold: + True + mouse_dnd_threshold True + 2 True - Low + Low True @@ -276,7 +292,7 @@ True - High + High True @@ -299,7 +315,7 @@ True - Drag and drop + Drag and Drop True @@ -308,6 +324,7 @@ + False 2 @@ -329,16 +346,19 @@ True 0 - Speed: + _Speed: + True + mouse_double_click_speed True + 2 True - Slow + Slow True @@ -361,7 +381,7 @@ True - Fast + Fast True @@ -384,7 +404,7 @@ True - Double click + Double Click True @@ -393,6 +413,7 @@ + False 3 From kelnos at xfce.org Wed Jul 2 09:01:03 2008 From: kelnos at xfce.org (Brian Tarricone) Date: Wed, 2 Jul 2008 07:01:03 +0000 (UTC) Subject: [Xfce4-commits] r27191 - xfce-utils/branches/xfce_4_4/xfrun Message-ID: <20080702070103.32AFCF29E0@mocha.foo-projects.org> Author: kelnos Date: 2008-07-02 07:01:03 +0000 (Wed, 02 Jul 2008) New Revision: 27191 Modified: xfce-utils/branches/xfce_4_4/xfrun/xfrun-dialog.c Log: fix missing translated chars, patch from Minoru Hashima (bug 3543) Modified: xfce-utils/branches/xfce_4_4/xfrun/xfrun-dialog.c =================================================================== --- xfce-utils/branches/xfce_4_4/xfrun/xfrun-dialog.c 2008-07-01 20:46:06 UTC (rev 27190) +++ xfce-utils/branches/xfce_4_4/xfrun/xfrun-dialog.c 2008-07-02 07:01:03 UTC (rev 27191) @@ -165,6 +165,8 @@ GtkWidget *entry, *chk, *btn, *vbox, *bbox, *hbox, *arrow; GtkTreeIter itr; gchar *first_item = NULL; + + xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8"); dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE(dialog, XFRUN_TYPE_DIALOG, XfrunDialogPrivate); From colossus at xfce.org Wed Jul 2 11:08:48 2008 From: colossus at xfce.org (Giuseppe Torelli) Date: Wed, 2 Jul 2008 09:08:48 +0000 (UTC) Subject: [Xfce4-commits] r27192 - xarchiver/trunk/src Message-ID: <20080702090848.3A8B8F29E0@mocha.foo-projects.org> Author: colossus Date: 2008-07-02 09:08:48 +0000 (Wed, 02 Jul 2008) New Revision: 27192 Modified: xarchiver/trunk/src/archive.c xarchiver/trunk/src/archive.h xarchiver/trunk/src/bzip2.c xarchiver/trunk/src/interface.c xarchiver/trunk/src/interface.h xarchiver/trunk/src/main.c xarchiver/trunk/src/pref_dialog.c xarchiver/trunk/src/pref_dialog.h xarchiver/trunk/src/string_utils.c xarchiver/trunk/src/window.c xarchiver/trunk/src/window.h xarchiver/trunk/src/zip.c Log: Changed the layout of the error dialog and delete confirmation buttons to Ok/Cancel. Xarchiver now shows in a side bar the directories content of the archive (many thanks to John Berthels for helping me). Added option Show archive dir tree in the Window tab of prefs dialog. Fixed behaviour of error dialog when the 'Store archiver output' option is unchecked. Fixed a small regression in xa_open_bzip2_lzma with the revision 27183. Fixed deletion again from archives. Fixed return error code in main.c:217 Deleted View option from the menu and from the toolbar. No more errors are issued when opening an empty zip file. Menu item Cmd-line output respects the settings in Store Archiver output. Modified: xarchiver/trunk/src/archive.c =================================================================== --- xarchiver/trunk/src/archive.c 2008-07-02 07:01:03 UTC (rev 27191) +++ xarchiver/trunk/src/archive.c 2008-07-02 09:08:48 UTC (rev 27192) @@ -168,7 +168,11 @@ { status = g_io_channel_read_line (ioc, &line, NULL, NULL, NULL); if (line != NULL) - archive->error_output = g_slist_prepend (archive->error_output,line); + { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->store_output))) + archive->error_output = g_slist_prepend (archive->error_output,g_strdup(line)); + g_free(line); + } } while (status == G_IO_STATUS_NORMAL); if (status == G_IO_STATUS_ERROR || status == G_IO_STATUS_EOF) @@ -351,7 +355,6 @@ break; else if(xa_main_window) gtk_main_iteration_do (FALSE); - //usleep(1000); //give the processor time to rest (0.1 sec) } result = xa_check_child_for_error_on_exit(archive,status); if (result == FALSE) @@ -529,7 +532,7 @@ void xa_update_window_with_archive_entries (XArchive *archive,XEntry *entry) { GdkPixbuf *pixbuf = NULL; - GtkTreeIter iter; + GtkTreeIter iter,dummy_iter; unsigned short int i; gpointer current_column; @@ -610,6 +613,9 @@ } entry = entry->next; } + if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(archive_dir_model),&dummy_iter)); + else + xa_browse_dir_sidebar(archive->root_entry,archive_dir_model,NULL,NULL); } XEntry* xa_find_entry_from_path (XEntry *root_entry,const gchar *fullpathname) @@ -648,55 +654,58 @@ void xa_fill_list_with_recursed_entries(XEntry *entry,GString **p_file_list,gchar *current_path) { + gchar *full_path, *_full_path = NULL; + gchar *quoted_path = NULL; gint idx,current_page; - gchar *full_path, *_dummy = NULL; - gchar *quoted_path, *parent_dir = NULL; if (entry == NULL) return; - + current_page = gtk_notebook_get_current_page (notebook); idx = xa_find_archive_index (current_page); - if (entry == archive[idx]->root_entry) - parent_dir = ""; - else - parent_dir = g_strdup(archive[idx]->location_entry_path); - /* Recurse to siblings with the same path */ - xa_fill_list_with_recursed_entries(entry->next,p_file_list,current_path); + if (entry->prev->is_dir) + xa_fill_list_with_recursed_entries(entry->next,p_file_list,current_path); if (strlen(current_path) == 0) full_path = g_strdup(entry->filename); else full_path = g_strconcat(current_path,"/",entry->filename,NULL); - if (parent_dir) - _dummy = g_strconcat (parent_dir,entry->filename,NULL); + if (entry->child) + { + xa_fill_list_with_recursed_entries(entry->child, p_file_list,full_path); + g_free(full_path); + } else - _dummy = g_strdup(entry->filename); - - quoted_path = g_shell_quote(_dummy); - g_free(_dummy); - *p_file_list = g_string_prepend (*p_file_list,quoted_path); - *p_file_list = g_string_prepend_c (*p_file_list,' '); - g_free(parent_dir); - if (entry->child) - xa_fill_list_with_recursed_entries(entry->child, p_file_list, full_path); - g_free(full_path); + { + if (archive[idx]->location_entry_path != NULL) + { + if (entry->is_dir) + _full_path = g_strconcat(archive[idx]->location_entry_path,full_path,"/",NULL); + else + _full_path = g_strconcat(archive[idx]->location_entry_path,full_path,NULL); + g_free (full_path); + full_path = _full_path; + } + quoted_path = g_shell_quote(full_path); + *p_file_list = g_string_prepend (*p_file_list,quoted_path); + *p_file_list = g_string_prepend_c (*p_file_list,' '); + } return; } void xa_entries_to_filelist(XEntry *entry,GString **p_file_list,gchar *current_path) { - gchar *full_path = NULL; + gchar *full_path; gchar *quoted_path = NULL; if (entry == NULL) return; - + /* Recurse to siblings with the same path */ - xa_entries_to_filelist(entry->next,p_file_list,current_path); + xa_entries_to_filelist(entry->next,p_file_list,current_path); if (strlen(current_path) == 0) full_path = g_strdup(entry->filename); @@ -714,7 +723,6 @@ *p_file_list = g_string_prepend (*p_file_list,quoted_path); *p_file_list = g_string_prepend_c (*p_file_list,' '); } - return; } gboolean xa_detect_encrypted_archive (XArchive *archive) @@ -801,3 +809,28 @@ return flag; } +void xa_browse_dir_sidebar (XEntry *entry, GtkTreeStore *model,gchar *path, GtkTreeIter *containing_iter) +{ + GtkTreeIter child_iter; + + if (!entry) + return; + + if (strlen(entry->filename) == 0) + return xa_browse_dir_sidebar(entry->child, model, path, containing_iter); + + if (entry->is_dir) + { + gtk_tree_store_append(model,&child_iter,containing_iter); + gtk_tree_store_set(model,&child_iter,0,"gtk-directory",1,entry->filename,2,"",-1); + } + xa_browse_dir_sidebar(entry->child,model,NULL,&child_iter); + xa_browse_dir_sidebar(entry->next, model,NULL,containing_iter); + +} + +void xa_clean_dir_sidebar() +{ + gtk_tree_store_clear(GTK_TREE_STORE(model)); +} + Modified: xarchiver/trunk/src/archive.h =================================================================== --- xarchiver/trunk/src/archive.h 2008-07-02 07:01:03 UTC (rev 27191) +++ xarchiver/trunk/src/archive.h 2008-07-02 09:08:48 UTC (rev 27192) @@ -142,5 +142,7 @@ void xa_fill_list_with_recursed_entries(XEntry *entry,GString **p_file_list,gchar *current_path); void xa_entries_to_filelist(XEntry *, GString **, gchar *); gboolean xa_detect_encrypted_archive (XArchive *archive); +void xa_browse_dir_sidebar (XEntry *, GtkTreeStore *,gchar *,GtkTreeIter *); +void xa_clean_dir_sidebar(); XArchive *archive[100]; #endif Modified: xarchiver/trunk/src/bzip2.c =================================================================== --- xarchiver/trunk/src/bzip2.c 2008-07-02 07:01:03 UTC (rev 27191) +++ xarchiver/trunk/src/bzip2.c 2008-07-02 09:08:48 UTC (rev 27192) @@ -36,21 +36,23 @@ gboolean result; dummy = g_string_new(""); - archive->delete = (void *)delete[archive->type]; - archive->add = (void *)add[archive->type]; - archive->extract = (void *)extract[archive->type]; - if (g_str_has_suffix(archive->escaped_path,".tar.bz2") || g_str_has_suffix (archive->escaped_path,".tar.bz") || g_str_has_suffix ( archive->escaped_path , ".tbz") || g_str_has_suffix (archive->escaped_path,".tbz2") ) { archive->type = XARCHIVETYPE_TAR_BZ2; archive->format = "TAR.BZIP2"; + archive->delete = (void *)delete[archive->type]; + archive->add = (void *)add[archive->type]; + archive->extract = (void *)extract[archive->type]; xa_open_tar_compressed_file(archive); } else if (g_str_has_suffix(archive->escaped_path,".tar.lzma") || g_str_has_suffix (archive->escaped_path,".tlz")) { archive->type = XARCHIVETYPE_TAR_LZMA; archive->format = "TAR.LZMA"; + archive->delete = (void *)delete[archive->type]; + archive->add = (void *)add[archive->type]; + archive->extract = (void *)extract[archive->type]; xa_open_tar_compressed_file(archive); } else Modified: xarchiver/trunk/src/interface.c =================================================================== --- xarchiver/trunk/src/interface.c 2008-07-02 07:01:03 UTC (rev 27191) +++ xarchiver/trunk/src/interface.c 2008-07-02 09:08:48 UTC (rev 27192) @@ -47,9 +47,10 @@ extern gboolean unrar; -void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location) +void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location,gboolean show_output_menu_item,gboolean show_sidebar) { GdkPixbuf *icon; + xa_create_popup_menu(); tooltips = gtk_tooltips_new (); accel_group = gtk_accel_group_new (); @@ -60,11 +61,11 @@ gtk_window_set_icon (GTK_WINDOW(xa_main_window),icon); g_signal_connect (G_OBJECT (xa_main_window), "delete-event", G_CALLBACK (xa_quit_application), NULL); - /* Create the menus */ - vbox1 = gtk_vbox_new (FALSE, 0); + vbox1 = gtk_vbox_new (FALSE,2); gtk_widget_show (vbox1); gtk_container_add (GTK_CONTAINER (xa_main_window), vbox1); - + + /* Create the menus */ menubar1 = gtk_menu_bar_new (); gtk_widget_show (menubar1); gtk_box_pack_start (GTK_BOX (vbox1), menubar1, FALSE, FALSE, 0); @@ -156,16 +157,6 @@ gtk_container_add (GTK_CONTAINER (menuitem2_menu), delete_menu); gtk_widget_add_accelerator (delete_menu, "activate",accel_group,GDK_d, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - view_menu = gtk_image_menu_item_new_with_mnemonic (_("_View")); - gtk_widget_set_sensitive (view_menu, FALSE); - gtk_widget_show (view_menu); - gtk_container_add (GTK_CONTAINER (menuitem2_menu), view_menu); - gtk_widget_add_accelerator (view_menu, "activate",accel_group,GDK_v, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - - image2 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_MENU); - gtk_widget_show (image2); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (view_menu), image2); - separatormenuitem3 = gtk_separator_menu_item_new (); gtk_widget_show (separatormenuitem3); gtk_container_add (GTK_CONTAINER (menuitem2_menu), separatormenuitem3); @@ -226,17 +217,21 @@ view_shell_output1 = gtk_image_menu_item_new_with_mnemonic (_("C_md-line output")); gtk_container_add (GTK_CONTAINER (menuitem2_menu), view_shell_output1); gtk_widget_add_accelerator (view_shell_output1, "activate",accel_group,GDK_m, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + if (show_output_menu_item) + gtk_widget_set_sensitive(view_shell_output1,TRUE); + else + gtk_widget_set_sensitive(view_shell_output1,FALSE); gtk_widget_show (view_shell_output1); image2 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU); gtk_widget_show (image2); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (view_shell_output1), image2); - password_entry = gtk_image_menu_item_new_with_mnemonic (_("Reset passwo_rd")); - gtk_widget_show (password_entry); - gtk_widget_set_sensitive ( password_entry , FALSE ); - gtk_container_add (GTK_CONTAINER (menuitem2_menu), password_entry); - gtk_widget_add_accelerator (password_entry, "activate",accel_group,GDK_r, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + password_entry_menu = gtk_image_menu_item_new_with_mnemonic (_("Reset passwo_rd")); + gtk_widget_show (password_entry_menu); + gtk_widget_set_sensitive ( password_entry_menu , FALSE ); + gtk_container_add (GTK_CONTAINER (menuitem2_menu), password_entry_menu); + gtk_widget_add_accelerator (password_entry_menu, "activate",accel_group,GDK_r, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); separatormenuitem6 = gtk_separator_menu_item_new (); gtk_widget_show (separatormenuitem6); @@ -352,15 +347,6 @@ gtk_container_add (GTK_CONTAINER (toolbar1), Extract_button); gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (Extract_button), tooltips, _("Extract files"), NULL); - tmp_image = gtk_image_new_from_stock ("gtk-find", tmp_toolbar_icon_size); - gtk_widget_show (tmp_image); - View_button = (GtkWidget*) gtk_tool_button_new (tmp_image, _("View")); - gtk_widget_show (View_button); - gtk_widget_set_sensitive (View_button,FALSE); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (View_button), FALSE); - gtk_container_add (GTK_CONTAINER (toolbar1), View_button); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (View_button), tooltips, _("View file with an external editor/viewer"), NULL); - separatortoolitem2 = (GtkWidget*) gtk_separator_tool_item_new (); gtk_widget_show (separatortoolitem2); gtk_container_add (GTK_CONTAINER (toolbar1), separatortoolitem2); @@ -394,9 +380,47 @@ if (show_location) gtk_widget_show_all(toolbar2); + /* Create the paned widgets */ + hpaned1 = gtk_hpaned_new (); + gtk_widget_show (hpaned1); + gtk_box_pack_start (GTK_BOX (vbox1),hpaned1,TRUE,TRUE,0); + //gtk_paned_set_position (GTK_PANED (hpaned1),200); + + scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL); + if (show_sidebar) + gtk_widget_show (scrolledwindow2); + else + gtk_widget_hide (scrolledwindow2); + gtk_paned_pack1 (GTK_PANED (hpaned1), scrolledwindow2, FALSE, TRUE); + g_object_set (G_OBJECT (scrolledwindow2),"hscrollbar-policy", GTK_POLICY_AUTOMATIC,"vscrollbar-policy", GTK_POLICY_AUTOMATIC, NULL); + + archive_dir_model = gtk_tree_store_new (3,G_TYPE_STRING,G_TYPE_STRING,G_TYPE_STRING); + archive_dir_treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(archive_dir_model)); + gtk_container_add (GTK_CONTAINER (scrolledwindow2), archive_dir_treeview); + gtk_widget_show(archive_dir_treeview); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (archive_dir_treeview), FALSE); + gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(archive_dir_model),1,GTK_SORT_ASCENDING); + + /*g_signal_connect (G_OBJECT (archive_dir_treeview),"row-expanded",G_CALLBACK(xa_expand_dir),dialog_data->destination_path_entry); + g_signal_connect (G_OBJECT (archive_dir_treeview),"row-activated",G_CALLBACK(xa_row_activated),dialog_data->destination_path_entry); + GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (archive_dir_treeview)); + g_signal_connect (sel,"changed",G_CALLBACK (xa_tree_view_row_selected),dialog_data->destination_path_entry);*/ + + column = gtk_tree_view_column_new(); + archive_dir_renderer = gtk_cell_renderer_pixbuf_new(); + gtk_tree_view_column_pack_start(column,archive_dir_renderer,FALSE); + gtk_tree_view_column_set_attributes(column,archive_dir_renderer, "stock-id",0,NULL); + + archive_dir_renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_column_pack_start(column,archive_dir_renderer,TRUE); + gtk_tree_view_column_set_attributes(column,archive_dir_renderer,"text",1,NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW (archive_dir_treeview),column); + /*g_signal_connect (renderer, "editing-canceled",G_CALLBACK (xa_cell_edited_canceled),dialog_data); + g_signal_connect (renderer, "edited",G_CALLBACK (xa_cell_edited),dialog_data);*/ + /* Create the notebook widget */ notebook = GTK_NOTEBOOK(gtk_notebook_new() ); - gtk_box_pack_start (GTK_BOX(vbox1), GTK_WIDGET(notebook),TRUE,TRUE,0); + gtk_paned_pack2(GTK_PANED (hpaned1),GTK_WIDGET(notebook),TRUE,TRUE); gtk_notebook_set_tab_pos (notebook, GTK_POS_TOP); gtk_notebook_set_scrollable (notebook,TRUE); gtk_notebook_popup_enable (notebook); @@ -438,12 +462,11 @@ g_signal_connect ((gpointer) select_all, "activate", G_CALLBACK (xa_select_all), NULL); g_signal_connect ((gpointer) deselect_all, "activate", G_CALLBACK (xa_deselect_all), NULL); g_signal_connect ((gpointer) select_pattern, "activate", G_CALLBACK (xa_create_delete_dialog), NULL); - g_signal_connect ((gpointer) password_entry, "activate", G_CALLBACK (xa_reset_password), NULL); + g_signal_connect ((gpointer) password_entry_menu, "activate", G_CALLBACK (xa_reset_password), NULL); g_signal_connect ((gpointer) prefs_menu, "activate", G_CALLBACK (xa_show_prefs_dialog), NULL); g_signal_connect ((gpointer) close1, "activate", G_CALLBACK (xa_close_archive), NULL); g_signal_connect ((gpointer) quit1, "activate", G_CALLBACK (xa_quit_application), NULL); g_signal_connect ((gpointer) delete_menu, "activate", G_CALLBACK (xa_delete_archive), NULL); - g_signal_connect ((gpointer) view_menu, "activate", G_CALLBACK (xa_view_file_inside_archive), NULL); g_signal_connect ((gpointer) comment_menu, "activate", G_CALLBACK (xa_show_archive_comment), NULL); g_signal_connect ((gpointer) help1, "activate", G_CALLBACK (xa_show_help), NULL); g_signal_connect ((gpointer) about1, "activate", G_CALLBACK (xa_about), NULL); @@ -458,7 +481,6 @@ g_signal_connect ((gpointer) AddFile_button,"clicked", G_CALLBACK (xa_add_files_archive), NULL); g_signal_connect ((gpointer) Extract_button,"clicked", G_CALLBACK (xa_extract_archive), NULL); - g_signal_connect ((gpointer) View_button, "clicked", G_CALLBACK (xa_view_file_inside_archive),NULL); g_signal_connect ((gpointer) Stop_button, "clicked", G_CALLBACK (xa_cancel_archive), NULL); g_signal_connect (xa_main_window, "key-press-event", G_CALLBACK (key_press_function), NULL); @@ -514,23 +536,13 @@ selection = gtk_tree_view_get_selection ( GTK_TREE_VIEW (archive[id]->treeview) ); gint selected = gtk_tree_selection_count_selected_rows ( selection ); if (selected == 0) - xa_disable_delete_view_buttons (FALSE); + xa_disable_delete_buttons (FALSE); else { if (archive[id]->type == XARCHIVETYPE_RAR && unrar) gtk_widget_set_sensitive ( delete_menu , FALSE ); else if ( archive[id]->type != XARCHIVETYPE_RPM && archive[id]->type != XARCHIVETYPE_DEB ) gtk_widget_set_sensitive ( delete_menu , TRUE ); - if (selected > 1 ) - { - gtk_widget_set_sensitive ( View_button , FALSE); - gtk_widget_set_sensitive ( view_menu, FALSE ); - } - else - { - gtk_widget_set_sensitive ( View_button , TRUE ); - gtk_widget_set_sensitive ( view_menu, TRUE ); - } } /* Let's set the location bar */ if (archive[id]->location_entry_path != NULL) @@ -591,6 +603,7 @@ gtk_notebook_append_page_menu (notebook, archive->scrollwindow,page_hbox,tab_label); gtk_notebook_set_current_page(notebook, -1); gtk_notebook_set_tab_reorderable(notebook, archive->scrollwindow,TRUE); + archive->treeview = gtk_tree_view_new (); gtk_container_add (GTK_CONTAINER (archive->scrollwindow), archive->treeview); gtk_widget_show (archive->treeview); @@ -611,71 +624,78 @@ void xa_close_page (GtkWidget *widget, gpointer data) { - xa_close_archive ( NULL , data ); + xa_close_archive (NULL,data); } -gchar *password_dialog () +gchar *xa_create_password_dialog(gchar *archive_name) { - GtkWidget *passwd; - GtkWidget *dialog_vbox1; - GtkWidget *hbox1; - GtkWidget *label1; - GtkWidget *password_entry; - GtkWidget *dialog_action_area1; - GtkWidget *cancelbutton1; - GtkWidget *okbutton1; - gboolean done = FALSE; + GtkWidget *password_dialog,*dialog_vbox1,*vbox1,*hbox2,*image2,*vbox2,*label_pwd_required,*label_filename,*hbox1,*label34,*pw_password_entry; gchar *password = NULL; - gint current_page; - gint idx; + + password_dialog = gtk_dialog_new_with_buttons ("Xarchiver " VERSION, + GTK_WINDOW (xa_main_window), GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_STOCK_CANCEL,GTK_RESPONSE_CANCEL,GTK_STOCK_OK,GTK_RESPONSE_OK,NULL); - current_page = gtk_notebook_get_current_page (notebook); - idx = xa_find_archive_index (current_page); + gtk_container_set_border_width (GTK_CONTAINER (password_dialog), 6); + gtk_window_set_position (GTK_WINDOW (password_dialog), GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_resizable (GTK_WINDOW (password_dialog), FALSE); + gtk_window_set_type_hint (GTK_WINDOW (password_dialog), GDK_WINDOW_TYPE_HINT_DIALOG); + gtk_dialog_set_has_separator (GTK_DIALOG (password_dialog), FALSE); - passwd = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (passwd),_("Enter Archive Password")); - gtk_window_set_type_hint (GTK_WINDOW (passwd), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_window_set_transient_for ( GTK_WINDOW (passwd) , GTK_WINDOW (xa_main_window) ); - gtk_window_set_default_size(GTK_WINDOW(passwd), 300, 80); + dialog_vbox1 = GTK_DIALOG (password_dialog)->vbox; + gtk_widget_show (dialog_vbox1); - dialog_vbox1 = GTK_DIALOG (passwd)->vbox; - gtk_widget_show (dialog_vbox1); + vbox1 = gtk_vbox_new (FALSE, 12); + gtk_widget_show (vbox1); + gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (vbox1), 6); - hbox1 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (dialog_vbox1), hbox1, TRUE, FALSE, 0); + hbox2 = gtk_hbox_new (FALSE, 12); + gtk_widget_show (hbox2); + gtk_box_pack_start (GTK_BOX (vbox1), hbox2, TRUE, TRUE, 0); - label1 = gtk_label_new (_("Password:")); - gtk_widget_show (label1); - gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 0); + image2 = gtk_image_new_from_stock ("gtk-dialog-authentication", GTK_ICON_SIZE_DIALOG); + gtk_widget_show (image2); + gtk_box_pack_start (GTK_BOX (hbox2), image2, FALSE, TRUE, 0); + gtk_misc_set_alignment (GTK_MISC (image2), 0, 0); - password_entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox1), password_entry, TRUE, TRUE, 0); - gtk_entry_set_visibility (GTK_ENTRY (password_entry), FALSE); - gtk_entry_set_activates_default(GTK_ENTRY(password_entry), TRUE); + vbox2 = gtk_vbox_new (FALSE, 0); + gtk_widget_show (vbox2); + gtk_box_pack_start (GTK_BOX (hbox2), vbox2, TRUE, TRUE, 0); - if (current_page > 0 && archive[idx]->passwd != NULL) - gtk_entry_set_text (GTK_ENTRY(password_entry),archive[idx]->passwd); - gtk_widget_show (password_entry); + label_pwd_required = gtk_label_new (_("Password required for")); + gtk_widget_show (label_pwd_required); + gtk_box_pack_start (GTK_BOX (vbox2), label_pwd_required, FALSE, FALSE, 0); + gtk_label_set_use_markup (GTK_LABEL (label_pwd_required), TRUE); + gtk_misc_set_alignment (GTK_MISC (label_pwd_required), 0, 0.5); - dialog_action_area1 = GTK_DIALOG (passwd)->action_area; - gtk_widget_show (dialog_action_area1); - gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END); + label_filename = gtk_label_new (""); + gtk_widget_show (label_filename); + gtk_box_pack_start (GTK_BOX (vbox2), label_filename, FALSE, FALSE, 12); + gtk_misc_set_alignment (GTK_MISC (label_filename), 0, 0.5); - cancelbutton1 = gtk_button_new_from_stock ("gtk-cancel"); - gtk_widget_show (cancelbutton1); - gtk_dialog_add_action_widget (GTK_DIALOG (passwd), cancelbutton1, GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT); + if (archive_name != NULL) + gtk_label_set_text(GTK_LABEL(label_filename),archive_name); + + hbox1 = gtk_hbox_new (FALSE, 5); + gtk_widget_show (hbox1); + gtk_box_pack_start (GTK_BOX (vbox2), hbox1, TRUE, TRUE, 0); - okbutton1 = gtk_button_new_from_stock ("gtk-ok"); - gtk_widget_show (okbutton1); - gtk_dialog_add_action_widget (GTK_DIALOG (passwd), okbutton1, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT); - gtk_dialog_set_default_response (GTK_DIALOG (passwd), GTK_RESPONSE_OK); + label34 = gtk_label_new_with_mnemonic (_("_Password:")); + gtk_widget_show (label34); + gtk_box_pack_start (GTK_BOX (hbox1), label34, FALSE, FALSE, 0); - while ( ! done ) + pw_password_entry = gtk_entry_new (); + gtk_widget_show (pw_password_entry); + gtk_box_pack_start (GTK_BOX (hbox1), pw_password_entry, TRUE, TRUE, 0); + gtk_entry_set_visibility (GTK_ENTRY (pw_password_entry), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY (pw_password_entry), 9679); + gtk_entry_set_activates_default (GTK_ENTRY (pw_password_entry), TRUE); + gtk_dialog_set_default_response (GTK_DIALOG (password_dialog), GTK_RESPONSE_OK); + + while (! done) { - switch (gtk_dialog_run ( GTK_DIALOG (passwd ) ) ) + switch (gtk_dialog_run (GTK_DIALOG(password_dialog)) ) { case GTK_RESPONSE_CANCEL: case GTK_RESPONSE_DELETE_EVENT: @@ -684,7 +704,7 @@ break; case GTK_RESPONSE_OK: - password = g_strdup (gtk_entry_get_text ( GTK_ENTRY (password_entry) )); + password = g_strdup (gtk_entry_get_text(GTK_ENTRY(pw_password_entry)) ); if (strlen(password) == 0) { response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, _("You missed the password!"),_("Please enter it!") ); @@ -694,7 +714,7 @@ break; } } - gtk_widget_destroy (passwd); + gtk_widget_destroy (password_dialog); return password; } @@ -1220,3 +1240,9 @@ gtk_widget_set_sensitive(home_button,home); } +void xa_disable_delete_buttons (gboolean value) +{ + gtk_widget_set_sensitive (delete_menu,value); + //TODO: disable the popupmenu entries + //gtk_widget_set_sensitive (delete,value); +} Modified: xarchiver/trunk/src/interface.h =================================================================== --- xarchiver/trunk/src/interface.h 2008-07-02 07:01:03 UTC (rev 27191) +++ xarchiver/trunk/src/interface.h 2008-07-02 09:08:48 UTC (rev 27192) @@ -72,11 +72,10 @@ GtkWidget *addfile; GtkWidget *extract_menu; GtkWidget *delete_menu; -GtkWidget *view_menu; GtkWidget *comment_menu; GtkWidget *view_shell_output1; GtkWidget *prefs_menu; -GtkWidget *password_entry; +GtkWidget *password_entry_menu; GtkWidget *image1; GtkWidget *image2; GtkWidget *menuitem4; @@ -102,15 +101,20 @@ GtkWidget *separatortoolitem3; GtkWidget *AddFile_button; GtkWidget *Extract_button; -GtkWidget *View_button; GtkWidget *Stop_button; GtkWidget *toolitem1; GtkWidget *location_label; GtkWidget *location_entry; +GtkWidget *hpaned1; +GtkWidget *archive_dir_treeview,*scrolledwindow2; +GtkTreeStore *archive_dir_model; +GtkTreeViewColumn *column; +GtkCellRenderer *archive_dir_renderer; +GtkWidget *ebox; GtkAccelGroup *accel_group; GtkTooltips *tooltips; -GtkWidget *ebox; + typedef struct { GtkWidget *dialog1; @@ -118,12 +122,12 @@ GtkTextIter iter; } widget_data; -gchar *password_dialog(); +gchar *xa_create_password_dialog(gchar *archive_name); void set_label (GtkWidget *label,gchar *text); int xa_progressbar_pulse (gpointer data); void xa_create_popup_menu(); widget_data *xa_create_output_window(gchar *); -void xa_create_main_window (GtkWidget *xa_main_window,gboolean show_location); +void xa_create_main_window (GtkWidget *xa_main_window,gboolean,gboolean,gboolean); GtkWidget *create_archive_properties_window(); gboolean select_matched_rows(GtkTreeModel *model,GtkTreePath *path,GtkTreeIter *iter,gpointer data); void xa_create_delete_dialog(GtkMenuItem *menuitem, gpointer user_data); @@ -133,5 +137,6 @@ void xa_close_page (GtkWidget *widget, gpointer data); void xa_set_button_state (gboolean,gboolean,gboolean,gboolean,gboolean, gboolean, gboolean,gboolean); void xa_restore_navigation(int idx); +void xa_disable_delete_buttons (gboolean value); #endif Modified: xarchiver/trunk/src/main.c =================================================================== --- xarchiver/trunk/src/main.c 2008-07-02 07:01:03 UTC (rev 27191) +++ xarchiver/trunk/src/main.c 2008-07-02 09:08:48 UTC (rev 27192) @@ -128,7 +128,7 @@ if (xa_detect_encrypted_archive (archive)) { archive->has_passwd = TRUE; - archive->passwd = password_dialog (archive); + archive->passwd = xa_create_password_dialog(archive->escaped_path); if (archive->passwd == NULL) goto done; } @@ -214,22 +214,26 @@ g_list_free (ArchiveType); if (archive != NULL) xa_clean_archive_structure (archive); - return status; + return WIFEXITED (status); } else { xa_main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - xa_create_main_window (xa_main_window,gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs_window->show_location_bar))); + xa_create_main_window (xa_main_window, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs_window->show_location_bar)), + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs_window->store_output)), + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (prefs_window->show_sidebar))); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_window->check_save_geometry)) && prefs_window->geometry[0] != -1) { gtk_window_move (GTK_WINDOW(xa_main_window), prefs_window->geometry[0], prefs_window->geometry[1]); gtk_window_set_default_size (GTK_WINDOW(xa_main_window), prefs_window->geometry[2], prefs_window->geometry[3]); + gtk_paned_set_position (GTK_PANED (hpaned1),prefs_window->geometry[4]); } else { gtk_window_set_position (GTK_WINDOW(xa_main_window),GTK_WIN_POS_CENTER); gtk_window_set_default_size (GTK_WINDOW(xa_main_window), 600, 400); + gtk_paned_set_position (GTK_PANED (hpaned1),200); } Update_StatusBar ( _("Ready.")); gtk_widget_show (xa_main_window); Modified: xarchiver/trunk/src/pref_dialog.c =================================================================== --- xarchiver/trunk/src/pref_dialog.c 2008-07-02 07:01:03 UTC (rev 27191) +++ xarchiver/trunk/src/pref_dialog.c 2008-07-02 09:08:48 UTC (rev 27192) @@ -118,14 +118,15 @@ archive_type = g_list_next (archive_type); } - /*prefs_data->allow_dir_extract_with_dnd = gtk_check_button_new_with_mnemonic (_("Allow extracting dirs by drag and drop")); - gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->allow_dir_extract_with_dnd, FALSE, FALSE, 0); - gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->allow_dir_extract_with_dnd), FALSE);*/ - prefs_data->confirm_deletion = gtk_check_button_new_with_mnemonic (_("Confirm deletion of files")); gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->confirm_deletion, FALSE, FALSE, 0); gtk_button_set_focus_on_click (GTK_BUTTON (prefs_data->confirm_deletion), FALSE); + prefs_data->check_sort_filename_column = gtk_check_button_new_with_mnemonic(_("Sort content by filename")); + gtk_box_pack_start (GTK_BOX (vbox4), prefs_data->check_sort_filename_column, FALSE, FALSE, 0); + gtk_button_set_focus_on_click (GTK_BUTTON (pre