Skip to content

Commit

Permalink
Fixes #25 and #24
Browse files Browse the repository at this point in the history
  • Loading branch information
Jaliborc committed Dec 9, 2011
1 parent 12176ca commit 5454a2a
Show file tree
Hide file tree
Showing 11 changed files with 91 additions and 46 deletions.
6 changes: 6 additions & 0 deletions Changelog.txt
@@ -1,3 +1,9 @@
====== 4.3.0
* Jaliborc: Updated for WoW 4.3

====== 4.2.6
* Jaliborc: Tagging as release

====== 4.2.5
* Jaliborc: The config has been divided into two windows - "General" & "Sets"
* Jaliborc: New options at the "General" window - "Display Sets on Left" and "Act as Interface Panel"
Expand Down
6 changes: 3 additions & 3 deletions Combuctor.toc
@@ -1,8 +1,8 @@
## Interface: 40200
## Interface: 40300
## Title: |cff20ff20Combuctor|r
## Author: Tuller
## Author: Tuller and Jaliborc (João Cardoso)
## Notes: Pants are a dangerous foe
## Version: 4.2.5
## Version: 4.2.6
## OptionalDeps: Ace3, Bagnon_Forever, BagSync, LibItemSearch-1.0
## SavedVariables: CombuctorDB2, CombuctorVersion

Expand Down
Empty file added Icon
Empty file.
36 changes: 18 additions & 18 deletions LICENSE
@@ -1,19 +1,19 @@
Copyright (c) 2010 Jason Greer

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
Copyright (c) 2010 Jason Greer and João Cardoso
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
6 changes: 1 addition & 5 deletions db/db.lua
Expand Up @@ -8,10 +8,6 @@ if not(BagnonDB) and BagSync then BagnonDB = {} else return end
local CURRENT_REALM = GetRealmName()
local function getBagTag(bagId)
if bagId == KEYRING_CONTAINER then
return 'key'
end
if bagId == BANK_CONTAINER then
return 'bank'
end
Expand Down Expand Up @@ -116,7 +112,7 @@ end
--]]
function BagnonDB:GetMoney(player)
local pd = playerData(player)
local c = pd and pd['gold:0:0']
local c = pd and pd['gold']
return c or 0
end
Expand Down
4 changes: 0 additions & 4 deletions libs/AceAddon-3.0/AceAddon-3.0.xml

This file was deleted.

4 changes: 0 additions & 4 deletions libs/AceConsole-3.0/AceConsole-3.0.xml

This file was deleted.

4 changes: 0 additions & 4 deletions libs/AceEvent-3.0/AceEvent-3.0.xml

This file was deleted.

4 changes: 0 additions & 4 deletions libs/CallbackHandler-1.0/CallbackHandler-1.0.xml

This file was deleted.

4 changes: 0 additions & 4 deletions libs/Unfit-1.0/Unfit-1.0.xml

This file was deleted.

63 changes: 63 additions & 0 deletions localization/localization.br.lua
@@ -0,0 +1,63 @@
--[[
Localization.lua
Translations for Combuctor
Português
Translation by Jaliborc (João Cardoso) and madcampos
--]]
local L = LibStub("AceLocale-3.0"):NewLocale("Combuctor", "ptBR")
if not L then return end
L.Updated = 'Atualizado para a versão %s'
--binding actions
L.ToggleInventory = "Mostrar/Ocultar mochila"
L.ToggleBank = "Mostrar/Ocultar banco"
--frame titles
L.InventoryTitle = "Mochila de %s"
L.BankTitle = "Banco de %s"
--tooltips
L.Inventory = 'Mochila'
L.Bank = 'Banco'
L.TotalOnRealm = 'Total em %s'
L.ClickToPurchase = '<Clique> para comprar'
L.Bags = 'Sacos'
L.BagToggle = '<Clique-esquerdo> para mostrar os sacos'
L.InventoryToggle = '<Clique-direito> para mostrar o banco'
L.BankToggle = '<Clique-direito> para mostrar o banco'
-- options
L.Sets = 'Conjuntos'
L.Panel = 'Janelas'
L.LeftFilters = 'Mostrar conjuntos à esquerda'
L.ActPanel = 'Comportar como painel padrão'
-- options tooltips
L.LeftFiltersTip = [[
Se ativado, as abas laterais serão
exibidas do lado esquerdo.]]

L.ActPanelTip = [[
Se ativado, este painel será imovível e se posicionará
automaticamente da mesma forma que os painéis padrão,como
o |cffffffffGrimório|r ou o |cffffffffLocalizador de Masmorras|r.]]

--these are automatically localized (aka, don't translate them :)
do
L.General = GENERAL
L.All = ALL
L.Weapon, L.Armor, L.Container, L.Consumable, L.Glyph, L.TradeGood, L.Recipe, L.Gem, L.Misc, L.Quest = GetAuctionItemClasses()
L.Trinket = _G['INVTYPE_TRINKET']
L.Devices, L.Explosives = select(10, GetAuctionItemSubClasses(6))
L.SimpleGem = select(8, GetAuctionItemSubClasses(7))
end

L.Normal = 'Normal'
L.Equipment = 'Equipamento'
L.Trade = 'Comércio'
L.Shards = 'Lascas'
L.SoulShard = 'Lascas de Alma'
L.Usable = 'Usável'

0 comments on commit 5454a2a

Please sign in to comment.