From 14f0ea97563f79e163979d447e81f04f0de4edd8 Mon Sep 17 00:00:00 2001 From: reniemarquet Date: Sat, 13 Mar 2010 03:46:00 +0000 Subject: [PATCH] Sorry, adjust final, 2010 RC5 translate to Portuguese (I think!) --- internat/pt/kicad.po | 1904 +++++++----------------------------------- 1 file changed, 315 insertions(+), 1589 deletions(-) diff --git a/internat/pt/kicad.po b/internat/pt/kicad.po index 463124cdb1..2c09f73000 100644 --- a/internat/pt/kicad.po +++ b/internat/pt/kicad.po @@ -2,29 +2,12 @@ msgid "" msgstr "" "Project-Id-Version: kicad\n" "POT-Creation-Date: \n" -<<<<<<< .mine -"PO-Revision-Date: 2010-03-11 20:54-0300\n" -======= -"PO-Revision-Date: 2010-02-16 12:43-0300\n" ->>>>>>> .r2446 +"PO-Revision-Date: 2010-03-13 00:39-0300\n" "Last-Translator: Renie S. Marquet \n" -"Language-Team: kicad team\n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: BRAZIL\n" -"X-Poedit-Basepath: G:\\KiCad\\kicad-sources\n" -"X-Poedit-SourceCharset: iso-8859-1\n" -"X-Poedit-SearchPath-0: pcbnew\n" -"X-Poedit-SearchPath-1: cvpcb\n" -"X-Poedit-SearchPath-2: eeschema\n" -"X-Poedit-SearchPath-3: kicad\n" -"X-Poedit-SearchPath-4: share\n" -"X-Poedit-SearchPath-5: common\n" -"X-Poedit-SearchPath-6: gerbview\n" -"X-Poedit-SearchPath-7: include\n" -"X-Poedit-SearchPath-8: 3d-viewer\n" #: pcbnew/automove.cpp:194 msgid "No modules found!" @@ -114,7 +97,6 @@ msgstr "Incluir desenhos" msgid "Include board outline layer" msgstr "Incluir camada de borda" -<<<<<<< .mine #: pcbnew/block.cpp:164 #: pcbnew/dialog_copper_zones_base.cpp:158 #: pcbnew/dialog_design_rules_base.cpp:377 @@ -133,27 +115,9 @@ msgstr "Incluir camada de borda" #: pcbnew/muonde.cpp:848 #: pcbnew/onrightclick.cpp:59 #: pcbnew/onrightclick.cpp:73 -======= -#: pcbnew/block.cpp:164 -#: pcbnew/dialog_copper_zones_base.cpp:158 #: pcbnew/dialog_display_options_base.cpp:138 -#: pcbnew/dialog_edit_module_text_base.cpp:109 -#: pcbnew/dialog_gendrill.cpp:297 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:157 -#: pcbnew/dialog_global_pads_edition_base.cpp:56 -#: pcbnew/dialog_non_copper_zones_properties_base.cpp:69 -#: pcbnew/dialog_orient_footprints.cpp:168 -#: pcbnew/dialog_pcb_text_properties.cpp:104 -#: pcbnew/dimension.cpp:107 -#: pcbnew/mirepcb.cpp:102 -#: pcbnew/modedit_onclick.cpp:202 -#: pcbnew/modedit_onclick.cpp:239 -#: pcbnew/muonde.cpp:848 -#: pcbnew/onrightclick.cpp:59 -#: pcbnew/onrightclick.cpp:73 ->>>>>>> .r2446 #: pcbnew/sel_layer.cpp:162 -<<<<<<< .mine #: pcbnew/sel_layer.cpp:312 #: eeschema/dialog_bodygraphictext_properties_base.cpp:109 #: eeschema/dialog_edit_label_base.cpp:71 @@ -169,27 +133,11 @@ msgstr "Incluir camada de borda" #: gerbview/onrightclick.cpp:64 #: gerbview/options.cpp:185 #: gerbview/reglage.cpp:101 -======= -#: pcbnew/sel_layer.cpp:312 -#: eeschema/dialog_bodygraphictext_properties_base.cpp:109 -#: eeschema/dialog_edit_label_base.cpp:71 -#: eeschema/eelayer.cpp:269 #: eeschema/libedit_onrightclick.cpp:44 #: eeschema/libedit_onrightclick.cpp:61 -#: eeschema/onrightclick.cpp:84 -#: eeschema/onrightclick.cpp:98 -#: eeschema/sheetlab.cpp:83 -#: common/get_component_dialog.cpp:90 -#: common/selcolor.cpp:200 -#: gerbview/onrightclick.cpp:39 -#: gerbview/onrightclick.cpp:64 -#: gerbview/options.cpp:185 -#: gerbview/reglage.cpp:101 ->>>>>>> .r2446 msgid "Cancel" msgstr "Cancelar" -<<<<<<< .mine #: pcbnew/block.cpp:167 #: pcbnew/dialog_design_rules_base.cpp:373 #: pcbnew/dialog_display_options_base.cpp:137 @@ -201,18 +149,8 @@ msgstr "Cancelar" #: pcbnew/dialog_orient_footprints.cpp:165 #: pcbnew/dialog_pcb_text_properties.cpp:100 #: pcbnew/dimension.cpp:104 -======= -#: pcbnew/block.cpp:167 #: pcbnew/dialog_display_options_base.cpp:135 -#: pcbnew/dialog_edit_module_text_base.cpp:105 -#: pcbnew/dialog_exchange_modules_base.cpp:62 -#: pcbnew/dialog_gendrill.cpp:293 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:153 -#: pcbnew/dialog_non_copper_zones_properties_base.cpp:65 -#: pcbnew/dialog_orient_footprints.cpp:165 -#: pcbnew/dialog_pcb_text_properties.cpp:100 -#: pcbnew/dimension.cpp:104 ->>>>>>> .r2446 #: pcbnew/mirepcb.cpp:99 #: pcbnew/muonde.cpp:845 #: pcbnew/sel_layer.cpp:159 @@ -227,17 +165,11 @@ msgstr "Cancelar" msgid "OK" msgstr "OK" -<<<<<<< .mine #: pcbnew/block.cpp:585 #: pcbnew/onrightclick.cpp:391 #: eeschema/libedit_onrightclick.cpp:348 #: eeschema/onrightclick.cpp:753 -======= -#: pcbnew/block.cpp:585 -#: pcbnew/onrightclick.cpp:391 #: eeschema/libedit_onrightclick.cpp:347 -#: eeschema/onrightclick.cpp:753 ->>>>>>> .r2446 msgid "Delete Block" msgstr "Deletar bloco" @@ -250,21 +182,19 @@ msgstr "Rotacionar bloco" msgid "Move Block" msgstr "Mover bloco" -<<<<<<< .mine #: pcbnew/block.cpp:870 #: pcbnew/onrightclick.cpp:385 #: eeschema/libedit_onrightclick.cpp:344 #: eeschema/onrightclick.cpp:749 msgid "Copy Block" msgstr "Copiar bloco" -======= + #: pcbnew/block.cpp:870 #: pcbnew/onrightclick.cpp:385 #: eeschema/libedit_onrightclick.cpp:343 #: eeschema/onrightclick.cpp:749 msgid "Copy Block" msgstr "Copiar bloco" ->>>>>>> .r2446 #: pcbnew/build_BOM_from_board.cpp:33 msgid "Comma separated value files (*.csv)|*.csv" @@ -316,7 +246,7 @@ msgstr "Esta #: pcbnew/class_board.cpp:215 msgid "Front" -msgstr "Frente" +msgstr "Superior" #: pcbnew/class_board.cpp:216 #: pcbnew/dialog_layers_setup_base.cpp:199 @@ -391,40 +321,39 @@ msgstr "Interno 5" #: pcbnew/class_board.cpp:230 #: pcbnew/dialog_layers_setup_base.cpp:577 msgid "Back" -msgstr "Verso" +msgstr "Face inferior" #: pcbnew/class_board.cpp:231 msgid "Adhes_Back" -msgstr "Adesivo_verso" +msgstr "Adesivo_Inferior" -<<<<<<< .mine #: pcbnew/class_board.cpp:232 msgid "Adhes_Front" -msgstr "Adesivo_frente" +msgstr "Adesivo_Superior" #: pcbnew/class_board.cpp:233 msgid "SoldP_Back" -msgstr "P.Solda_verso" +msgstr "P.Solda_Inferior" #: pcbnew/class_board.cpp:234 msgid "SoldP_Front" -msgstr "P.Solda_frente" +msgstr "P.Solda_Superior" #: pcbnew/class_board.cpp:235 msgid "SilkS_Back" -msgstr "Silk_verso" +msgstr "Silk_inferior" #: pcbnew/class_board.cpp:236 msgid "SilkS_Front" -msgstr "Silk_frente" +msgstr "Silk_Superior" #: pcbnew/class_board.cpp:237 msgid "Mask_Back" -msgstr "Máscara_verso" +msgstr "Máscara_inferior" #: pcbnew/class_board.cpp:238 msgid "Mask_Front" -msgstr "Máscara_frente" +msgstr "Máscara_Superior" #: pcbnew/class_board.cpp:239 msgid "Drawings" @@ -463,34 +392,33 @@ msgid "Vias" msgstr "Vias" #: pcbnew/class_board.cpp:900 -======= #: pcbnew/class_board.cpp:232 msgid "Adhes_Front" -msgstr "Adesivo_frente" +msgstr "Adesivo_Superior" #: pcbnew/class_board.cpp:233 msgid "SoldP_Back" -msgstr "P.Solda_verso" +msgstr "P.Solda_inferior" #: pcbnew/class_board.cpp:234 msgid "SoldP_Front" -msgstr "P.Solda_frente" +msgstr "P.Solda_Superior" #: pcbnew/class_board.cpp:235 msgid "SilkS_Back" -msgstr "Silk_verso" +msgstr "Silk_inferior" #: pcbnew/class_board.cpp:236 msgid "SilkS_Front" -msgstr "Silk_frente" +msgstr "Silk_Superior" #: pcbnew/class_board.cpp:237 msgid "Mask_Back" -msgstr "Máscara_verso" +msgstr "Máscara_inferior" #: pcbnew/class_board.cpp:238 msgid "Mask_Front" -msgstr "Máscara_frente" +msgstr "Máscara_Supoerior" #: pcbnew/class_board.cpp:239 msgid "Drawings" @@ -529,47 +457,37 @@ msgid "Vias" msgstr "Vias" #: pcbnew/class_board.cpp:899 ->>>>>>> .r2446 msgid "Nodes" msgstr "Nós" -<<<<<<< .mine #: pcbnew/class_board.cpp:903 msgid "Nets" msgstr "Ligações" #: pcbnew/class_board.cpp:911 -======= #: pcbnew/class_board.cpp:902 msgid "Nets" msgstr "Ligações" #: pcbnew/class_board.cpp:910 ->>>>>>> .r2446 msgid "Links" msgstr "Links" -<<<<<<< .mine #: pcbnew/class_board.cpp:914 -======= #: pcbnew/class_board.cpp:913 ->>>>>>> .r2446 msgid "Connect" msgstr "Conectados" -<<<<<<< .mine #: pcbnew/class_board.cpp:917 #: pcbnew/dialog_drc_base.cpp:171 msgid "Unconnected" msgstr "Não conectado" -======= + #: pcbnew/class_board.cpp:916 #: pcbnew/dialog_drc_base.cpp:171 msgid "Unconnected" msgstr "Não conectado" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/class_board_item.cpp:23 #: pcbnew/dialog_copper_zones_base.cpp:106 #: pcbnew/dialog_display_options_base.cpp:67 @@ -580,7 +498,7 @@ msgstr "N #: eeschema/class_pin.cpp:60 msgid "Line" msgstr "Linha" -======= + #: pcbnew/class_board_item.cpp:23 #: pcbnew/dialog_copper_zones_base.cpp:106 #: pcbnew/dialog_display_options_base.cpp:67 @@ -591,7 +509,6 @@ msgstr "Linha" #: eeschema/class_pin.cpp:50 msgid "Line" msgstr "Linha" ->>>>>>> .r2446 #: pcbnew/class_board_item.cpp:24 #: pcbnew/dialog_pad_properties_base.cpp:189 @@ -662,7 +579,6 @@ msgstr " em " msgid "Pcb Text" msgstr "Texto no PCB " -<<<<<<< .mine #: pcbnew/class_board_item.cpp:96 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:27 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:47 @@ -673,18 +589,7 @@ msgstr "Texto no PCB " #: eeschema/edit_component_in_schematic.cpp:305 #: eeschema/onrightclick.cpp:327 #: eeschema/eelayer.h:148 -======= -#: pcbnew/class_board_item.cpp:96 -#: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:27 -#: pcbnew/dialog_edit_module_for_Modedit_base.cpp:47 -#: pcbnew/dialog_netlist_fbp.cpp:25 -#: eeschema/class_libentry_fields.cpp:554 #: eeschema/class_sch_component.cpp:1109 -#: eeschema/dialog_create_component.cpp:156 -#: eeschema/edit_component_in_schematic.cpp:305 -#: eeschema/onrightclick.cpp:327 -#: eeschema/eelayer.h:148 ->>>>>>> .r2446 msgid "Reference" msgstr "Referência" @@ -787,7 +692,6 @@ msgstr "Destino:" msgid "size" msgstr "dimensão" -<<<<<<< .mine #: pcbnew/class_drawsegment.cpp:378 #: pcbnew/class_marker_pcb.cpp:64 #: pcbnew/class_text_mod.cpp:469 @@ -799,7 +703,7 @@ msgstr "dimens #: eeschema/libedit.cpp:322 msgid "Type" msgstr "Tipo" -======= + #: pcbnew/class_drawsegment.cpp:378 #: pcbnew/class_marker_pcb.cpp:64 #: pcbnew/class_text_mod.cpp:469 @@ -811,13 +715,11 @@ msgstr "Tipo" #: eeschema/libedit.cpp:322 msgid "Type" msgstr "Tipo" ->>>>>>> .r2446 #: pcbnew/class_drawsegment.cpp:380 msgid "Shape" msgstr "Forma" -<<<<<<< .mine #: pcbnew/class_drawsegment.cpp:391 msgid "Angle" msgstr "Ângulo" @@ -971,7 +873,6 @@ msgstr "Elementos Gr #: pcbnew/class_pad.cpp:580 #: pcbnew/class_text_mod.cpp:461 #: cvpcb/setvisu.cpp:37 -======= #: pcbnew/class_drawsegment.cpp:391 msgid "Angle" msgstr "Ângulo" @@ -1123,7 +1024,6 @@ msgstr "Elementos Gr #: pcbnew/class_pad.cpp:578 #: pcbnew/class_text_mod.cpp:461 #: cvpcb/setvisu.cpp:37 ->>>>>>> .r2446 msgid "Module" msgstr "Módulo" @@ -1155,17 +1055,11 @@ msgstr "Netlist: " msgid "Stat" msgstr "Stat" -<<<<<<< .mine #: pcbnew/class_module.cpp:881 #: pcbnew/class_pad.cpp:732 #: pcbnew/class_pcb_text.cpp:243 #: pcbnew/class_text_mod.cpp:492 -======= -#: pcbnew/class_module.cpp:881 #: pcbnew/class_pad.cpp:730 -#: pcbnew/class_pcb_text.cpp:243 -#: pcbnew/class_text_mod.cpp:492 ->>>>>>> .r2446 msgid "Orient" msgstr "Orientação" @@ -1185,7 +1079,6 @@ msgstr "Doc:" msgid "KeyW: " msgstr "Palavra-chave:" -<<<<<<< .mine #: pcbnew/class_netinfo_item.cpp:133 msgid "Net Name" msgstr "Nome da ligação" @@ -1199,8 +1092,6 @@ msgid "Net Length" msgstr "Comprimento:" #: pcbnew/class_pad.cpp:498 -msgid "Unknown pad shape" -======= #: pcbnew/class_netinfo_item.cpp:133 msgid "Net Name" msgstr "Nome da ligação" @@ -1215,18 +1106,13 @@ msgstr "Comprimento:" #: pcbnew/class_pad.cpp:496 msgid "Unknown pad shape" ->>>>>>> .r2446 msgstr "Formato de ilha desconhecido" -<<<<<<< .mine #: pcbnew/class_pad.cpp:582 -======= #: pcbnew/class_pad.cpp:580 ->>>>>>> .r2446 msgid "RefP" msgstr "RefP" -<<<<<<< .mine #: pcbnew/class_pad.cpp:585 #: pcbnew/dialog_design_rules.cpp:114 msgid "Net" @@ -1247,7 +1133,6 @@ msgstr "Interno" #: pcbnew/class_pad.cpp:705 #: pcbnew/class_pcb_text.cpp:249 #: pcbnew/class_text_mod.cpp:498 -======= #: pcbnew/class_pad.cpp:583 #: pcbnew/dialog_design_rules.cpp:114 msgid "Net" @@ -1268,59 +1153,39 @@ msgstr "Interno" #: pcbnew/class_pad.cpp:703 #: pcbnew/class_pcb_text.cpp:249 #: pcbnew/class_text_mod.cpp:498 ->>>>>>> .r2446 msgid "H Size" msgstr "Tamanho H." -<<<<<<< .mine #: pcbnew/class_pad.cpp:708 #: pcbnew/class_pcb_text.cpp:252 #: pcbnew/class_text_mod.cpp:501 -======= #: pcbnew/class_pad.cpp:706 -#: pcbnew/class_pcb_text.cpp:252 -#: pcbnew/class_text_mod.cpp:501 ->>>>>>> .r2446 msgid "V Size" msgstr "Tamanho V." -<<<<<<< .mine #: pcbnew/class_pad.cpp:713 #: pcbnew/class_track.cpp:1068 #: pcbnew/dialog_design_rules_base.cpp:287 -======= #: pcbnew/class_pad.cpp:711 -#: pcbnew/class_track.cpp:1068 #: pcbnew/dialog_design_rules_base.cpp:288 ->>>>>>> .r2446 msgid "Drill" msgstr "Furo" -<<<<<<< .mine #: pcbnew/class_pad.cpp:721 -======= #: pcbnew/class_pad.cpp:719 ->>>>>>> .r2446 msgid "Drill X / Y" msgstr "Furo X/Y" -<<<<<<< .mine #: pcbnew/class_pad.cpp:735 -======= #: pcbnew/class_pad.cpp:733 ->>>>>>> .r2446 msgid "X Pos" msgstr "Pos X" -<<<<<<< .mine #: pcbnew/class_pad.cpp:738 -======= #: pcbnew/class_pad.cpp:736 ->>>>>>> .r2446 msgid "Y pos" msgstr "Pos Y" -<<<<<<< .mine #: pcbnew/class_pcb_layer_widget.cpp:69 #: common/pcbcommon.cpp:66 msgid "Through Via" @@ -1352,32 +1217,32 @@ msgstr "Mostrar nets n #: pcbnew/class_pcb_layer_widget.cpp:74 msgid "Pads Front" -msgstr "Ilhas da frente" +msgstr "Ilhas face Superior" #: pcbnew/class_pcb_layer_widget.cpp:74 msgid "Show footprint pads on board's front" -msgstr "Mostar ilhas de footprints da frente das placas" +msgstr "Mostar ilhas de footprints da parte superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:75 msgid "Pads Back" -msgstr "Ilhas verso" +msgstr "Ilhas face inferior" #: pcbnew/class_pcb_layer_widget.cpp:75 msgid "Show footprint pads on board's back" -msgstr "Mostrar ilhas de footprint no verso das placas" +msgstr "Mostrar ilhas de footprint na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:77 msgid "Text Front" -msgstr "Texto frente" +msgstr "Texto camada superior" #: pcbnew/class_pcb_layer_widget.cpp:77 #: pcbnew/class_pcb_layer_widget.cpp:78 msgid "Show footprint text on board's back" -msgstr "Mostar texto de footprint no verso das placas" +msgstr "Mostar texto de footprint na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:78 msgid "Text Back" -msgstr "Texto verso" +msgstr "Texto na face inferior" #: pcbnew/class_pcb_layer_widget.cpp:79 msgid "Hidden Text" @@ -1418,19 +1283,19 @@ msgstr "Mostar uma marca em ilhas que n #: pcbnew/class_pcb_layer_widget.cpp:84 msgid "Modules Front" -msgstr "Módulos frente" +msgstr "Módulos camada superior" #: pcbnew/class_pcb_layer_widget.cpp:84 msgid "Show footprints that are on board's front" -msgstr "Mostrar footprints que estão na frente das placas" +msgstr "Mostrar footprints que estão face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:85 msgid "Modules Back" -msgstr "Módulos verso" +msgstr "Módulos na face inferior" #: pcbnew/class_pcb_layer_widget.cpp:85 msgid "Show footprints that are on board's back" -msgstr "Mostar footprints que estão no verso das placas" +msgstr "Mostar footprints que estão na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:86 msgid "Values" @@ -1464,7 +1329,7 @@ msgstr "Desenhar" #: pcbnew/class_pcb_layer_widget.cpp:230 msgid "Front copper layer" -msgstr "Camada de cobre da frente" +msgstr "Camada de cobre superior" #: pcbnew/class_pcb_layer_widget.cpp:238 msgid "An innner copper layer" @@ -1472,39 +1337,39 @@ msgstr "Uma camada de cobre interna" #: pcbnew/class_pcb_layer_widget.cpp:246 msgid "Back copper layer" -msgstr "Camada de cobre do verso" +msgstr "Camada de cobre na face inferior" #: pcbnew/class_pcb_layer_widget.cpp:254 msgid "Adhesive on board's front" -msgstr "Adesivo na frente das placas" +msgstr "Adesivo na face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:255 msgid "Adhesive on board's back" -msgstr "Adesivo no verso das placas" +msgstr "Adesivo na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:256 msgid "Solder paste on board's front" -msgstr "Pasta de solda na frente das placas" +msgstr "Pasta de solda na face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:257 msgid "Solder paste on board's back" -msgstr "Pasta de solda no verso das placas" +msgstr "Pasta de solda na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:258 msgid "Silkscreen on board's front" -msgstr "Silkscreen na frente das placas" +msgstr "Silkscreen na face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:259 msgid "Silkscreen on board's back" -msgstr "Silkscreen no verso das placas" +msgstr "Silkscreen na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:260 msgid "Solder mask on board's front" -msgstr "Másc.solda na frente das placas" +msgstr "Másc.solda na face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:261 msgid "Solder mask on board's back" -msgstr "Másc.solda no verso das placas" +msgstr "Másc.solda na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:262 msgid "Explanatory drawings" @@ -1527,7 +1392,6 @@ msgid "Board's perimeter definition" msgstr "Definição de perimetro das placas" #: pcbnew/class_pcb_text.cpp:230 -======= #: pcbnew/class_pcb_layer_widget.cpp:69 #: common/pcbcommon.cpp:66 msgid "Through Via" @@ -1559,32 +1423,32 @@ msgstr "Mostrar nets n #: pcbnew/class_pcb_layer_widget.cpp:74 msgid "Pads Front" -msgstr "Ilhas da frente" +msgstr "Ilhas da face superior" #: pcbnew/class_pcb_layer_widget.cpp:74 msgid "Show footprint pads on board's front" -msgstr "Mostar ilhas de footprints da frente das placas" +msgstr "Mostar ilhas de footprints da face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:75 msgid "Pads Back" -msgstr "Ilhas verso" +msgstr "Ilhas na face inferior" #: pcbnew/class_pcb_layer_widget.cpp:75 msgid "Show footprint pads on board's back" -msgstr "Mostrar ilhas de footprint no verso das placas" +msgstr "Mostrar ilhas de footprint na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:77 msgid "Text Front" -msgstr "Texto frente" +msgstr "Texto face Superior" #: pcbnew/class_pcb_layer_widget.cpp:77 #: pcbnew/class_pcb_layer_widget.cpp:78 msgid "Show footprint text on board's back" -msgstr "Mostar texto de footprint no verso das placas" +msgstr "Mostar texto de footprint na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:78 msgid "Text Back" -msgstr "Texto verso" +msgstr "Texto na face inferior" #: pcbnew/class_pcb_layer_widget.cpp:79 msgid "Hidden Text" @@ -1625,19 +1489,19 @@ msgstr "Mostar uma marca em ilhas que n #: pcbnew/class_pcb_layer_widget.cpp:84 msgid "Modules Front" -msgstr "Módulos frente" +msgstr "Módulos face Superior" #: pcbnew/class_pcb_layer_widget.cpp:84 msgid "Show footprints that are on board's front" -msgstr "Mostrar footprints que estão na frente das placas" +msgstr "Mostrar footprints que estão na face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:85 msgid "Modules Back" -msgstr "Módulos verso" +msgstr "Módulos na face inferior" #: pcbnew/class_pcb_layer_widget.cpp:85 msgid "Show footprints that are on board's back" -msgstr "Mostar footprints que estão no verso das placas" +msgstr "Mostar footprints que estão na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:86 msgid "Values" @@ -1665,7 +1529,7 @@ msgstr "Ocultar todos os Cobres" #: pcbnew/class_pcb_layer_widget.cpp:217 msgid "Front copper layer" -msgstr "Camada de cobre da frente" +msgstr "Camada de cobre da face superior" #: pcbnew/class_pcb_layer_widget.cpp:225 msgid "An innner copper layer" @@ -1673,39 +1537,39 @@ msgstr "Uma camada de cobre interna" #: pcbnew/class_pcb_layer_widget.cpp:233 msgid "Back copper layer" -msgstr "Camada de cobre do verso" +msgstr "Camada de cobre da face inferior" #: pcbnew/class_pcb_layer_widget.cpp:241 msgid "Adhesive on board's front" -msgstr "Adesivo na frente das placas" +msgstr "Adesivo na face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:242 msgid "Adhesive on board's back" -msgstr "Adesivo no verso das placas" +msgstr "Adesivo na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:243 msgid "Solder paste on board's front" -msgstr "Pasta de solda na frente das placas" +msgstr "Pasta de solda na face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:244 msgid "Solder paste on board's back" -msgstr "Pasta de solda no verso das placas" +msgstr "Pasta de solda na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:245 msgid "Silkscreen on board's front" -msgstr "Silkscreen na frente das placas" +msgstr "Silkscreen na face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:246 msgid "Silkscreen on board's back" -msgstr "Silkscreen no verso das placas" +msgstr "Silkscreen na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:247 msgid "Solder mask on board's front" -msgstr "Másc.solda na frente das placas" +msgstr "Másc.solda na face superior das placas" #: pcbnew/class_pcb_layer_widget.cpp:248 msgid "Solder mask on board's back" -msgstr "Másc.solda no verso das placas" +msgstr "Másc.solda na face inferior das placas" #: pcbnew/class_pcb_layer_widget.cpp:249 msgid "Explanatory drawings" @@ -1728,7 +1592,6 @@ msgid "Board's perimeter definition" msgstr "Definição de perimetro das placas" #: pcbnew/class_pcb_text.cpp:230 ->>>>>>> .r2446 msgid "COTATION" msgstr "COTAÇÃO" @@ -1748,31 +1611,21 @@ msgstr "Texto PCB" msgid "Mirror" msgstr "Espelho" -<<<<<<< .mine #: pcbnew/class_pcb_text.cpp:238 #: pcbnew/class_text_mod.cpp:472 #: pcbnew/dialog_display_options_base.cpp:126 #: eeschema/class_pin.cpp:1646 -======= -#: pcbnew/class_pcb_text.cpp:238 -#: pcbnew/class_text_mod.cpp:472 #: pcbnew/dialog_display_options_base.cpp:124 #: eeschema/class_pin.cpp:1619 ->>>>>>> .r2446 msgid "No" msgstr "Não" -<<<<<<< .mine #: pcbnew/class_pcb_text.cpp:240 #: pcbnew/class_text_mod.cpp:474 #: pcbnew/dialog_display_options_base.cpp:126 #: eeschema/class_pin.cpp:1644 -======= -#: pcbnew/class_pcb_text.cpp:240 -#: pcbnew/class_text_mod.cpp:474 #: pcbnew/dialog_display_options_base.cpp:124 #: eeschema/class_pin.cpp:1617 ->>>>>>> .r2446 msgid "Yes" msgstr "Sim" @@ -2297,7 +2150,6 @@ msgstr "%s: Di msgid "%s: Via Drill ≥ Via Dia
" msgstr "%s: Furo da Via ≥ Diâmtro Via
" -<<<<<<< .mine #: pcbnew/dialog_design_rules.cpp:954 #, c-format msgid "%s: Via Drill < Min Via Drill
" @@ -2654,7 +2506,6 @@ msgstr "Trilhas e vias: " #: gerbview/gerbview_dialog_display_options_frame_base.cpp:25 #: gerbview/gerbview_dialog_display_options_frame_base.cpp:31 #: gerbview/gerbview_dialog_display_options_frame_base.cpp:37 -======= #: pcbnew/dialog_design_rules.cpp:954 #, c-format msgid "%s: Via Drill < Min Via Drill
" @@ -3010,11 +2861,9 @@ msgstr "Trilhas e vias: " #: gerbview/gerbview_dialog_display_options_frame_base.cpp:25 #: gerbview/gerbview_dialog_display_options_frame_base.cpp:31 #: gerbview/gerbview_dialog_display_options_frame_base.cpp:37 ->>>>>>> .r2446 msgid "Sketch" msgstr "Contorno" -<<<<<<< .mine #: pcbnew/dialog_display_options_base.cpp:22 #: pcbnew/dialog_display_options_base.cpp:67 #: pcbnew/dialog_display_options_base.cpp:73 @@ -3025,17 +2874,7 @@ msgstr "Contorno" #: gerbview/gerbview_dialog_display_options_frame_base.cpp:25 #: gerbview/gerbview_dialog_display_options_frame_base.cpp:31 #: gerbview/gerbview_dialog_display_options_frame_base.cpp:37 -======= -#: pcbnew/dialog_display_options_base.cpp:22 -#: pcbnew/dialog_display_options_base.cpp:67 -#: pcbnew/dialog_display_options_base.cpp:73 -#: pcbnew/dialog_display_options_base.cpp:84 #: pcbnew/dialog_display_options_base.cpp:118 -#: pcbnew/dialog_plot_base.cpp:97 -#: gerbview/gerbview_dialog_display_options_frame_base.cpp:25 -#: gerbview/gerbview_dialog_display_options_frame_base.cpp:31 -#: gerbview/gerbview_dialog_display_options_frame_base.cpp:37 ->>>>>>> .r2446 msgid "Filled" msgstr "Preenchido" @@ -3047,7 +2886,6 @@ msgstr "Trilhas:" msgid "Select how tracks are displayed" msgstr "Selecionar como as trilhas são exibidas" -<<<<<<< .mine #: pcbnew/dialog_display_options_base.cpp:30 #: pcbnew/dialog_display_options_base.cpp:38 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:128 @@ -3055,8 +2893,6 @@ msgstr "Selecionar como as trilhas s msgid "Never" msgstr "Nunca" -#: pcbnew/dialog_display_options_base.cpp:30 -======= #: pcbnew/dialog_display_options_base.cpp:30 #: pcbnew/dialog_display_options_base.cpp:38 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:137 @@ -3065,7 +2901,6 @@ msgid "Never" msgstr "Nunca" #: pcbnew/dialog_display_options_base.cpp:30 ->>>>>>> .r2446 msgid "New track" msgstr "Nova Trilha" @@ -3073,21 +2908,19 @@ msgstr "Nova Trilha" msgid "New track with via area" msgstr "Nova trilha com área de via" -<<<<<<< .mine #: pcbnew/dialog_display_options_base.cpp:30 #: pcbnew/dialog_display_options_base.cpp:38 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:128 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:136 msgid "Always" msgstr "Sempre" -======= + #: pcbnew/dialog_display_options_base.cpp:30 #: pcbnew/dialog_display_options_base.cpp:38 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:137 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:145 msgid "Always" msgstr "Sempre" ->>>>>>> .r2446 #: pcbnew/dialog_display_options_base.cpp:32 msgid "Show Tracks Clearance:" @@ -3166,37 +2999,30 @@ msgstr "Op msgid "Pad Shapes:" msgstr "Formatos de Ilha:" -<<<<<<< .mine #: pcbnew/dialog_display_options_base.cpp:92 msgid "Via Shapes:" msgstr "Formatos de Via:" -======= + #: pcbnew/dialog_display_options_base.cpp:90 msgid "Via Shapes:" msgstr "Formatos de Via:" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_display_options_base.cpp:96 msgid "Show pad clearance" msgstr "Mostrar isolamento de Ilha" -======= + #: pcbnew/dialog_display_options_base.cpp:94 msgid "Show pad clearance" msgstr "Mostrar isolamento de Ilha" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_display_options_base.cpp:100 msgid "Show pad number" msgstr "Mostrar Numeração de Ilha" -======= + #: pcbnew/dialog_display_options_base.cpp:98 msgid "Show pad number" msgstr "Mostrar Numeração de Ilha" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_display_options_base.cpp:105 msgid "Show pad NoConnect" msgstr "Mostrar Ilha não conectada" @@ -3206,7 +3032,6 @@ msgid "Others:" msgstr "Outros:" #: pcbnew/dialog_display_options_base.cpp:122 -======= #: pcbnew/dialog_display_options_base.cpp:103 msgid "Show pad NoConnect" msgstr "Mostrar Ilha não conectada" @@ -3216,15 +3041,11 @@ msgid "Others:" msgstr "Outros:" #: pcbnew/dialog_display_options_base.cpp:120 ->>>>>>> .r2446 msgid "Display other items:" msgstr "Mostrar outros ítens:" -<<<<<<< .mine #: pcbnew/dialog_display_options_base.cpp:128 -======= #: pcbnew/dialog_display_options_base.cpp:126 ->>>>>>> .r2446 msgid "Show page limits" msgstr "Mostrar limites de página" @@ -3239,7 +3060,6 @@ msgstr "Arquivo de relat msgid "Disk File Report Completed" msgstr "Arquivo relatório completado" -<<<<<<< .mine #: pcbnew/dialog_drc.cpp:279 msgid "DRC report files (.rpt)|*.rpt" msgstr "Arquivo relatório de DRC (.rpt)|*.rpt" @@ -3256,8 +3076,6 @@ msgstr "Salvar relat #: eeschema/dialog_build_BOM_base.cpp:60 #: eeschema/netlist_control.cpp:126 #: gerbview/dialog_print_using_printer_base.cpp:70 -msgid "Options:" -======= #: pcbnew/dialog_drc.cpp:279 msgid "DRC report files (.rpt)|*.rpt" msgstr "Arquivo relatório de DRC (.rpt)|*.rpt" @@ -3276,40 +3094,34 @@ msgstr "Salvar relat #: eeschema/netlist_control.cpp:126 #: gerbview/dialog_print_using_printer_base.cpp:70 msgid "Options:" ->>>>>>> .r2446 msgstr "Opções" #: pcbnew/dialog_drc_base.cpp:40 msgid "By Netclass" msgstr "Por Classes de Nets" -<<<<<<< .mine #: pcbnew/dialog_drc_base.cpp:47 msgid "Enter the minimum acceptable value for a track width" msgstr "Entre o valor mínimo aceitável para largura de trilha" -======= + #: pcbnew/dialog_drc_base.cpp:50 #: pcbnew/dialog_drc_base.cpp:59 #: pcbnew/dialog_drc_base.cpp:68 msgid "In the clearance units, enter the clearance distance" msgstr "Em unidades de isolamento, entre a distância de isolamento" ->>>>>>> .r2446 #: pcbnew/dialog_drc_base.cpp:54 msgid "Min via size" msgstr "Tamanho min. de via" -<<<<<<< .mine #: pcbnew/dialog_drc_base.cpp:56 msgid "Enter the minimum acceptable diameter for a standard via" msgstr "Entre o diâmetro mínimo aceitável para via padrão" -======= + #: pcbnew/dialog_drc_base.cpp:63 msgid "Min uVia size" msgstr "Tamanho mín. de Micro Via" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_drc_base.cpp:63 msgid "Min uVia size" msgstr "Tamanho mín. de Micro Via" @@ -3320,10 +3132,6 @@ msgstr "Entre o di #: pcbnew/dialog_drc_base.cpp:75 msgid "Create Report File" -======= -#: pcbnew/dialog_drc_base.cpp:75 -msgid "Create Report File" ->>>>>>> .r2446 msgstr "Criar arquivo de relatório" #: pcbnew/dialog_drc_base.cpp:79 @@ -3400,7 +3208,6 @@ msgstr "" "Usar este atributo para componentes smd.\n" "Somente componentes com esta opção são colocados nas listas de posicionamento de footprint" -<<<<<<< .mine #: pcbnew/dialog_edit_module_for_BoardEditor.cpp:228 #: pcbnew/dialog_edit_module_for_Modedit.cpp:89 msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)" @@ -3454,7 +3261,6 @@ msgstr "Tipo de caminho" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:24 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:24 -======= #: pcbnew/dialog_edit_module_for_BoardEditor.cpp:228 #: pcbnew/dialog_edit_module_for_Modedit.cpp:89 msgid "Use this attribute for \"virtual\" components drawn on board (like a old ISA PC bus connector)" @@ -3508,7 +3314,6 @@ msgstr "Tipo de caminho" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:24 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:24 ->>>>>>> .r2446 msgid "Fields:" msgstr "Campos:" @@ -3536,7 +3341,6 @@ msgstr "Inferior" msgid "Side Select" msgstr "Selecionar lado" -<<<<<<< .mine #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:55 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:59 #: pcbnew/dialog_edit_module_text_base.cpp:81 @@ -3544,7 +3348,7 @@ msgstr "Selecionar lado" #: eeschema/class_pin.cpp:1655 msgid "Orientation" msgstr "Orientação" -======= + #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:55 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:59 #: pcbnew/dialog_edit_module_text_base.cpp:81 @@ -3552,7 +3356,6 @@ msgstr "Orienta #: eeschema/class_pin.cpp:1628 msgid "Orientation" msgstr "Orientação" ->>>>>>> .r2446 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:57 #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:101 @@ -3672,7 +3475,6 @@ msgstr "Rota msgid "Masks clearances local values:" msgstr "Valores locais de máscara de isolamento:" -<<<<<<< .mine #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:145 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:116 msgid "Set these values to 0 to use global values" @@ -3797,7 +3599,6 @@ msgstr "Propriedades" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:231 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:200 -======= #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:145 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:116 msgid "Set these values to 0 to use global values" @@ -3922,11 +3723,9 @@ msgstr "Propriedades" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:231 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:200 ->>>>>>> .r2446 msgid "3D Shape Name" msgstr "Nome modelo 3D" -<<<<<<< .mine #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:241 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:210 msgid "3D Scale and Pos" @@ -3938,7 +3737,6 @@ msgstr "Pesquisar formatos" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:251 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:217 -======= #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:241 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:210 msgid "3D Scale and Pos" @@ -3951,31 +3749,24 @@ msgstr "Pesquisar formatos" #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:251 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:220 ->>>>>>> .r2446 msgid "Add 3D Shape" msgstr "Adicionar modelo 3D" -<<<<<<< .mine #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:254 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:220 -======= -#: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:254 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:223 ->>>>>>> .r2446 msgid "Remove 3D Shape" msgstr "Remover modelo 3D:" -<<<<<<< .mine #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:264 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:230 msgid "3D settings" msgstr "Configurações 3D" -======= + #: pcbnew/dialog_edit_module_for_BoardEditor_base.cpp:264 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:233 msgid "3D settings" msgstr "Configurações 3D" ->>>>>>> .r2446 #: pcbnew/dialog_edit_module_for_Modedit_base.cpp:27 #: eeschema/onrightclick.cpp:373 @@ -4043,17 +3834,15 @@ msgstr "horiz" msgid "vertical" msgstr "Vertical" -<<<<<<< .mine #: pcbnew/dialog_edit_module_text_base.cpp:85 #: eeschema/class_pin.cpp:1647 msgid "Visible" msgstr "Visível" -======= + #: pcbnew/dialog_edit_module_text_base.cpp:85 #: eeschema/class_pin.cpp:1620 msgid "Visible" msgstr "Visível" ->>>>>>> .r2446 #: pcbnew/dialog_edit_module_text_base.cpp:85 msgid "Invisible" @@ -4068,27 +3857,24 @@ msgstr "Invis msgid "Italic" msgstr "Itálico" -<<<<<<< .mine #: pcbnew/dialog_edit_module_text_base.cpp:98 #: pcbnew/dialog_pcb_text_properties.cpp:181 #: eeschema/class_pin.cpp:1642 #: eeschema/dialog_edit_label_base.cpp:45 msgid "Style" msgstr "Estilo" -======= + #: pcbnew/dialog_edit_module_text_base.cpp:98 #: pcbnew/dialog_pcb_text_properties.cpp:181 #: eeschema/class_pin.cpp:1615 #: eeschema/dialog_edit_label_base.cpp:45 msgid "Style" msgstr "Estilo" ->>>>>>> .r2446 #: pcbnew/dialog_exchange_modules_base.cpp:25 msgid "Current Module" msgstr "Módulo atual" -<<<<<<< .mine #: pcbnew/dialog_exchange_modules_base.cpp:32 msgid "Current Value" msgstr "Valor atual" @@ -4376,7 +4162,6 @@ msgstr "Mostrar Gerenciador de Camadas" #: pcbnew/dialog_general_options_BoardEditor_base.cpp:22 #: gerbview/options.cpp:191 -======= #: pcbnew/dialog_exchange_modules_base.cpp:32 msgid "Current Value" msgstr "Valor atual" @@ -4616,7 +4401,6 @@ msgstr "Mostrar Gerenciador de Camadas" #: pcbnew/dialog_general_options_BoardEditor_base.cpp:22 #: gerbview/options.cpp:191 ->>>>>>> .r2446 msgid "No Display" msgstr "Não Mostrar" @@ -4659,50 +4443,37 @@ msgstr "Cursor" msgid "Main cursor shape selection (small cross or large cursor)" msgstr "Formato principal do cursor ( pequena cruz ou cursor grande)" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:51 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:60 ->>>>>>> .r2446 msgid "Max Links:" msgstr "Ligações máx:" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:56 msgid "Adjust the number of ratsnets shown from cursor to closest pads" msgstr "Ajustar o número de ratsnets apresentadas a partir do cursor para as ilhas interligadas" #: pcbnew/dialog_general_options_BoardEditor_base.cpp:60 -msgid "Auto Save (minutes):" -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:65 msgid "Adjust the number of ratsnets shown from cursor to closest pads" msgstr "Ajustar o número de ratsnets apresentadas a partir do cursor para as ilhas interligadas" #: pcbnew/dialog_general_options_BoardEditor_base.cpp:69 msgid "Auto Save (minutes):" ->>>>>>> .r2446 msgstr "Auto Salvar (min)" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:65 msgid "Delay after the first change to create a backup file of the board on disk." msgstr "Intervalo após a primeira alteração para criar um arquivo backup da placa no disco." -======= + #: pcbnew/dialog_general_options_BoardEditor_base.cpp:74 msgid "Delay after the first change to create a backup file of the board on disk." msgstr "Intervalo após a primeira alteração para criar um arquivo backup da placa no disco." ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:74 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:83 ->>>>>>> .r2446 msgid "Drc ON" msgstr "Drc ATIVO" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:77 msgid "" "Enable/disable the DRC control.\n" @@ -4712,7 +4483,6 @@ msgstr "" "Quando o DRC está desativado, qualquer conexão é permitida." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:81 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:86 msgid "" "Enable/disable the DRC control.\n" @@ -4722,27 +4492,22 @@ msgstr "" "Quando o DRC está desativado, qualquer conexão é permitida." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:90 ->>>>>>> .r2446 msgid "Show Ratsnest" msgstr "Mostrar Interligações" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:83 msgid "Show (or not) the full rastnest." msgstr "Mostrar as interligações do módulo. *" #: pcbnew/dialog_general_options_BoardEditor_base.cpp:87 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:92 msgid "Show (or not) the full rastnest." msgstr "Mostrar as interligações do módulo. *" #: pcbnew/dialog_general_options_BoardEditor_base.cpp:96 ->>>>>>> .r2446 msgid "Show Mod Ratsnest" msgstr "Mostrar Interligações do Módulo" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:89 msgid "" "Shows (or not) the local ratsnest relative to a footprint, when moving it.\n" @@ -4752,7 +4517,6 @@ msgstr "" "Estas rastnests são úteis para posicionar um footprint." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:93 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:98 msgid "" "Shows (or not) the local ratsnest relative to a footprint, when moving it.\n" @@ -4762,21 +4526,17 @@ msgstr "" "Estas rastnests são úteis para posicionar um footprint." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:102 ->>>>>>> .r2446 msgid "Tracks Auto Del" msgstr "Auto deletar Trilhas" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:95 msgid "Enable/disable the automatic track deletion when recreating a track." msgstr "Ativa/desativa a deleção automática de trilha quando recriando uma trilha." -======= + #: pcbnew/dialog_general_options_BoardEditor_base.cpp:104 msgid "Enable/disable the automatic track deletion when recreating a track." msgstr "Ativa/desativa a deleção automática de trilha quando recriando uma trilha." ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:99 msgid "Track only 45 degrees" msgstr "Trilhas somente a 45 graus" @@ -4786,7 +4546,6 @@ msgid "If enabled, force tracks directions to H, V or 45 degrees, when creating msgstr "Se ativido, força a direção das trilhas H, V ou 45 graus, quando criando uma trilha." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:105 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:108 msgid "Track only 45 degrees" msgstr "Trilhas somente a 45 graus" @@ -4796,77 +4555,59 @@ msgid "If enabled, force tracks directions to H, V or 45 degrees, when creating msgstr "Se ativido, força a direção das trilhas H, V ou 45 graus, quando criando uma trilha." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:114 ->>>>>>> .r2446 msgid "Segments 45 Only" msgstr "Segmentos somente a 45" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:107 msgid "If enabled, force segments directions to H, V or 45 degrees, when creating a segment on technical layers." msgstr "Se ativado, força direção de segmentos para H, V ou 45 graus, quando criando um segmento em camadas técnicas." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:111 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:116 msgid "If enabled, force segments directions to H, V or 45 degrees, when creating a segment on technical layers." msgstr "Se ativado, força direção de segmentos para H, V ou 45 graus, quando criando um segmento em camadas técnicas." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:120 ->>>>>>> .r2446 msgid "Auto PAN" msgstr "Deslizamento automático" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:113 msgid "Allows auto pan when creating a track, or moving an item." msgstr "Permitir auto deslizamento da tela quando criando uma trilha ou movendo um item." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:117 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:122 msgid "Allows auto pan when creating a track, or moving an item." msgstr "Permitir auto deslizamento da tela quando criando uma trilha ou movendo um item." #: pcbnew/dialog_general_options_BoardEditor_base.cpp:126 ->>>>>>> .r2446 msgid "Double Segm Track" msgstr "Trilha em linha dupla ***" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:119 msgid "If enabled, uses two track segments, with 45 degrees angle between them when creating a new track " msgstr "Se abilitado, usa dois seguintos de trilha, com um angulo de 45 graus entre elas quando criando uma nova trilha" #: pcbnew/dialog_general_options_BoardEditor_base.cpp:128 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:136 -======= -#: pcbnew/dialog_general_options_BoardEditor_base.cpp:128 msgid "If enabled, uses two track segments, with 45 degrees angle between them when creating a new track " msgstr "Se abilitado, usa dois seguintos de trilha, com um angulo de 45 graus entre elas quando criando uma nova trilha" #: pcbnew/dialog_general_options_BoardEditor_base.cpp:137 #: pcbnew/dialog_general_options_BoardEditor_base.cpp:145 ->>>>>>> .r2446 msgid "When creating tracks" msgstr "Quando criando trilhas" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:130 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:139 ->>>>>>> .r2446 msgid "Magnetic Pads" msgstr "Ilhas Magnéticas" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:132 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:141 ->>>>>>> .r2446 msgid "control the capture of the pcb cursor when the mouse cursor enters a pad area" msgstr "controlar a captura do cursor na pcb quando o cursor do mouse entrar na área de uma ilha" -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.cpp:138 msgid "Magnetic Tracks" msgstr "Trilhas Magnéticas" @@ -4988,7 +4729,6 @@ msgid "Change Pads on Same Modules" msgstr "Alterar ilhas nos mesmos módulos" #: pcbnew/dialog_graphic_items_options_base.cpp:23 -======= #: pcbnew/dialog_general_options_BoardEditor_base.cpp:147 msgid "Magnetic Tracks" msgstr "Trilhas Magnéticas" @@ -5110,91 +4850,59 @@ msgid "Change Pads on Same Modules" msgstr "Alterar ilhas nos mesmos módulos" #: pcbnew/dialog_graphic_items_options.cpp:194 ->>>>>>> .r2446 msgid "Graphics:" msgstr "Gráficos:" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:25 -======= #: pcbnew/dialog_graphic_items_options.cpp:200 ->>>>>>> .r2446 msgid "Graphic segm Width" msgstr "Largura de segmentos gráficos" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:32 -======= #: pcbnew/dialog_graphic_items_options.cpp:217 ->>>>>>> .r2446 msgid "Board Edges Width" msgstr "Largura de bordas de placa" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:39 -======= #: pcbnew/dialog_graphic_items_options.cpp:234 ->>>>>>> .r2446 msgid "Copper Text Width" msgstr "Largura de texto de cobreado" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:46 -======= #: pcbnew/dialog_graphic_items_options.cpp:251 ->>>>>>> .r2446 msgid "Text Size V" msgstr "Dimensão de Texto V" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:53 -======= #: pcbnew/dialog_graphic_items_options.cpp:268 ->>>>>>> .r2446 msgid "Text Size H" msgstr "Dimensão de Texto H" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:63 -======= #: pcbnew/dialog_graphic_items_options.cpp:287 ->>>>>>> .r2446 msgid "Modules:" msgstr "Módulos:" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:65 -======= #: pcbnew/dialog_graphic_items_options.cpp:293 ->>>>>>> .r2446 msgid "Edges Module Width" msgstr "Largura de borda de módulos" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:72 -======= #: pcbnew/dialog_graphic_items_options.cpp:313 ->>>>>>> .r2446 msgid "Text Module Width" msgstr "Largura de texto de módulos" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:79 -======= #: pcbnew/dialog_graphic_items_options.cpp:334 ->>>>>>> .r2446 msgid "Text Module Size V" msgstr "Tamanho de Texto de Módulo V" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:86 -======= #: pcbnew/dialog_graphic_items_options.cpp:355 ->>>>>>> .r2446 msgid "Text Module Size H" msgstr "Tamanho de Texto de Módulo H" -<<<<<<< .mine #: pcbnew/dialog_graphic_items_options_base.cpp:96 msgid "General:" msgstr " Geral :" @@ -5242,7 +4950,6 @@ msgid "Start Point Y" msgstr "Ponto inicial Y" #: pcbnew/dialog_initpcb.cpp:103 -======= #: pcbnew/dialog_graphic_items_options.cpp:380 #: pcbnew/dialog_initpcb.cpp:159 #: pcbnew/set_grid.cpp:179 @@ -5294,7 +5001,6 @@ msgid "Start Point Y" msgstr "Ponto inicial Y" #: pcbnew/dialog_initpcb.cpp:103 ->>>>>>> .r2446 msgid "Items to delete" msgstr "Ítens para deletar" @@ -5342,7 +5048,6 @@ msgstr "Incluir Trilhas Auto-roteadas" msgid "Include Locked Tracks" msgstr "Incluir Trilhas Travadas" -<<<<<<< .mine #: pcbnew/dialog_initpcb.cpp:159 #: pcbnew/set_grid.cpp:179 #: pcbnew/swap_layers.cpp:255 @@ -5404,23 +5109,23 @@ msgstr "Customizado" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Two layers, parts on Front only" -msgstr "Duas camadas, componentes na frente somente" +msgstr "Duas camadas, componentes na face superior somente" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Two layers, parts on Back only" -msgstr "Duas camadas, componentes no verso somente" +msgstr "Duas camadas, componentesna face inferior somente" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Two layers, parts on Front and Back" -msgstr "Duas camadas, componentes na frente e no verso" +msgstr "Duas camadas, componentes na face superior e na face inferior" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Four layers, parts on Front only" -msgstr "Quatro Camadas, Componentes na frente somente" +msgstr "Quatro Camadas, Componentes na face superior somente" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Four layers, parts on Front and Back" -msgstr "Quatro Camadas, Componentes na frente e no verso" +msgstr "Quatro Camadas, Componentes na face superior e na face inferior" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "All layers on" @@ -5480,7 +5185,7 @@ msgstr "" #: pcbnew/dialog_layers_setup_base.cpp:80 msgid "If you want an adhesive template for the front side of the board" -msgstr "Se você quiser um adesivo de exemplo para o lado da frente da placa" +msgstr "Se você quiser um adesivo de exemplo para o lado da face superior da placa" #: pcbnew/dialog_layers_setup_base.cpp:89 #: pcbnew/dialog_layers_setup_base.cpp:114 @@ -5503,7 +5208,7 @@ msgstr "" #: pcbnew/dialog_layers_setup_base.cpp:130 msgid "If you want a silk screen layer for the front side of the board" -msgstr "Se você quiser uma camada de silk screen para o lado da frente da placa" +msgstr "Se você quiser uma camada de silk screen para o lado da face superior da placa" #: pcbnew/dialog_layers_setup_base.cpp:139 #: pcbnew/dialog_layers_setup_base.cpp:164 @@ -5518,7 +5223,7 @@ msgstr "" #: pcbnew/dialog_layers_setup_base.cpp:155 msgid "If you want a solder mask layer for the front of the board" -msgstr "Se você quiser uma camada de máscara de solta para a frente da placa" +msgstr "Se você quiser uma camada de máscara de solta para a face superior da placa" #: pcbnew/dialog_layers_setup_base.cpp:168 msgid "Front_later" @@ -5526,11 +5231,11 @@ msgstr "" #: pcbnew/dialog_layers_setup_base.cpp:170 msgid "Layer name of front (top) copper layer" -msgstr "Nome da camada da frente (top) de cobre" +msgstr "Nome da camada da face superior (top) de cobre" #: pcbnew/dialog_layers_setup_base.cpp:182 msgid "If you want a front copper layer" -msgstr "Se quiser uma camada de cobre na frente" +msgstr "Se quiser uma camada de cobre na face superior" #: pcbnew/dialog_layers_setup_base.cpp:191 #: pcbnew/dialog_layers_setup_base.cpp:218 @@ -5629,11 +5334,11 @@ msgstr "Tipo de camada de cobre para Freerouter. Camadas Power (alimenta #: pcbnew/dialog_layers_setup_base.cpp:579 msgid "Layer name of back (bottom) copper layer" -msgstr "Nome da camada de cobre do verso (bottom)" +msgstr "Nome da camada de cobre na face inferior (bottom)" #: pcbnew/dialog_layers_setup_base.cpp:591 msgid "If you want a back copper layer" -msgstr "Se quiser uma camada de cobre no verso" +msgstr "Se quiser uma camada de cobre na face inferior" #: pcbnew/dialog_layers_setup_base.cpp:608 msgid "Mask_Back_later" @@ -5759,7 +5464,6 @@ msgid "Netlist Selection:" msgstr "Seleção de netlist:" #: pcbnew/dialog_netlist_fbp.cpp:25 -======= #: pcbnew/dialog_layers_setup.cpp:267 #: eeschema/class_pin.cpp:1602 #: eeschema/class_sch_component.cpp:1116 @@ -5799,23 +5503,23 @@ msgstr "Customizado" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Two layers, parts on Front only" -msgstr "Duas camadas, componentes na frente somente" +msgstr "Duas camadas, componentes na face superior somente" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Two layers, parts on Back only" -msgstr "Duas camadas, componentes no verso somente" +msgstr "Duas camadas, componentesna face inferior somente" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Two layers, parts on Front and Back" -msgstr "Duas camadas, componentes na frente e no verso" +msgstr "Duas camadas, componentes na face superior e na face inferior" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Four layers, parts on Front only" -msgstr "Quatro Camadas, Componentes na frente somente" +msgstr "Quatro Camadas, Componentes na face superior somente" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "Four layers, parts on Front and Back" -msgstr "Quatro Camadas, Componentes na frente e no verso" +msgstr "Quatro Camadas, Componentes na face superior e na face inferior" #: pcbnew/dialog_layers_setup_base.cpp:25 msgid "All layers on" @@ -5875,7 +5579,7 @@ msgstr "" #: pcbnew/dialog_layers_setup_base.cpp:80 msgid "If you want an adhesive template for the front side of the board" -msgstr "Se você quiser um adesivo de exemplo para o lado da frente da placa" +msgstr "Se você quiser um adesivo de exemplo para a face superior da placa" #: pcbnew/dialog_layers_setup_base.cpp:89 #: pcbnew/dialog_layers_setup_base.cpp:114 @@ -5898,7 +5602,7 @@ msgstr "" #: pcbnew/dialog_layers_setup_base.cpp:130 msgid "If you want a silk screen layer for the front side of the board" -msgstr "Se você quiser uma camada de silk screen para o lado da frente da placa" +msgstr "Se você quiser uma camada de silk screen para a face superior da placa" #: pcbnew/dialog_layers_setup_base.cpp:139 #: pcbnew/dialog_layers_setup_base.cpp:164 @@ -5913,7 +5617,7 @@ msgstr "" #: pcbnew/dialog_layers_setup_base.cpp:155 msgid "If you want a solder mask layer for the front of the board" -msgstr "Se você quiser uma camada de máscara de solta para a frente da placa" +msgstr "Se você quiser uma camada de máscara de solta para a face superior da placa" #: pcbnew/dialog_layers_setup_base.cpp:168 msgid "Front_later" @@ -5921,11 +5625,11 @@ msgstr "" #: pcbnew/dialog_layers_setup_base.cpp:170 msgid "Layer name of front (top) copper layer" -msgstr "Nome da camada da frente (top) de cobre" +msgstr "Nome da camada da face superior (top) de cobre" #: pcbnew/dialog_layers_setup_base.cpp:182 msgid "If you want a front copper layer" -msgstr "Se quiser uma camada de cobre na frente" +msgstr "Se quiser uma camada de cobre na face superior" #: pcbnew/dialog_layers_setup_base.cpp:191 #: pcbnew/dialog_layers_setup_base.cpp:218 @@ -6024,11 +5728,11 @@ msgstr "Tipo de camada de cobre para Freerouter. Camadas Power (alimenta #: pcbnew/dialog_layers_setup_base.cpp:579 msgid "Layer name of back (bottom) copper layer" -msgstr "Nome da camada de cobre do verso (bottom)" +msgstr "Nome da camada de cobre na face inferior (bottom)" #: pcbnew/dialog_layers_setup_base.cpp:591 msgid "If you want a back copper layer" -msgstr "Se quiser uma camada de cobre no verso" +msgstr "Se quiser uma camada de cobre na face inferior" #: pcbnew/dialog_layers_setup_base.cpp:608 msgid "Mask_Back_later" @@ -6154,7 +5858,6 @@ msgid "Netlist Selection:" msgstr "Seleção de netlist:" #: pcbnew/dialog_netlist_fbp.cpp:25 ->>>>>>> .r2446 msgid "Timestamp" msgstr "Timestamp" @@ -6238,7 +5941,6 @@ msgstr "Carregar arquivo netlist corrente, atualizar e listar informa msgid "Footprints Test" msgstr "Testar Módulos" -<<<<<<< .mine #: pcbnew/dialog_netlist_fbp.cpp:76 msgid "Read the current neltist file and list missing and extra footprints" msgstr "Carregar arquivo netlist atual e listar footprints extras ou ausentes" @@ -6352,7 +6054,6 @@ msgid "Unknown netname, no change" msgstr "Nome de net desconhecido, não alterado" #: pcbnew/dialog_pad_properties_base.cpp:25 -======= #: pcbnew/dialog_netlist_fbp.cpp:76 msgid "Read the current neltist file and list missing and extra footprints" msgstr "Carregar arquivo netlist atual e listar footprints extras ou ausentes" @@ -6458,7 +6159,6 @@ msgid "Unknown netname, no change" msgstr "Nome de net desconhecido, não alterado" #: pcbnew/dialog_pad_properties_base.cpp:25 ->>>>>>> .r2446 msgid "Pad Num :" msgstr "Num Ilha :" @@ -6615,13 +6315,9 @@ msgstr "Padr msgid "SMD" msgstr "SMD" -<<<<<<< .mine #: pcbnew/dialog_pad_properties_base.cpp:307 #: eeschema/netlist.cpp:115 -======= -#: pcbnew/dialog_pad_properties_base.cpp:307 #: eeschema/netlist.cpp:114 ->>>>>>> .r2446 msgid "Conn" msgstr "Conec." @@ -6639,27 +6335,21 @@ msgstr "Tipo da Ilha:" msgid "Layers:" msgstr "Camadas:" -<<<<<<< .mine #: pcbnew/dialog_pad_properties_base.cpp:316 msgid "Component layer" msgstr "Camada componente" #: pcbnew/dialog_pad_properties_base.cpp:320 -======= #: pcbnew/dialog_pad_properties_base.cpp:316 ->>>>>>> .r2446 msgid "Copper layer" msgstr "Camada cobre" -<<<<<<< .mine #: pcbnew/dialog_pad_properties_base.cpp:327 -======= #: pcbnew/dialog_pad_properties_base.cpp:320 msgid "Component layer" msgstr "Camada componente" #: pcbnew/dialog_pad_properties_base.cpp:327 ->>>>>>> .r2446 msgid "Adhesive Cmp" msgstr "Adesivos Cmp" @@ -6691,31 +6381,23 @@ msgstr "M msgid "Solder mask Copper" msgstr "Másc.solda cobreado" -<<<<<<< .mine #: pcbnew/dialog_pad_properties_base.cpp:359 msgid "Draft layer" msgstr "Camada Rascunho" #: pcbnew/dialog_pad_properties_base.cpp:363 -======= #: pcbnew/dialog_pad_properties_base.cpp:359 ->>>>>>> .r2446 msgid "E.C.O.1 layer" msgstr "Camada E.C.O.1" -<<<<<<< .mine #: pcbnew/dialog_pad_properties_base.cpp:367 -======= #: pcbnew/dialog_pad_properties_base.cpp:363 ->>>>>>> .r2446 msgid "E.C.O.2 layer" msgstr "Camada E.C.O.2" -<<<<<<< .mine #: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:40 #: eeschema/dialog_eeschema_config.cpp:75 #: gerbview/reglage.cpp:80 -======= #: pcbnew/dialog_pad_properties_base.cpp:367 msgid "Draft layer" msgstr "Camada Rascunho" @@ -6723,7 +6405,6 @@ msgstr "Camada Rascunho" #: pcbnew/dialog_pcbnew_config_libs_and_paths.cpp:40 #: eeschema/dialog_eeschema_config.cpp:75 #: gerbview/reglage.cpp:80 ->>>>>>> .r2446 msgid "from " msgstr "de " @@ -6899,7 +6580,6 @@ msgstr "" "Quando desativado, ilhas nunca são plotadas em camadas de silkscreen\n" "Quando ativado, ilhas são plotadas somente se elas apareceram nas camadas de silkscreen" -<<<<<<< .mine #: pcbnew/dialog_plot_base.cpp:60 msgid "Print module value" msgstr "Imprimir valor do módulo" @@ -7186,7 +6866,6 @@ msgstr "Modo Impress #: pcbnew/dialog_SVG_print_base.cpp:51 #: eeschema/dialog_SVG_print_base.cpp:38 #: gerbview/dialog_print_using_printer_base.cpp:82 -======= #: pcbnew/dialog_plot_base.cpp:60 msgid "Print module value" msgstr "Imprimir valor do módulo" @@ -7495,7 +7174,6 @@ msgstr "Modo Impress #: pcbnew/dialog_SVG_print_base.cpp:51 #: eeschema/dialog_SVG_print_base.cpp:38 #: gerbview/dialog_print_using_printer_base.cpp:82 ->>>>>>> .r2446 msgid "" "Choose if you wand to draw the sheet like it appears on screen,\n" "or in black and white mode, better to print it when using black and white printers" @@ -7503,21 +7181,18 @@ msgstr "" "Escolher se deseja desenhar as folhas como aparecem na tela,\n" "ou em preto e branco, melhor para imprimir quando usando impressoras preto e branco" -<<<<<<< .mine #: pcbnew/dialog_print_for_modedit_base.cpp:46 #: pcbnew/dialog_print_using_printer_base.cpp:128 #: gerbview/dialog_print_using_printer_base.cpp:97 msgid "Page Options" msgstr "Opções de Páginas" -======= + #: pcbnew/dialog_print_for_modedit_base.cpp:63 #: pcbnew/dialog_print_using_printer_base.cpp:128 #: gerbview/dialog_print_using_printer_base.cpp:97 msgid "Page Options" msgstr "Opções de Páginas" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_print_for_modedit_base.cpp:49 #: pcbnew/dialog_print_using_printer_base.cpp:131 #: eeschema/dialog_print_using_printer.cpp:208 @@ -7525,7 +7200,7 @@ msgstr "Op #: gerbview/dialog_print_using_printer_base.cpp:100 msgid "Preview" msgstr "Pré-visualização" -======= + #: pcbnew/dialog_print_for_modedit_base.cpp:66 #: pcbnew/dialog_print_using_printer_base.cpp:131 #: eeschema/dialog_print_using_printer.cpp:206 @@ -7533,9 +7208,7 @@ msgstr "Pr #: gerbview/dialog_print_using_printer_base.cpp:100 msgid "Preview" msgstr "Pré-visualização" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_print_for_modedit_base.cpp:52 #: pcbnew/dialog_print_using_printer.cpp:504 #: pcbnew/dialog_print_using_printer_base.cpp:134 @@ -7548,7 +7221,7 @@ msgstr "Pr #: gerbview/dialog_print_using_printer_base.h:69 msgid "Print" msgstr "Imprimir" -======= + #: pcbnew/dialog_print_for_modedit_base.cpp:69 #: pcbnew/dialog_print_using_printer.cpp:500 #: pcbnew/dialog_print_using_printer_base.cpp:134 @@ -7561,37 +7234,31 @@ msgstr "Imprimir" #: gerbview/dialog_print_using_printer_base.h:69 msgid "Print" msgstr "Imprimir" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_print_using_printer.cpp:372 #: pcbnew/pcbplot.cpp:563 #: gerbview/dialog_print_using_printer.cpp:313 msgid "Warning: Scale option set to a very large value" msgstr "Atenção: Opção de escala definida para um valor muito grande" -======= + #: pcbnew/dialog_print_using_printer.cpp:370 #: pcbnew/pcbplot.cpp:561 #: gerbview/dialog_print_using_printer.cpp:313 msgid "Warning: Scale option set to a very large value" msgstr "Atenção: Opção de escala definida para um valor muito grande" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_print_using_printer.cpp:380 #: pcbnew/pcbplot.cpp:560 #: gerbview/dialog_print_using_printer.cpp:321 msgid "Warning: Scale option set to a very small value" msgstr "Atenção: Opção de escala definida para um valor muito pequeno" -======= + #: pcbnew/dialog_print_using_printer.cpp:378 #: pcbnew/pcbplot.cpp:558 #: gerbview/dialog_print_using_printer.cpp:321 msgid "Warning: Scale option set to a very small value" msgstr "Atenção: Opção de escala definida para um valor muito pequeno" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_print_using_printer.cpp:466 #: pcbnew/dialog_print_using_printer.cpp:496 #: pcbnew/pcbplot.cpp:704 @@ -7600,7 +7267,7 @@ msgstr "Aten #: gerbview/edit.cpp:176 msgid "No layer selected" msgstr "Nenhuma camada selecionada" -======= + #: pcbnew/dialog_print_using_printer.cpp:462 #: pcbnew/dialog_print_using_printer.cpp:492 #: pcbnew/pcbplot.cpp:702 @@ -7609,7 +7276,6 @@ msgstr "Nenhuma camada selecionada" #: gerbview/edit.cpp:176 msgid "No layer selected" msgstr "Nenhuma camada selecionada" ->>>>>>> .r2446 #: pcbnew/dialog_print_using_printer_base.cpp:35 msgid "Exclude Edges_Pcb Layer" @@ -7660,7 +7326,6 @@ msgstr "Imprimir (ou n msgid "1 Page per Layer" msgstr "1 página por camada" -<<<<<<< .mine #: pcbnew/dialog_print_using_printer_base.cpp:119 #: gerbview/dialog_print_using_printer_base.cpp:86 msgid "Single page" @@ -7778,7 +7443,6 @@ msgid "Finished" msgstr "Concluiído" #: pcbnew/drc.cpp:325 -======= #: pcbnew/dialog_print_using_printer_base.cpp:119 #: gerbview/dialog_print_using_printer_base.cpp:86 msgid "Single page" @@ -7892,7 +7556,6 @@ msgid "Finished" msgstr "Concluiído" #: pcbnew/drc.cpp:325 ->>>>>>> .r2446 #, c-format msgid "NETCLASS: '%s' has Clearance:%s which is less than global:%s" msgstr "CLASSE NET: '%s' tem Isolamento:%s o qual é menor que o global:%s" @@ -7984,17 +7647,11 @@ msgstr "Real msgid "Local Ratsnest" msgstr "Interligação Local" -<<<<<<< .mine #: pcbnew/edit.cpp:573 #: pcbnew/modedit.cpp:459 #: eeschema/libeditframe.cpp:770 #: eeschema/schedit.cpp:357 -======= -#: pcbnew/edit.cpp:573 -#: pcbnew/modedit.cpp:459 #: eeschema/libframe.cpp:777 -#: eeschema/schedit.cpp:357 ->>>>>>> .r2446 msgid "Delete item" msgstr "Deletar Ítem" @@ -8034,7 +7691,6 @@ msgstr "Arquivos de placas GenCAD 1.4(.cad)|*.cad" msgid "Save GenCAD Board File" msgstr "Salvar arquivo de placa GenCAD" -<<<<<<< .mine #: pcbnew/export_gencad.cpp:87 #: pcbnew/files.cpp:365 #: pcbnew/gen_modules_placefile.cpp:145 @@ -8050,23 +7706,7 @@ msgstr "Salvar arquivo de placa GenCAD" #: eeschema/plotps.cpp:447 #: common/hotkeys_basic.cpp:464 #: gerbview/export_to_pcbnew.cpp:74 -======= -#: pcbnew/export_gencad.cpp:87 -#: pcbnew/files.cpp:365 -#: pcbnew/gen_modules_placefile.cpp:145 -#: pcbnew/gen_modules_placefile.cpp:161 -#: pcbnew/gen_modules_placefile.cpp:329 -#: pcbnew/librairi.cpp:301 -#: pcbnew/librairi.cpp:447 -#: pcbnew/librairi.cpp:606 -#: pcbnew/librairi.cpp:809 -#: cvpcb/genequiv.cpp:38 -#: eeschema/plotdxf.cpp:393 -#: eeschema/plothpgl.cpp:694 -#: eeschema/plotps.cpp:447 #: common/hotkeys_basic.cpp:447 -#: gerbview/export_to_pcbnew.cpp:74 ->>>>>>> .r2446 msgid "Unable to create " msgstr "Incapaz de criar" @@ -8080,7 +7720,6 @@ msgstr "Imprimir Placa" msgid "Recovery file " msgstr "Arquivo de recuperação" -<<<<<<< .mine #: pcbnew/files.cpp:71 #: pcbnew/librairi.cpp:248 #: eeschema/find.cpp:260 @@ -8089,16 +7728,9 @@ msgstr "Arquivo de recupera #: common/eda_doc.cpp:150 #: gerbview/dcode.cpp:299 #: gerbview/readgerb.cpp:136 -======= -#: pcbnew/files.cpp:71 -#: pcbnew/librairi.cpp:248 #: eeschema/find.cpp:259 #: eeschema/find.cpp:267 #: eeschema/find.cpp:693 -#: common/eda_doc.cpp:150 -#: gerbview/dcode.cpp:299 -#: gerbview/readgerb.cpp:136 ->>>>>>> .r2446 msgid " not found" msgstr "não encontrado" @@ -8301,35 +7933,28 @@ msgstr "Ativar este para visibilidade" msgid "Middle click for color change" msgstr "Clique botão do meio para mudar cor" -<<<<<<< .mine #: pcbnew/librairi.cpp:32 msgid "Kicad foot print export files (*.emp)|*.emp" msgstr "Arquivos de exportação de footprints Kicad (*.emp)|*.emp" -======= + #: pcbnew/layer_widget.cpp:491 msgid "Render" msgstr "Desenhar" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/librairi.cpp:62 msgid "Import Footprint Module" msgstr "Importar Módulo" -======= + #: pcbnew/librairi.cpp:32 msgid "Kicad foot print export files (*.emp)|*.emp" msgstr "Arquivos de exportação de footprints Kicad (*.emp)|*.emp" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/librairi.cpp:98 -======= #: pcbnew/librairi.cpp:62 msgid "Import Footprint Module" msgstr "Importar Módulo" #: pcbnew/librairi.cpp:98 ->>>>>>> .r2446 msgid "Not a module file" msgstr "Não é um arquivo de módulo" @@ -8341,13 +7966,9 @@ msgstr "Criar Nova Biblioteca" msgid "Export Module" msgstr "Exportar Módulo" -<<<<<<< .mine #: pcbnew/librairi.cpp:187 #: pcbnew/pcbplot.cpp:694 -======= -#: pcbnew/librairi.cpp:187 #: pcbnew/pcbplot.cpp:692 ->>>>>>> .r2446 #, c-format msgid "Unable to create <%s>" msgstr "Incapaz de criar <%s>" @@ -8386,13 +8007,9 @@ msgstr "Componente %s deletado na biblioteca %s" msgid " No modules to archive!" msgstr "Nenhum módulo para arquivar!" -<<<<<<< .mine #: pcbnew/librairi.cpp:416 #: eeschema/class_sch_component.cpp:1126 -======= -#: pcbnew/librairi.cpp:416 #: eeschema/class_sch_component.cpp:1123 ->>>>>>> .r2446 msgid "Library" msgstr "Bibliotecas" @@ -8552,21 +8169,13 @@ msgstr "Dimens msgid "Adjust user grid" msgstr "Ajustar grade do usuário" -<<<<<<< .mine #: pcbnew/menubar_modedit.cpp:54 #: pcbnew/menubar_pcbframe.cpp:482 #: cvpcb/menucfg.cpp:81 #: eeschema/menubar.cpp:430 #: kicad/menubar.cpp:228 #: gerbview/tool_gerber.cpp:117 -======= -#: pcbnew/menubar_modedit.cpp:54 -#: pcbnew/menubar_pcbframe.cpp:482 -#: cvpcb/menucfg.cpp:81 -#: eeschema/menubar.cpp:430 #: kicad/menubar.cpp:232 -#: gerbview/tool_gerber.cpp:117 ->>>>>>> .r2446 msgid "&Contents" msgstr "&Conteúdo" @@ -8602,21 +8211,13 @@ msgstr "&Dimens msgid "&3D Display" msgstr "&Visualização 3D" -<<<<<<< .mine #: pcbnew/menubar_modedit.cpp:81 #: pcbnew/menubar_pcbframe.cpp:507 #: cvpcb/menucfg.cpp:102 #: eeschema/menubar.cpp:454 #: kicad/menubar.cpp:250 #: gerbview/tool_gerber.cpp:128 -======= -#: pcbnew/menubar_modedit.cpp:81 -#: pcbnew/menubar_pcbframe.cpp:507 -#: cvpcb/menucfg.cpp:102 -#: eeschema/menubar.cpp:454 #: kicad/menubar.cpp:254 -#: gerbview/tool_gerber.cpp:128 ->>>>>>> .r2446 msgid "&Help" msgstr "&Ajuda" @@ -8628,45 +8229,40 @@ msgstr "&Novo" msgid "Clear current board and initialize a new one" msgstr "Limpar placa atual e iniciar uma nova" -<<<<<<< .mine #: pcbnew/menubar_pcbframe.cpp:45 #: eeschema/menubar.cpp:51 #: kicad/menubar.cpp:89 msgid "&Open\tCtrl+O" msgstr "&Abrir\tCtrl+A" -======= + #: pcbnew/menubar_pcbframe.cpp:45 #: eeschema/menubar.cpp:51 #: kicad/menubar.cpp:93 msgid "&Open\tCtrl+O" msgstr "&Abrir\tCtrl+A" ->>>>>>> .r2446 #: pcbnew/menubar_pcbframe.cpp:46 msgid "Delete current board and load new board" msgstr "Deletar placa atual e carregar nova placa" -<<<<<<< .mine #: pcbnew/menubar_pcbframe.cpp:54 #: cvpcb/menucfg.cpp:35 #: eeschema/menubar.cpp:60 #: kicad/menubar.cpp:98 msgid "Open &Recent" msgstr "Abrir &Recente" -======= + #: pcbnew/menubar_pcbframe.cpp:54 #: cvpcb/menucfg.cpp:35 #: eeschema/menubar.cpp:60 #: kicad/menubar.cpp:102 msgid "Open &Recent" msgstr "Abrir &Recente" ->>>>>>> .r2446 #: pcbnew/menubar_pcbframe.cpp:55 msgid "Open a recent opened board" msgstr "Abrir uma placa aberta recentemente" -<<<<<<< .mine #: pcbnew/menubar_pcbframe.cpp:59 msgid "&Append Board" msgstr "&Adicionar Placa" @@ -8701,7 +8297,6 @@ msgid "Clear board and get previous saved version of board" msgstr "Limpar placa atual e obter versão anterior da placa" #: pcbnew/menubar_pcbframe.cpp:92 -======= #: pcbnew/menubar_pcbframe.cpp:59 msgid "&Append Board" msgstr "&Adicionar Placa" @@ -8736,7 +8331,6 @@ msgid "Clear board and get previous saved version of board" msgstr "Limpar placa atual e obter versão anterior da placa" #: pcbnew/menubar_pcbframe.cpp:92 ->>>>>>> .r2446 msgid "&Rescue" msgstr "&Recuperar" @@ -8784,7 +8378,6 @@ msgstr "Arquivos para Fabrica msgid "Generate files for fabrication" msgstr "Gerar arquivos para fabricação" -<<<<<<< .mine #: pcbnew/menubar_pcbframe.cpp:140 msgid "&Specctra Session" msgstr "&Specctra Session" @@ -8811,7 +8404,6 @@ msgid "Export the current board to a \"Specctra DSN\" file" msgstr "Exportar a placa corrente para um arquivo \"Specctra DSN\" " #: pcbnew/menubar_pcbframe.cpp:171 -======= #: pcbnew/menubar_pcbframe.cpp:140 msgid "&Specctra Session" msgstr "&Specctra Session" @@ -8838,7 +8430,6 @@ msgid "Export the current board to a \"Specctra DSN\" file" msgstr "Exportar a placa corrente para um arquivo \"Specctra DSN\" " #: pcbnew/menubar_pcbframe.cpp:171 ->>>>>>> .r2446 msgid "&GenCAD" msgstr "&GenCAD" @@ -8911,21 +8502,19 @@ msgstr "Arquivar Footprints" msgid "Archive or add footprints in a library file" msgstr "Arquivar ou adicionar footprints em arquivo de biblioteca" -<<<<<<< .mine #: pcbnew/menubar_pcbframe.cpp:229 #: cvpcb/menucfg.cpp:52 #: eeschema/menubar.cpp:142 #: kicad/menubar.cpp:133 msgid "&Quit" msgstr "Sair" -======= + #: pcbnew/menubar_pcbframe.cpp:229 #: cvpcb/menucfg.cpp:52 #: eeschema/menubar.cpp:142 #: kicad/menubar.cpp:137 msgid "&Quit" msgstr "Sair" ->>>>>>> .r2446 #: pcbnew/menubar_pcbframe.cpp:230 msgid "Quit PCBNew" @@ -9009,7 +8598,6 @@ msgstr "Mais Zoom " msgid "Zoom out" msgstr "Menos Zoom " -<<<<<<< .mine #: pcbnew/menubar_pcbframe.cpp:316 #: eeschema/menubar.cpp:226 #: eeschema/menubar.cpp:227 @@ -9080,7 +8668,6 @@ msgstr "Ajustar grade do usu #: pcbnew/menubar_pcbframe.cpp:405 #: pcbnew/dialog_graphic_items_options_base.h:66 -======= #: pcbnew/menubar_pcbframe.cpp:316 #: eeschema/menubar.cpp:226 #: eeschema/menubar.cpp:227 @@ -9151,7 +8738,6 @@ msgstr "Ajustar grade do usu #: pcbnew/menubar_pcbframe.cpp:405 #: pcbnew/dialog_graphic_items_options.h:47 ->>>>>>> .r2446 msgid "Texts and Drawings" msgstr "Textos e Desenhos" @@ -9223,7 +8809,6 @@ msgstr "&Configura msgid "Enable and set layer properties" msgstr "Habilita e define propriedades das camadas" -<<<<<<< .mine #: pcbnew/menubar_pcbframe.cpp:483 msgid "Open the PCBnew manual" msgstr "Abrir o manual PCBNew" @@ -9245,7 +8830,6 @@ msgstr "Sobre PCBnew designer de placa de circuito impresso" #: kicad/menubar.cpp:247 #: gerbview/tool_gerber.cpp:123 #: 3d-viewer/3d_toolbar.cpp:115 -======= #: pcbnew/menubar_pcbframe.cpp:483 msgid "Open the PCBnew manual" msgstr "Abrir o manual PCBNew" @@ -9267,11 +8851,9 @@ msgstr "Sobre PCBnew designer de placa de circuito impresso" #: kicad/menubar.cpp:251 #: gerbview/tool_gerber.cpp:123 #: 3d-viewer/3d_toolbar.cpp:115 ->>>>>>> .r2446 msgid "&File" msgstr "&Arquivo" -<<<<<<< .mine #: pcbnew/menubar_pcbframe.cpp:502 #: eeschema/menubar.cpp:450 msgid "&Edit" @@ -9288,7 +8870,6 @@ msgstr "&Ver" #: kicad/menubar.cpp:249 #: gerbview/tool_gerber.cpp:124 #: 3d-viewer/3d_toolbar.cpp:125 -======= #: pcbnew/menubar_pcbframe.cpp:502 #: eeschema/menubar.cpp:450 msgid "&Edit" @@ -9305,7 +8886,6 @@ msgstr "&Ver" #: kicad/menubar.cpp:253 #: gerbview/tool_gerber.cpp:124 #: 3d-viewer/3d_toolbar.cpp:125 ->>>>>>> .r2446 msgid "&Preferences" msgstr "&Preferências" @@ -9367,63 +8947,42 @@ msgstr "Adicionar Desenho" msgid "Place anchor" msgstr "Inserir âncora" -<<<<<<< .mine #: pcbnew/modedit_onclick.cpp:206 #: pcbnew/onrightclick.cpp:64 #: eeschema/libedit_onrightclick.cpp:50 #: eeschema/onrightclick.cpp:89 #: gerbview/onrightclick.cpp:41 -======= -#: pcbnew/modedit_onclick.cpp:206 -#: pcbnew/onrightclick.cpp:64 #: eeschema/libedit_onrightclick.cpp:49 -#: eeschema/onrightclick.cpp:89 -#: gerbview/onrightclick.cpp:41 ->>>>>>> .r2446 msgid "End Tool" msgstr "Finalizar ferramenta" -<<<<<<< .mine #: pcbnew/modedit_onclick.cpp:216 #: pcbnew/onrightclick.cpp:378 #: eeschema/libedit_onrightclick.cpp:327 #: eeschema/onrightclick.cpp:734 -======= -#: pcbnew/modedit_onclick.cpp:216 -#: pcbnew/onrightclick.cpp:378 #: eeschema/libedit_onrightclick.cpp:326 -#: eeschema/onrightclick.cpp:734 ->>>>>>> .r2446 #: gerbview/onrightclick.cpp:51 msgid "Cancel Block" msgstr "Cancelar Bloco" -<<<<<<< .mine #: pcbnew/modedit_onclick.cpp:218 #: eeschema/libedit_onrightclick.cpp:331 #: gerbview/onrightclick.cpp:53 msgid "Zoom Block (drag middle mouse)" msgstr "Zoom em bloco (botão do meio + arrastar mouse)" -======= + #: pcbnew/modedit_onclick.cpp:218 #: eeschema/libedit_onrightclick.cpp:330 #: gerbview/onrightclick.cpp:53 msgid "Zoom Block (drag middle mouse)" msgstr "Zoom em bloco (botão do meio + arrastar mouse)" ->>>>>>> .r2446 #: pcbnew/modedit_onclick.cpp:222 -<<<<<<< .mine #: pcbnew/onrightclick.cpp:383 #: eeschema/libedit_onrightclick.cpp:336 #: eeschema/onrightclick.cpp:742 #: gerbview/onrightclick.cpp:55 -======= -#: pcbnew/onrightclick.cpp:383 #: eeschema/libedit_onrightclick.cpp:335 -#: eeschema/onrightclick.cpp:742 -#: gerbview/onrightclick.cpp:55 ->>>>>>> .r2446 msgid "Place Block" msgstr "Colocar Bloco" @@ -9551,7 +9110,6 @@ msgstr "Mostrar coordenadas retangulares" msgid "Display polar coordinates" msgstr "Mostrar coordenadas polares" -<<<<<<< .mine #: pcbnew/moduleframe.cpp:370 #: pcbnew/toolbars_update_user_interface.cpp:209 #: pcbnew/tool_modedit.cpp:201 @@ -9559,7 +9117,7 @@ msgstr "Mostrar coordenadas polares" #: eeschema/schframe.cpp:553 msgid "Hide grid" msgstr "Ocultar grade" -======= + #: pcbnew/moduleframe.cpp:370 #: pcbnew/toolbars_update_user_interface.cpp:209 #: pcbnew/tool_modedit.cpp:201 @@ -9567,9 +9125,7 @@ msgstr "Ocultar grade" #: eeschema/schframe.cpp:530 msgid "Hide grid" msgstr "Ocultar grade" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/moduleframe.cpp:371 #: pcbnew/toolbars_update_user_interface.cpp:210 #: eeschema/schframe.cpp:553 @@ -9601,7 +9157,6 @@ msgid "Search footprint" msgstr "Pesquisar Footprints" #: pcbnew/modules.cpp:310 -======= #: pcbnew/moduleframe.cpp:371 #: pcbnew/toolbars_update_user_interface.cpp:210 #: eeschema/schframe.cpp:530 @@ -9633,7 +9188,6 @@ msgid "Search footprint" msgstr "Pesquisar Footprints" #: pcbnew/modules.cpp:310 ->>>>>>> .r2446 #, c-format msgid "Delete Module %s (value %s) ?" msgstr "Deletar Módulo %s (valor %s) ?" @@ -9651,7 +9205,6 @@ msgstr "Imposs msgid "Unable to drag this segment: two collinear segments" msgstr "Impossível arrastar este segmento: muitos segmentos conectados" -<<<<<<< .mine #: pcbnew/muonde.cpp:227 msgid "Length(inch):" msgstr "Comprimento (polegadas):" @@ -9686,7 +9239,6 @@ msgid "Segment count = %d, length = " msgstr "Qtd segm.= %d, tamanho =" #: pcbnew/muonde.cpp:658 -======= #: pcbnew/muonde.cpp:227 msgid "Length(inch):" msgstr "Comprimento (polegadas):" @@ -9721,7 +9273,6 @@ msgid "Segment count = %d, length = " msgstr "Qtd segm.= %d, tamanho =" #: pcbnew/muonde.cpp:658 ->>>>>>> .r2446 msgid "Gap" msgstr "Fenda" @@ -9733,13 +9284,9 @@ msgstr "Toco" msgid "Arc Stub" msgstr "Arco de toco" -<<<<<<< .mine #: pcbnew/muonde.cpp:684 #: common/common.cpp:235 -======= -#: pcbnew/muonde.cpp:684 #: common/common.cpp:231 ->>>>>>> .r2446 msgid " (mm):" msgstr " (mm):" @@ -9852,102 +9399,66 @@ msgstr "Ok para deletar m msgid "Component \"%s\": Mismatch! module is [%s] and netlist said [%s]\n" msgstr "Componente \"%s\": Não confere! módulo é [%s] e netlist diz [%s]\n" -<<<<<<< .mine #: pcbnew/netlist.cpp:545 -======= #: pcbnew/netlist.cpp:544 ->>>>>>> .r2446 #, c-format msgid "Component [%s] not found" msgstr "Módulo [%s] não encontrado " -<<<<<<< .mine #: pcbnew/netlist.cpp:611 -======= #: pcbnew/netlist.cpp:610 ->>>>>>> .r2446 #, c-format msgid "Module [%s]: Pad [%s] not found" msgstr "Módulo [%s]: Ilha [%s] não encontrada" -<<<<<<< .mine #: pcbnew/netlist.cpp:634 -======= #: pcbnew/netlist.cpp:633 ->>>>>>> .r2446 msgid "No Modules" msgstr "Nenhum Módulo" -<<<<<<< .mine #: pcbnew/netlist.cpp:637 -======= #: pcbnew/netlist.cpp:636 ->>>>>>> .r2446 msgid "Components" msgstr "Componentes" -<<<<<<< .mine #: pcbnew/netlist.cpp:687 -======= #: pcbnew/netlist.cpp:686 ->>>>>>> .r2446 msgid "No modules" msgstr "Nenhum Módulo" -<<<<<<< .mine #: pcbnew/netlist.cpp:701 -======= #: pcbnew/netlist.cpp:700 ->>>>>>> .r2446 msgid "No modules in NetList" msgstr "Nenhum Módulo na Netlist" -<<<<<<< .mine #: pcbnew/netlist.cpp:705 -======= #: pcbnew/netlist.cpp:704 ->>>>>>> .r2446 msgid "Check Modules" msgstr "Checar Módulos" -<<<<<<< .mine #: pcbnew/netlist.cpp:708 -======= #: pcbnew/netlist.cpp:707 ->>>>>>> .r2446 msgid "Duplicates" msgstr "Duplicados" -<<<<<<< .mine #: pcbnew/netlist.cpp:728 -======= #: pcbnew/netlist.cpp:727 ->>>>>>> .r2446 msgid "Lack:" msgstr "Falta:" -<<<<<<< .mine #: pcbnew/netlist.cpp:750 -======= #: pcbnew/netlist.cpp:749 ->>>>>>> .r2446 msgid "Not in Netlist:" msgstr "Não está na netlist:" -<<<<<<< .mine #: pcbnew/netlist.cpp:890 -======= #: pcbnew/netlist.cpp:889 ->>>>>>> .r2446 #, c-format msgid "File <%s> not found, use Netlist for lib module selection" msgstr "Arquivo <%s> não encontrado, use netlist para seleção de biblioteca de módulos" -<<<<<<< .mine #: pcbnew/netlist.cpp:1017 -======= #: pcbnew/netlist.cpp:1016 ->>>>>>> .r2446 #, c-format msgid "Component [%s]: footprint <%s> not found" msgstr "Componente [%s]: Módulo <%s> não encontrado" @@ -10389,55 +9900,47 @@ msgstr "Via %s" msgid "Via %s; (drl %s)" msgstr "Via %s; (furo %s)" -<<<<<<< .mine #: pcbnew/pcbframe.cpp:337 #: pcbnew/pcbframe.cpp:628 #: gerbview/gerberframe.cpp:186 #: gerbview/gerberframe.cpp:496 msgid "Visibles" msgstr "Visíveis" -======= + #: pcbnew/pcbframe.cpp:336 #: gerbview/gerberframe.cpp:188 msgid "Visibles" msgstr "Visíveis" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/pcbframe.cpp:423 msgid "Board modified, Save before exit ?" msgstr "Placa modificada, Salvar antes de sair?" -======= + #: pcbnew/pcbframe.cpp:422 msgid "Board modified, Save before exit ?" msgstr "Placa modificada, Salvar antes de sair?" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/pcbframe.cpp:424 #: cvpcb/cvframe.cpp:262 #: eeschema/schframe.cpp:361 #: common/confirm.cpp:110 msgid "Confirmation" msgstr "Confirmação" -======= + #: pcbnew/pcbframe.cpp:423 #: cvpcb/cvframe.cpp:262 #: eeschema/schframe.cpp:359 #: common/confirm.cpp:110 msgid "Confirmation" msgstr "Confirmação" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/pcbnew.cpp:113 msgid "Pcbnew is already running, Continue?" msgstr "Pcbnew já está em execução. Continuar ?" -======= + #: pcbnew/pcbnew.cpp:102 msgid "Pcbnew is already running, Continue?" msgstr "Pcbnew já está em execução. Continuar ?" ->>>>>>> .r2446 #: pcbnew/pcbnew_config.cpp:92 #: eeschema/eeschema_config.cpp:54 @@ -10449,31 +9952,27 @@ msgstr "Carregar arquivo de projeto" msgid "File %s not found" msgstr " Arquivo %s não encontrado" -<<<<<<< .mine #: pcbnew/pcbnew_config.cpp:213 #: cvpcb/cfg.cpp:97 #: kicad/prjconfig.cpp:132 msgid "Save Project File" msgstr "Salvar arquivo de projeto" -======= + #: pcbnew/pcbnew_config.cpp:213 #: cvpcb/cfg.cpp:97 #: kicad/prjconfig.cpp:136 msgid "Save Project File" msgstr "Salvar arquivo de projeto" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/pcbplot.cpp:692 #, c-format msgid "Plot file <%s> created" msgstr "Arquivo de plotagem <%s> criado" -======= + #: pcbnew/pcbplot.cpp:690 #, c-format msgid "Plot file <%s> created" msgstr "Arquivo de plotagem <%s> criado" ->>>>>>> .r2446 #: pcbnew/plot_rtn.cpp:151 #, c-format @@ -10534,19 +10033,17 @@ msgstr "Camada Inferior" msgid "Warning: The Top Layer and Bottom Layer are same." msgstr "A camada superior e inferior precisam ser diferentes" -<<<<<<< .mine #: pcbnew/set_grid.cpp:130 #: eeschema/dialog_lib_edit_draw_item_base.cpp:44 #: common/drawframe.cpp:332 msgid "mm" msgstr "mm" -======= + #: pcbnew/set_grid.cpp:130 #: eeschema/dialog_lib_edit_draw_item_base.cpp:44 #: common/drawframe.cpp:326 msgid "mm" msgstr "mm" ->>>>>>> .r2446 #: pcbnew/set_grid.cpp:132 msgid "Grid Size Units" @@ -10693,55 +10190,47 @@ msgstr "Filtrar Nets:" msgid "List Nets" msgstr "Listar Ligações" -<<<<<<< .mine #: pcbnew/swap_layers.cpp:70 msgid "Swap Layers:" msgstr "Trocar camadas:" -======= + #: pcbnew/swap_layers.cpp:68 msgid "Swap Layers:" msgstr "Trocar camadas:" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/swap_layers.cpp:217 #: pcbnew/swap_layers.cpp:222 #: pcbnew/swap_layers.cpp:308 msgid "No Change" msgstr "Não trocar" -======= + #: pcbnew/swap_layers.cpp:215 #: pcbnew/swap_layers.cpp:220 #: pcbnew/swap_layers.cpp:306 msgid "No Change" msgstr "Não trocar" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/swap_layers.cpp:298 msgid "Deselect this layer to select the No Change state" msgstr "Libere esta camada para selcionar o estado Não Alterar" -======= + #: pcbnew/swap_layers.cpp:296 msgid "Deselect this layer to select the No Change state" msgstr "Libere esta camada para selcionar o estado Não Alterar" ->>>>>>> .r2446 #: pcbnew/toolbars_update_user_interface.cpp:39 msgid " mils" msgstr " mils" -<<<<<<< .mine #: pcbnew/toolbars_update_user_interface.cpp:41 #: common/common.cpp:346 msgid " mm" msgstr "mm" -======= + #: pcbnew/toolbars_update_user_interface.cpp:41 #: common/common.cpp:342 msgid " mm" msgstr "mm" ->>>>>>> .r2446 #: pcbnew/toolbars_update_user_interface.cpp:54 msgid "NetClass: " @@ -11129,13 +10618,9 @@ msgstr "Adicionar trilhas e vias" msgid "Add zones" msgstr "Adicionar zonas" -<<<<<<< .mine #: pcbnew/tool_pcb.cpp:454 #: eeschema/libeditframe.cpp:693 -======= -#: pcbnew/tool_pcb.cpp:454 #: eeschema/libframe.cpp:700 ->>>>>>> .r2446 msgid "Add text" msgstr "Adicionar Texto" @@ -11346,23 +10831,18 @@ msgstr "Arquivos de reanota msgid "Kicad footprint alias files (*.equ)|*.equ" msgstr "Arquivos de correspondência de footprints Kicad (*.equ)|*.equ" -<<<<<<< .mine #: cvpcb/cvpcb.cpp:100 -======= #: cvpcb/cvpcb.cpp:97 ->>>>>>> .r2446 msgid "Cvpcb is already running, Continue?" msgstr "Cvpcb já está rodando, continuar?" -<<<<<<< .mine #: cvpcb/cvpcb.cpp:142 msgid " [no file]" msgstr "[sem arquivo]" -======= + #: cvpcb/cvpcb.cpp:139 msgid " [no file]" msgstr "[sem arquivo]" ->>>>>>> .r2446 #: cvpcb/dialog_cvpcb_config.cpp:33 msgid "Project file: " @@ -11574,16 +11054,14 @@ msgstr "Formato do netlist: EESchema" msgid "Netlist error: %s" msgstr "Erro no netlist: %s" -<<<<<<< .mine #: cvpcb/savecmp.cpp:24 msgid "Component Library Error" msgstr "Erro na Biblioteca de Componentes" -======= + #: cvpcb/savecmp.cpp:24 #: eeschema/edit_component_in_lib.cpp:90 msgid "Component Library Error" msgstr "Erro na Biblioteca de Componentes" ->>>>>>> .r2446 #: cvpcb/savecmp.cpp:86 #, c-format @@ -11657,123 +11135,102 @@ msgstr "Apresentar a lista completa de footprints (sem filtrar)" msgid "Component %s %s pin %s : Different Nets" msgstr "Componente %s %s pinos %s: Ligações Diferentes" -<<<<<<< .mine #: eeschema/annotate.cpp:286 #, c-format msgid "%d duplicate time stamps replaced." msgstr "%d alterado Time stamps duplicado" -======= + #: eeschema/annotate.cpp:285 #, c-format msgid "%d duplicate time stamps replaced." msgstr "%d alterado Time stamps duplicado" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/annotate.cpp:719 #, c-format msgid "item not annotated: %s%s" msgstr "ítem não anotado: %s%s" -======= + #: eeschema/annotate.cpp:718 #, c-format msgid "item not annotated: %s%s" msgstr "ítem não anotado: %s%s" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/annotate.cpp:725 #, c-format msgid "( unit %d)" msgstr "(unidade %d)" -======= + #: eeschema/annotate.cpp:724 #, c-format msgid "( unit %d)" msgstr "(unidade %d)" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/annotate.cpp:751 #, c-format msgid "Error item %s%s" msgstr "Ítem errado %s%s" -======= + #: eeschema/annotate.cpp:750 #, c-format msgid "Error item %s%s" msgstr "Ítem errado %s%s" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/annotate.cpp:754 #, c-format msgid " unit %d and no more than %d parts" msgstr " unidade %d e não mais que %d partes" -======= + #: eeschema/annotate.cpp:753 #, c-format msgid " unit %d and no more than %d parts" msgstr " unidade %d e não mais que %d partes" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/annotate.cpp:792 #: eeschema/annotate.cpp:822 #, c-format msgid "Multiple item %s%s" msgstr "Ítem múltiplo %s%s" -======= + #: eeschema/annotate.cpp:791 #: eeschema/annotate.cpp:821 #, c-format msgid "Multiple item %s%s" msgstr "Ítem múltiplo %s%s" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/annotate.cpp:798 #: eeschema/annotate.cpp:828 #, c-format msgid " (unit %d)" msgstr " (Unidade %d)" -======= + #: eeschema/annotate.cpp:797 #: eeschema/annotate.cpp:827 #, c-format msgid " (unit %d)" msgstr " (Unidade %d)" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/annotate.cpp:852 #, c-format msgid "Diff values for %s%d.%c (%s) and %s%d.%c (%s)" msgstr "Valores diferem entre %s%d%c (%s) e %s%d%c (%s)" -======= + #: eeschema/annotate.cpp:851 #, c-format msgid "Diff values for %s%d.%c (%s) and %s%d.%c (%s)" msgstr "Valores diferem entre %s%d%c (%s) e %s%d%c (%s)" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/annotate.cpp:862 #, c-format msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)" msgstr "Valores diferem entre %s%d%c (%s) e %s%d%c (%s)" -======= + #: eeschema/annotate.cpp:861 #, c-format msgid "Diff values for %s%d%c (%s) and %s%d%c (%s)" msgstr "Valores diferem entre %s%d%c (%s) e %s%d%c (%s)" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/annotate.cpp:904 -======= #: eeschema/annotate.cpp:903 ->>>>>>> .r2446 #, c-format msgid "duplicate time stamp (%s) for %s%d and %s%d" msgstr "time stamp duplicado (%s) para %s%d e %s%d" @@ -11843,40 +11300,33 @@ msgstr "Op msgid "Failed to open stuff file <%s>" msgstr "Falhou ao abrir arquivo <%s>" -<<<<<<< .mine #: eeschema/build_BOM.cpp:59 msgid "Bill of Materials file (*.lst)|*.lst" msgstr "Arquivo de Lista de Materiais (*.lst)|*.lst" -======= + #: eeschema/build_BOM.cpp:57 msgid "Bill of Materials file (*.lst)|*.lst" msgstr "Arquivo de Lista de Materiais (*.lst)|*.lst" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/build_BOM.cpp:104 msgid "Bill of Materials" msgstr "Lista de Materiais" -======= + #: eeschema/build_BOM.cpp:99 msgid "Bill of Materials" msgstr "Lista de Materiais" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/build_BOM.cpp:154 #: eeschema/build_BOM.cpp:191 #: eeschema/build_BOM.cpp:227 msgid "Failed to open file " msgstr "Falhou ao abrir arquivo" -======= + #: eeschema/build_BOM.cpp:140 #: eeschema/build_BOM.cpp:176 msgid "Failed to open file " msgstr "Falhou ao abrir arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/build_BOM.cpp:272 #, c-format msgid "" @@ -11885,7 +11335,7 @@ msgid "" msgstr "" "\n" "#Etiquetas Globais, hierárquicas ( ordenação = Número da Folha ) cont= %d\n" -======= + #: eeschema/build_BOM.cpp:220 #, c-format msgid "" @@ -11894,9 +11344,7 @@ msgid "" msgstr "" "\n" "#Etiquetas Globais, hierárquicas ( ordenação = Número da Folha ) cont= %d\n" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/build_BOM.cpp:284 #, c-format msgid "" @@ -11907,7 +11355,7 @@ msgstr "" "\n" "#Etiquetas Globais, hierárquicas ( ordenação = Número da Folha ) cont=%d\n" "\n" -======= + #: eeschema/build_BOM.cpp:231 #, c-format msgid "" @@ -11918,9 +11366,7 @@ msgstr "" "\n" "#Etiquetas Globais, hierárquicas ( ordenação = Número da Folha ) cont=%d\n" "\n" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/build_BOM.cpp:292 msgid "" "\n" @@ -11981,7 +11427,6 @@ msgstr "N #: eeschema/classes_body_items.cpp:67 #: eeschema/classes_body_items.cpp:73 -======= #: eeschema/build_BOM.cpp:239 msgid "" "\n" @@ -12042,7 +11487,6 @@ msgstr "N #: eeschema/classes_body_items.cpp:67 #: eeschema/classes_body_items.cpp:73 ->>>>>>> .r2446 msgid "All" msgstr "Todas" @@ -12073,7 +11517,6 @@ msgstr "Converter" msgid "arc only had %d parameters of the required 8" msgstr "o arco tem somente %d parâmetros dos 8 requeridos" -<<<<<<< .mine #: eeschema/classes_body_items.cpp:535 #: eeschema/classes_body_items.cpp:795 #: eeschema/classes_body_items.cpp:1022 @@ -12083,7 +11526,7 @@ msgstr "o arco tem somente %d par #: eeschema/class_BodyItem_Text.cpp:330 msgid "Line width" msgstr "Largura das linhas" -======= + #: eeschema/classes_body_items.cpp:540 #: eeschema/classes_body_items.cpp:804 #: eeschema/classes_body_items.cpp:1279 @@ -12091,9 +11534,7 @@ msgstr "Largura das linhas" #: eeschema/classes_body_items.cpp:2066 msgid "Bounding box" msgstr "Caixca delimitadora" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/classes_body_items.cpp:540 #: eeschema/classes_body_items.cpp:804 #: eeschema/classes_body_items.cpp:1279 @@ -12103,9 +11544,6 @@ msgid "Bounding box" msgstr "Caixca delimitadora" #: eeschema/classes_body_items.cpp:586 -======= -#: eeschema/classes_body_items.cpp:586 ->>>>>>> .r2446 #, c-format msgid "circle only had %d parameters of the required 6" msgstr "o círculo tem somente %d parâmetros dos 6 requeridos" @@ -12215,7 +11653,6 @@ msgstr "Nome do arquivo" msgid "%8.8lX/" msgstr "%8.8lX/" -<<<<<<< .mine #: eeschema/class_drc_erc_item.cpp:39 msgid "ERC err unspecified" msgstr "Erri ERC não especificado" @@ -12491,8 +11928,6 @@ msgid "Key words" msgstr "Palavras Chaves" #: eeschema/database.cpp:49 -msgid "No components found matching " -======= #: eeschema/class_drc_erc_item.cpp:39 msgid "ERC err unspecified" msgstr "Erri ERC não especificado" @@ -12760,7 +12195,6 @@ msgstr "Palavras Chaves" #: eeschema/database.cpp:49 msgid "No components found matching " ->>>>>>> .r2446 msgstr "Nenhum componente encontrado" #: eeschema/database.cpp:52 @@ -12924,13 +12358,9 @@ msgstr "Hierarquia de pinos por nome" msgid "Hierarchy pins by sheets" msgstr "Hierarquia de pinos por páginas" -<<<<<<< .mine #: eeschema/dialog_build_BOM_base.cpp:47 #: eeschema/netlist.cpp:89 -======= -#: eeschema/dialog_build_BOM_base.cpp:47 #: eeschema/netlist.cpp:88 ->>>>>>> .r2446 msgid "List" msgstr "Lista" @@ -12938,15 +12368,11 @@ msgstr "Lista" msgid "Text for spreadsheet import" msgstr "Texto para importar em planilha" -<<<<<<< .mine #: eeschema/dialog_build_BOM_base.cpp:47 msgid "Single Part per line" msgstr "Uma parte simples por linha" #: eeschema/dialog_build_BOM_base.cpp:49 -======= -#: eeschema/dialog_build_BOM_base.cpp:49 ->>>>>>> .r2446 msgid "Output format:" msgstr "Formato de saída:" @@ -13348,17 +12774,15 @@ msgstr "" "Nomes de footprints podem usar coringas.\n" "(como sm* para permitir todos os footprints que comecem por sm)." -<<<<<<< .mine #: eeschema/dialog_edit_component_in_lib_base.cpp:228 #: eeschema/edit_component_in_lib.cpp:418 msgid "Footprint Filter" msgstr "Filtro de Módulos" -======= + #: eeschema/dialog_edit_component_in_lib_base.cpp:228 #: eeschema/edit_component_in_lib.cpp:416 msgid "Footprint Filter" msgstr "Filtro de Módulos" ->>>>>>> .r2446 #: eeschema/dialog_edit_component_in_schematic.cpp:96 #: eeschema/dialog_edit_component_in_schematic.cpp:101 @@ -13862,33 +13286,28 @@ msgstr "N #: eeschema/dialog_lib_edit_draw_item_base.cpp:96 msgid "Fill &foreground" -msgstr "Preencher &frente" +msgstr "Preencher &face superior" #: eeschema/dialog_lib_edit_draw_item_base.cpp:99 msgid "Fill &background" msgstr "Preencher fundo" -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:26 msgid "Pin &name:" msgstr "&Nome do Pino:" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:24 msgid "Pin &name:" msgstr "&Nome do Pino:" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:36 msgid "N&ame text size:" msgstr "T&amanho do texto do Nome:" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:34 msgid "N&ame text size:" msgstr "T&amanho do texto do Nome:" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:43 #: eeschema/dialog_lib_edit_pin_base.cpp:66 #: eeschema/dialog_lib_edit_pin_base.cpp:87 @@ -13896,7 +13315,7 @@ msgstr "T&amanho do texto do Nome:" #: eeschema/dialog_sch_sheet_props_base.cpp:63 msgid "units" msgstr "Unidades" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:41 #: eeschema/dialog_lib_edit_pin_base.cpp:64 #: eeschema/dialog_lib_edit_pin_base.cpp:87 @@ -13904,47 +13323,38 @@ msgstr "Unidades" #: eeschema/dialog_sch_sheet_props_base.cpp:63 msgid "units" msgstr "Unidades" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:47 msgid "Pin n&umber:" msgstr "Número do pino:" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:45 msgid "Pin n&umber:" msgstr "Número do pino:" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:49 msgid "Pin number: 1 to 4 ASCII letters and/or digits" msgstr "Número Pino: 1 a 4 leras ASCII e/ou digitos" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:47 msgid "Pin number: 1 to 4 ASCII letters and/or digits" msgstr "Número Pino: 1 a 4 leras ASCII e/ou digitos" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:59 msgid "Number te&xt size:" msgstr "Tamanho do te&xto do Número:" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:57 msgid "Number te&xt size:" msgstr "Tamanho do te&xto do Número:" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:70 msgid "&Orientation:" msgstr "&Orientação:" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:68 msgid "&Orientation:" msgstr "&Orientação:" ->>>>>>> .r2446 #: eeschema/dialog_lib_edit_pin_base.cpp:80 msgid "&Length:" @@ -13958,45 +13368,37 @@ msgstr "Tipo &el msgid "Used by the ERC." msgstr "Usado por ERC." -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:112 msgid "Graphic &Style:" msgstr "E&stilo Gráfico:" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:114 msgid "Graphic &Style:" msgstr "E&stilo Gráfico:" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:133 msgid "Add to all &parts in package" msgstr "Adicionar a todas as &partes no pacote" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:137 msgid "Add to all &parts in package" msgstr "Adicionar a todas as &partes no pacote" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:137 msgid "Add to all alternate &body styles (DeMorgan)" msgstr "Adicionar a todos estilos de corpo alternativo (DeMorgan)" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:141 msgid "Add to all alternate &body styles (DeMorgan)" msgstr "Adicionar a todos estilos de corpo alternativo (DeMorgan)" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_lib_edit_pin_base.cpp:141 msgid "&Visible" msgstr "&Visível" -======= + #: eeschema/dialog_lib_edit_pin_base.cpp:145 msgid "&Visible" msgstr "&Visível" ->>>>>>> .r2446 #: eeschema/dialog_lib_new_component_base.cpp:22 msgid "General Settings" @@ -14062,47 +13464,39 @@ msgstr "Mostrar nome de pino" msgid "Pin name &inside" msgstr "Nome do pino interno" -<<<<<<< .mine #: eeschema/dialog_print_using_printer.cpp:243 msgid "Print Schematic" msgstr "Imprimir esquemático" -======= + #: eeschema/dialog_print_using_printer.cpp:241 msgid "Print Schematic" msgstr "Imprimir esquemático" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_print_using_printer.cpp:248 msgid "An error occurred attempting to print the schematic." msgstr "Ocorreu um erro ao tentar imprimir o esquemático." -======= + #: eeschema/dialog_print_using_printer.cpp:246 msgid "An error occurred attempting to print the schematic." msgstr "Ocorreu um erro ao tentar imprimir o esquemático." ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_print_using_printer.cpp:249 msgid "Printing" msgstr "Imprimiindo" -======= + #: eeschema/dialog_print_using_printer.cpp:247 msgid "Printing" msgstr "Imprimiindo" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_print_using_printer.cpp:262 #, c-format msgid "Print page %d" msgstr "Imprimir página %d" -======= + #: eeschema/dialog_print_using_printer.cpp:260 #, c-format msgid "Print page %d" msgstr "Imprimir página %d" ->>>>>>> .r2446 #: eeschema/dialog_print_using_printer_base.cpp:22 msgid "Print sheet &reference and title block" @@ -14148,134 +13542,106 @@ msgstr "Imprimir Atual" msgid "Print All" msgstr "Imprimir tudo" -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:202 #: eeschema/edit_component_in_lib.cpp:275 #, c-format msgid "Alias <%s> cannot be removed while it is being edited!" msgstr "Alias <%s> não pode ser removido enquanto este está sendo editado!" -======= + #: eeschema/edit_component_in_lib.cpp:85 #, c-format msgid "Alias <%s> not found for component <%s> in library <%s>." msgstr "Alias <%s> não encontrado para o componente <%s> na biblioteca <%s>." ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:212 msgid "Remove all aliases from list?" msgstr "Remover todos alias da lista?" -======= + #: eeschema/edit_component_in_lib.cpp:206 #: eeschema/edit_component_in_lib.cpp:276 #, c-format msgid "Alias <%s> cannot be removed while it is being edited!" msgstr "Alias <%s> não pode ser removido enquanto este está sendo editado!" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:239 -======= #: eeschema/edit_component_in_lib.cpp:215 msgid "Remove all aliases from list?" msgstr "Remover todos alias da lista?" #: eeschema/edit_component_in_lib.cpp:240 ->>>>>>> .r2446 msgid "New alias:" msgstr "Novo alias:" -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:240 msgid "Component Alias" msgstr "Componente Alias" -======= + #: eeschema/edit_component_in_lib.cpp:241 msgid "Component Alias" msgstr "Componente Alias" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:250 #, c-format msgid "Alias or component name <%s> already exists in library <%s>." msgstr "Alias ou nome de componente <%s> já existe na biblioteca <%s>." -======= + #: eeschema/edit_component_in_lib.cpp:251 #, c-format msgid "Alias or component name <%s> already exists in library <%s>." msgstr "Alias ou nome de componente <%s> já existe na biblioteca <%s>." ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:307 msgid "Delete extra parts from component?" msgstr "Deletar partes extas do componente?" -======= + #: eeschema/edit_component_in_lib.cpp:305 msgid "Delete extra parts from component?" msgstr "Deletar partes extas do componente?" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:328 msgid "Add new pins for alternate body style ( DeMorgan ) to component?" msgstr "Adicionar novos pinos para estilo de corpo alternativo (DeMorgan) para o componente?" -======= + #: eeschema/edit_component_in_lib.cpp:326 msgid "Add new pins for alternate body style ( DeMorgan ) to component?" msgstr "Adicionar novos pinos para estilo de corpo alternativo (DeMorgan) para o componente?" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:335 msgid "Delete alternate body style (DeMorgan) draw items from component?" msgstr "Deletar itens de desenho do estilo de corpo alternativo (DeMorgan) do componente?" -======= + #: eeschema/edit_component_in_lib.cpp:333 msgid "Delete alternate body style (DeMorgan) draw items from component?" msgstr "Deletar itens de desenho do estilo de corpo alternativo (DeMorgan) do componente?" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:359 #: common/eda_doc.cpp:134 -======= #: eeschema/edit_component_in_lib.cpp:357 -#: common/eda_doc.cpp:134 ->>>>>>> .r2446 msgid "Doc Files" msgstr "Arquivos de documentação" -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:395 -======= #: eeschema/edit_component_in_lib.cpp:393 ->>>>>>> .r2446 msgid "Ok to Delete FootprintFilter LIST" msgstr "Ok para deletar a lista de filtro de módulos" -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:418 msgid "Add Footprint Filter" msgstr "Adicionar filtro de Footprint" -======= + #: eeschema/edit_component_in_lib.cpp:416 msgid "Add Footprint Filter" msgstr "Adicionar filtro de Footprint" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/edit_component_in_lib.cpp:431 #, c-format msgid "Foot print filter <%s> is already defined." msgstr "Filtro de Footprint <%s> já está definido." -======= + #: eeschema/edit_component_in_lib.cpp:429 #, c-format msgid "Foot print filter <%s> is already defined." msgstr "Filtro de Footprint <%s> já está definido." ->>>>>>> .r2446 #: eeschema/edit_component_in_schematic.cpp:35 msgid "No Field to move" @@ -14357,25 +13723,21 @@ msgstr "Erro!" msgid "The following libraries could not be found:" msgstr "As seguintes bibliotecas não foram encontradas:" -<<<<<<< .mine #: eeschema/eeredraw.cpp:80 #: eeschema/eelayer.h:167 msgid "Sheet" msgstr "Folha" #: eeschema/eeschema.cpp:135 -======= #: eeschema/eeredraw.cpp:80 #: eeschema/eelayer.h:167 msgid "Sheet" msgstr "Folha" #: eeschema/eeschema.cpp:131 ->>>>>>> .r2446 msgid "Eeschema is already running, Continue?" msgstr "EESchema já está sendo executado, continuar?" -<<<<<<< .mine #: eeschema/eeschema_config.cpp:333 msgid "Save Project Settings" msgstr "Salvar definições do projeto" @@ -14385,8 +13747,6 @@ msgid "Duplicate Sheet name" msgstr "Nome de Planilha Duplicado" #: eeschema/erc.cpp:249 -msgid "Annotation required!" -======= #: eeschema/eeschema_config.cpp:333 msgid "Save Project Settings" msgstr "Salvar definições do projeto" @@ -14397,109 +13757,82 @@ msgstr "Nome de Planilha Duplicado" #: eeschema/erc.cpp:248 msgid "Annotation required!" ->>>>>>> .r2446 msgstr "Anotação requerida!" -<<<<<<< .mine #: eeschema/erc.cpp:379 msgid "ERC File" msgstr "Arquivo ERC" -======= + #: eeschema/erc.cpp:378 msgid "ERC File" msgstr "Arquivo ERC" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/erc.cpp:380 msgid "Electronic rule check file (.erc)|*.erc" msgstr "Arquivos de checagem de regas eletônicas (.erc)|*.erc" #: eeschema/erc.cpp:430 -======= #: eeschema/erc.cpp:379 msgid "Electronic rule check file (.erc)|*.erc" msgstr "Arquivos de checagem de regas eletônicas (.erc)|*.erc" #: eeschema/erc.cpp:429 ->>>>>>> .r2446 #, c-format msgid "HLabel %s not connected to SheetLabel" msgstr "Etiqueta hierárquica %s não está conectada a Etiqueta da Página" -<<<<<<< .mine #: eeschema/erc.cpp:434 -======= #: eeschema/erc.cpp:433 ->>>>>>> .r2446 #, c-format msgid "SheetLabel %s not connected to HLabel" msgstr "Etiqueta da Página %s não conectada a etiqueta global" -<<<<<<< .mine #: eeschema/erc.cpp:460 -======= #: eeschema/erc.cpp:459 ->>>>>>> .r2446 #, c-format msgid "Cmp %s, Pin %s (%s) Unconnected" msgstr "Componente %s, Pino %s (%s) Não conectado" -<<<<<<< .mine #: eeschema/erc.cpp:475 -======= #: eeschema/erc.cpp:474 ->>>>>>> .r2446 #, c-format msgid "Cmp %s, Pin %s (%s) not driven (Net %d)" msgstr "Componente %s, Pino %s (%s) não controlado (Net %d)" -<<<<<<< .mine #: eeschema/erc.cpp:488 msgid "More than 1 Pin connected to UnConnect symbol" msgstr "Mais de 1 pino conectado a um símbolo Não Conectado" -======= + #: eeschema/erc.cpp:487 msgid "More than 1 Pin connected to UnConnect symbol" msgstr "Mais de 1 pino conectado a um símbolo Não Conectado" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/erc.cpp:515 #, c-format msgid "Cmp %s, Pin %s (%s) connected to " msgstr "Componente %s, Pino %s (%s) conectado a" -======= + #: eeschema/erc.cpp:514 #, c-format msgid "Cmp %s, Pin %s (%s) connected to " msgstr "Componente %s, Pino %s (%s) conectado a" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/erc.cpp:522 -======= #: eeschema/erc.cpp:521 ->>>>>>> .r2446 #, c-format msgid "Cmp %s, Pin %s (%s) (net %d)" msgstr "Componente %s, Pino %s (%s) (Net %d)" -<<<<<<< .mine #: eeschema/erc.cpp:689 msgid "ERC report" msgstr "Relatório de ERC" -======= + #: eeschema/erc.cpp:688 msgid "ERC report" msgstr "Relatório de ERC" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/erc.cpp:701 -======= #: eeschema/erc.cpp:700 ->>>>>>> .r2446 msgid "" "\n" "***** Sheet / (Root) \n" @@ -14507,11 +13840,8 @@ msgstr "" "\n" "***** página / (Raiz) \n" -<<<<<<< .mine #: eeschema/erc.cpp:706 -======= #: eeschema/erc.cpp:705 ->>>>>>> .r2446 #, c-format msgid "" "\n" @@ -14520,11 +13850,8 @@ msgstr "" "\n" "***** página %s\n" -<<<<<<< .mine #: eeschema/erc.cpp:725 -======= #: eeschema/erc.cpp:724 ->>>>>>> .r2446 #, c-format msgid "" "\n" @@ -14554,129 +13881,88 @@ msgstr "" msgid "File <%s> not found." msgstr "Arquivo <%s> não encontrado." -<<<<<<< .mine #: eeschema/find.cpp:231 -======= #: eeschema/find.cpp:230 ->>>>>>> .r2446 msgid "Pin " msgstr "Pino" -<<<<<<< .mine #: eeschema/find.cpp:235 -======= #: eeschema/find.cpp:234 ->>>>>>> .r2446 msgid "Ref " msgstr "Ref" -<<<<<<< .mine #: eeschema/find.cpp:239 #: eeschema/onrightclick.cpp:321 msgid "Value " msgstr "Valor" #: eeschema/find.cpp:243 -======= #: eeschema/find.cpp:238 #: eeschema/onrightclick.cpp:321 msgid "Value " msgstr "Valor" #: eeschema/find.cpp:242 ->>>>>>> .r2446 msgid "Field " msgstr "Campo" -<<<<<<< .mine #: eeschema/find.cpp:253 #: eeschema/find.cpp:257 -msgid " found" -======= #: eeschema/find.cpp:252 #: eeschema/find.cpp:256 msgid " found" ->>>>>>> .r2446 msgstr "Encontrado" -<<<<<<< .mine #: eeschema/find.cpp:388 -======= #: eeschema/find.cpp:387 ->>>>>>> .r2446 #, c-format msgid "Marker %d found in %s" msgstr "Marcador %d encontrado em %s" -<<<<<<< .mine #: eeschema/find.cpp:395 -======= #: eeschema/find.cpp:394 ->>>>>>> .r2446 msgid "Marker Not Found" msgstr "Marcador não encontrado" -<<<<<<< .mine #: eeschema/find.cpp:616 -======= #: eeschema/find.cpp:615 ->>>>>>> .r2446 msgid " Found in " msgstr " Encontrado em" -<<<<<<< .mine #: eeschema/find.cpp:628 -======= #: eeschema/find.cpp:627 ->>>>>>> .r2446 msgid " Not Found" msgstr " Não encontrado" -<<<<<<< .mine #: eeschema/find.cpp:660 #: eeschema/selpart.cpp:26 -msgid "No component libraries are loaded." -======= #: eeschema/find.cpp:659 -#: eeschema/selpart.cpp:26 msgid "No component libraries are loaded." ->>>>>>> .r2446 msgstr "Nenhuma biblioteca carregada" #: eeschema/find.cpp:683 -<<<<<<< .mine #: eeschema/find.cpp:750 #: eeschema/find.cpp:767 -======= #: eeschema/find.cpp:749 #: eeschema/find.cpp:766 ->>>>>>> .r2446 msgid "Found " msgstr "Encontrado " -<<<<<<< .mine #: eeschema/find.cpp:684 msgid " in library " msgstr "na biblioteca" -======= + #: eeschema/find.cpp:683 msgid " in library " msgstr "na biblioteca" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/find.cpp:692 -======= #: eeschema/find.cpp:691 ->>>>>>> .r2446 msgid " found only in cache" msgstr "encontrado somente no cache" -<<<<<<< .mine #: eeschema/find.cpp:695 -======= #: eeschema/find.cpp:694 ->>>>>>> .r2446 msgid "" "\n" "Explore All Libraries?" @@ -14684,25 +13970,20 @@ msgstr "" "\n" "Examinar todas as bibliotecas?" -<<<<<<< .mine #: eeschema/find.cpp:701 -======= #: eeschema/find.cpp:700 ->>>>>>> .r2446 msgid "Nothing found" msgstr "Nada encontrado" -<<<<<<< .mine #: eeschema/find.cpp:751 #: eeschema/find.cpp:768 msgid " in lib " msgstr " na bibl. " -======= + #: eeschema/find.cpp:750 #: eeschema/find.cpp:767 msgid " in lib " msgstr " na bibl. " ->>>>>>> .r2446 #: eeschema/getpart.cpp:96 #, c-format @@ -14735,17 +14016,15 @@ msgstr "Adicionar Componente" msgid "Add Wire" msgstr "Adicionar Cabo" -<<<<<<< .mine #: eeschema/libarch.cpp:59 #, c-format msgid "An error occurred attempting to save component library <%s>." msgstr "Ocorreu um erro ao tentar salvar a biblioteca de componentes <%s>." -======= + #: eeschema/libarch.cpp:55 #, c-format msgid "An error occurred attempting to save component library <%s>." msgstr "Ocorreu um erro ao tentar salvar a biblioteca de componentes <%s>." ->>>>>>> .r2446 #: eeschema/libedit.cpp:25 msgid "Component Library Editor: " @@ -14771,99 +14050,72 @@ msgstr "" msgid "Component or alias name \"%s\" not found in library \"%s\"." msgstr "Componente ou alias \"%s\" não encontrado na biblioteca \"%s\"." -<<<<<<< .mine #: eeschema/libedit.cpp:171 #, c-format msgid "Could not create copy of part <%s> in library <%s>." msgstr "Não foi possível criar cópia da parte <%s> na biblioteca <%s>." -======= + #: eeschema/libedit.cpp:168 #, c-format msgid "Could not create copy of part <%s> in library <%s>." msgstr "Não foi possível criar cópia da parte <%s> na biblioteca <%s>." ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit.cpp:241 msgid "Include last component changes?" msgstr "Incluir últimas alterações do componente?" #: eeschema/libedit.cpp:253 -msgid "Modify library file \"" -======= #: eeschema/libedit.cpp:235 msgid "Include last component changes?" msgstr "Incluir últimas alterações do componente?" #: eeschema/libedit.cpp:247 msgid "Modify library file \"" ->>>>>>> .r2446 msgstr "Modificar arquivo de Biblioteca \"" -<<<<<<< .mine #: eeschema/libedit.cpp:253 -======= #: eeschema/libedit.cpp:247 ->>>>>>> .r2446 msgid "\"?" msgstr "\"?" -<<<<<<< .mine #: eeschema/libedit.cpp:264 -msgid "Error while saving library file \"" -======= #: eeschema/libedit.cpp:258 msgid "Error while saving library file \"" ->>>>>>> .r2446 msgstr "Erro durante a salva do arquivo de Biblioteca \"" -<<<<<<< .mine #: eeschema/libedit.cpp:265 -======= #: eeschema/libedit.cpp:259 ->>>>>>> .r2446 msgid "\"." msgstr "\"." -<<<<<<< .mine #: eeschema/libedit.cpp:266 msgid "*** ERROR: ***" msgstr "*** ERRO: ***" #: eeschema/libedit.cpp:271 -msgid "Library file \"" -======= #: eeschema/libedit.cpp:260 msgid "*** ERROR: ***" msgstr "*** ERRO: ***" #: eeschema/libedit.cpp:265 msgid "Library file \"" ->>>>>>> .r2446 msgstr "Arquivo Biblioteca \"" -<<<<<<< .mine #: eeschema/libedit.cpp:273 -msgid "Document file \"" -======= #: eeschema/libedit.cpp:267 msgid "Document file \"" ->>>>>>> .r2446 msgstr "Arquivo Documentação \"" -<<<<<<< .mine #: eeschema/libedit.cpp:296 #: eeschema/viewlibs.cpp:314 msgid "Part" msgstr "Elemento" -======= + #: eeschema/libedit.cpp:291 #: eeschema/viewlibs.cpp:314 msgid "Part" msgstr "Elemento" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit.cpp:315 #: eeschema/eelayer.h:118 msgid "Body" @@ -14874,7 +14126,6 @@ msgid "Please select a component library." msgstr "Por favor selecione uma biblioteca de componente." #: eeschema/libedit.cpp:389 -======= #: eeschema/libedit.cpp:315 #: eeschema/eelayer.h:118 msgid "Body" @@ -14885,22 +14136,18 @@ msgid "Please select a component library." msgstr "Por favor selecione uma biblioteca de componente." #: eeschema/libedit.cpp:381 ->>>>>>> .r2446 #, c-format msgid "Component library <%s> is empty." msgstr "Biblioteca de componentes <%s> está vazia." -<<<<<<< .mine #: eeschema/libedit.cpp:391 msgid "Delete Entry Error" msgstr "Deletar entrada de erro" -======= + #: eeschema/libedit.cpp:383 msgid "Delete Entry Error" msgstr "Deletar entrada de erro" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit.cpp:396 #, c-format msgid "" @@ -14909,7 +14156,7 @@ msgid "" msgstr "" "Selecione 1 dos %d componentes para deletar\n" "da biblioteca <%s>." -======= + #: eeschema/libedit.cpp:388 #, c-format msgid "" @@ -14918,55 +14165,45 @@ msgid "" msgstr "" "Selecione 1 dos %d componentes para deletar\n" "da biblioteca <%s>." ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit.cpp:400 #: eeschema/onrightclick.cpp:366 msgid "Delete Component" msgstr "Deletar Componente" -======= + #: eeschema/libedit.cpp:392 #: eeschema/onrightclick.cpp:366 msgid "Delete Component" msgstr "Deletar Componente" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit.cpp:409 #, c-format msgid "Entry <%s> not found in library <%s>." msgstr "Entrada <%s> não encontrada na biblioteca <%s>." -======= + #: eeschema/libedit.cpp:401 #, c-format msgid "Entry <%s> not found in library <%s>." msgstr "Entrada <%s> não encontrada na biblioteca <%s>." ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit.cpp:416 #, c-format msgid "Delete component \"%s\" from library \"%s\"?" msgstr "Deletar componente \"%s\" da biblioteca \"%s\"?" -======= + #: eeschema/libedit.cpp:408 #, c-format msgid "Delete component \"%s\" from library \"%s\"?" msgstr "Deletar componente \"%s\" da biblioteca \"%s\"?" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit.cpp:436 msgid "The component being deleted has been modified. All changes will be lost. Discard changes?" msgstr "O componente a ser deletado foi modificado. Todas as alterações serão perdidas. Decartar alterações?" -======= + #: eeschema/libedit.cpp:428 msgid "The component being deleted has been modified. All changes will be lost. Discard changes?" msgstr "O componente a ser deletado foi modificado. Todas as alterações serão perdidas. Decartar alterações?" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit.cpp:491 msgid "" "All changes to the current component will be lost!\n" @@ -14991,8 +14228,6 @@ msgid "No component to save." msgstr "Nenhum componente para Salvar." #: eeschema/libedit.cpp:598 -msgid "No library specified." -======= #: eeschema/libedit.cpp:483 msgid "" "All changes to the current component will be lost!\n" @@ -15018,28 +14253,20 @@ msgstr "Nenhum componente para Salvar." #: eeschema/libedit.cpp:588 msgid "No library specified." ->>>>>>> .r2446 msgstr "Nenhuma biblioteca especificada." -<<<<<<< .mine #: eeschema/libedit.cpp:608 -======= #: eeschema/libedit.cpp:598 ->>>>>>> .r2446 #, c-format msgid "Component \"%s\" exists. Change it?" msgstr "Componente \"%s\" existe, modificar?" -<<<<<<< .mine #: eeschema/libedit.cpp:626 -======= #: eeschema/libedit.cpp:616 ->>>>>>> .r2446 #, c-format msgid "Component %s saved in library %s" msgstr "Componente %s salvo na biblioteca %s" -<<<<<<< .mine #: eeschema/libeditframe.cpp:301 msgid "" "Component was modified!\n" @@ -15100,349 +14327,231 @@ msgid "Export" msgstr "Exportar" #: eeschema/libedit_onrightclick.cpp:84 -msgid "Move Arc " -======= #: eeschema/libedit_onrightclick.cpp:83 msgid "Move Arc " ->>>>>>> .r2446 msgstr "Mover Arco" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:88 msgid "Drag Arc Size" msgstr "Arrastar tamanho do Arco" -======= + #: eeschema/libedit_onrightclick.cpp:87 msgid "Drag Arc Size" msgstr "Arrastar tamanho do Arco" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:94 msgid "Edit Arc Options" msgstr "Editar Opções de Arco" #: eeschema/libedit_onrightclick.cpp:101 -msgid "Delete Arc " -======= #: eeschema/libedit_onrightclick.cpp:93 msgid "Edit Arc Options" msgstr "Editar Opções de Arco" #: eeschema/libedit_onrightclick.cpp:100 msgid "Delete Arc " ->>>>>>> .r2446 msgstr "Deletar Arco" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:111 -msgid "Move Circle " -======= #: eeschema/libedit_onrightclick.cpp:110 msgid "Move Circle " ->>>>>>> .r2446 msgstr "Mover Círculo" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:119 msgid "Drag Circle Outline" msgstr "Arrastar contorno de Círculo" #: eeschema/libedit_onrightclick.cpp:125 -msgid "Edit Circle Options" -======= #: eeschema/libedit_onrightclick.cpp:118 msgid "Drag Circle Outline" msgstr "Arrastar contorno de Círculo" #: eeschema/libedit_onrightclick.cpp:124 msgid "Edit Circle Options" ->>>>>>> .r2446 msgstr "Opções de Círculo" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:132 -msgid "Delete Circle " -======= #: eeschema/libedit_onrightclick.cpp:131 msgid "Delete Circle " ->>>>>>> .r2446 msgstr "Deletar Círculo" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:142 -msgid "Move Rectangle " -======= #: eeschema/libedit_onrightclick.cpp:141 msgid "Move Rectangle " ->>>>>>> .r2446 msgstr "Mover Retângulo" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:148 -msgid "Edit Rectangle Options" -======= #: eeschema/libedit_onrightclick.cpp:147 msgid "Edit Rectangle Options" ->>>>>>> .r2446 msgstr "Opções de Retângulo" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:155 msgid "Drag Rectangle Edge" msgstr "Retângulo" #: eeschema/libedit_onrightclick.cpp:163 -msgid "Delete Rectangle " -======= #: eeschema/libedit_onrightclick.cpp:154 msgid "Drag Rectangle Edge" msgstr "Retângulo" #: eeschema/libedit_onrightclick.cpp:162 msgid "Delete Rectangle " ->>>>>>> .r2446 msgstr "Deletar Retângulo" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:174 -msgid "Move Text " -======= #: eeschema/libedit_onrightclick.cpp:173 msgid "Move Text " ->>>>>>> .r2446 msgstr "Mover texto" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:180 msgid "Edit Text " msgstr "Editar Texto" -======= + #: eeschema/libedit_onrightclick.cpp:179 msgid "Edit Text " msgstr "Editar Texto" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:185 -msgid "Rotate Text " -======= #: eeschema/libedit_onrightclick.cpp:184 msgid "Rotate Text " ->>>>>>> .r2446 msgstr "Rotacionar Texto" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:192 -msgid "Delete Text " -======= #: eeschema/libedit_onrightclick.cpp:191 msgid "Delete Text " ->>>>>>> .r2446 msgstr "Deletar Texto" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:202 -msgid "Move Line " -======= #: eeschema/libedit_onrightclick.cpp:201 msgid "Move Line " ->>>>>>> .r2446 msgstr "Mover Linha" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:206 msgid "Drag Edge Point" msgstr "Arrastar Segmento" #: eeschema/libedit_onrightclick.cpp:215 -======= #: eeschema/libedit_onrightclick.cpp:205 msgid "Drag Edge Point" msgstr "Arrastar Segmento" #: eeschema/libedit_onrightclick.cpp:214 ->>>>>>> .r2446 msgid "Line End" msgstr "Encerrar Linha" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:218 -msgid "Edit Line Options" -======= #: eeschema/libedit_onrightclick.cpp:217 msgid "Edit Line Options" ->>>>>>> .r2446 msgstr "Opções de Linhas" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:225 -msgid "Delete Line " -======= #: eeschema/libedit_onrightclick.cpp:224 msgid "Delete Line " ->>>>>>> .r2446 msgstr "Deletar Linha" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:234 -msgid "Delete Segment " -======= #: eeschema/libedit_onrightclick.cpp:233 msgid "Delete Segment " ->>>>>>> .r2446 msgstr "Deletar Segmento" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:247 -msgid "Move Field " -======= #: eeschema/libedit_onrightclick.cpp:246 msgid "Move Field " ->>>>>>> .r2446 msgstr "Mover Campo" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:253 -======= #: eeschema/libedit_onrightclick.cpp:252 ->>>>>>> .r2446 msgid "Field Rotate" msgstr "Rotacionar Campo" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:255 -======= #: eeschema/libedit_onrightclick.cpp:254 ->>>>>>> .r2446 msgid "Field Edit" msgstr "Editar Campo" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:284 -msgid "Move Pin " -======= #: eeschema/libedit_onrightclick.cpp:283 msgid "Move Pin " ->>>>>>> .r2446 msgstr "Mover Pino" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:290 msgid "Edit Pin " msgstr "Editar Pino" -======= + #: eeschema/libedit_onrightclick.cpp:289 msgid "Edit Pin " msgstr "Editar Pino" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:293 msgid "Rotate Pin " msgstr "Rotacionar Pino" #: eeschema/libedit_onrightclick.cpp:298 -msgid "Delete Pin " -======= #: eeschema/libedit_onrightclick.cpp:292 msgid "Rotate Pin " msgstr "Rotacionar Pino" #: eeschema/libedit_onrightclick.cpp:297 msgid "Delete Pin " ->>>>>>> .r2446 msgstr "Deletar Pino" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:306 -======= #: eeschema/libedit_onrightclick.cpp:305 ->>>>>>> .r2446 msgid "Global" msgstr "Global" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:309 -======= #: eeschema/libedit_onrightclick.cpp:308 ->>>>>>> .r2446 msgid "Pin Size to selected pins" msgstr "Dimensão de Pino para os pinos selecionados" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:310 -msgid "Pin Size to Others" -======= #: eeschema/libedit_onrightclick.cpp:309 msgid "Pin Size to Others" ->>>>>>> .r2446 msgstr "Dimensão de pinos para demais pinos" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:313 -======= #: eeschema/libedit_onrightclick.cpp:312 ->>>>>>> .r2446 msgid "Pin Name Size to selected pin" msgstr "Tamanho de Nome de Pino para pino selecionado" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:314 -msgid "Pin Name Size to Others" -======= #: eeschema/libedit_onrightclick.cpp:313 msgid "Pin Name Size to Others" ->>>>>>> .r2446 msgstr "Tamanho de Nome de Pino para os demais pinos" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:317 -======= #: eeschema/libedit_onrightclick.cpp:316 ->>>>>>> .r2446 msgid "Pin Num Size to selected pin" msgstr "Tamanho do Número de Pino para o pino selecionado" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:318 -msgid "Pin Num Size to Others" -======= #: eeschema/libedit_onrightclick.cpp:317 msgid "Pin Num Size to Others" ->>>>>>> .r2446 msgstr "Tamanho do Número de Pino para os demais pinos" -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:342 msgid "Select Items" msgstr "Selecionar ítens" -======= + #: eeschema/libedit_onrightclick.cpp:341 msgid "Select Items" msgstr "Selecionar ítens" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/libedit_onrightclick.cpp:346 #: eeschema/onrightclick.cpp:756 msgid "Mirror Block ||" msgstr "Espelhar bloco ||" -======= + #: eeschema/libedit_onrightclick.cpp:345 #: eeschema/onrightclick.cpp:756 msgid "Mirror Block ||" msgstr "Espelhar bloco ||" ->>>>>>> .r2446 #: eeschema/libfield.cpp:155 msgid "Edit field" msgstr "Editar Campo" -<<<<<<< .mine -#: eeschema/libfield.cpp:172 -#, c-format -======= #: eeschema/libfield.cpp:172 #, c-format msgid "" @@ -15466,7 +14575,6 @@ msgid "No new text: no change" msgstr "Nenhum texto novo: sem modificação" #: eeschema/libframe.cpp:297 ->>>>>>> .r2446 msgid "" "The field name <%s> is an existing alias of the component <%s>.\n" "Please choose another name that does not conflict with any names in the alias list." @@ -15474,11 +14582,8 @@ msgstr "" "O nome de campo <%s> é um alias existente do componente <%s>.\n" "Por favor escolha outro nome que não haja conflito com os nomes da lista de alias." -<<<<<<< .mine #: eeschema/libfield.cpp:186 -======= #: eeschema/libframe.cpp:310 ->>>>>>> .r2446 #, c-format msgid "" "The field name <%s> conflicts with an existing entry in the component library <%s>.\n" @@ -15487,19 +14592,16 @@ msgstr "" "O campo nome <%s> conflita com uma entrada existente na biblioteca de componentes <%s>.\n" "Por favor escolha outro nome que não conflite com qualquer entrada da biblioteca." -<<<<<<< .mine #: eeschema/libfield.cpp:208 msgid "No new text: no change" msgstr "Nenhum texto novo: sem modificação" -======= + #: eeschema/libframe.cpp:420 #: eeschema/tool_viewlib.cpp:147 #, c-format msgid "Part %c" msgstr "Elemento %c" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/lib_export.cpp:44 msgid "Import Component" msgstr "Importar componente" @@ -15508,26 +14610,21 @@ msgstr "Importar componente" #, c-format msgid "Component library file <%s> is empty." msgstr "Arquivo biblioteca de componentes <%s> está vazio." -======= + #: eeschema/libframe.cpp:683 #: eeschema/tool_lib.cpp:43 msgid "Add pin" msgstr "Adicionar Pino" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/lib_export.cpp:104 msgid "There is no component selected to save." msgstr "Nenhum componente selecionado para Salvar." -======= + #: eeschema/libframe.cpp:687 msgid "Set pin options" msgstr "Definir opções de Pino" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/lib_export.cpp:111 -======= #: eeschema/libframe.cpp:704 #: eeschema/tool_lib.cpp:51 msgid "Add rectangle" @@ -15569,35 +14666,27 @@ msgid "There is no component selected to save." msgstr "Nenhum componente selecionado para Salvar." #: eeschema/lib_export.cpp:106 ->>>>>>> .r2446 msgid "New Library" msgstr "Nova Biblioteca" -<<<<<<< .mine #: eeschema/lib_export.cpp:111 msgid "Export Component" msgstr "Exportar componente" -======= + #: eeschema/lib_export.cpp:106 msgid "Export Component" msgstr "Exportar componente" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/lib_export.cpp:139 msgid " - OK" msgstr "- OK" -======= + #: eeschema/lib_export.cpp:132 msgid " - OK" msgstr "- OK" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/lib_export.cpp:140 -======= #: eeschema/lib_export.cpp:133 ->>>>>>> .r2446 msgid "" "This library will not be available until it is loaded by EESchema.\n" "\n" @@ -15607,17 +14696,13 @@ msgstr "" "\n" "Modifique a configuração do eeschema se desejar utilizá-la" -<<<<<<< .mine #: eeschema/lib_export.cpp:145 msgid " - Export OK" msgstr " - Exportar OK" #: eeschema/lib_export.cpp:148 -msgid "Error creating " -======= #: eeschema/lib_export.cpp:138 msgid "Error creating " ->>>>>>> .r2446 msgstr "Erro durante criação" #: eeschema/load_one_schematic_file.cpp:70 @@ -15641,7 +14726,6 @@ msgstr " foi criado por uma vers msgid " was created by an older version of EESchema. It will be stored in the new file format when you save this file again." msgstr " foi criado por uma versão antiga do EESchema. Este será guardado no novo formato quando você salvar o arquivo novamente." -<<<<<<< .mine #: eeschema/load_one_schematic_file.cpp:383 msgid "Done Loading " msgstr "Carregado" @@ -15651,7 +14735,6 @@ msgstr "Carregado" msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" -======= #: eeschema/load_one_schematic_file.cpp:383 msgid "Done Loading " msgstr "Carregado" @@ -15661,7 +14744,6 @@ msgstr "Carregado" msgid "&New\tCtrl+N" msgstr "&Novo\tCtrl+N" ->>>>>>> .r2446 #: eeschema/menubar.cpp:45 #: eeschema/tool_sch.cpp:30 msgid "New schematic project" @@ -15671,17 +14753,15 @@ msgstr "&Novo Esquem msgid "Open an existing schematic project" msgstr "Abrir um projeto de esquemático" -<<<<<<< .mine #: eeschema/menubar.cpp:61 #: kicad/menubar.cpp:99 msgid "Open a recent opened schematic project" msgstr "Abrir um projeto de esquemático recente" -======= + #: eeschema/menubar.cpp:61 #: kicad/menubar.cpp:103 msgid "Open a recent opened schematic project" msgstr "Abrir um projeto de esquemático recente" ->>>>>>> .r2446 #: eeschema/menubar.cpp:70 msgid "&Save Whole Schematic Project\tCtrl+S" @@ -15777,7 +14857,6 @@ msgstr "Campos Footprint com anota msgid "Fit the schematic sheet on the screen" msgstr "Ajustar a folha do esquema a tela" -<<<<<<< .mine #: eeschema/menubar.cpp:249 msgid "Redraw the schematic view" msgstr "Redesenhar" @@ -15930,7 +15009,6 @@ msgstr "Prefer #: eeschema/menubar.cpp:398 #: gerbview/tool_gerber.cpp:84 -======= #: eeschema/menubar.cpp:249 msgid "Redraw the schematic view" msgstr "Redesenhar" @@ -16082,7 +15160,6 @@ msgstr "Prefer #: eeschema/menubar.cpp:398 #: gerbview/tool_gerber.cpp:84 ->>>>>>> .r2446 msgid "&Options" msgstr "&Opções" @@ -16106,7 +15183,6 @@ msgstr "Abrir o manual do eeschema " msgid "About eeschema schematic designer" msgstr "Sobre designer de esquemas eeschema" -<<<<<<< .mine #: eeschema/menubar.cpp:452 msgid "&Place" msgstr "Inserir " @@ -16114,7 +15190,6 @@ msgstr "Inserir " #: eeschema/netform.cpp:69 #: eeschema/netform.cpp:274 #: eeschema/save_schemas.cpp:82 -======= #: eeschema/menubar.cpp:452 msgid "&Place" msgstr "Inserir " @@ -16122,45 +15197,33 @@ msgstr "Inserir " #: eeschema/netform.cpp:68 #: eeschema/netform.cpp:273 #: eeschema/save_schemas.cpp:82 ->>>>>>> .r2446 msgid "Failed to create file " msgstr "Falhou ao criar arquivo" -<<<<<<< .mine #: eeschema/netlist.cpp:107 msgid "NbItems" msgstr "Nr.Itens" -======= + #: eeschema/netlist.cpp:106 msgid "NbItems" msgstr "Nr.Itens" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/netlist.cpp:217 #: eeschema/netlist.cpp:262 #: eeschema/netlist.cpp:283 -======= #: eeschema/netlist.cpp:216 #: eeschema/netlist.cpp:261 #: eeschema/netlist.cpp:282 ->>>>>>> .r2446 msgid "Done" msgstr "Pronto" -<<<<<<< .mine #: eeschema/netlist.cpp:223 -======= #: eeschema/netlist.cpp:222 ->>>>>>> .r2446 msgid "Labels" msgstr "Etiquetas" -<<<<<<< .mine #: eeschema/netlist.cpp:266 -======= #: eeschema/netlist.cpp:265 ->>>>>>> .r2446 msgid "Hierar." msgstr "Hierar." @@ -16520,19 +15583,16 @@ msgstr "Editar Planilha" msgid "Resize Sheet" msgstr "Redimensionar Planilha" -<<<<<<< .mine #: eeschema/onrightclick.cpp:699 msgid "Import PinSheets" msgstr "Importar pino da Planilha" #: eeschema/onrightclick.cpp:703 -======= #: eeschema/onrightclick.cpp:699 msgid "Import PinSheets" msgstr "Importar Planilha de Pinos" #: eeschema/onrightclick.cpp:703 ->>>>>>> .r2446 msgid "Cleanup PinSheets" msgstr "Apagar pino da Planilha" @@ -16568,107 +15628,89 @@ msgstr "Arrastar bloco" msgid "Copy to Clipboard" msgstr "Copiar para Clipboard " -<<<<<<< .mine #: eeschema/pinedit.cpp:238 msgid "This position is already occupied by another pin. Continue?" msgstr "Ocupado por outro pino, Continuar?" -======= + #: eeschema/pinedit.cpp:234 msgid "This position is already occupied by another pin. Continue?" msgstr "Ocupado por outro pino, Continuar?" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/pinedit.cpp:664 msgid "No pins!" msgstr "Sem pinos!" -======= + #: eeschema/pinedit.cpp:659 msgid "No pins!" msgstr "Sem pinos!" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/pinedit.cpp:675 msgid "Marker Information" msgstr "Informação do Marcador" -======= + #: eeschema/pinedit.cpp:670 msgid "Marker Information" msgstr "Informação do Marcador" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/pinedit.cpp:694 #, c-format msgid "Duplicate pin %s \"%s\" at location (%.3f, %.3f) conflicts with pin %s \"%s\" at location (%.3f, %.3f)" msgstr "Pino duplicado %s \"%s\" na posição (%.3f, %.3f) conflito com pino %s \"%s\" na posição (%.3f, %.3f)" -======= + #: eeschema/pinedit.cpp:689 #, c-format msgid "Duplicate pin %s \"%s\" at location (%.3f, %.3f) conflicts with pin %s \"%s\" at location (%.3f, %.3f)" msgstr "Pino duplicado %s \"%s\" na posição (%.3f, %.3f) conflito com pino %s \"%s\" na posição (%.3f, %.3f)" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/pinedit.cpp:707 #: eeschema/pinedit.cpp:746 #, c-format msgid " in part %c" msgstr "na parte %c" -======= + #: eeschema/pinedit.cpp:702 #: eeschema/pinedit.cpp:741 #, c-format msgid " in part %c" msgstr "na parte %c" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/pinedit.cpp:714 #: eeschema/pinedit.cpp:753 msgid " of converted" msgstr " do convertido" -======= + #: eeschema/pinedit.cpp:709 #: eeschema/pinedit.cpp:748 msgid " of converted" msgstr " do convertido" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/pinedit.cpp:716 #: eeschema/pinedit.cpp:755 msgid " of normal" msgstr " do normal" -======= + #: eeschema/pinedit.cpp:711 #: eeschema/pinedit.cpp:750 msgid " of normal" msgstr " do normal" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/pinedit.cpp:737 #, c-format msgid "Off grid pin %s \"%s\" at location (%.3f, %.3f)" msgstr "Pino desligado %s \"%s\" na localização (%.3f, %.3f)" -======= + #: eeschema/pinedit.cpp:732 #, c-format msgid "Off grid pin %s \"%s\" at location (%.3f, %.3f)" msgstr "Pino desligado %s \"%s\" na localização (%.3f, %.3f)" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/pinedit.cpp:764 msgid "No off grid or duplicate pins were found." msgstr "Nenhum pino duplicado." -======= + #: eeschema/pinedit.cpp:759 msgid "No off grid or duplicate pins were found." msgstr "Nenhum pino duplicado." ->>>>>>> .r2446 #: eeschema/plotdxf.cpp:154 #: eeschema/plotps.cpp:177 @@ -16849,15 +15891,11 @@ msgstr "Importar pino da Planilha****" msgid "Add Power" msgstr "Adiconar alimentação" -<<<<<<< .mine #: eeschema/schframe.cpp:360 -======= #: eeschema/schframe.cpp:358 ->>>>>>> .r2446 msgid "Schematic modified, Save before exit ?" msgstr "Esquemático modificado, salvar antes de fechar?" -<<<<<<< .mine #: eeschema/schframe.cpp:516 msgid "Draw wires and buses in any direction" msgstr "Desenho de cabos e barramentos em qualquer direção" @@ -16867,8 +15905,6 @@ msgid "Draw horizontal and vertical wires and buses only" msgstr "Permitir somente cabos e barramentos horizontais e verticais " #: eeschema/schframe.cpp:527 -msgid "Do not show hidden pins" -======= #: eeschema/schframe.cpp:493 msgid "Draw wires and buses in any direction" msgstr "Desenho de cabos e barramentos em qualquer direção" @@ -16879,29 +15915,21 @@ msgstr "Permitir somente cabos e barramentos horizontais e verticais " #: eeschema/schframe.cpp:504 msgid "Do not show hidden pins" ->>>>>>> .r2446 msgstr "Não mostrar pinos ocultos" -<<<<<<< .mine #: eeschema/schframe.cpp:528 #: eeschema/tool_sch.cpp:268 -msgid "Show hidden pins" -======= #: eeschema/schframe.cpp:505 -#: eeschema/tool_sch.cpp:268 msgid "Show hidden pins" ->>>>>>> .r2446 msgstr "Mostrar pinos ocultos" -<<<<<<< .mine #: eeschema/schframe.cpp:619 msgid "Schematic" msgstr "Esquemático" -======= + #: eeschema/schframe.cpp:596 msgid "Schematic" msgstr "Esquemático" ->>>>>>> .r2446 #: eeschema/selpart.cpp:32 #, c-format @@ -16936,13 +15964,10 @@ msgstr "Formato de planilha de pinos:" msgid "No new hierarchical labels found" msgstr "Não encontrada Nova Etiqueta Hierárquica" -<<<<<<< .mine #: eeschema/symbdraw.cpp:962 #: eeschema/symbdraw.cpp:1050 -======= #: eeschema/symbdraw.cpp:954 #: eeschema/symbdraw.cpp:1042 ->>>>>>> .r2446 #, c-format msgid "Arc %.1f deg" msgstr "Arco %.1f graus" @@ -17075,16 +16100,11 @@ msgstr "Mostrar como um elemento \"De Morgan\" convertido" msgid "Edit document file" msgstr "Editar arquivo de documentação" -<<<<<<< .mine #: eeschema/tool_lib.cpp:203 -msgid "Edit pins part per part ( Use carefully!)" -======= #: eeschema/tool_lib.cpp:205 msgid "Edit pins part per part ( Use carefully!)" ->>>>>>> .r2446 msgstr "Editar pinos elemento por elemento (use com cuidado!)" -<<<<<<< .mine #: eeschema/tool_lib.cpp:205 msgid "Usual option = OFF when parts are not locked" msgstr "Opção usual = Desativado quando as partes não estão travadas" @@ -17094,9 +16114,6 @@ msgid "Usual option = ON when parts are locked" msgstr "Opção usual = Ativada quando as partes estão travadas" #: eeschema/tool_sch.cpp:33 -======= -#: eeschema/tool_sch.cpp:33 ->>>>>>> .r2446 msgid "Open schematic project" msgstr "&Carregar Esquemático do Projeto" @@ -17242,28 +16259,23 @@ msgstr "Inserir componente no esquema" msgid "Library Browser" msgstr "Pesquisador de Bibliotecas" -<<<<<<< .mine #: kicad/class_treeproject_item.cpp:128 msgid "Unable to move file ... " msgstr "Incapaz de moverr arquivo ..." -======= + #: kicad/commandframe.cpp:72 msgid "EESchema (Schematic editor)" msgstr "EESchema (Editor de esquemáticos)" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/class_treeproject_item.cpp:129 #: kicad/class_treeproject_item.cpp:204 msgid "Permission error ?" msgstr "Permitir erro ?" -======= + #: kicad/commandframe.cpp:76 msgid "CVpcb (Components to modules)" msgstr "Cvpcb (Associação de componentes/módulos)" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/class_treeproject_item.cpp:187 msgid "" "Changing file extension will change file type.\n" @@ -17271,7 +16283,7 @@ msgid "" msgstr "" "Alterar a extensão do arquivo irá alterar o tipo de arquivo.\n" "Você quer continuar ?" -======= + #: kicad/commandframe.cpp:80 msgid "PCBnew (PCB editor)" msgstr "Pcbnew (Editor de placas de circuito impresso)" @@ -17328,24 +16340,20 @@ msgid "" msgstr "" "\n" "Criar Arquivo Zip <%s>" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/class_treeproject_item.cpp:189 msgid "Rename File" msgstr "Renomear arquivo" -======= + #: kicad/kicad.cpp:78 #: kicad/prjconfig.cpp:118 msgid "Working dir: " msgstr "Diretório de Trabalho: " ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/class_treeproject_item.cpp:203 msgid "Unable to rename file ... " msgstr "Impossível renomerar arquivo" -======= + #: kicad/kicad.cpp:79 #: kicad/prjconfig.cpp:119 msgid "" @@ -17354,23 +16362,19 @@ msgid "" msgstr "" "\n" "Projeto: " ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/class_treeproject_item.cpp:219 msgid "Do you really want to delete " msgstr "Você quer apagar realmente" -======= + #: kicad/kicad.cpp:106 msgid "noname" msgstr "sem nome" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/class_treeproject_item.cpp:220 msgid "Delete File" msgstr "Deletar Arquivo" -======= + #: kicad/mainframe.cpp:71 #, c-format msgid "" @@ -17379,13 +16383,11 @@ msgid "" msgstr "" "Pronto\n" "Diretório de trabalho: %s\n" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/commandframe.cpp:72 msgid "EESchema (Schematic editor)" msgstr "EESchema (Editor de esquemáticos)" -======= + #: kicad/mainframe.cpp:252 msgid "Text file (" msgstr "Arquivo de texto (" @@ -17504,49 +16506,39 @@ msgstr "Atualizar #: kicad/preferences.cpp:47 msgid "You must choose a PDF viewer before using this option." msgstr "Você precisa escolher um visualizador PDF antes de usar esta opção " ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/commandframe.cpp:76 msgid "CVpcb (Components to modules)" msgstr "Cvpcb (Associação de componentes/módulos)" -======= + #: kicad/preferences.cpp:56 msgid "Executable files (" msgstr "Arquivos executáveis (" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/commandframe.cpp:80 msgid "PCBnew (PCB editor)" msgstr "Pcbnew (Editor de placas de circuito impresso)" -======= + #: kicad/preferences.cpp:60 msgid "Select Preferred Pdf Browser" msgstr "Pesquisador Pdf preferido" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/commandframe.cpp:84 msgid "GerbView (Gerber viewer)" msgstr "GerbView (Visualisador de arquivos Gerber)" -======= + #: kicad/preferences.cpp:82 msgid "Executable file (" msgstr "Arquivo executável (" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/files-io.cpp:50 msgid "Unzip Project" msgstr "Descomprimir Projeto" -======= + #: kicad/preferences.cpp:84 msgid "Select Prefered Editor" msgstr "Selecionar Editor preferido" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/files-io.cpp:57 msgid "" "\n" @@ -17607,9 +16599,8 @@ msgstr "" "Projeto: " #: kicad/mainframe.cpp:68 -#, c-format -======= #: kicad/prjconfig.cpp:41 +#, c-format msgid "Project template file not found " msgstr "Arquivo de modelo não encontrado" @@ -17635,7 +16626,6 @@ msgid "Permission error ?" msgstr "Erro de permissão ?" #: kicad/treeprj_datas.cpp:272 ->>>>>>> .r2446 msgid "" "Ready\n" "Working dir: %s\n" @@ -17643,25 +16633,21 @@ msgstr "" "Pronto\n" "Diretório de trabalho: %s\n" -<<<<<<< .mine #: kicad/mainframe.cpp:228 msgid "Text file (" msgstr "Arquivo de texto (" -======= + #: kicad/treeprj_datas.cpp:274 msgid "Rename File" msgstr "Renomear Arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/mainframe.cpp:230 msgid "Load File to Edit" msgstr "Carregar arquivo para Editar" -======= + #: kicad/treeprj_datas.cpp:288 msgid "Unable to rename file ... " msgstr "Impossível renomear arquivo..." ->>>>>>> .r2446 #: kicad/menubar.cpp:90 msgid "Open an existing project" @@ -17672,12 +16658,11 @@ msgstr "Abrir um projeto existente" msgid "Start a new project" msgstr "Criar novo projeto" -<<<<<<< .mine #: kicad/menubar.cpp:110 #: kicad/menubar.cpp:282 msgid "Save current project" msgstr "Salvar projeto atual" -======= + #: kicad/treeprj_datas.cpp:381 msgid "no kicad files found in this directory" msgstr "nenhum arquivo Kicad encontrado neste diretório" @@ -17685,9 +16670,7 @@ msgstr "nenhum arquivo Kicad encontrado neste diret #: kicad/treeprj_frame.cpp:126 msgid "&Run" msgstr "&Executar" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:118 msgid "&Archive" msgstr "&Arquivar projeto" @@ -17695,54 +16678,44 @@ msgstr "&Arquivar projeto" #: kicad/menubar.cpp:119 msgid "Archive project files in zip archive" msgstr "Compactar arquivos do projeto" -======= + #: kicad/treeprj_frame.cpp:136 #: kicad/treeprj_frame.cpp:211 msgid "&Edit in a text editor" msgstr "&Editar em um editor de textos" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:124 msgid "&Unarchive" msgstr "&Descompactar projeto" -======= + #: kicad/treeprj_frame.cpp:137 msgid "&Open the file in a Text Editor" msgstr "%Abrir o arquivo em um Editor de Textos" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:125 msgid "Unarchive project files from zip file" msgstr "Decompactar arquivos de projeto a partir do zip" -======= + #: kicad/treeprj_frame.cpp:154 msgid "New D&irectory" msgstr "Novo D&iretório" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:134 msgid "Quit KiCad" msgstr "Finalizar Kicad" -======= + #: kicad/treeprj_frame.cpp:155 msgid "Create a New Directory" msgstr "Criar Novo Diretório" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:148 msgid "Text E&ditor" msgstr "E&ditor de textos" -======= + #: kicad/treeprj_frame.cpp:164 msgid "New P&ython Script" msgstr "Novo Script P&ython" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:149 msgid "Open prefered text editor" msgstr "Abrir o arquivo em um Editor de Textos *" @@ -17750,74 +16723,60 @@ msgstr "Abrir o arquivo em um Editor de Textos *" #: kicad/menubar.cpp:155 msgid "&View File" msgstr "&Ver Arquivo" -======= + #: kicad/treeprj_frame.cpp:174 msgid "New &Text File" msgstr "Novo Arquivo &Texto" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:156 msgid "View, read or edit file with a text editor" msgstr "Ler ou editar arquivos com um editor de texto" -======= + #: kicad/treeprj_frame.cpp:175 msgid "Create a New Txt File" msgstr "Criar um Novo arquivo Txt" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:169 msgid "&Text Editor" msgstr "Editor de &textos" -======= + #: kicad/treeprj_frame.cpp:183 msgid "New &File" msgstr "Novo &Arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:170 msgid "Select your prefered text editor" msgstr "Selecione seu editor de textos preferido" -======= + #: kicad/treeprj_frame.cpp:184 msgid "Create a New File" msgstr "Criar um Novo Arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:184 msgid "Use system default PDF viewer used to browse datasheets" msgstr "Usar o visualizador PDF default (sistema) para pesquisar datasheets" -======= + #: kicad/treeprj_frame.cpp:198 msgid "&Rename file" msgstr "&Renomear Arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:194 msgid "Favourite" msgstr "Favorito" -======= + #: kicad/treeprj_frame.cpp:199 #: kicad/treeprj_frame.cpp:201 msgid "&Rename directory" msgstr "&Renomear Diretório" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:195 msgid "Use your favourite PDF viewer used to browse datasheets" msgstr "Usar seu visualizador PDF favorito para pesquisar datasheets" -======= + #: kicad/treeprj_frame.cpp:200 msgid "Rename file" msgstr "Renomear Arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:206 #: kicad/menubar.cpp:213 msgid "PDF Viewer" @@ -17826,103 +16785,83 @@ msgstr "Visualizador PDF" #: kicad/menubar.cpp:207 msgid "Select your favourite PDF viewer used to browse datasheets" msgstr "Selecione seu visualizador PDF favorito para pesquisa de datasheets" -======= + #: kicad/treeprj_frame.cpp:212 msgid "Open the file in a Text Editor" msgstr "Abrir o arquivo em um Editor de Textos" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:214 msgid "PDF viewer preferences" msgstr "Preferências do visualizador de Pdf" -======= + #: kicad/treeprj_frame.cpp:220 msgid "&Delete File" msgstr "&Deletar Arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:229 msgid "Open the kicad manual" msgstr "Abrir o manual do Kicad" -======= + #: kicad/treeprj_frame.cpp:221 msgid "&Delete Directory" msgstr "&Deletar Diretório" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:238 msgid "About kicad project manager" msgstr "Sobre o gerenciados de projetos Kicad" -======= + #: kicad/treeprj_frame.cpp:222 msgid "Delete the File" msgstr "Deletar o Arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:248 msgid "&Browse" msgstr "&Examinar" -======= + #: kicad/treeprj_frame.cpp:223 msgid "&Delete the Directory and its content" msgstr "&Deletar o Diretório e seu conteúdo" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:277 msgid "Load existing project" msgstr "Carregar projeto existente" -======= + #: kicad/treeprj_frame.cpp:549 msgid "Create New File" msgstr "Criar Novo Arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:290 msgid "Archive all project files" msgstr "Compactar todos os arquivos do projeto" -======= + #: kicad/treeprj_frame.cpp:550 msgid "Create New Directory" msgstr "Criar Novo Diretório" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/menubar.cpp:298 msgid "Refresh project tree" msgstr "Atualizar árvore do projeto" -======= + #: kicad/treeprj_frame.cpp:559 msgid "noname." msgstr "sem nome." ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/preferences.cpp:47 msgid "You must choose a PDF viewer before using this option." msgstr "Você precisa escolher um visualizador PDF antes de usar esta opção " -======= + #: kicad/treeprj_frame.cpp:1088 msgid "Change filename: " msgstr "Trocar Nome Arquivo:" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/preferences.cpp:56 msgid "Executable files (" msgstr "Arquivos executáveis (" -======= + #: kicad/treeprj_frame.cpp:1090 msgid "Change filename" msgstr "Trocar Nome Arquivo:" ->>>>>>> .r2446 -<<<<<<< .mine #: kicad/preferences.cpp:60 msgid "Select Preferred Pdf Browser" msgstr "Pesquisador Pdf preferido" @@ -18014,10 +16953,6 @@ msgstr "Alterar nome de arquivo" #: share/setpage.cpp:261 #: gerbview/gerbview_dialog_display_options_frame_base.cpp:51 -======= -#: share/setpage.cpp:261 -#: gerbview/gerbview_dialog_display_options_frame_base.cpp:51 ->>>>>>> .r2446 msgid "Size A4" msgstr "Tamanho A4" @@ -18122,50 +17057,40 @@ msgstr "Coment msgid "Comment4:" msgstr "Comentário4:" -<<<<<<< .mine #: common/basicframe.cpp:224 msgid " file <" msgstr "arquivo <" -======= + #: common/basicframe.cpp:207 msgid " file <" msgstr "arquivo <" ->>>>>>> .r2446 -<<<<<<< .mine #: common/basicframe.cpp:224 msgid "> was not found." msgstr "> não encontrado." -======= + #: common/basicframe.cpp:207 msgid "> was not found." msgstr "> não encontrado." ->>>>>>> .r2446 -<<<<<<< .mine #: common/basicframe.cpp:258 -======= #: common/basicframe.cpp:241 ->>>>>>> .r2446 #, c-format msgid "Help file %s not found" msgstr "Arquivo de Help %s não encontrado" -<<<<<<< .mine #: common/basicframe.cpp:267 #, c-format msgid "Help file %s could not be found." msgstr "Arquivo de Help %s não encontrado." #: common/block_commande.cpp:47 -======= #: common/basicframe.cpp:250 #, c-format msgid "Help file %s could not be found." msgstr "Arquivo de Help %s não encontrado." #: common/block_commande.cpp:47 ->>>>>>> .r2446 msgid "Block Move" msgstr "Mover Bloco" @@ -18209,137 +17134,111 @@ msgstr "Espelhar bloco" msgid "Marker Info" msgstr "Informação do Marcador" -<<<<<<< .mine #: common/common.cpp:64 msgid "Kicad project files (*.pro)|*.pro" msgstr "Arquivo de projeto Kicad (*.pro)|*.pro" -======= + #: common/common.cpp:60 msgid "Kicad project files (*.pro)|*.pro" msgstr "Arquivo de projeto Kicad (*.pro)|*.pro" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:65 msgid "Kicad PCB files (*.brd)|*.brd" msgstr "Arquivos PCB Kicad (*.brd)|*.brd" -======= + #: common/common.cpp:61 msgid "Kicad PCB files (*.brd)|*.brd" msgstr "Arquivos PCB Kicad (*.brd)|*.brd" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:66 msgid "Kicad schematic files (*.sch)|*.sch" msgstr "Arquivos esquemas Kicad (*.sch)|*.sch" -======= + #: common/common.cpp:62 msgid "Kicad schematic files (*.sch)|*.sch" msgstr "Arquivos esquemas Kicad (*.sch)|*.sch" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:67 msgid "Kicad netlist files (*.net)|*.net" msgstr "Arquivos netlist Kicad (*.net)|*.net" -======= + #: common/common.cpp:63 msgid "Kicad netlist files (*.net)|*.net" msgstr "Arquivos netlist Kicad (*.net)|*.net" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:68 msgid "Gerber files (*.pho)|*.pho" msgstr "Arquivos Gerber (*.pho)|*.pho" -======= + #: common/common.cpp:64 msgid "Gerber files (*.pho)|*.pho" msgstr "Arquivos Gerber (*.pho)|*.pho" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:69 msgid "Portable document format files (*.pdf)|*.pdf" msgstr "Arquivos de documentos portáveis (.pdf)|*.pdf" -======= + #: common/common.cpp:65 msgid "Portable document format files (*.pdf)|*.pdf" msgstr "Arquivos de documentos portáveis (.pdf)|*.pdf" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:70 msgid "All files (*)|*" msgstr "Todos arquivos (*)|*" -======= + #: common/common.cpp:66 msgid "All files (*)|*" msgstr "Todos arquivos (*)|*" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:231 msgid " (\"):" msgstr " (\"):" -======= + #: common/common.cpp:227 msgid " (\"):" msgstr " (\"):" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:253 msgid "inches" msgstr "polegadas" -======= + #: common/common.cpp:249 msgid "inches" msgstr "polegadas" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:257 #: gerbview/options.cpp:204 msgid "millimeters" msgstr "millimetros" -======= + #: common/common.cpp:253 #: gerbview/options.cpp:204 msgid "millimeters" msgstr "millimetros" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:261 msgid "centimeters" msgstr "centímetros" -======= + #: common/common.cpp:257 msgid "centimeters" msgstr "centímetros" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:264 msgid "Unknown" msgstr "Desconhecido" -======= + #: common/common.cpp:260 msgid "Unknown" msgstr "Desconhecido" ->>>>>>> .r2446 -<<<<<<< .mine #: common/common.cpp:342 msgid " \"" msgstr "\"" -======= + #: common/common.cpp:338 msgid " \"" msgstr "\"" ->>>>>>> .r2446 #: common/confirm.cpp:83 msgid "Error" @@ -18349,212 +17248,161 @@ msgstr "Erro" msgid "Load Error!" msgstr "Erro de leitura!" -<<<<<<< .mine #: common/drawframe.cpp:336 msgid "??" msgstr "??" -======= + #: common/drawframe.cpp:330 msgid "??" msgstr "??" ->>>>>>> .r2446 -<<<<<<< .mine #: common/dsnlexer.cpp:88 msgid "clipboard" msgstr "clipboard " -======= + #: common/dsnlexer.cpp:167 msgid "in file" msgstr "no arquivo" ->>>>>>> .r2446 -<<<<<<< .mine #: common/dsnlexer.cpp:188 msgid "in" msgstr "em" -======= + #: common/dsnlexer.cpp:168 msgid "on line" msgstr "na linha" ->>>>>>> .r2446 -<<<<<<< .mine #: common/dsnlexer.cpp:189 msgid "on line" msgstr "na linha" -======= + #: common/dsnlexer.cpp:169 msgid "at offset" msgstr "deslocado" ->>>>>>> .r2446 -<<<<<<< .mine #: common/dsnlexer.cpp:190 msgid "at offset" msgstr "deslocado" -======= + #: common/dsnlexer.cpp:231 msgid "String delimiter must be a single character of ', \", or $" msgstr "Delimitador de String precisa ser um simples carecter de ', \", ou $" ->>>>>>> .r2446 -<<<<<<< .mine #: common/dsnlexer.cpp:266 msgid "String delimiter must be a single character of ', \", or $" msgstr "Delimitador de String precisa ser um simples carecter de ', \", ou $" -======= + #: common/dsnlexer.cpp:315 msgid "Un-terminated delimited string" msgstr "Delimitador de string não encontrado" ->>>>>>> .r2446 -<<<<<<< .mine #: common/dsnlexer.cpp:381 #: common/dsnlexer.cpp:394 msgid "Un-terminated delimited string" msgstr "Delimitador de string não encontrado" #: common/edaappl.cpp:108 -======= #: common/edaappl.cpp:112 ->>>>>>> .r2446 msgid "French" msgstr "Francês" -<<<<<<< .mine #: common/edaappl.cpp:116 msgid "Finnish" msgstr "Concluiído" #: common/edaappl.cpp:124 -======= #: common/edaappl.cpp:120 msgid "Finnish" msgstr "Concluiído" #: common/edaappl.cpp:128 ->>>>>>> .r2446 msgid "Spanish" msgstr "Espanhol" -<<<<<<< .mine #: common/edaappl.cpp:132 -======= #: common/edaappl.cpp:136 ->>>>>>> .r2446 msgid "Portuguese" msgstr "Português" -<<<<<<< .mine #: common/edaappl.cpp:140 -======= #: common/edaappl.cpp:144 ->>>>>>> .r2446 msgid "Italian" msgstr "Italiano" -<<<<<<< .mine #: common/edaappl.cpp:148 -======= #: common/edaappl.cpp:152 ->>>>>>> .r2446 msgid "German" msgstr "Alemão" -<<<<<<< .mine #: common/edaappl.cpp:156 -======= #: common/edaappl.cpp:160 ->>>>>>> .r2446 msgid "Slovenian" msgstr "Slovenio" -<<<<<<< .mine #: common/edaappl.cpp:164 -======= #: common/edaappl.cpp:168 ->>>>>>> .r2446 msgid "Hungarian" msgstr "Hungaro" -<<<<<<< .mine #: common/edaappl.cpp:172 -======= #: common/edaappl.cpp:176 ->>>>>>> .r2446 msgid "Polish" msgstr "Polonês" -<<<<<<< .mine #: common/edaappl.cpp:180 msgid "Czech" msgstr "Tcheco" #: common/edaappl.cpp:188 -======= #: common/edaappl.cpp:184 msgid "Czech" msgstr "Tcheco" #: common/edaappl.cpp:192 ->>>>>>> .r2446 msgid "Russian" msgstr "Russo" -<<<<<<< .mine #: common/edaappl.cpp:196 -======= #: common/edaappl.cpp:200 ->>>>>>> .r2446 msgid "Korean" msgstr "Koreano" -<<<<<<< .mine #: common/edaappl.cpp:204 msgid "Chinese simplified" msgstr "Chinês simplificado" #: common/edaappl.cpp:212 -======= #: common/edaappl.cpp:208 msgid "Chinese simplified" msgstr "Chinês simplificado" #: common/edaappl.cpp:216 ->>>>>>> .r2446 msgid "Catalan" msgstr "Italiano" -<<<<<<< .mine #: common/edaappl.cpp:220 msgid "Dutch" msgstr "Holandês" #: common/edaappl.cpp:817 -======= #: common/edaappl.cpp:224 msgid "Dutch" msgstr "Holandês" #: common/edaappl.cpp:824 ->>>>>>> .r2446 msgid "Language" msgstr "Idioma" -<<<<<<< .mine #: common/edaappl.cpp:818 msgid "Select application language (only for testing!)" msgstr "Selecione o idioma da aplicação ( somente para teste!)" #: common/eda_doc.cpp:149 -======= #: common/edaappl.cpp:825 msgid "Select application language (only for testing!)" msgstr "Selecione o idioma da aplicação ( somente para teste!)" #: common/eda_doc.cpp:149 ->>>>>>> .r2446 msgid "Doc File " msgstr "Arquivo de documentação" @@ -18608,11 +17456,8 @@ msgstr "Listar tudo" msgid "Select by Browser" msgstr "Selecionar por Pesquisa" -<<<<<<< .mine #: common/hotkeys_basic.cpp:384 -======= #: common/hotkeys_basic.cpp:367 ->>>>>>> .r2446 msgid "" "Current hotkey list:\n" "\n" @@ -18620,127 +17465,95 @@ msgstr "" "Lista das teclas de atalho corrente:\n" "\n" -<<<<<<< .mine #: common/hotkeys_basic.cpp:392 -======= #: common/hotkeys_basic.cpp:375 ->>>>>>> .r2446 msgid "key " msgstr "Tecla " -<<<<<<< .mine #: common/hotkeys_basic.cpp:445 -msgid "Save Hotkey Configuration File:" -======= #: common/hotkeys_basic.cpp:428 msgid "Save Hotkey Configuration File:" ->>>>>>> .r2446 msgstr "Arquivo de configuração de teclas de atalho:" -<<<<<<< .mine #: common/hotkeys_basic.cpp:477 -======= #: common/hotkeys_basic.cpp:460 ->>>>>>> .r2446 msgid "Allowed keys:\n" msgstr "Chaves permitidas:\n" -<<<<<<< .mine #: common/hotkeys_basic.cpp:562 msgid "Open Hotkey Configuration File:" msgstr "Abrir Arquivo de configuração de teclas de atalho:" #: common/hotkeys_basic.cpp:580 -======= #: common/hotkeys_basic.cpp:545 msgid "Open Hotkey Configuration File:" msgstr "Abrir Arquivo de configuração de teclas de atalho:" #: common/hotkeys_basic.cpp:563 ->>>>>>> .r2446 msgid "Unable to read " msgstr "Incapaz de carregar" -<<<<<<< .mine #: common/hotkeys_basic.cpp:698 msgid "List Current Keys" msgstr "Lista de teclas de atalho atual" -======= + #: common/hotkeys_basic.cpp:681 msgid "List Current Keys" msgstr "Lista de teclas de atalho atual" ->>>>>>> .r2446 -<<<<<<< .mine #: common/hotkeys_basic.cpp:699 msgid "Displays the current hotkeys list and corresponding commands" msgstr "Apresenta a lista de teclas de atalho corrente e os comandos correspondentes" -======= + #: common/hotkeys_basic.cpp:682 msgid "Displays the current hotkeys list and corresponding commands" msgstr "Apresenta a lista de teclas de atalho corrente e os comandos correspondentes" ->>>>>>> .r2446 -<<<<<<< .mine #: common/hotkeys_basic.cpp:705 msgid "(Re)create Hotkeys File" msgstr "(Re)Criar arquivo de teclas de atalho" -======= + #: common/hotkeys_basic.cpp:688 msgid "(Re)create Hotkeys File" msgstr "(Re)Criar arquivo de teclas de atalho" ->>>>>>> .r2446 -<<<<<<< .mine #: common/hotkeys_basic.cpp:707 -msgid "Create or recreate the hotkey configuration file from current hotkey list" -======= #: common/hotkeys_basic.cpp:690 msgid "Create or recreate the hotkey configuration file from current hotkey list" ->>>>>>> .r2446 msgstr "Criar ou recriar o arquivo de teclas de atalho apartir da lista atual" -<<<<<<< .mine #: common/hotkeys_basic.cpp:714 msgid "Reload Hotkeys File" msgstr "Recarregar arquivo de teclas de atalho" -======= + #: common/hotkeys_basic.cpp:697 msgid "Reload Hotkeys File" msgstr "Recarregar arquivo de teclas de atalho" ->>>>>>> .r2446 -<<<<<<< .mine #: common/hotkeys_basic.cpp:715 msgid "Reload the hotkey configuration file" msgstr "Recarregar o arquivo de teclas de atalho" -======= + #: common/hotkeys_basic.cpp:698 msgid "Reload the hotkey configuration file" msgstr "Recarregar o arquivo de teclas de atalho" ->>>>>>> .r2446 -<<<<<<< .mine #: common/hotkeys_basic.cpp:721 msgid "Edit Hotkeys File" msgstr "Editar teclas de atalho" -======= + #: common/hotkeys_basic.cpp:704 msgid "Edit Hotkeys File" msgstr "Editar teclas de atalho" ->>>>>>> .r2446 -<<<<<<< .mine #: common/hotkeys_basic.cpp:722 msgid "Edit the hotkey configuration file in a text editor" msgstr "Editar o arquivo de configuração de teclas de atalho em um editor de texto" -======= + #: common/hotkeys_basic.cpp:705 msgid "Edit the hotkey configuration file in a text editor" msgstr "Editar o arquivo de configuração de teclas de atalho em um editor de texto" ->>>>>>> .r2446 -<<<<<<< .mine #: common/hotkeys_basic.cpp:728 msgid "Hotkeys" msgstr "Teclas de atalho" @@ -18750,8 +17563,6 @@ msgid "Hotkeys configuration and preferences" msgstr "Configuração e preferências de teclas de atalho" #: common/hotkeys_basic.cpp:737 -msgid "Home directory" -======= #: common/hotkeys_basic.cpp:711 msgid "Hotkeys" msgstr "Teclas de atalho" @@ -18762,53 +17573,38 @@ msgstr "Configura #: common/hotkeys_basic.cpp:720 msgid "Home directory" ->>>>>>> .r2446 msgstr "Diretório principal" -<<<<<<< .mine #: common/hotkeys_basic.cpp:738 -======= #: common/hotkeys_basic.cpp:721 ->>>>>>> .r2446 msgid "Use home directory to load or store Hotkey config files" msgstr "Usar diretório principal para salvar ou carregar arquivos de configuração de teclas de atalho" -<<<<<<< .mine #: common/hotkeys_basic.cpp:745 -msgid "KiCad template directory" -======= #: common/hotkeys_basic.cpp:728 msgid "KiCad template directory" ->>>>>>> .r2446 msgstr "diretório kicad/template" -<<<<<<< .mine #: common/hotkeys_basic.cpp:746 -======= #: common/hotkeys_basic.cpp:729 ->>>>>>> .r2446 msgid "Use kicad/template directory to load or store Hotkey config files" msgstr "Usar diretório Kicad/template para salvar ou carregar arquivos de configuração de teclas de atalho" -<<<<<<< .mine #: common/hotkeys_basic.cpp:752 msgid "Location" msgstr "Localização" -======= + #: common/hotkeys_basic.cpp:735 msgid "Location" msgstr "Localização" ->>>>>>> .r2446 -<<<<<<< .mine #: common/hotkeys_basic.cpp:753 msgid "Select hotkey configuration file location" msgstr "Selecionar localização do arquivo de telcas de atalho" -======= + #: common/hotkeys_basic.cpp:736 msgid "Select hotkey configuration file location" msgstr "Selecionar localização do arquivo de telcas de atalho" ->>>>>>> .r2446 #: common/pcbcommon.cpp:61 msgid "??? Via" @@ -18826,26 +17622,22 @@ msgstr "Arquivos de biblioteca de footprint Kicad (*.mod)|*.mod" msgid "Printed circuit board files (*.brd)|*.brd" msgstr "Arquivos PCB Kicad (*.brd)|*.brd" -<<<<<<< .mine #: common/richio.cpp:73 #: common/richio.cpp:95 msgid "Line length exceeded" msgstr "Comprimento de linha excedido" -======= + #: common/richio.cpp:67 msgid "Line length exceeded" msgstr "Comprimento de linha excedido" ->>>>>>> .r2446 -<<<<<<< .mine #: common/richio.cpp:212 msgid "Error writing to STRINGFORMATTER" msgstr "Erro escrevendo para STRINGFORMATTER" -======= + #: common/richio.cpp:177 msgid "Error writing to STRINGFORMATTER" msgstr "Erro escrevendo para STRINGFORMATTER" ->>>>>>> .r2446 #: common/selcolor.cpp:68 msgid "Colors" @@ -18875,7 +17667,6 @@ msgstr "Ok para deletar bloco?" msgid "DCodes" msgstr "DCodes" -<<<<<<< .mine #: gerbview/class_gerbview_layer_widget.cpp:65 msgid "Show DCodes identification" msgstr "Mostar identificação DCodes" @@ -18899,7 +17690,6 @@ msgid "File " msgstr "Arquivo" #: gerbview/dcode.cpp:476 -======= #: gerbview/class_gerbview_layer_widget.cpp:65 msgid "Show DCodes identification" msgstr "Mostar identificação DCodes" @@ -18923,7 +17713,6 @@ msgid "File " msgstr "Arquivo" #: gerbview/dcode.cpp:476 ->>>>>>> .r2446 msgid "List D codes" msgstr "Lista D CODES" @@ -19019,19 +17808,16 @@ msgstr "Carregar Arquivo de D-Codes" msgid "Save Gerber File" msgstr "Salvar Arquivo GERBER" -<<<<<<< .mine #: gerbview/gerbview.cpp:40 msgid "GerbView project files (.cnf)|*.cnf" msgstr "Arquivos de projeto GerbView (.cnf)|*.cnf" #: gerbview/gerbview.cpp:97 -======= #: gerbview/gerbview.cpp:40 msgid "GerbView project files (.cnf)|*.cnf" msgstr "Arquivos de projeto GerbView (.cnf)|*.cnf" #: gerbview/gerbview.cpp:92 ->>>>>>> .r2446 msgid "GerbView is already running. Continue?" msgstr "Gerbview já está sendo executado, continuar?" @@ -19506,271 +18292,217 @@ msgstr "Op msgid "Fill Zones Options" msgstr "Opções de Preenchimento de Zonas" -<<<<<<< .mine #: pcbnew/dialog_design_rules_base.h:110 msgid "Design Rules Editor" msgstr "Editor de Regras de Design" -======= + #: pcbnew/dialog_design_rules_base.h:111 msgid "Design Rules Editor" msgstr "Editor de Regras de Design" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_display_options_base.h:69 msgid "Display options" msgstr "Opções de exibição" -======= -#: pcbnew/dialog_drc_base.h:96 -msgid "DRC Control" -msgstr "Controle DRC" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_drc_base.h:96 msgid "DRC Control" msgstr "Controle DRC" -======= + +#: pcbnew/dialog_drc_base.h:96 +msgid "DRC Control" +msgstr "Controle DRC" + #: pcbnew/dialog_edit_module_for_BoardEditor_base.h:118 #: pcbnew/dialog_edit_module_for_Modedit_base.h:105 msgid "Module properties" msgstr "Propriedades do Módulo" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_edit_module_for_BoardEditor_base.h:118 #: pcbnew/dialog_edit_module_for_Modedit_base.h:102 msgid "Module properties" msgstr "Propriedades do Módulo" -======= + #: pcbnew/dialog_edit_module_text.h:43 msgid "TextMod properties" msgstr "Propriedades do Texto do Módulo" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_edit_module_text.h:43 msgid "TextMod properties" msgstr "Propriedades do Texto do Módulo" -======= + #: pcbnew/dialog_edit_module_text_base.h:63 msgid "Footprint text properties" msgstr "Propriedades de texto de módulos" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_edit_module_text_base.h:63 msgid "Footprint text properties" msgstr "Propriedades de texto de módulos" -======= + #: pcbnew/dialog_exchange_modules_base.h:57 msgid "Exchange Modules" msgstr "Trocar módulos:" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_exchange_modules_base.h:57 msgid "Exchange Modules" msgstr "Trocar módulos:" -======= -#: pcbnew/dialog_gendrill.h:50 -msgid "Drill Files Generation" -msgstr "Geração de arquivos de furação" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_gendrill.h:50 msgid "Drill Files Generation" msgstr "Geração de arquivos de furação" -======= + +#: pcbnew/dialog_gendrill.h:50 +msgid "Drill Files Generation" +msgstr "Geração de arquivos de furação" + #: pcbnew/dialog_general_options_BoardEditor_base.h:80 msgid "General settings" msgstr "Opções Gerais" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_general_options_BoardEditor_base.h:78 msgid "General settings" msgstr "Opções Gerais" -======= + #: pcbnew/dialog_global_edit_tracks_and_vias_base.h:69 msgid "Global Edition of Tracks and Vias" msgstr "Edição Global de Trilhas e Vias" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_global_edit_tracks_and_vias_base.h:69 msgid "Global Edition of Tracks and Vias" msgstr "Edição Global de Trilhas e Vias" -======= + #: pcbnew/dialog_initpcb.h:38 msgid "Global Delete" msgstr "Deletar Global" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_initpcb.h:38 msgid "Global Delete" msgstr "Deletar Global" -======= + #: pcbnew/dialog_layers_setup_base.h:262 msgid "Layer Setup" msgstr "Configuração de Camada" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_layers_setup_base.h:262 msgid "Layer Setup" msgstr "Configuração de Camada" -======= + #: pcbnew/dialog_netlist_fbp.h:68 msgid "Netlist Dialog" msgstr "Diálogo de netlist" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_netlist_fbp.h:68 msgid "Netlist Dialog" msgstr "Diálogo de netlist" -======= + #: pcbnew/dialog_non_copper_zones_properties_base.h:59 msgid "Non Copper Zones Properties" msgstr "Propriedades de Zonas não de cobre" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_non_copper_zones_properties_base.h:59 msgid "Non Copper Zones Properties" msgstr "Propriedades de Zonas não de cobre" -======= + #: pcbnew/dialog_orient_footprints.h:42 msgid "Footprints Orientation" msgstr "Orientação de footprint" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_orient_footprints.h:42 msgid "Footprints Orientation" msgstr "Orientação de footprint" -======= -#: pcbnew/dialog_pad_properties_base.h:140 -msgid "Pad Properties" -msgstr "Propriedades da Ilha" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_pad_properties_base.h:140 msgid "Pad Properties" msgstr "Propriedades da Ilha" -======= + +#: pcbnew/dialog_pad_properties_base.h:140 +msgid "Pad Properties" +msgstr "Propriedades da Ilha" + #: pcbnew/dialog_SVG_print_base.h:68 #: eeschema/dialog_SVG_print_base.h:65 msgid "Create SVG file" msgstr "Cirar Arquivo SVG" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/dialog_SVG_print_base.h:68 #: eeschema/dialog_SVG_print_base.h:65 msgid "Create SVG file" msgstr "Cirar Arquivo SVG" -======= + #: pcbnew/find.h:43 msgid "Find" msgstr "Procurar" ->>>>>>> .r2446 -<<<<<<< .mine #: pcbnew/find.h:43 msgid "Find" msgstr "Procurar" -======= + #: eeschema/dialog_annotate_base.h:77 msgid "Annotate Schematic" msgstr "Anotação de esquemático" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_annotate_base.h:77 msgid "Annotate Schematic" msgstr "Anotação de esquemático" -======= + #: eeschema/dialog_bodygraphictext_properties_base.h:58 msgid "Graphic text properties:" msgstr "Propriedades de texto gráfico" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_bodygraphictext_properties_base.h:58 msgid "Graphic text properties:" msgstr "Propriedades de texto gráfico" -======= + #: eeschema/dialog_build_BOM_base.h:69 msgid "List of Material" msgstr "Lista de Material" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_build_BOM_base.h:69 msgid "List of Material" msgstr "Lista de Material" -======= -#: eeschema/dialog_edit_component_in_lib_base.h:107 -msgid "Lib Component Properties" -msgstr "Propriedades Biblioteca de Componentes" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_edit_component_in_lib_base.h:107 msgid "Lib Component Properties" msgstr "Propriedades Biblioteca de Componentes" -======= + +#: eeschema/dialog_edit_component_in_lib_base.h:107 +msgid "Lib Component Properties" +msgstr "Propriedades Biblioteca de Componentes" + #: eeschema/dialog_edit_component_in_schematic_fbp.h:82 #: eeschema/dialog_lib_new_component_base.h:77 msgid "Component Properties" msgstr "Propriedades do componente" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_edit_component_in_schematic_fbp.h:82 #: eeschema/dialog_lib_new_component_base.h:77 msgid "Component Properties" msgstr "Propriedades do componente" -======= + #: eeschema/dialog_edit_label_base.h:60 msgid "Text Editor" msgstr "Editor de textos" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_edit_label_base.h:60 msgid "Text Editor" msgstr "Editor de textos" -======= -#: eeschema/dialog_edit_libentry_fields_in_lib_base.h:74 -msgid "Fields Properties" -msgstr "Propriedades" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_edit_libentry_fields_in_lib_base.h:74 msgid "Fields Properties" msgstr "Propriedades" -======= + +#: eeschema/dialog_edit_libentry_fields_in_lib_base.h:74 +msgid "Fields Properties" +msgstr "Propriedades" + #: eeschema/dialog_eeschema_options_base.h:77 msgid "Schematic Editor Options" msgstr "Editor de opções de esquemático" ->>>>>>> .r2446 -<<<<<<< .mine #: eeschema/dialog_eeschema_options_base.h:77 msgid "Schematic Editor Options" msgstr "Editor de opções de esquemático" #: eeschema/dialog_erc_base.h:94 -======= -#: eeschema/dialog_erc_base.h:94 ->>>>>>> .r2446 msgid "EESchema Erc" msgstr "EESchema Erc" @@ -19778,7 +18510,6 @@ msgstr "EESchema Erc" msgid "EESchema Locate" msgstr "Localizador" -<<<<<<< .mine #: eeschema/dialog_lib_edit_draw_item_base.h:58 msgid "Drawing Properties" msgstr "Propriedades de Desenhos" @@ -19792,7 +18523,6 @@ msgid "Schematic Sheet Properties" msgstr "Propriedades da folha de esquemático" #: eeschema/eelayer.h:31 -======= #: eeschema/dialog_lib_edit_draw_item_base.h:58 msgid "Drawing Properties" msgstr "Propriedades de Desenhos" @@ -19806,7 +18536,6 @@ msgid "Schematic Sheet Properties" msgstr "Propriedades da folha de esquemático" #: eeschema/eelayer.h:31 ->>>>>>> .r2446 msgid "EESchema Colors" msgstr "Cores EESchema" @@ -19818,15 +18547,12 @@ msgstr "Cabo" msgid "Bus" msgstr "Barramento" -<<<<<<< .mine #: eeschema/eelayer.h:93 -======= #: eeschema/eelayer.h:87 msgid "Label" msgstr "Etiqueta" #: eeschema/eelayer.h:93 ->>>>>>> .r2446 msgid "GlobLabel" msgstr "Etiqueta Global"