From 1da741d1af8f40df6b8902d8d817da8d733cff45 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Thu, 15 Dec 2005 03:10:03 +0000 Subject: [PATCH 01/93] auto-import xfce4-battery-plugin-0.3.0-3.fc4 on branch devel from xfce4-battery-plugin-0.3.0-3.fc4.src.rpm --- .cvsignore | 1 + GPL | 340 ++++++++++++++++++++++++++++++++++++++ sources | 1 + xfce4-battery-plugin.spec | 59 +++++++ 4 files changed, 401 insertions(+) create mode 100644 GPL create mode 100644 xfce4-battery-plugin.spec diff --git a/.cvsignore b/.cvsignore index e69de29..cf4a97c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +xfce4-battery-plugin-0.3.0.tar.gz diff --git a/GPL b/GPL new file mode 100644 index 0000000..d60c31a --- /dev/null +++ b/GPL @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/sources b/sources index e69de29..2d0b881 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +04e121df1ff264281e56e12a8ff5f155 xfce4-battery-plugin-0.3.0.tar.gz diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec new file mode 100644 index 0000000..7c20069 --- /dev/null +++ b/xfce4-battery-plugin.spec @@ -0,0 +1,59 @@ +Name: xfce4-battery-plugin +Version: 0.3.0 +Release: 3%{?dist} +Summary: Battery monitor for the Xfce panel + +Group: User Interface/Desktops +License: GPL +URL: http://xfce-goodies.berlios.de/ +Source0: http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz +Source1: GPL +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: xfce4-panel-devel >= 4.2, libxml2-devel + +%description +A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. + +%prep +%setup -q + +%build +%configure --disable-static +make + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' + +# replace wrong BSD license with a copy of GPL +%__cp %{SOURCE1} COPYING + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog README +%{_libdir}/xfce4/panel-plugins/*.so + +%changelog +* Sat Nov 19 2005 Christoph Wickert - 0.3.0-3 +- Use %{?_smp_mflags}. +- Replace wrong BSD license with a copy of the GPL (#173105). + +* Mon Nov 14 2005 Christoph Wickert - 0.3.0-2 +- Initial Fedora Extras version. +- Rebuild for XFCE 4.2.3. +- disable-static instead of removing .a files. + +* Fri Sep 23 2005 Christoph Wickert - 0.3.0-1.fc4.cw +- Update to 0.3.0. +- Add libxml2 BuildReqs. + +* Sat Jul 09 2005 Christoph Wickert - 0.2.0-1.fc4.cw +- Rebuild for Core 4. + +* Wed Apr 13 2005 Christoph Wickert - 0.2.0-1.fc3.cw +- Initial RPM release. From ba7b078883349dd7f3b3f7ea4374b4077f982446 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 30 Dec 2005 13:06:34 +0000 Subject: [PATCH 02/93] add libxfcegui4-devel buildreq and fix %defattr --- xfce4-battery-plugin.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 7c20069..132a231 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-battery-plugin Version: 0.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -8,9 +8,9 @@ License: GPL URL: http://xfce-goodies.berlios.de/ Source0: http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz Source1: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.2, libxml2-devel +BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel %description A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. @@ -34,11 +34,15 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README %{_libdir}/xfce4/panel-plugins/*.so %changelog +* Fri Dec 30 2005 Christoph Wickert - 0.3.0-4 +- Add libxfcegui4-devel BuildReqs. +- Fix %defattr. + * Sat Nov 19 2005 Christoph Wickert - 0.3.0-3 - Use %{?_smp_mflags}. - Replace wrong BSD license with a copy of the GPL (#173105). From cdbe2f490968275e5054b67b9f1237ac341e4474 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Wed, 15 Feb 2006 22:09:07 +0000 Subject: [PATCH 03/93] Rebuild for Fedora Extras 5 --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 132a231..b51c747 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-battery-plugin Version: 0.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -39,6 +39,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xfce4/panel-plugins/*.so %changelog +* Wed Feb 15 2006 Christoph Wickert - 0.3.0-5 +- Rebuild for Fedora Extras 5. + * Fri Dec 30 2005 Christoph Wickert - 0.3.0-4 - Add libxfcegui4-devel BuildReqs. - Fix %defattr. From cc04dcb8de9e853d291b282a6f25332f69a499f5 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Wed, 12 Apr 2006 00:02:08 +0000 Subject: [PATCH 04/93] require xfce4-panel, fix license field (#173105) --- GPL | 340 ---------------------------- LGPL | 458 ++++++++++++++++++++++++++++++++++++++ xfce4-battery-plugin.spec | 13 +- 3 files changed, 467 insertions(+), 344 deletions(-) delete mode 100644 GPL create mode 100644 LGPL diff --git a/GPL b/GPL deleted file mode 100644 index d60c31a..0000000 --- a/GPL +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/LGPL b/LGPL new file mode 100644 index 0000000..3b20440 --- /dev/null +++ b/LGPL @@ -0,0 +1,458 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index b51c747..66f694d 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,16 +1,17 @@ Name: xfce4-battery-plugin Version: 0.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops -License: GPL +License: LGPL URL: http://xfce-goodies.berlios.de/ Source0: http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz -Source1: GPL +Source1: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel +Requires: xfce4-panel >= 4.2 %description A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. @@ -27,7 +28,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -# replace wrong BSD license with a copy of GPL +# replace wrong BSD license with a copy of LGPL %__cp %{SOURCE1} COPYING %clean @@ -39,6 +40,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xfce4/panel-plugins/*.so %changelog +* Tue Apr 11 2006 Christoph Wickert - 0.3.0-6 +- Require xfce4-panel. +- Change license back to LGPL (#173105). + * Wed Feb 15 2006 Christoph Wickert - 0.3.0-5 - Rebuild for Fedora Extras 5. From f2f5e2bcf24b854206808e76560dcd64bf38b253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 21:15:55 +0000 Subject: [PATCH 05/93] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 5cd57d437d888873add7def1c5a1071c169e52cc Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 8 Sep 2006 18:36:48 +0000 Subject: [PATCH 06/93] Mass rebuild for Fedora Core 6 --- needs.rebuild | 1 - xfce4-battery-plugin.spec | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 66f694d..d923880 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-battery-plugin Version: 0.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xfce4/panel-plugins/*.so %changelog +* Mon Sep 04 2006 Christoph Wickert - 0.3.0-7 +- Mass rebuild for Fedora Core 6. + * Tue Apr 11 2006 Christoph Wickert - 0.3.0-6 - Require xfce4-panel. - Change license back to LGPL (#173105). From 8d8d2224031847c11d2bacd598f357063145d331 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Thu, 5 Oct 2006 10:53:26 +0000 Subject: [PATCH 07/93] Update for XFCE 4.4 --- .cvsignore | 2 +- sources | 2 +- xfce4-battery-plugin.spec | 40 +++++++++++++++++++++++++-------------- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index cf4a97c..f4fccff 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-battery-plugin-0.3.0.tar.gz +xfce4-battery-plugin-0.4.90.2.tar.bz2 diff --git a/sources b/sources index 2d0b881..f0247d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04e121df1ff264281e56e12a8ff5f155 xfce4-battery-plugin-0.3.0.tar.gz +4dd103909b3d5bb373c12b69da783a6c xfce4-battery-plugin-0.4.90.2.tar.bz2 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index d923880..bd3b9ce 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,17 +1,18 @@ Name: xfce4-battery-plugin -Version: 0.3.0 -Release: 7%{?dist} +Version: 0.4.90.2 +Release: 3%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops License: LGPL -URL: http://xfce-goodies.berlios.de/ -Source0: http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz -Source1: LGPL +URL: http://goodies.xfce.org/ +Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Source1: LGPL.%{name} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel -Requires: xfce4-panel >= 4.2 +BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel +BuildRequires: gettext, perl(XML::Parser) +Requires: xfce4-panel >= 4.3.99.1 %description A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. @@ -26,20 +27,31 @@ make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +%find_lang %{name} -# replace wrong BSD license with a copy of LGPL -%__cp %{SOURCE1} COPYING +# replace wrong BSD license with a copy of LGPL (#173105) +cp %{SOURCE1} COPYING %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog README -%{_libdir}/xfce4/panel-plugins/*.so +%{_libexecdir}/xfce4/panel-plugins/%{name} +%{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Thu Oct 05 2006 Christoph Wickert - 0.4.90.2-3 +- Bump release for devel checkin. + +* Wed Sep 13 2006 Christoph Wickert - 0.4.90.2-2 +- Rebuild for XFCE 4.3.99.1. +- BR perl(XML::Parser). + +* Mon Sep 04 2006 Christoph Wickert - 0.4.90.2-1 +- Update to 0.4.90.2 on XFCE 4.3.90.2. + * Mon Sep 04 2006 Christoph Wickert - 0.3.0-7 - Mass rebuild for Fedora Core 6. @@ -52,10 +64,10 @@ rm -rf $RPM_BUILD_ROOT * Fri Dec 30 2005 Christoph Wickert - 0.3.0-4 - Add libxfcegui4-devel BuildReqs. -- Fix %defattr. +- Fix %%defattr. * Sat Nov 19 2005 Christoph Wickert - 0.3.0-3 -- Use %{?_smp_mflags}. +- Use {?_smp_mflags}. - Replace wrong BSD license with a copy of the GPL (#173105). * Mon Nov 14 2005 Christoph Wickert - 0.3.0-2 From 942a96061f8b5689356c4dcaaa006a30744ae8fe Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 6 Oct 2006 05:49:18 +0000 Subject: [PATCH 08/93] rename LGPL to LGPL.xfce4-battery-plugin --- LGPL => LGPL.xfce4-battery-plugin | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename LGPL => LGPL.xfce4-battery-plugin (100%) diff --git a/LGPL b/LGPL.xfce4-battery-plugin similarity index 100% rename from LGPL rename to LGPL.xfce4-battery-plugin From 46d95e9bed2983fb10a70d1930bebc9ea9c86669 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 11 Nov 2006 16:30:38 +0000 Subject: [PATCH 09/93] Update to 0.4.90.3 on XFCE 4.3.99.2 --- .cvsignore | 2 +- sources | 2 +- xfce4-battery-plugin.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f4fccff..1035a41 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-battery-plugin-0.4.90.2.tar.bz2 +xfce4-battery-plugin-0.4.90.3.tar.bz2 diff --git a/sources b/sources index f0247d1..0734055 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dd103909b3d5bb373c12b69da783a6c xfce4-battery-plugin-0.4.90.2.tar.bz2 +98fbbe0eb2840d7ad4534f124029ebd0 xfce4-battery-plugin-0.4.90.3.tar.bz2 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index bd3b9ce..6caf768 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-battery-plugin -Version: 0.4.90.2 -Release: 3%{?dist} +Version: 0.4.90.3 +Release: 1%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel BuildRequires: gettext, perl(XML::Parser) -Requires: xfce4-panel >= 4.3.99.1 +Requires: xfce4-panel >= 4.3.99.2 %description A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. @@ -42,6 +42,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog +* Thu Oct 31 2006 Christoph Wickert - 0.4.90.3-1 +- Update to 0.4.90.3 on XFCE 4.3.99.2. + * Thu Oct 05 2006 Christoph Wickert - 0.4.90.2-3 - Bump release for devel checkin. From e05f71e4db8c250e35fb5973b04e6b5b0002f8e8 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 11 Nov 2006 19:32:56 +0000 Subject: [PATCH 10/93] fix date in changelog --- xfce4-battery-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 6caf768..3a6f12d 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -42,7 +42,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/xfce4/panel-plugins/*.desktop %changelog -* Thu Oct 31 2006 Christoph Wickert - 0.4.90.3-1 +* Sat Nov 11 2006 Christoph Wickert - 0.4.90.3-1 - Update to 0.4.90.3 on XFCE 4.3.99.2. * Thu Oct 05 2006 Christoph Wickert - 0.4.90.2-3 From fe4736b42b6bcffa5729ea7ae9cee7397798fffa Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 22 Jan 2007 10:39:33 +0000 Subject: [PATCH 11/93] Update to 0.5.0 --- xfce4-battery-plugin.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 3a6f12d..62da895 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,13 +1,12 @@ Name: xfce4-battery-plugin -Version: 0.4.90.3 +Version: 0.5.0 Release: 1%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops License: LGPL -URL: http://goodies.xfce.org/ +URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 -Source1: LGPL.%{name} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel @@ -29,8 +28,13 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} -# replace wrong BSD license with a copy of LGPL (#173105) -cp %{SOURCE1} COPYING +%post +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT @@ -40,8 +44,13 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog README %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop +%{_datadir}/icons/hicolor/*/devices/battery.png +%{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog +* Mon Jan 22 2007 Christoph Wickert - 0.5.0-1 +- Update to 0.5.0 on Xfce 4.4. + * Sat Nov 11 2006 Christoph Wickert - 0.4.90.3-1 - Update to 0.4.90.3 on XFCE 4.3.99.2. From 7dcb8dfa21735e4c7492492047414e1e428f36a3 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 22 Jan 2007 10:59:35 +0000 Subject: [PATCH 12/93] forgot to upload new source --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1035a41..02c1fdb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-battery-plugin-0.4.90.3.tar.bz2 +xfce4-battery-plugin-0.5.0.tar.bz2 diff --git a/sources b/sources index 0734055..8e50afa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98fbbe0eb2840d7ad4534f124029ebd0 xfce4-battery-plugin-0.4.90.3.tar.bz2 +c1d923bb90b79087ca7044bcc24bab5a xfce4-battery-plugin-0.5.0.tar.bz2 From 09f711eb3d95bc05f9347555b0eb3e3d77bc1ea9 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 22 Jan 2007 11:53:53 +0000 Subject: [PATCH 13/93] remove LGPL, proper license included in Source0 now --- LGPL.xfce4-battery-plugin | 458 -------------------------------------- 1 file changed, 458 deletions(-) delete mode 100644 LGPL.xfce4-battery-plugin diff --git a/LGPL.xfce4-battery-plugin b/LGPL.xfce4-battery-plugin deleted file mode 100644 index 3b20440..0000000 --- a/LGPL.xfce4-battery-plugin +++ /dev/null @@ -1,458 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS From e1308454f9dba9357b54b014ae8e64d4d4a25d35 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 28 Apr 2007 16:32:55 +0000 Subject: [PATCH 14/93] Rebuild for Xfce 4.4.1 --- xfce4-battery-plugin.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 62da895..bf289e5 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-battery-plugin Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel BuildRequires: gettext, perl(XML::Parser) -Requires: xfce4-panel >= 4.3.99.2 +Requires: xfce4-panel >= 4.4.0 %description A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. @@ -48,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog +* Mon Apr 23 2007 Christoph Wickert - 0.5.0-2 +- Rebuild for Xfce 4.4.1 + * Mon Jan 22 2007 Christoph Wickert - 0.5.0-1 - Update to 0.5.0 on Xfce 4.4. From 85eb9809ca20f81ac179e990c36c3dc70cec6026 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Tue, 28 Aug 2007 21:33:57 +0000 Subject: [PATCH 15/93] Rebuild for BuildID feature Update license tag --- xfce4-battery-plugin.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index bf289e5..d5141a7 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,10 +1,10 @@ Name: xfce4-battery-plugin Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops -License: LGPL +License: PLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,13 +41,17 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog README +%doc AUTHORS COPYING COPYING.LIB ChangeLog README %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop %{_datadir}/icons/hicolor/*/devices/battery.png %{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog +* Tue Aug 28 2007 Christoph Wickert - 0.5.0-3 +- Rebuild for BuildID feature +- Update license tag + * Mon Apr 23 2007 Christoph Wickert - 0.5.0-2 - Rebuild for Xfce 4.4.1 From e2fcd7a1fe8ab8e9a74a67c43efd320e2920ee86 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Tue, 28 Aug 2007 21:35:21 +0000 Subject: [PATCH 16/93] fix typo --- xfce4-battery-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index d5141a7..bdb80ae 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -4,7 +4,7 @@ Release: 3%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops -License: PLv2+ +License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From 1fda71bd7dd889578d7877b68219bb1d11edaeaf Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Tue, 28 Aug 2007 21:56:45 +0000 Subject: [PATCH 17/93] Fix for x86_64 kernels >= 2.6.21. (bugzilla.xfce.org #3190) Update license tag --- xfce4-battery-plugin.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index bdb80ae..5200ba5 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -7,6 +7,7 @@ Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.5.0-acpi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel @@ -18,6 +19,7 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q +%patch0 -p1 -b .acpi %build %configure --disable-static @@ -49,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Aug 28 2007 Christoph Wickert - 0.5.0-3 -- Rebuild for BuildID feature +- Fix for x86_64 kernels >= 2.6.21. (bugzilla.xfce.org #3190) - Update license tag * Mon Apr 23 2007 Christoph Wickert - 0.5.0-2 From 1dc1b14145085619c6b241d0a7dbfed238f5780a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 18 Feb 2008 23:42:06 +0000 Subject: [PATCH 18/93] - Autorebuild for GCC 4.3 --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 5200ba5..7f39b08 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-battery-plugin Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog +* Mon Feb 18 2008 Fedora Release Engineering - 0.5.0-4 +- Autorebuild for GCC 4.3 + * Tue Aug 28 2007 Christoph Wickert - 0.5.0-3 - Fix for x86_64 kernels >= 2.6.21. (bugzilla.xfce.org #3190) - Update license tag From 6707038a5a13dafe256e560b3f29645453bf68ac Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 5 Apr 2008 15:41:02 +0000 Subject: [PATCH 19/93] - Fix for kernel 2.6.24 (bugzilla.xfce.org #3938) - Lower acpi polling. (bugzilla.xfce.org #2948) - Rebuild with gcc 4.3.0 --- xfce4-battery-plugin-0.5.0-acpi.patch | 18 + ...attery-plugin-0.5.0-fix-ftbfs-2.6.24.patch | 12 + ...tery-plugin-0.5.0-lower-acpi-polling.patch | 39 +++ xfce4-battery-plugin-0.5.0-use-sysfs.patch | 320 ++++++++++++++++++ xfce4-battery-plugin.spec | 12 +- 5 files changed, 399 insertions(+), 2 deletions(-) create mode 100644 xfce4-battery-plugin-0.5.0-acpi.patch create mode 100644 xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch create mode 100644 xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch create mode 100644 xfce4-battery-plugin-0.5.0-use-sysfs.patch diff --git a/xfce4-battery-plugin-0.5.0-acpi.patch b/xfce4-battery-plugin-0.5.0-acpi.patch new file mode 100644 index 0000000..4dcfcbb --- /dev/null +++ b/xfce4-battery-plugin-0.5.0-acpi.patch @@ -0,0 +1,18 @@ +diff -urN xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.0-new/panel-plugin/libacpi.c +--- xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c 2007-01-17 18:56:51.000000000 +0100 ++++ xfce4-battery-plugin-0.5.0-new/panel-plugin/libacpi.c 2007-07-25 12:03:41.000000000 +0200 +@@ -190,10 +190,12 @@ + #ifdef __linux__ + FILE *acpi; + +- if (!(acpi = fopen ("/proc/acpi/info", "r"))) ++ if (!(acpi = fopen ("/proc/acpi/info", "r")) && ++ !(acpi = fopen ("/sys/module/acpi/parameters/acpica_version", "r"))) + { + #ifdef DEBUG +- printf("DBG:no acpi: /proc/acpi/info not found!\n"); ++ printf("DBG:no acpi: /proc/acpi/info or " ++ "/sys/module/acpi/parameters/acpica_version not found!\n"); + #endif + return 1; + } diff --git a/xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch b/xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch new file mode 100644 index 0000000..080707a --- /dev/null +++ b/xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch @@ -0,0 +1,12 @@ +--- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig 2008-03-18 20:10:58.000000000 +0100 ++++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h 2008-03-18 20:14:45.000000000 +0100 +@@ -17,8 +17,8 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +-#include + #include ++#include + + #define APM_PROC "/proc/apm" + #define APM_DEVICE "/dev/apm_bios" diff --git a/xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch b/xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch new file mode 100644 index 0000000..bd2279e --- /dev/null +++ b/xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch @@ -0,0 +1,39 @@ +Index: panel-plugin/battery.c +=================================================================== +--- panel-plugin/battery.c (revision 3481) ++++ panel-plugin/battery.c (working copy) +@@ -326,14 +326,14 @@ + } + else + #endif +- battmon->timeoutid = g_timeout_add(2 * 1024, ++ battmon->timeoutid = g_timeout_add(10 * 1024, + (GSourceFunc) update_apm_status, battmon); + } + + /* Show initial state if using ACPI rather than waiting a minute */ + if(battmon->flag) { + g_source_remove(battmon->timeoutid); +- battmon->timeoutid = g_timeout_add(2 * 1024, ++ battmon->timeoutid = g_timeout_add(10 * 1024, + (GSourceFunc) update_apm_status, battmon); + } + +@@ -739,7 +739,7 @@ + gtk_container_remove(GTK_CONTAINER(battmon->ebox), GTK_WIDGET(battmon->vbox)); + setup_battmon(battmon,orientation); + update_apm_status( battmon ); +- battmon->timeoutid = g_timeout_add(1 * 1024, (GSourceFunc) update_apm_status, battmon); ++ battmon->timeoutid = g_timeout_add(10 * 1024, (GSourceFunc) update_apm_status, battmon); + + return TRUE; + } +@@ -1405,7 +1405,7 @@ + if(battmon->method == BM_USE_ACPI) { + battmon->flag = TRUE; + g_source_remove(battmon->timeoutid); +- battmon->timeoutid = g_timeout_add(1000, (GSourceFunc) update_apm_status, battmon); ++ battmon->timeoutid = g_timeout_add(10 * 1024, (GSourceFunc) update_apm_status, battmon); + } + } + diff --git a/xfce4-battery-plugin-0.5.0-use-sysfs.patch b/xfce4-battery-plugin-0.5.0-use-sysfs.patch new file mode 100644 index 0000000..fc6f6d6 --- /dev/null +++ b/xfce4-battery-plugin-0.5.0-use-sysfs.patch @@ -0,0 +1,320 @@ +=== modified file 'panel-plugin/libacpi.c' +--- panel-plugin/libacpi.c 2007-09-03 14:54:36 +0000 ++++ panel-plugin/libacpi.c 2007-09-03 15:09:41 +0000 +@@ -54,6 +54,7 @@ + + static char batteries[MAXBATT][128]; + static char battinfo[MAXBATT][128]; ++ + #ifndef __linux__ + #if HAVE_SYSCTL + static int +@@ -181,9 +182,56 @@ + #endif + #endif + ++int check_acpi_sysfs(void) ++{ ++ DIR *sysfs; ++ struct dirent *batt; ++ char *name; ++ ++ sysfs = opendir("/sys/class/power_supply"); ++ if (sysfs == 0) ++ { ++#ifdef DEBUG ++ printf("DBG:No acpi support for sysfs. Trying procfs...\n"); ++#endif ++ return 2; ++ } ++ while ((batt = readdir(sysfs))) ++ { ++ name = batt->d_name; ++ if (!strncmp(".", name, 1) || !strncmp("..", name, 2) || (strstr(name,"AC") != NULL) ) continue; ++ ++ sprintf(batteries[batt_count], "/sys/class/power_supply/%s", name); ++#ifdef DEBUG ++ printf("DBG:battery number %d at:\n",batt_count); ++ printf("DBG:sysfs dir->%s\n",batteries[batt_count]); ++ printf("DBG:------------------------\n"); ++#endif ++ batt_count++; ++ } ++ closedir(sysfs); ++ if ( batt_count == 0 ) ++ { ++#ifdef DEBUG ++ printf("DBG:No acpi support for sysfs. Trying procfs...\n"); ++#endif ++ acpi_sysfs = 0; ++ return 2; ++ } ++ else ++ { ++ acpi_sysfs = 1; ++ return 0; ++ } ++} ++ + /* see if we have ACPI support */ + int check_acpi(void) + { ++#ifdef __linux__ ++ if ( check_acpi_sysfs() == 0 ) ++ return 0; ++#endif + DIR *battdir; + struct dirent *batt; + char *name; +@@ -264,9 +312,75 @@ + #endif + } + ++int read_sysfs_int(char* filename) ++{ ++ FILE* f; ++ f = fopen(filename,"r"); ++ if ( !f ) ++ { ++#ifdef DEBUG ++ printf("DBG:Could not open %s\n",filename); ++#endif ++ return 0; ++ } ++ int out; ++ fscanf(f,"%d",&out); ++ fclose(f); ++ return out; ++} ++ ++char* read_sysfs_string(char* filename) ++{ ++ FILE* f; ++ f = fopen(filename,"r"); ++ if ( !f ) ++ { ++#ifdef DEBUG ++ printf("DBG:Could not open %s\n",filename); ++#endif ++ return NULL; ++ } ++ fscanf(f,"%s",buf2); ++ fclose(f); ++ return buf2; ++} ++ ++int read_acad_state_sysfs(void) ++{ ++ DIR *sysfs; ++ struct dirent *propety; ++ char *name; ++ ++ sysfs = opendir("/sys/class/power_supply/AC"); ++ if (sysfs == 0) ++ { ++#ifdef DEBUG ++ printf("DBG:Can't open /sys/class/power_supply/AC"); ++#endif ++ return 0; ++ } ++ ++ if (!acadstate) acadstate=(ACADstate *)malloc(sizeof(ACADstate)); ++ ++ while ((propety = readdir(sysfs))) ++ { ++ name = propety->d_name; ++ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; ++ ++ if (strcmp(name,"online") == 0) ++ { ++ acadstate->state = ( read_sysfs_int("/sys/class/power_supply/AC/online") == 1 ) ; ++ } ++ } ++ closedir(sysfs); ++ return acadstate->state; ++} ++ + int read_acad_state(void) + { + #ifdef __linux__ ++ if (acpi_sysfs) ++ return read_acad_state_sysfs(); + FILE *acpi; + char *ptr; + char stat; +@@ -356,20 +470,79 @@ + #endif + } + ++int read_acpi_info_sysfs(int battery) ++{ ++ DIR *sysfs; ++ struct dirent *propety; ++ char *name; ++ ++ sysfs = opendir(batteries[battery]); ++ if (sysfs == 0) ++ { ++#ifdef DEBUG ++ printf("DBG:Can't open %s!\n", batteries[battery]); ++#endif ++ return 0; ++ } ++ ++ if (!acpiinfo) acpiinfo=(ACPIinfo *)malloc(sizeof(ACPIinfo)); ++ ++ while ((propety = readdir(sysfs))) ++ { ++ name = propety->d_name; ++ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; ++ ++ if (strcmp(name,"energy_full") == 0) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpiinfo->last_full_capacity = read_sysfs_int(buf); ++ } ++ if (strcmp(name,"energy_full_design") == 0) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpiinfo->design_capacity = read_sysfs_int(buf); ++ } ++ if (strcmp(name,"technology") == 0) ++ { ++ char *tmp; ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ tmp = read_sysfs_string(buf); ++ if (tmp != NULL) ++ { ++ if (strcmp(tmp,"Li-ion") == 0) ++ acpiinfo->battery_technology = 1; ++ else ++ acpiinfo->battery_technology = 0; ++ } ++ } ++ if (strcmp(name,"present") == 0) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpiinfo->present = read_sysfs_int(buf); ++ } ++ } ++ closedir(sysfs); ++ return acpiinfo->present; ++} ++ + int read_acpi_info(int battery) + { + #ifdef __linux__ +- FILE *acpi; +- char *ptr; +- char stat; +- int temp; +- + if (battery > MAXBATT) { + #ifdef DEBUG + printf("DBG: error, battery > MAXBATT (%d)\n",MAXBATT); + #endif + return 0; + } ++ ++ if (acpi_sysfs) ++ return read_acpi_info_sysfs(battery); ++ ++ FILE *acpi; ++ char *ptr; ++ char stat; ++ int temp; ++ + if (!(acpi = fopen (battinfo[battery], "r"))) { + #ifdef DEBUG + printf("DBG:cannot open %s for read!\n",battinfo[battery]); +@@ -516,9 +689,76 @@ + + } + ++int read_acpi_state_sysfs(int battery) ++{ ++ DIR *sysfs; ++ struct dirent *propety; ++ char *name; ++ ++ sysfs = opendir(batteries[battery]); ++ if (sysfs == 0) ++ { ++#ifdef DEBUG ++ printf("DBG:Can't open %s!\n", batteries[battery]); ++#endif ++ return 0; ++ } ++ ++ if (!acpistate) acpistate=(ACPIstate *)malloc(sizeof(ACPIstate)); ++ ++ while ((propety = readdir(sysfs))) ++ { ++ name = propety->d_name; ++ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; ++ ++ if (strcmp(name,"status") == 0) ++ { ++ char *tmp; ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ tmp = read_sysfs_string(buf); ++ if ( tmp != NULL ) ++ { ++ if (strcmp(tmp,"Charging") == 0) ++ acpistate->state = CHARGING; ++ else if (strcmp(tmp,"Discharging") == 0) ++ acpistate->state = DISCHARGING; ++ else if (strcmp(tmp,"Full") == 0) ++ acpistate->state = POWER; ++ else ++ acpistate->state = UNKNOW; ++ } ++ } ++ if (strcmp(name,"energy_now") == 0) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpistate->rcapacity = read_sysfs_int(buf); ++ acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100; ++ } ++ if (strcmp(name,"current_now") == 0) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpistate->prate = read_sysfs_int(buf); ++ if ( acpistate->prate < 0 ) ++ acpistate->prate = 0; ++ if ( acpistate->prate > 0 ) ++ acpistate->rtime = (((float) acpistate->rcapacity) / acpistate->prate) * 60; ++ } ++ if (strcmp(name,"voltage_now") == 0) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpistate->pvoltage = read_sysfs_int(buf); ++ } ++ } ++ closedir(sysfs); ++ return acpiinfo->present; ++} ++ + int read_acpi_state(int battery) + { + #ifdef __linux__ ++ if (acpi_sysfs) ++ return read_acpi_state_sysfs(battery); ++ + FILE *acpi; + char *ptr; + char stat; + +=== modified file 'panel-plugin/libacpi.h' +--- panel-plugin/libacpi.h 2007-09-03 14:54:36 +0000 ++++ panel-plugin/libacpi.h 2007-09-03 15:09:41 +0000 +@@ -80,6 +80,8 @@ + int batt_count; + /* temp buffer */ + char buf[512]; ++char buf2[512]; ++int acpi_sysfs; + #else + extern int batt_count; + extern ACPIstate *acpistate; + diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 7f39b08..36d1449 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -8,6 +8,9 @@ License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 Patch0: %{name}-0.5.0-acpi.patch +Patch1: %{name}-0.5.0-fix-ftbfs-2.6.24.patch +Patch2: %{name}-0.5.0-lower-acpi-polling.patch +#Patch3: %{name}-0.5.0-use-sysfs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel @@ -20,6 +23,9 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q %patch0 -p1 -b .acpi +%patch1 -p1 -b .2.6.24 +%patch2 -p0 -b .lower-acpi-polling +#%patch3 -p0 -b .use-sysfs %build %configure --disable-static @@ -50,8 +56,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog -* Mon Feb 18 2008 Fedora Release Engineering - 0.5.0-4 -- Autorebuild for GCC 4.3 +* Sat Apr 05 2008 Christoph Wickert - 0.5.0-4 +- Fix for kernel 2.6.24 (bugzilla.xfce.org #3938) +- Lower acpi polling. (bugzilla.xfce.org #2948) +- Rebuild with gcc 4.3.0 * Tue Aug 28 2007 Christoph Wickert - 0.5.0-3 - Fix for x86_64 kernels >= 2.6.21. (bugzilla.xfce.org #3190) From f0c48773f90c8a2bf5890981bc92990428981f14 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Fri, 5 Sep 2008 21:42:14 +0000 Subject: [PATCH 20/93] - Fix for kernel 2.6.24 (bugzilla.xfce.org #3938) - Lower acpi polling. (bugzilla.xfce.org #2948) - Rebuild with gcc 4.3.0 --- xfce4-battery-plugin-0.5.0-acpi.patch | 18 - ...tery-plugin-0.5.0-lower-acpi-polling.patch | 39 --- xfce4-battery-plugin-0.5.0-use-sysfs.patch | 320 ------------------ xfce4-battery-plugin.spec | 19 +- 4 files changed, 9 insertions(+), 387 deletions(-) delete mode 100644 xfce4-battery-plugin-0.5.0-acpi.patch delete mode 100644 xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch delete mode 100644 xfce4-battery-plugin-0.5.0-use-sysfs.patch diff --git a/xfce4-battery-plugin-0.5.0-acpi.patch b/xfce4-battery-plugin-0.5.0-acpi.patch deleted file mode 100644 index 4dcfcbb..0000000 --- a/xfce4-battery-plugin-0.5.0-acpi.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urN xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c xfce4-battery-plugin-0.5.0-new/panel-plugin/libacpi.c ---- xfce4-battery-plugin-0.5.0/panel-plugin/libacpi.c 2007-01-17 18:56:51.000000000 +0100 -+++ xfce4-battery-plugin-0.5.0-new/panel-plugin/libacpi.c 2007-07-25 12:03:41.000000000 +0200 -@@ -190,10 +190,12 @@ - #ifdef __linux__ - FILE *acpi; - -- if (!(acpi = fopen ("/proc/acpi/info", "r"))) -+ if (!(acpi = fopen ("/proc/acpi/info", "r")) && -+ !(acpi = fopen ("/sys/module/acpi/parameters/acpica_version", "r"))) - { - #ifdef DEBUG -- printf("DBG:no acpi: /proc/acpi/info not found!\n"); -+ printf("DBG:no acpi: /proc/acpi/info or " -+ "/sys/module/acpi/parameters/acpica_version not found!\n"); - #endif - return 1; - } diff --git a/xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch b/xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch deleted file mode 100644 index bd2279e..0000000 --- a/xfce4-battery-plugin-0.5.0-lower-acpi-polling.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: panel-plugin/battery.c -=================================================================== ---- panel-plugin/battery.c (revision 3481) -+++ panel-plugin/battery.c (working copy) -@@ -326,14 +326,14 @@ - } - else - #endif -- battmon->timeoutid = g_timeout_add(2 * 1024, -+ battmon->timeoutid = g_timeout_add(10 * 1024, - (GSourceFunc) update_apm_status, battmon); - } - - /* Show initial state if using ACPI rather than waiting a minute */ - if(battmon->flag) { - g_source_remove(battmon->timeoutid); -- battmon->timeoutid = g_timeout_add(2 * 1024, -+ battmon->timeoutid = g_timeout_add(10 * 1024, - (GSourceFunc) update_apm_status, battmon); - } - -@@ -739,7 +739,7 @@ - gtk_container_remove(GTK_CONTAINER(battmon->ebox), GTK_WIDGET(battmon->vbox)); - setup_battmon(battmon,orientation); - update_apm_status( battmon ); -- battmon->timeoutid = g_timeout_add(1 * 1024, (GSourceFunc) update_apm_status, battmon); -+ battmon->timeoutid = g_timeout_add(10 * 1024, (GSourceFunc) update_apm_status, battmon); - - return TRUE; - } -@@ -1405,7 +1405,7 @@ - if(battmon->method == BM_USE_ACPI) { - battmon->flag = TRUE; - g_source_remove(battmon->timeoutid); -- battmon->timeoutid = g_timeout_add(1000, (GSourceFunc) update_apm_status, battmon); -+ battmon->timeoutid = g_timeout_add(10 * 1024, (GSourceFunc) update_apm_status, battmon); - } - } - diff --git a/xfce4-battery-plugin-0.5.0-use-sysfs.patch b/xfce4-battery-plugin-0.5.0-use-sysfs.patch deleted file mode 100644 index fc6f6d6..0000000 --- a/xfce4-battery-plugin-0.5.0-use-sysfs.patch +++ /dev/null @@ -1,320 +0,0 @@ -=== modified file 'panel-plugin/libacpi.c' ---- panel-plugin/libacpi.c 2007-09-03 14:54:36 +0000 -+++ panel-plugin/libacpi.c 2007-09-03 15:09:41 +0000 -@@ -54,6 +54,7 @@ - - static char batteries[MAXBATT][128]; - static char battinfo[MAXBATT][128]; -+ - #ifndef __linux__ - #if HAVE_SYSCTL - static int -@@ -181,9 +182,56 @@ - #endif - #endif - -+int check_acpi_sysfs(void) -+{ -+ DIR *sysfs; -+ struct dirent *batt; -+ char *name; -+ -+ sysfs = opendir("/sys/class/power_supply"); -+ if (sysfs == 0) -+ { -+#ifdef DEBUG -+ printf("DBG:No acpi support for sysfs. Trying procfs...\n"); -+#endif -+ return 2; -+ } -+ while ((batt = readdir(sysfs))) -+ { -+ name = batt->d_name; -+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2) || (strstr(name,"AC") != NULL) ) continue; -+ -+ sprintf(batteries[batt_count], "/sys/class/power_supply/%s", name); -+#ifdef DEBUG -+ printf("DBG:battery number %d at:\n",batt_count); -+ printf("DBG:sysfs dir->%s\n",batteries[batt_count]); -+ printf("DBG:------------------------\n"); -+#endif -+ batt_count++; -+ } -+ closedir(sysfs); -+ if ( batt_count == 0 ) -+ { -+#ifdef DEBUG -+ printf("DBG:No acpi support for sysfs. Trying procfs...\n"); -+#endif -+ acpi_sysfs = 0; -+ return 2; -+ } -+ else -+ { -+ acpi_sysfs = 1; -+ return 0; -+ } -+} -+ - /* see if we have ACPI support */ - int check_acpi(void) - { -+#ifdef __linux__ -+ if ( check_acpi_sysfs() == 0 ) -+ return 0; -+#endif - DIR *battdir; - struct dirent *batt; - char *name; -@@ -264,9 +312,75 @@ - #endif - } - -+int read_sysfs_int(char* filename) -+{ -+ FILE* f; -+ f = fopen(filename,"r"); -+ if ( !f ) -+ { -+#ifdef DEBUG -+ printf("DBG:Could not open %s\n",filename); -+#endif -+ return 0; -+ } -+ int out; -+ fscanf(f,"%d",&out); -+ fclose(f); -+ return out; -+} -+ -+char* read_sysfs_string(char* filename) -+{ -+ FILE* f; -+ f = fopen(filename,"r"); -+ if ( !f ) -+ { -+#ifdef DEBUG -+ printf("DBG:Could not open %s\n",filename); -+#endif -+ return NULL; -+ } -+ fscanf(f,"%s",buf2); -+ fclose(f); -+ return buf2; -+} -+ -+int read_acad_state_sysfs(void) -+{ -+ DIR *sysfs; -+ struct dirent *propety; -+ char *name; -+ -+ sysfs = opendir("/sys/class/power_supply/AC"); -+ if (sysfs == 0) -+ { -+#ifdef DEBUG -+ printf("DBG:Can't open /sys/class/power_supply/AC"); -+#endif -+ return 0; -+ } -+ -+ if (!acadstate) acadstate=(ACADstate *)malloc(sizeof(ACADstate)); -+ -+ while ((propety = readdir(sysfs))) -+ { -+ name = propety->d_name; -+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; -+ -+ if (strcmp(name,"online") == 0) -+ { -+ acadstate->state = ( read_sysfs_int("/sys/class/power_supply/AC/online") == 1 ) ; -+ } -+ } -+ closedir(sysfs); -+ return acadstate->state; -+} -+ - int read_acad_state(void) - { - #ifdef __linux__ -+ if (acpi_sysfs) -+ return read_acad_state_sysfs(); - FILE *acpi; - char *ptr; - char stat; -@@ -356,20 +470,79 @@ - #endif - } - -+int read_acpi_info_sysfs(int battery) -+{ -+ DIR *sysfs; -+ struct dirent *propety; -+ char *name; -+ -+ sysfs = opendir(batteries[battery]); -+ if (sysfs == 0) -+ { -+#ifdef DEBUG -+ printf("DBG:Can't open %s!\n", batteries[battery]); -+#endif -+ return 0; -+ } -+ -+ if (!acpiinfo) acpiinfo=(ACPIinfo *)malloc(sizeof(ACPIinfo)); -+ -+ while ((propety = readdir(sysfs))) -+ { -+ name = propety->d_name; -+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; -+ -+ if (strcmp(name,"energy_full") == 0) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpiinfo->last_full_capacity = read_sysfs_int(buf); -+ } -+ if (strcmp(name,"energy_full_design") == 0) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpiinfo->design_capacity = read_sysfs_int(buf); -+ } -+ if (strcmp(name,"technology") == 0) -+ { -+ char *tmp; -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ tmp = read_sysfs_string(buf); -+ if (tmp != NULL) -+ { -+ if (strcmp(tmp,"Li-ion") == 0) -+ acpiinfo->battery_technology = 1; -+ else -+ acpiinfo->battery_technology = 0; -+ } -+ } -+ if (strcmp(name,"present") == 0) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpiinfo->present = read_sysfs_int(buf); -+ } -+ } -+ closedir(sysfs); -+ return acpiinfo->present; -+} -+ - int read_acpi_info(int battery) - { - #ifdef __linux__ -- FILE *acpi; -- char *ptr; -- char stat; -- int temp; -- - if (battery > MAXBATT) { - #ifdef DEBUG - printf("DBG: error, battery > MAXBATT (%d)\n",MAXBATT); - #endif - return 0; - } -+ -+ if (acpi_sysfs) -+ return read_acpi_info_sysfs(battery); -+ -+ FILE *acpi; -+ char *ptr; -+ char stat; -+ int temp; -+ - if (!(acpi = fopen (battinfo[battery], "r"))) { - #ifdef DEBUG - printf("DBG:cannot open %s for read!\n",battinfo[battery]); -@@ -516,9 +689,76 @@ - - } - -+int read_acpi_state_sysfs(int battery) -+{ -+ DIR *sysfs; -+ struct dirent *propety; -+ char *name; -+ -+ sysfs = opendir(batteries[battery]); -+ if (sysfs == 0) -+ { -+#ifdef DEBUG -+ printf("DBG:Can't open %s!\n", batteries[battery]); -+#endif -+ return 0; -+ } -+ -+ if (!acpistate) acpistate=(ACPIstate *)malloc(sizeof(ACPIstate)); -+ -+ while ((propety = readdir(sysfs))) -+ { -+ name = propety->d_name; -+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; -+ -+ if (strcmp(name,"status") == 0) -+ { -+ char *tmp; -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ tmp = read_sysfs_string(buf); -+ if ( tmp != NULL ) -+ { -+ if (strcmp(tmp,"Charging") == 0) -+ acpistate->state = CHARGING; -+ else if (strcmp(tmp,"Discharging") == 0) -+ acpistate->state = DISCHARGING; -+ else if (strcmp(tmp,"Full") == 0) -+ acpistate->state = POWER; -+ else -+ acpistate->state = UNKNOW; -+ } -+ } -+ if (strcmp(name,"energy_now") == 0) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpistate->rcapacity = read_sysfs_int(buf); -+ acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100; -+ } -+ if (strcmp(name,"current_now") == 0) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpistate->prate = read_sysfs_int(buf); -+ if ( acpistate->prate < 0 ) -+ acpistate->prate = 0; -+ if ( acpistate->prate > 0 ) -+ acpistate->rtime = (((float) acpistate->rcapacity) / acpistate->prate) * 60; -+ } -+ if (strcmp(name,"voltage_now") == 0) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpistate->pvoltage = read_sysfs_int(buf); -+ } -+ } -+ closedir(sysfs); -+ return acpiinfo->present; -+} -+ - int read_acpi_state(int battery) - { - #ifdef __linux__ -+ if (acpi_sysfs) -+ return read_acpi_state_sysfs(battery); -+ - FILE *acpi; - char *ptr; - char stat; - -=== modified file 'panel-plugin/libacpi.h' ---- panel-plugin/libacpi.h 2007-09-03 14:54:36 +0000 -+++ panel-plugin/libacpi.h 2007-09-03 15:09:41 +0000 -@@ -80,6 +80,8 @@ - int batt_count; - /* temp buffer */ - char buf[512]; -+char buf2[512]; -+int acpi_sysfs; - #else - extern int batt_count; - extern ACPIstate *acpistate; - diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 36d1449..5728c15 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,16 +1,13 @@ Name: xfce4-battery-plugin -Version: 0.5.0 -Release: 4%{?dist} +Version: 0.5.1 +Release: 1%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 -Patch0: %{name}-0.5.0-acpi.patch -Patch1: %{name}-0.5.0-fix-ftbfs-2.6.24.patch -Patch2: %{name}-0.5.0-lower-acpi-polling.patch -#Patch3: %{name}-0.5.0-use-sysfs.patch +Patch0: %{name}-0.5.0-fix-ftbfs-2.6.24.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel @@ -22,10 +19,7 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q -%patch0 -p1 -b .acpi -%patch1 -p1 -b .2.6.24 -%patch2 -p0 -b .lower-acpi-polling -#%patch3 -p0 -b .use-sysfs +%patch0 -p1 -b .2.6.24 %build %configure --disable-static @@ -56,6 +50,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog +* Fri Sep 05 2008 Christoph Wickert - 0.5.1-1 +- Update to 0.5.1 +- Remove acpi.patch (included upstream) +- Remove lower-acpi-polling.patch (upstream use different values) + * Sat Apr 05 2008 Christoph Wickert - 0.5.0-4 - Fix for kernel 2.6.24 (bugzilla.xfce.org #3938) - Lower acpi polling. (bugzilla.xfce.org #2948) From 495c31ada14357428d3061ef40540c3bb0925c3d Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 6 Sep 2008 00:59:41 +0000 Subject: [PATCH 21/93] upload new source --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 02c1fdb..4507e8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfce4-battery-plugin-0.5.0.tar.bz2 +xfce4-battery-plugin-0.5.1.tar.bz2 diff --git a/sources b/sources index 8e50afa..187ac91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1d923bb90b79087ca7044bcc24bab5a xfce4-battery-plugin-0.5.0.tar.bz2 +d8a666d85bb3c1dd007b547de4dd7037 xfce4-battery-plugin-0.5.1.tar.bz2 From d3f12f668267e32fecc2c4435dca3618d24447ba Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 18 Jan 2009 22:16:44 +0000 Subject: [PATCH 22/93] - Update to 0.5.1 - Remove acpi.patch (included upstream) - Remove lower-acpi-polling.patch (upstream use different values) --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 5728c15..7672243 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-battery-plugin Version: 0.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog +* Sun Jan 18 2009 Christoph Wickert - 0.5.1-2 +- Rebuild for Xfce 4.6 (Beta 3) + * Fri Sep 05 2008 Christoph Wickert - 0.5.1-1 - Update to 0.5.1 - Remove acpi.patch (included upstream) From aa48fc1746f3248fcbd38572be966c5254c462e5 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 18 Jan 2009 23:03:34 +0000 Subject: [PATCH 23/93] fix email in changelog --- xfce4-battery-plugin.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 7672243..9afeb60 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -19,7 +19,7 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q -%patch0 -p1 -b .2.6.24 +#%patch0 -p1 -b .2.6.24 %build %configure --disable-static @@ -50,43 +50,43 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog -* Sun Jan 18 2009 Christoph Wickert - 0.5.1-2 +* Sun Jan 18 2009 Christoph Wickert - 0.5.1-2 - Rebuild for Xfce 4.6 (Beta 3) -* Fri Sep 05 2008 Christoph Wickert - 0.5.1-1 +* Fri Sep 05 2008 Christoph Wickert - 0.5.1-1 - Update to 0.5.1 - Remove acpi.patch (included upstream) - Remove lower-acpi-polling.patch (upstream use different values) -* Sat Apr 05 2008 Christoph Wickert - 0.5.0-4 +* Sat Apr 05 2008 Christoph Wickert - 0.5.0-4 - Fix for kernel 2.6.24 (bugzilla.xfce.org #3938) - Lower acpi polling. (bugzilla.xfce.org #2948) - Rebuild with gcc 4.3.0 -* Tue Aug 28 2007 Christoph Wickert - 0.5.0-3 +* Tue Aug 28 2007 Christoph Wickert - 0.5.0-3 - Fix for x86_64 kernels >= 2.6.21. (bugzilla.xfce.org #3190) - Update license tag -* Mon Apr 23 2007 Christoph Wickert - 0.5.0-2 +* Mon Apr 23 2007 Christoph Wickert - 0.5.0-2 - Rebuild for Xfce 4.4.1 -* Mon Jan 22 2007 Christoph Wickert - 0.5.0-1 +* Mon Jan 22 2007 Christoph Wickert - 0.5.0-1 - Update to 0.5.0 on Xfce 4.4. -* Sat Nov 11 2006 Christoph Wickert - 0.4.90.3-1 +* Sat Nov 11 2006 Christoph Wickert - 0.4.90.3-1 - Update to 0.4.90.3 on XFCE 4.3.99.2. -* Thu Oct 05 2006 Christoph Wickert - 0.4.90.2-3 +* Thu Oct 05 2006 Christoph Wickert - 0.4.90.2-3 - Bump release for devel checkin. -* Wed Sep 13 2006 Christoph Wickert - 0.4.90.2-2 +* Wed Sep 13 2006 Christoph Wickert - 0.4.90.2-2 - Rebuild for XFCE 4.3.99.1. - BR perl(XML::Parser). -* Mon Sep 04 2006 Christoph Wickert - 0.4.90.2-1 +* Mon Sep 04 2006 Christoph Wickert - 0.4.90.2-1 - Update to 0.4.90.2 on XFCE 4.3.90.2. -* Mon Sep 04 2006 Christoph Wickert - 0.3.0-7 +* Mon Sep 04 2006 Christoph Wickert - 0.3.0-7 - Mass rebuild for Fedora Core 6. * Tue Apr 11 2006 Christoph Wickert - 0.3.0-6 From 7a6a36384a4f3f2707409d7670d0d70e4dcf8b72 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 08:41:13 +0000 Subject: [PATCH 24/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 9afeb60..70fb03d 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-battery-plugin Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Jan 18 2009 Christoph Wickert - 0.5.1-2 - Rebuild for Xfce 4.6 (Beta 3) From 30e94b68210d0921941bd560aad3398bcf3b916c Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 19 Apr 2009 01:37:38 +0000 Subject: [PATCH 25/93] make sure patch gets applied --- xfce4-battery-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 70fb03d..026ac6e 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -19,7 +19,7 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q -#%patch0 -p1 -b .2.6.24 +%patch0 -p1 -b .2.6.24 %build %configure --disable-static From b7e764ab37f8a70b9b66c338361efc68eed78668 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:49:25 +0000 Subject: [PATCH 26/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 026ac6e..cf63a4f 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,6 +1,6 @@ Name: xfce4-battery-plugin Version: 0.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/scalable/devices/battery.svg %changelog +* Mon Jul 27 2009 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 336b201ed7594e2065393186f688a021500688ec Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:56 +0000 Subject: [PATCH 27/93] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 845ed19..1686845 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xfce4-battery-plugin SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From fbf5a26926f4f47ef50a4b345646cd2a4d8b0c81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:43:04 +0000 Subject: [PATCH 28/93] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 1686845..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xfce4-battery-plugin -# $Id$ -NAME := xfce4-battery-plugin -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 3ddcab623c1748666a74554bdacfc9d71ceb715e Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 18 Dec 2010 19:49:13 +0100 Subject: [PATCH 29/93] - Use sysfs instead of procfs (bugzilla.xfce.org #3793) - Correctly handle case when no battery is present (bugzilla.xfce.org #3546) - Update translations from Xfce Transifex - Use parallel make - Fix Source0 URL - Update icon-cache scriptlets --- xfce4-battery-plugin-0.5.0-no-battery.patch | 21 + ...ery-plugin-0.5.1-update-translations.patch | 3911 +++++++++++++++++ xfce4-battery-plugin-0.5.1-use-sysfs.patch | 354 ++ xfce4-battery-plugin.spec | 74 +- 4 files changed, 4339 insertions(+), 21 deletions(-) create mode 100644 xfce4-battery-plugin-0.5.0-no-battery.patch create mode 100644 xfce4-battery-plugin-0.5.1-update-translations.patch create mode 100644 xfce4-battery-plugin-0.5.1-use-sysfs.patch diff --git a/xfce4-battery-plugin-0.5.0-no-battery.patch b/xfce4-battery-plugin-0.5.0-no-battery.patch new file mode 100644 index 0000000..7bad893 --- /dev/null +++ b/xfce4-battery-plugin-0.5.0-no-battery.patch @@ -0,0 +1,21 @@ +--- panel-plugin/battery.c.old 2007-09-14 23:40:34.282880732 +0100 ++++ panel-plugin/battery.c 2007-09-15 00:31:27.768941875 +0100 +@@ -502,8 +502,16 @@ battmon.c:241: for each function it appe + + + if(acline) { +- char *t=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)"); +- if(battmon->options.tooltip_display_percentage) { ++ char *t1=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)"); ++ char *t2=_("(No battery, AC on-line)"); ++ char *t; ++ ++ if((battmon->method == BM_USE_ACPI) && (acpiinfo->present == 0)) ++ t=t2; ++ else ++ t=t1; ++ ++ if(battmon->options.tooltip_display_percentage) { + g_snprintf(buffer, sizeof(buffer), "%d%% %s", charge,t); + } + else diff --git a/xfce4-battery-plugin-0.5.1-update-translations.patch b/xfce4-battery-plugin-0.5.1-update-translations.patch new file mode 100644 index 0000000..a3d43c6 --- /dev/null +++ b/xfce4-battery-plugin-0.5.1-update-translations.patch @@ -0,0 +1,3911 @@ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ar.po xfce4-battery-plugin-0.5.1/po/ar.po +--- xfce4-battery-plugin-0.5.1.orig/po/ar.po 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/ar.po 1970-01-01 01:00:00.000000000 +0100 +@@ -1,144 +0,0 @@ +-msgid "" +-msgstr "" +-"Project-Id-Version: xfce\n" +-"Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2006-12-20 17:45+0100\n" +-"PO-Revision-Date: 2008-07-15 22:17+0200\n" +-"Last-Translator: Mohamed Magdy \n" +-"Language-Team: Arabeyes \n" +-"MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Content-Transfer-Encoding: 8bit\n" +-"X-Poedit-Language: Arabic\n" +- +-#: ../panel-plugin/battery.c:491 +-msgid "(Charging from AC)" +-msgstr "" +- +-#: ../panel-plugin/battery.c:491 +-msgid "(AC on-line)" +-msgstr "" +- +-#: ../panel-plugin/battery.c:500 +-#, c-format +-msgid "%d%% (%02d:%02d) remaining" +-msgstr "" +- +-#: ../panel-plugin/battery.c:502 +-#, c-format +-msgid "%02d:%02d remaining" +-msgstr "" +- +-#: ../panel-plugin/battery.c:504 +-#, c-format +-msgid "%d%% remaining" +-msgstr "" +- +-#: ../panel-plugin/battery.c:506 +-msgid "AC off-line" +-msgstr "" +- +-#: ../panel-plugin/battery.c:570 +-msgid "" +-"WARNING: Your battery has reached critical status. You should plug in or " +-"shutdown your computer now to avoid possible data loss." +-msgstr "" +- +-#: ../panel-plugin/battery.c:584 +-msgid "" +-"WARNING: Your battery is running low. You should consider plugging in or " +-"shutting down your computer soon to avoid possible data loss." +-msgstr "" +- +-#: ../panel-plugin/battery.c:673 +-msgid "Battery" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1099 +-msgid "Select file" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1140 +-msgid "Select command" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1159 +-#, c-format +-msgid "Unable to open the following url: %s" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 +-msgid "Battery Monitor" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1212 +-msgid "Low percentage:" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1223 +-msgid "Critical percentage:" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1236 +-msgid "Low battery action:" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 +-msgid "Do nothing" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 +-msgid "Display a warning message" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 +-msgid "Run command" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 +-msgid "Run command in terminal" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 +-msgid "Command:" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1277 +-msgid "Critical battery action:" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1324 +-msgid "Display label" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1327 +-msgid "Display percentage" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1330 +-msgid "Display time" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1333 +-msgid "Hide time/percentage when full" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1336 +-msgid "Display percentage in tooltip" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1339 +-msgid "Display time remaining in tooltip" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1342 +-msgid "Display power" +-msgstr "" +- +-#: ../panel-plugin/battery.c:1345 +-msgid "Display icon" +-msgstr "" +- +-#: ../panel-plugin/battmon.desktop.in.in.h:2 +-msgid "Show and monitor the battery status" +-msgstr "" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ast.po xfce4-battery-plugin-0.5.1/po/ast.po +--- xfce4-battery-plugin-0.5.1.orig/po/ast.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/ast.po 2010-12-18 19:27:33.134625740 +0100 +@@ -0,0 +1,149 @@ ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce 4-battery-complementu\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2009-07-13 19:55+0100\n" ++"Last-Translator: Marcos Antonio Alvarez Costales \n" ++"Language-Team: Asturian \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Cargando d'alimentación)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(Alimentación coneutada)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) restante" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d restante" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% restante" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "Alimentación desconeutada" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "" ++"WARNING: Your battery has reached critical status. You should plug in or " ++"shutdown your computer now to avoid possible data loss." ++msgstr "" ++"ATENCIÓN: La batería algamó un estáu críticu. Tienes d'enchufar o apagar el " ++"to ordenador pa evitar una dable perda de datos." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "" ++"WARNING: Your battery is running low. You should consider plugging in or " ++"shutting down your computer soon to avoid possible data loss." ++msgstr "" ++"ATENCIÓN: La batería ta escosándose. Deberíes enchufar o apagar el to " ++"ordenador aína pa evitar una dable perda de datos." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Batería" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Seleicionar ficheru" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Seleicionar comandu" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Imposible abrir la siguiente URL: %s" ++ ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Monitor de batería" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Porcentaxe baxu:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Porcentaxe críticu:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "Aición de batería baxa:" ++ ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "Nun facer res" ++ ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Amosar un mensaxe d'alvertencia" ++ ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Executar comandu" ++ ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Executar comandu en terminal" ++ ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Comandu:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "Aición de batería crítica:" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Amosar etiqueta" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Amosar porcentaxe" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Amosar tiempu" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Anubrir tiempu/porcentaxe cuando tea completa" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "Amosar porcentaxe en ventanu emerxente" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "Amosar tiempu restante en " ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Amosar conexón" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "Amosar iconu" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Amosar y monitorizar l'estáu de la batería" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ChangeLog xfce4-battery-plugin-0.5.1/po/ChangeLog +--- xfce4-battery-plugin-0.5.1.orig/po/ChangeLog 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/ChangeLog 2010-12-18 19:28:11.324712057 +0100 +@@ -1,3 +1,90 @@ ++2009-08-08 Mike Massonnet ++ ++ * kk.po: Kazakh translation added (Baurzhan Muftakhidinov) ++ * ast.po: Asturian translation added (Marcos Alvarez Costales) ++ ++2009-07-23 Gabor Kelemen ++ ++ * hu.po: Translation reworked. ++ ++2009-06-28 Mike Massonnet ++ ++ * vi.po: Vietnamese translation update (Vincent Nguyen) ++ ++2009-05-29 Mike Massonnet ++ ++ * ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki) ++ * ur.po: Urdu translation update (Muhammad Ali Makki) ++ ++2009-04-20 Mike Massonnet ++ ++ * gl.po: Galician translation update (Leandro Regueiro) ++ ++2009-04-16 Mike Massonnet ++ ++ * gl.po: Galician translation update (Leandro Regueiro) ++ ++2009-03-14 Maximilian Schleiss ++ ++ * gl.po: Galician translation update (Leandro Regueiro) ++ ++2009-03-05 Mike Massonnet ++ ++ * pt.po: Renamed pt_PT.po to pt.po (bug #4574) ++ ++2009-03-05 Mike Massonnet ++ ++ * nb.po: Renamed nb_NO.po to nb.po (bug #4574) ++ ++2009-02-22 Mike Massonnet ++ ++ * es.po: Add Spanish translation (Abel Martín) ++ ++2009-02-20 Maximilian Schleiss ++ ++ * gl.po: Galician translation update (Leandro Regueiro) ++ ++2009-02-19 Per Kongstad ++ ++ * da.po: Danish translation updated (Per Kongstad) ++ ++2009-02-07 Maximilian Schleiss ++ ++ * pl.po: Polish translation update (Piotr Sokół) ++ ++2009-02-07 Alexander Toresson ++ ++ * sv.po: Swedish translation update (Daniel Nylander) ++ ++2009-01-13 Alexander Toresson ++ ++ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) ++ ++2008-12-25 Maximilian Schleiss ++ ++ * gl.po: Galician translation update (Leandro Regueiro) ++ * ja.po: Japanese translation update (Masato Hashimoto) ++ ++2008-12-13 Maximilian Schleiss ++ ++ * zh_CN.po: Simplified Chinese translation added (Hunt Xu) ++ ++2008-11-17 Eren Türkay ++ ++ * tr.po: Turkish translation update (Turkish translation team) ++ ++2008-11-12 Piarres Beobide ++ ++ * eu.po: Basque translation update ++ ++2008-11-09 Maximilian Schleiss ++ ++ * sq.po: Albanian translation update (Besnik Bleta) ++ ++2008-10-18 Maximilian Schleiss ++ ++ * ja.po, LINGUAS: Japanese translation added (Nobuhiro Iwamatsu) ++ + 2008-07-15 Mohamed Magdy + + * ar.po: Add Arabic translation +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/da.po xfce4-battery-plugin-0.5.1/po/da.po +--- xfce4-battery-plugin-0.5.1.orig/po/da.po 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/da.po 2010-12-18 19:27:33.134625740 +0100 +@@ -1,28 +1,30 @@ +-# Danish translation for the xfce4-battery-plugin +-# Copyright (C) 2008 The xfce4-battery-plugin's COPYRIGHT HOLDER ++# translation of xfce4-battery-plugin to Danish ++# Copyright (C) 2007 THE xfce4-battery-plugin'S COPYRIGHT HOLDER + # This file is distributed under the same license as the xfce4-battery-plugin package. +-# Jannich Brendle , 2008. +-# +-#, fuzzy ++# Jens Hyllegaard , 2007. ++# Per Kongstad , 2009. + msgid "" + msgstr "" +-"Project-Id-Version: xfce4-battery-plugin 0.5.0\n" ++"Project-Id-Version: xfce4-battery-plugin 0.5.2\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-12-20 17:45+0100\n" +-"PO-Revision-Date: 2008-05-13 13:51+0200\n" +-"Last-Translator: Jannich Brendle \n" +-"Language-Team: Danish \n" ++"PO-Revision-Date: 2009-02-19 16:24+0100\n" ++"Last-Translator: Per Kongstad \n" ++"Language-Team: Danish \n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Danish\n" ++"X-Poedit-Country: DENMARK\n" ++"X-Poedit-SourceCharset: utf-8\n" + + #: ../panel-plugin/battery.c:491 + msgid "(Charging from AC)" +-msgstr "(Oplader fra AC)" ++msgstr "(Oplader via AC)" + + #: ../panel-plugin/battery.c:491 + msgid "(AC on-line)" +-msgstr "(AC tilsluttet)" ++msgstr "(AC tilkoblet)" + + #: ../panel-plugin/battery.c:500 + #, c-format +@@ -41,23 +43,15 @@ + + #: ../panel-plugin/battery.c:506 + msgid "AC off-line" +-msgstr "AC ikke tilsluttet" ++msgstr "AC frakoblet" + + #: ../panel-plugin/battery.c:570 +-msgid "" +-"WARNING: Your battery has reached critical status. You should plug in or " +-"shutdown your computer now to avoid possible data loss." +-msgstr "" +-"ADVARSEL: Dit batteri har nået kritisk status. Du bør oplade eller" +-"slukke din computer nu for at undgå eventuelt tab af data." ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "ADVARSEL: Dit batteri er næsten helt fladt. Du bør tilslutte din computer til en strømkilde, eller lukke den ned nu, for at undgå muligt datatab." + + #: ../panel-plugin/battery.c:584 +-msgid "" +-"WARNING: Your battery is running low. You should consider plugging in or " +-"shutting down your computer soon to avoid possible data loss." +-msgstr "" +-"ADVARSEL: Dit batteri er ved at løbe tør for strøm. Du bør overveje at oplade eller" +-"slukke din computer snart for at undgå eventuelt tab af data." ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "ADVARSEL: Dit batteri er ved at være fladt. Du bør overveje at tilslutte din computer til en strømkilde, eller lukke den ned, for at undgå muligt datatab." + + #: ../panel-plugin/battery.c:673 + msgid "Battery" +@@ -74,11 +68,12 @@ + #: ../panel-plugin/battery.c:1159 + #, c-format + msgid "Unable to open the following url: %s" +-msgstr "Kan ikke åbne denne url: %s" ++msgstr "Kunne ikke åbne denne url: %s" + +-#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++#: ../panel-plugin/battery.c:1183 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 + msgid "Battery Monitor" +-msgstr "Batteriovervåger" ++msgstr "Batteriovervågning" + + #: ../panel-plugin/battery.c:1212 + msgid "Low percentage:" +@@ -90,35 +85,40 @@ + + #: ../panel-plugin/battery.c:1236 + msgid "Low battery action:" +-msgstr "Lavt batteriniveau handling:" ++msgstr "Handling ved lav batteristand:" + +-#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++#: ../panel-plugin/battery.c:1242 ++#: ../panel-plugin/battery.c:1283 + msgid "Do nothing" +-msgstr "Gør intet" ++msgstr "Gør ingenting" + +-#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++#: ../panel-plugin/battery.c:1244 ++#: ../panel-plugin/battery.c:1285 + msgid "Display a warning message" +-msgstr "Vis en advarsel" ++msgstr "Vis advarselsmeddelelse" + +-#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++#: ../panel-plugin/battery.c:1246 ++#: ../panel-plugin/battery.c:1287 + msgid "Run command" + msgstr "Kør kommando" + +-#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++#: ../panel-plugin/battery.c:1248 ++#: ../panel-plugin/battery.c:1289 + msgid "Run command in terminal" +-msgstr "Kør kommando i terminal" ++msgstr "Kør kommando i en terminal" + +-#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++#: ../panel-plugin/battery.c:1261 ++#: ../panel-plugin/battery.c:1301 + msgid "Command:" +-msgstr "Kommando" ++msgstr "Kommando:" + + #: ../panel-plugin/battery.c:1277 + msgid "Critical battery action:" +-msgstr "Kritisk batteriniveauhandling:" ++msgstr "Handling ved kritisk batteristand:" + + #: ../panel-plugin/battery.c:1324 + msgid "Display label" +-msgstr "Vis label" ++msgstr "Vis mærkat" + + #: ../panel-plugin/battery.c:1327 + msgid "Display percentage" +@@ -130,19 +130,19 @@ + + #: ../panel-plugin/battery.c:1333 + msgid "Hide time/percentage when full" +-msgstr "Gem tid/procentdel når fuldt opladt" ++msgstr "Skjul tid/procentdel når fuld" + + #: ../panel-plugin/battery.c:1336 + msgid "Display percentage in tooltip" +-msgstr "Vis procentdel i tooltip" ++msgstr "Vis procentdel i værktøjstip" + + #: ../panel-plugin/battery.c:1339 + msgid "Display time remaining in tooltip" +-msgstr "Vis resterende tid i tooltip" ++msgstr "Vis tilbageværende tid i værktøjstip" + + #: ../panel-plugin/battery.c:1342 + msgid "Display power" +-msgstr "Vis strømkilde" ++msgstr "Vis strøm" + + #: ../panel-plugin/battery.c:1345 + msgid "Display icon" +@@ -150,4 +150,4 @@ + + #: ../panel-plugin/battmon.desktop.in.in.h:2 + msgid "Show and monitor the battery status" +-msgstr "Viser og overvåger batteristatus" ++msgstr "Vis og overvåg batteristatus" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/de.po xfce4-battery-plugin-0.5.1/po/de.po +--- xfce4-battery-plugin-0.5.1.orig/po/de.po 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/de.po 2010-12-18 19:27:33.134625740 +0100 +@@ -2,13 +2,13 @@ + # Copyright (C) 2007 THE xfce4-battery-plugin'S COPYRIGHT HOLDER + # This file is distributed under the same license as the xfce4-battery-plugin package. + # Fabian Nowak , 2007. +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: xfce4-battery-plugin 0.5.1svn-r3672\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2007-12-06 22:27+0100\n" +-"PO-Revision-Date: 2007-12-06 22:27+0100\n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2009-02-01 16:15+0100\n" + "Last-Translator: Fabian Nowak \n" + "Language-Team: German\n" + "MIME-Version: 1.0\n" +@@ -16,138 +16,127 @@ + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + +-#: ../panel-plugin/battery.c:490 ++#: ../panel-plugin/battery.c:491 + msgid "(Charging from AC)" +-msgstr "(Lade von Steckdose)" ++msgstr "(Wird von Stromzufuhr geladen)" + +-#: ../panel-plugin/battery.c:490 ++#: ../panel-plugin/battery.c:491 + msgid "(AC on-line)" + msgstr "(Externe Stromzufuhr vorhanden)" + +-#: ../panel-plugin/battery.c:499 ++#: ../panel-plugin/battery.c:500 + #, c-format + msgid "%d%% (%02d:%02d) remaining" + msgstr "%d%% (%02d:%02d) verbleibend" + +-#: ../panel-plugin/battery.c:501 ++#: ../panel-plugin/battery.c:502 + #, c-format + msgid "%02d:%02d remaining" + msgstr "%02d:%02d verbleibend" + +-#: ../panel-plugin/battery.c:503 ++#: ../panel-plugin/battery.c:504 + #, c-format + msgid "%d%% remaining" + msgstr "%d%% verbleibend" + +-#: ../panel-plugin/battery.c:505 +-#, c-format ++#: ../panel-plugin/battery.c:506 + msgid "AC off-line" + msgstr "Keine externe Stromzufuhr" + +-#: ../panel-plugin/battery.c:569 +-msgid "" +-"WARNING: Your battery has reached critical status. You should plug in or " +-"shutdown your computer now to avoid possible data loss." +-msgstr "" +-"ACHTUNG: Ihr Akku hat einen kritischen Zustand erreicht. Sie sollten Ihr " +-"Gerät jetzt an Strom anschließen oder herunterfahren, um möglichen " +-"Datenverlust zu verhindern." +- +-#: ../panel-plugin/battery.c:583 +-msgid "" +-"WARNING: Your battery is running low. You should consider plugging in or " +-"shutting down your computer soon to avoid possible data loss." +-msgstr "" +-"ACHTUNG: Ihr Akku befindet sich in einem niedrigen Energiezustand. Sie " +-"sollten es demnächst in Erwägung ziehen, ihr Gerät an Strom anzuschließen " +-"oder herunterzufahren, um möglichen Datenverlust zu verhindern." ++#: ../panel-plugin/battery.c:570 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "ACHTUNG: Ihr Akku hat einen kritischen Zustand erreicht. Sie sollten Ihr Gerät jetzt an Strom anschließen oder herunterfahren, um möglichen Datenverlust zu vermeiden." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "ACHTUNG: Ihr Akku befindet sich in einem niedrigen Energiezustand. Sie sollten es demnächst in Erwägung ziehen, ihr Gerät an Strom anzuschließen oder herunterzufahren, um möglichen Datenverlust zu vermeiden." + +-#: ../panel-plugin/battery.c:668 ++#: ../panel-plugin/battery.c:673 + msgid "Battery" +-msgstr "Betteriezustand" ++msgstr "Batteriezustand" + +-#: ../panel-plugin/battery.c:1094 ++#: ../panel-plugin/battery.c:1099 + msgid "Select file" +-msgstr "Wählen Sie eine Datei" ++msgstr "Datei auswählen" + +-#: ../panel-plugin/battery.c:1135 ++#: ../panel-plugin/battery.c:1140 + msgid "Select command" +-msgstr "Wählen Sie einen Befehl" ++msgstr "Befehl auswählen" + +-#: ../panel-plugin/battery.c:1154 ++#: ../panel-plugin/battery.c:1159 + #, c-format + msgid "Unable to open the following url: %s" + msgstr "Kann die folgende Adresse nicht öffnen: %s" + +-#: ../panel-plugin/battery.c:1178 ../panel-plugin/battmon.desktop.in.in.h:1 ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 + msgid "Battery Monitor" + msgstr "Batterieüberwachung" + +-#: ../panel-plugin/battery.c:1207 ++#: ../panel-plugin/battery.c:1212 + msgid "Low percentage:" + msgstr "Niedriger Prozentsatz:" + +-#: ../panel-plugin/battery.c:1218 ++#: ../panel-plugin/battery.c:1223 + msgid "Critical percentage:" + msgstr "Kritischer Prozentsatz:" + +-#: ../panel-plugin/battery.c:1231 ++#: ../panel-plugin/battery.c:1236 + msgid "Low battery action:" +-msgstr "Ereignis bei niedrigen Emergiezustand:" ++msgstr "Ereignis bei niedrigem Energiezustand:" + +-#: ../panel-plugin/battery.c:1237 ../panel-plugin/battery.c:1278 ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 + msgid "Do nothing" + msgstr "Nichts unternehmen" + +-#: ../panel-plugin/battery.c:1239 ../panel-plugin/battery.c:1280 ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 + msgid "Display a warning message" + msgstr "Warnhinweis anzeigen" + +-#: ../panel-plugin/battery.c:1241 ../panel-plugin/battery.c:1282 ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 + msgid "Run command" + msgstr "Befehl ausführen" + +-#: ../panel-plugin/battery.c:1243 ../panel-plugin/battery.c:1284 ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 + msgid "Run command in terminal" +-msgstr "Befehl im Terminal ausführen." ++msgstr "Befehl im Terminal ausführen" + +-#: ../panel-plugin/battery.c:1256 ../panel-plugin/battery.c:1296 ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 + msgid "Command:" + msgstr "Befehl:" + +-#: ../panel-plugin/battery.c:1272 ++#: ../panel-plugin/battery.c:1277 + msgid "Critical battery action:" + msgstr "Ereignis bei kritischem Energiezustand:" + +-#: ../panel-plugin/battery.c:1319 ++#: ../panel-plugin/battery.c:1324 + msgid "Display label" + msgstr "Beschriftung anzeigen" + +-#: ../panel-plugin/battery.c:1322 ++#: ../panel-plugin/battery.c:1327 + msgid "Display percentage" + msgstr "Prozentsatz anzeigen" + +-#: ../panel-plugin/battery.c:1325 ++#: ../panel-plugin/battery.c:1330 + msgid "Display time" + msgstr "Zeit anzeigen" + +-#: ../panel-plugin/battery.c:1328 ++#: ../panel-plugin/battery.c:1333 + msgid "Hide time/percentage when full" + msgstr "Zeit/Prozentsatz verstecken wenn voll" + +-#: ../panel-plugin/battery.c:1331 ++#: ../panel-plugin/battery.c:1336 + msgid "Display percentage in tooltip" +-msgstr "Prozentsatz in Tooltip anzeigen" ++msgstr "Prozentsatz in der Kurzhilfe anzeigen" + +-#: ../panel-plugin/battery.c:1334 ++#: ../panel-plugin/battery.c:1339 + msgid "Display time remaining in tooltip" +-msgstr "Verbleibdende Zeit in Tooltip anzeigen" ++msgstr "Verbleibende Zeit in der Kurzhilfe anzeigen" + +-#: ../panel-plugin/battery.c:1337 ++#: ../panel-plugin/battery.c:1342 + msgid "Display power" +-msgstr "Strom anzeigen" ++msgstr "Vorhandene Stromversorgung anzeigen" + +-#: ../panel-plugin/battery.c:1340 ++#: ../panel-plugin/battery.c:1345 + msgid "Display icon" + msgstr "Symbol anzeigen" + +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/es.po xfce4-battery-plugin-0.5.1/po/es.po +--- xfce4-battery-plugin-0.5.1.orig/po/es.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/es.po 2010-12-18 19:27:33.135625652 +0100 +@@ -0,0 +1,153 @@ ++# Spanish translations for xfce package ++# Traducciones al español para el paquete xfce. ++# Copyright (C) 2009 THE xfce'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the xfce package. ++# , 2009. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce 4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2009-02-10 18:12+0100\n" ++"Last-Translator: Abel Martín \n" ++"Language-Team: Spanish\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Cargando de alimentación)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(Alimentación conectada)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) restante" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d restante" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% restante" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "Alimentación desconectada" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "ATENCIÓN: La batería ha alcanzado un estado crítico. Debe enchufar o apagar su ordenador para evitar una posible pérdida de datos." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "ATENCIÓN: La batería se está agotando. Debería considerar enchufar o apagar su ordenador pronto para evitar una posible pérdida de datos." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Batería" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Seleccionar archivo" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Seleccionar comando" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Imposible abrir la siguiente URL: %s" ++ ++#: ../panel-plugin/battery.c:1183 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Monitor de batería" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Porcentaje bajo:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Porcentaje crítico:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "Acción de batería baja:" ++ ++#: ../panel-plugin/battery.c:1242 ++#: ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "No hacer nada" ++ ++#: ../panel-plugin/battery.c:1244 ++#: ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Mostrar un mensaje de advertencia" ++ ++#: ../panel-plugin/battery.c:1246 ++#: ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Ejecutar comando" ++ ++#: ../panel-plugin/battery.c:1248 ++#: ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Ejecutar comando en terminal" ++ ++#: ../panel-plugin/battery.c:1261 ++#: ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Comando:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "Acción de batería crítica:" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Mostrar etiqueta" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Mostrar porcentaje" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Mostrar tiempo" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Ocultar tiempo/porcentaje cuando esté completa" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "Mostrar porcentaje en cuadro emergente" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "Mostrar tiempo restante en " ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Mostrar conexión" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "Mostrar icono" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Mostrar y monitorizar el estado de la batería" ++ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/eu.po xfce4-battery-plugin-0.5.1/po/eu.po +--- xfce4-battery-plugin-0.5.1.orig/po/eu.po 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/eu.po 2010-12-18 19:27:33.135625652 +0100 +@@ -8,14 +8,15 @@ + "Project-Id-Version: xfce4-battery-plugin 0.5.0\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-12-20 17:45+0100\n" +-"PO-Revision-Date: 2006-10-24 13:10+0200\n" ++"PO-Revision-Date: 2008-11-09 15:38+0200\n" + "Last-Translator: Piarres Beobide \n" + "Language-Team: Basque \n" ++"Language: eu\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: KBabel 1.11.4\n" +-"Plural-Forms: nplurals=2; plural=(n != 1)\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++"X-Generator: Pootle 1.2.0\n" + + #: ../panel-plugin/battery.c:491 + msgid "(Charging from AC)" +@@ -143,11 +144,11 @@ + + #: ../panel-plugin/battery.c:1342 + msgid "Display power" +-msgstr "Karga Bistarazi" ++msgstr "Bistarazi karga" + + #: ../panel-plugin/battery.c:1345 + msgid "Display icon" +-msgstr "Ikonoa Bistarazi" ++msgstr "Bistarazi ikonoa" + + #: ../panel-plugin/battmon.desktop.in.in.h:2 + msgid "Show and monitor the battery status" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/gl.po xfce4-battery-plugin-0.5.1/po/gl.po +--- xfce4-battery-plugin-0.5.1.orig/po/gl.po 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/gl.po 2010-12-18 19:27:33.135625652 +0100 +@@ -1,19 +1,19 @@ + # Galician translation of xfce4-battery-plugin +-# Copyright (C) 2008 Leandro Regueiro ++# Copyright (C) 2008-2009 Leandro Regueiro + # This file is distributed under the same license as the xfce package. +-# +-# Leandro Regueiro , 2008. +-# ++# ++# Leandro Regueiro , 2008, 2009. ++# + # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas + # colaborar connosco, podes atopar máis información en +-# ++# + msgid "" + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-12-20 17:45+0100\n" +-"PO-Revision-Date: 2008-06-24 19:05+0100\n" +-"Last-Translator: Leandro Regueiro \n" ++"PO-Revision-Date: 2009-07-15 17:28+0100\n" ++"Last-Translator: Leandro Regueiro \n" + "Language-Team: Galician \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -22,16 +22,16 @@ + + #: ../panel-plugin/battery.c:491 + msgid "(Charging from AC)" +-msgstr "" ++msgstr "(Cargando da rede eléctrica)" + + #: ../panel-plugin/battery.c:491 + msgid "(AC on-line)" +-msgstr "" ++msgstr "(Conectado á rede eléctrica)" + + #: ../panel-plugin/battery.c:500 + #, c-format + msgid "%d%% (%02d:%02d) remaining" +-msgstr "" ++msgstr "%d%% (%02d:%02d) restante" + + #: ../panel-plugin/battery.c:502 + #, c-format +@@ -41,19 +41,19 @@ + #: ../panel-plugin/battery.c:504 + #, c-format + msgid "%d%% remaining" +-msgstr "" ++msgstr "Quedan %d%%" + + #: ../panel-plugin/battery.c:506 + msgid "AC off-line" +-msgstr "" ++msgstr "Desconectado da rede eléctrica" + + #: ../panel-plugin/battery.c:570 + msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." +-msgstr "" ++msgstr "ADVERTENCIA: A batería chegou a un estado crítico. Debe enchufala ou apagar o ordenador agora para evitar unha posible perda de datos." + + #: ../panel-plugin/battery.c:584 + msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." +-msgstr "" ++msgstr "ADVERTENCIA: A batería estase esgotando. Deberia considerar enchufala ou apagar o ordenador pronto para evitar unha posible perda de datos." + + #: ../panel-plugin/battery.c:673 + msgid "Battery" +@@ -61,96 +61,89 @@ + + #: ../panel-plugin/battery.c:1099 + msgid "Select file" +-msgstr "" ++msgstr "Seleccione un ficheiro" + + #: ../panel-plugin/battery.c:1140 + msgid "Select command" +-msgstr "" ++msgstr "Seleccione un comando" + + #: ../panel-plugin/battery.c:1159 + #, c-format + msgid "Unable to open the following url: %s" + msgstr "Non foi posible abrir o seguinte url: %s" + +-#: ../panel-plugin/battery.c:1183 +-#: ../panel-plugin/battmon.desktop.in.in.h:1 ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 + msgid "Battery Monitor" + msgstr "Monitor da Batería" + + #: ../panel-plugin/battery.c:1212 + msgid "Low percentage:" +-msgstr "" ++msgstr "Porcentaxe baixa:" + + #: ../panel-plugin/battery.c:1223 + msgid "Critical percentage:" +-msgstr "" ++msgstr "Porcentaxe crítica:" + + #: ../panel-plugin/battery.c:1236 + msgid "Low battery action:" +-msgstr "" ++msgstr "Acción para cando a batería está baixa:" + +-#: ../panel-plugin/battery.c:1242 +-#: ../panel-plugin/battery.c:1283 ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 + msgid "Do nothing" + msgstr "Non facer nada" + +-#: ../panel-plugin/battery.c:1244 +-#: ../panel-plugin/battery.c:1285 ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 + msgid "Display a warning message" + msgstr "Mostrar unha mensaxe de advertencia" + +-#: ../panel-plugin/battery.c:1246 +-#: ../panel-plugin/battery.c:1287 ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 + msgid "Run command" + msgstr "Executar comando" + +-#: ../panel-plugin/battery.c:1248 +-#: ../panel-plugin/battery.c:1289 ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 + msgid "Run command in terminal" +-msgstr "" ++msgstr "Executar o comando nun terminal" + +-#: ../panel-plugin/battery.c:1261 +-#: ../panel-plugin/battery.c:1301 ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 + msgid "Command:" + msgstr "Comando:" + + #: ../panel-plugin/battery.c:1277 + msgid "Critical battery action:" +-msgstr "" ++msgstr "Acción para cando a batería está crítica:" + + #: ../panel-plugin/battery.c:1324 + msgid "Display label" +-msgstr "" ++msgstr "Mostrar unha etiqueta" + + #: ../panel-plugin/battery.c:1327 + msgid "Display percentage" +-msgstr "" ++msgstr "Mostrar a porcentaxe" + + #: ../panel-plugin/battery.c:1330 + msgid "Display time" +-msgstr "" ++msgstr "Mostrar o tempo" + + #: ../panel-plugin/battery.c:1333 + msgid "Hide time/percentage when full" +-msgstr "" ++msgstr "Ocultar tempo/porcentaxe cando estea cargada" + + #: ../panel-plugin/battery.c:1336 + msgid "Display percentage in tooltip" +-msgstr "" ++msgstr "Mostrar a porcentaxe na notificación" + + #: ../panel-plugin/battery.c:1339 + msgid "Display time remaining in tooltip" +-msgstr "" ++msgstr "Mostrar o tempo restante na notificación" + + #: ../panel-plugin/battery.c:1342 + msgid "Display power" +-msgstr "" ++msgstr "Mostrar a enerxía" + + #: ../panel-plugin/battery.c:1345 + msgid "Display icon" +-msgstr "" ++msgstr "Mostrar unha icona" + + #: ../panel-plugin/battmon.desktop.in.in.h:2 + msgid "Show and monitor the battery status" + msgstr "Mostrar e monitorizar o estado da batería" +- +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/hr.po xfce4-battery-plugin-0.5.1/po/hr.po +--- xfce4-battery-plugin-0.5.1.orig/po/hr.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/hr.po 2010-12-18 19:27:33.135625652 +0100 +@@ -0,0 +1,154 @@ ++# Croatian translations for xfce4-battery-plugin package. ++# Copyright (C) 2010 The Xfce development team. ++# This file is distributed under the same license as the xfce4-battery-plugin package. ++# Ivica Kolić, 2010. ++# Ivica Kolić <>, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2010-06-12 18:02+0200\n" ++"Last-Translator: Ivica Kolić <>\n" ++"Language-Team: Croatian <>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" ++"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Punjenje iz AC)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(AC on-line)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) preostalo" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d preostalo" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% preostalo" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "AC off-line" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "" ++"WARNING: Your battery has reached critical status. You should plug in or " ++"shutdown your computer now to avoid possible data loss." ++msgstr "" ++"UPOZORENJE:Vaša baterija je dosegla kritični status.Trebate je uključiti ili " ++"isključiti računalo da izbjegnete gubitak podataka." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "" ++"WARNING: Your battery is running low. You should consider plugging in or " ++"shutting down your computer soon to avoid possible data loss." ++msgstr "" ++"UPOZORENJE:Vaša se baterija prazni.Ramislite o uključivanju ili " ++"isključivanju računala uskoro da biste izbjegli gubitak podataka." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Baterija" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Odaberi datoteku" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Odaberi naredbu" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Neuspjeh u otvaranju slijedećeg url: %s" ++ ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Monitor baterije" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Niski postotak:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Kritični postotak:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "" ++ ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "Ne čini mišta" ++ ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Prikaži poruku upozorenja" ++ ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Pokreni naredbu" ++ ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Pokreni naredbu u terminalu" ++ ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Naredba:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Prikaži natips" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Prikaži postotak" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Prikaži vrijeme" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Sakrij vrijeme/postotak kada je puna" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Prikaži napajanje" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "Prikaži ikonu" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Pokaži i prati status baterije" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/hu.po xfce4-battery-plugin-0.5.1/po/hu.po +--- xfce4-battery-plugin-0.5.1.orig/po/hu.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/hu.po 2010-12-18 19:27:33.136625569 +0100 +@@ -0,0 +1,154 @@ ++# Hungarian translation of xfce4-battery-plugin ++# Copyright 2009. Free Software Foundation, Inc. ++# This file is distributed under the same license as the xfce4-battery-plugin package. ++# ++# Németh Csaba , 2007. ++# Gabor Kelemen , 2009. ++# SZERVÁC Attila ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2009-07-23 12:18+0200\n" ++"PO-Revision-Date: 2009-07-23 15:42+0200\n" ++"Last-Translator: Gabor Kelemen \n" ++"Language-Team: Hungarian \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: ../panel-plugin/battery.c:494 ++msgid "(Charging from AC)" ++msgstr "(Töltés váltóáramról)" ++ ++#: ../panel-plugin/battery.c:494 ++msgid "(AC on-line)" ++msgstr "(Energiaellátás elérhető)" ++ ++#: ../panel-plugin/battery.c:503 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d.%02d) van hátra" ++ ++#: ../panel-plugin/battery.c:505 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d.%02d van hátra" ++ ++#: ../panel-plugin/battery.c:507 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% van hátra" ++ ++#: ../panel-plugin/battery.c:509 ++#, c-format ++msgid "AC off-line" ++msgstr "Az energiaellátás megszűnt" ++ ++#: ../panel-plugin/battery.c:573 ++msgid "" ++"WARNING: Your battery has reached critical status. You should plug in or " ++"shutdown your computer now to avoid possible data loss." ++msgstr "FIGYELMEZTETÉS: az akkumulátor elérte a kritikus szintet. Csatlakoztassa a hálózatra vagy kapcsolja ki számítógépét az adatvesztés elkerülése érdekében." ++ ++#: ../panel-plugin/battery.c:587 ++msgid "" ++"WARNING: Your battery is running low. You should consider plugging in or " ++"shutting down your computer soon to avoid possible data loss." ++msgstr "FIGYELMEZTETÉS: az akkumulátor gyenge. Csatlakoztassa a hálózatra vagy kapcsolja ki számítógépét az adatvesztés elkerülése érdekében." ++ ++#: ../panel-plugin/battery.c:672 ++msgid "Battery" ++msgstr "Akkumulátor" ++ ++#: ../panel-plugin/battery.c:1098 ++msgid "Select file" ++msgstr "Válasszon fájlt" ++ ++#: ../panel-plugin/battery.c:1139 ++msgid "Select command" ++msgstr "Válasszon parancsot" ++ ++#: ../panel-plugin/battery.c:1158 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "A következő URL megnyitása meghiúsult: %s" ++ ++#: ../panel-plugin/battery.c:1182 ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Akkumulátorfigyelő" ++ ++#: ../panel-plugin/battery.c:1211 ++msgid "Low percentage:" ++msgstr "Alacsony töltöttség:" ++ ++#: ../panel-plugin/battery.c:1222 ++msgid "Critical percentage:" ++msgstr "Kritikus töltöttség:" ++ ++#: ../panel-plugin/battery.c:1235 ++msgid "Low battery action:" ++msgstr "Gyenge akkumulátor művelet:" ++ ++#: ../panel-plugin/battery.c:1241 ../panel-plugin/battery.c:1282 ++msgid "Do nothing" ++msgstr "Ne tegyen semmit" ++ ++#: ../panel-plugin/battery.c:1243 ../panel-plugin/battery.c:1284 ++msgid "Display a warning message" ++msgstr "Figyelmeztetés megjelenítése" ++ ++#: ../panel-plugin/battery.c:1245 ../panel-plugin/battery.c:1286 ++msgid "Run command" ++msgstr "Parancs futtatása" ++ ++#: ../panel-plugin/battery.c:1247 ../panel-plugin/battery.c:1288 ++msgid "Run command in terminal" ++msgstr "Parancs futtatása terminálban" ++ ++#: ../panel-plugin/battery.c:1260 ../panel-plugin/battery.c:1300 ++msgid "Command:" ++msgstr "Parancs:" ++ ++#: ../panel-plugin/battery.c:1276 ++msgid "Critical battery action:" ++msgstr "Kritikus akkumulátor művelet:" ++ ++#: ../panel-plugin/battery.c:1323 ++msgid "Display label" ++msgstr "Címke megjelenítése" ++ ++#: ../panel-plugin/battery.c:1326 ++msgid "Display percentage" ++msgstr "Százalék megjelenítése" ++ ++#: ../panel-plugin/battery.c:1329 ++msgid "Display time" ++msgstr "Idő megjelenítése" ++ ++#: ../panel-plugin/battery.c:1332 ++msgid "Hide time/percentage when full" ++msgstr "Idő/százalék elrejtése, ha fel van töltve" ++ ++#: ../panel-plugin/battery.c:1335 ++msgid "Display percentage in tooltip" ++msgstr "Százalék megjelenítése buboréksúgóban" ++ ++#: ../panel-plugin/battery.c:1338 ++msgid "Display time remaining in tooltip" ++msgstr "Hátralévő idő megjelenítése buboréksúgóban" ++ ++#: ../panel-plugin/battery.c:1341 ++msgid "Display power" ++msgstr "Energiaszint megjelenítése" ++ ++#: ../panel-plugin/battery.c:1344 ++msgid "Display icon" ++msgstr "Ikon megjelenítése" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Az akkumulátor állapotának megjelenítése és figyelése" ++ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ja.po xfce4-battery-plugin-0.5.1/po/ja.po +--- xfce4-battery-plugin-0.5.1.orig/po/ja.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/ja.po 2010-12-18 19:27:33.136625569 +0100 +@@ -0,0 +1,162 @@ ++# Japanese translations for xfce4-battery-plugin package. ++# Copyright (C) Eduard Roccatello ++# Eduard Roccatello ++# Benedikt Meurer ++# Edscott Wilson Garcia ++# Rickard E. Faith ++# Noberasco Michele <2001s098@educ.disi.unige.it> ++# Nick Schermer ++# This file is distributed under the same license as the xfce4-battery-plugin package. ++# Nobuhiro Iwamatsu , 2007,2008. ++# ++# battery: バッテリ(のばさない) ++# percentage: 残量 ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2008-12-05 22:54+0900\n" ++"PO-Revision-Date: 2008-12-06 23:24+0900\n" ++"Last-Translator: Masato Hashimoto \n" ++"Language-Team: Japanese \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: ../panel-plugin/battery.c:494 ++msgid "(Charging from AC)" ++msgstr "(AC から充電中)" ++ ++#: ../panel-plugin/battery.c:494 ++msgid "(AC on-line)" ++msgstr "(AC 接続)" ++ ++#: ../panel-plugin/battery.c:503 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "残り %d%% (%02d:%02d)" ++ ++#: ../panel-plugin/battery.c:505 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "残り %02d:%02d" ++ ++#: ../panel-plugin/battery.c:507 ++#, c-format ++msgid "%d%% remaining" ++msgstr "残り %d%%" ++ ++#: ../panel-plugin/battery.c:509 ++#, c-format ++msgid "AC off-line" ++msgstr "AC 未接続" ++ ++#: ../panel-plugin/battery.c:573 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "警告: バッテリが空に近い状態になりました。電源プラグを差し込むか、できるたけデータが消えないようにコンピュータをシャットダウンすべきです。" ++ ++#: ../panel-plugin/battery.c:587 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "警告: バッテリが残り少なくなりました。電源プラグを差し込むか、データが消えないようにコンピュータのシャットダウンを検討してください。" ++ ++#: ../panel-plugin/battery.c:672 ++msgid "Battery" ++msgstr "バッテリ" ++ ++#: ../panel-plugin/battery.c:1098 ++msgid "Select file" ++msgstr "ファイル選択" ++ ++#: ../panel-plugin/battery.c:1139 ++msgid "Select command" ++msgstr "コマンド選択" ++ ++#: ../panel-plugin/battery.c:1158 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "次の URL を開くことができません: %s" ++ ++#: ../panel-plugin/battery.c:1182 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "バッテリモニタ" ++ ++#: ../panel-plugin/battery.c:1211 ++msgid "Low percentage:" ++msgstr "残り少ないとする割合:" ++ ++#: ../panel-plugin/battery.c:1222 ++msgid "Critical percentage:" ++msgstr "空に近いとする割合:" ++ ++#: ../panel-plugin/battery.c:1235 ++msgid "Low battery action:" ++msgstr "バッテリーが少ない時のアクション:" ++ ++#: ../panel-plugin/battery.c:1241 ++#: ../panel-plugin/battery.c:1282 ++msgid "Do nothing" ++msgstr "なにもしない" ++ ++#: ../panel-plugin/battery.c:1243 ++#: ../panel-plugin/battery.c:1284 ++msgid "Display a warning message" ++msgstr "警告メッセージを表示する" ++ ++#: ../panel-plugin/battery.c:1245 ++#: ../panel-plugin/battery.c:1286 ++msgid "Run command" ++msgstr "コマンドを実行する" ++ ++#: ../panel-plugin/battery.c:1247 ++#: ../panel-plugin/battery.c:1288 ++msgid "Run command in terminal" ++msgstr "ターミナルでコマンドを実行する" ++ ++#: ../panel-plugin/battery.c:1260 ++#: ../panel-plugin/battery.c:1300 ++msgid "Command:" ++msgstr "コマンド:" ++ ++#: ../panel-plugin/battery.c:1276 ++msgid "Critical battery action:" ++msgstr "バッテリが空に近い時のアクション:" ++ ++#: ../panel-plugin/battery.c:1323 ++msgid "Display label" ++msgstr "ラベルを表示する" ++ ++#: ../panel-plugin/battery.c:1326 ++msgid "Display percentage" ++msgstr "残量を表示する" ++ ++#: ../panel-plugin/battery.c:1329 ++msgid "Display time" ++msgstr "時間を表示する" ++ ++#: ../panel-plugin/battery.c:1332 ++msgid "Hide time/percentage when full" ++msgstr "バッテリがフル充電時、時間と残量を隠す" ++ ++#: ../panel-plugin/battery.c:1335 ++msgid "Display percentage in tooltip" ++msgstr "残量をツールチップに表示する" ++ ++#: ../panel-plugin/battery.c:1338 ++msgid "Display time remaining in tooltip" ++msgstr "残り時間をツールチップに表示する" ++ ++#: ../panel-plugin/battery.c:1341 ++msgid "Display power" ++msgstr "電源を表示する" ++ ++#: ../panel-plugin/battery.c:1344 ++msgid "Display icon" ++msgstr "アイコンを表示する" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "バッテリ状況の表示と監視を行います" ++ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/kk.po xfce4-battery-plugin-0.5.1/po/kk.po +--- xfce4-battery-plugin-0.5.1.orig/po/kk.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/kk.po 2010-12-18 19:27:33.136625569 +0100 +@@ -0,0 +1,153 @@ ++# xfce4-battery-plugin to kazakh. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# Baurzhan Muftakhidinov , 2009. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: trunk\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2009-07-11 17:37+0600\n" ++"Last-Translator: Baurzhan Muftakhidinov \n" ++"Language-Team: Kazakh \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Электр желіден зарядталу)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(Электр желісіне қосулы тұр)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) қалды" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d қалды" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% қалды" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "Электр желісінде емес" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "" ++"WARNING: Your battery has reached critical status. You should plug in or " ++"shutdown your computer now to avoid possible data loss." ++msgstr "" ++"Ескерту: Батареяның заряд шамасы критикалық мәніне жетті. Ақпаратты " ++"жоғалтпас үшін компьютеріңізді электр желісіне қосыңыз не өшіріңіз." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "" ++"WARNING: Your battery is running low. You should consider plugging in or " ++"shutting down your computer soon to avoid possible data loss." ++msgstr "" ++"Ескерту: Батареяның заряд шамасы аз мәніне жетті. Ақпаратты жоғалтпас үшін " ++"компьютеріңізді электр желісіне қосыңыз не өшіріңіз." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Батарея" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Файлды таңдаңыз" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Команданы таңдаңыз" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Келесі url-ды ашу мүмкін емес: %s" ++ ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Батарея бақылаушысы" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Төмен заряд:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Критикалық заряд:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "Аз батарея әрекеті:" ++ ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "Ешнәрсе жасамау" ++ ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Ескерту хабарламасын көрсету" ++ ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Команданы орындау" ++ ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Команданы терминалда орындау" ++ ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Команда:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "Критикалық батарея әрекеті:" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Атауын көрсету" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Пайыз өлшемін көрсету" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Уақытын көрсету" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Батарея толық кезінде уақыт/пайыз шамаларын жасыру" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "Пайыз шамасын көмексөз түрінде көрсету" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "Қалған уақыт шамасын көмексөз түрінде көрсету" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Ток көзін көрсету" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "Таңбашаны көрсету" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Батарея қалпын көрсету және бақылау" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/LINGUAS xfce4-battery-plugin-0.5.1/po/LINGUAS +--- xfce4-battery-plugin-0.5.1.orig/po/LINGUAS 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/LINGUAS 2010-12-18 19:38:16.836154551 +0100 +@@ -1,2 +1,2 @@ + # set of available languages (in alphabetic order) +-ar ca cs da de el en_GB eu fi fr gl id it lv nb_NO pl pt_BR pt_PT sq uk ur zh_TW ++ast ca cs da de el en_GB es eu fi fr gl hr hu id it ja kk lv nb_NO nb nl pa pl pt_BR pt pt_PT ru sq sv tr ug uk ur_PK ur vi zh_CN zh_TW +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/lv.po xfce4-battery-plugin-0.5.1/po/lv.po +--- xfce4-battery-plugin-0.5.1.orig/po/lv.po 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/lv.po 2010-12-18 19:27:33.136625569 +0100 +@@ -1,54 +1,70 @@ + # Latvian translation of the xfce4-battery-plugin package. + # Copyright (C) 2006-2007 The Xfce development team. + # This file is distributed under the same license as the xfce4-battery-plugin package. +-# Rihards Prieditis , 2007. + # ++# Rihards Prieditis , 2007. ++# Rihards Prieditis , 2009. + msgid "" + msgstr "" + "Project-Id-Version: xfce4-battery-plugin 0.5.0\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-12-20 17:45+0100\n" +-"PO-Revision-Date: 2007-11-15 22:12+0300\n" +-"Last-Translator: Rihards Priedītis \n" +-"Language-Team: Latvian \n" ++"PO-Revision-Date: 2009-09-18 21:30+0100\n" ++"Last-Translator: Rihards Prieditis \n" ++"Language-Team: Latvian \n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=utf-8\n" ++"Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " ++"2);\n" + + #: ../panel-plugin/battery.c:491 + msgid "(Charging from AC)" +-msgstr "(Lādējas no tīkla)" ++msgstr "(Lādējas no elektrotīkla)" + + #: ../panel-plugin/battery.c:491 + msgid "(AC on-line)" +-msgstr "(Tīkls pieejams)" ++msgstr "(Elektrotīkls pieejams)" + + #: ../panel-plugin/battery.c:500 + #, c-format + msgid "%d%% (%02d:%02d) remaining" +-msgstr "%d%% (%02d:%02d) paliek" ++msgstr "%d%% (%02d:%02d) atlicis" + + #: ../panel-plugin/battery.c:502 + #, c-format + msgid "%02d:%02d remaining" +-msgstr "%02d:%02d paliek" ++msgstr "%02d:%02d atlicis" + + #: ../panel-plugin/battery.c:504 + #, c-format + msgid "%d%% remaining" +-msgstr "%d%% paliek" ++msgstr "%d%% atlicis" + + #: ../panel-plugin/battery.c:506 + msgid "AC off-line" +-msgstr "Tīkls atslēgts" ++msgstr "Elektrotīkls atslēgts" + + #: ../panel-plugin/battery.c:570 +-msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." +-msgstr "UZMANĪBU: Jūsu baterija ir sasniegusi kritisku līmeni. epieciešams pieslēgt elektroenerģijas tīklu, vai izslēgt datoru, lai novērstu iespējamo datu zudumu." ++msgid "" ++"WARNING: Your battery has reached critical status. You should plug in or " ++"shutdown your computer now to avoid possible data loss." ++msgstr "" ++"UZMANĪBU: Jūsu baterija ir sasniegusi kritisku līmeni. nepieciešams " ++"pieslēgties pie " ++"elektroenerģijas tīkla, vai izslēgt datoru, lai novērstu iespējamos datu " ++"zudumu." + + #: ../panel-plugin/battery.c:584 +-msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." +-msgstr "UZMANĪBU: Jūsu baterijai ir zems uzlādes līmenis. Nepieciešams pieslēgt elektroenerģijas tīklu, vai izslēgt datoru, lai novērstu iespējamo datu zudumu." ++msgid "" ++"WARNING: Your battery is running low. You should consider plugging in or " ++"shutting down your computer soon to avoid possible data loss." ++msgstr "" ++"UZMANĪBU: Jūsu baterijai ir zems uzlādēs līmenis. Nepieciešams pieslēgties " ++"pie " ++"elektroenerģijas tīkla, vai izslēgt datoru, lai novērstu iespējamos datu " ++"zudumu." + + #: ../panel-plugin/battery.c:673 + msgid "Battery" +@@ -67,45 +83,39 @@ + msgid "Unable to open the following url: %s" + msgstr "Neizdevās atvērt sekojošu url: %s" + +-#: ../panel-plugin/battery.c:1183 +-#: ../panel-plugin/battmon.desktop.in.in.h:1 ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 + msgid "Battery Monitor" +-msgstr "Baterijas Novērotājs" ++msgstr "Baterijas novērotājs" + + #: ../panel-plugin/battery.c:1212 + msgid "Low percentage:" +-msgstr "Procenti zemajam līmenim:" ++msgstr "Zems līmenis:" + + #: ../panel-plugin/battery.c:1223 + msgid "Critical percentage:" +-msgstr "Procenti kritiskajam līmenim:" ++msgstr "Kritisks līmenis:" + + #: ../panel-plugin/battery.c:1236 + msgid "Low battery action:" +-msgstr "Zema baterijas līmēņa darbības:" ++msgstr "Zema baterijas līmeņa darbība:" + +-#: ../panel-plugin/battery.c:1242 +-#: ../panel-plugin/battery.c:1283 ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 + msgid "Do nothing" + msgstr "Nedarīt neko" + +-#: ../panel-plugin/battery.c:1244 +-#: ../panel-plugin/battery.c:1285 ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 + msgid "Display a warning message" +-msgstr "Rādit brīdinājuma paziņojumu" ++msgstr "Rādīt brīdinājuma paziņojumu" + +-#: ../panel-plugin/battery.c:1246 +-#: ../panel-plugin/battery.c:1287 ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 + msgid "Run command" + msgstr "Izpildīt komandu" + +-#: ../panel-plugin/battery.c:1248 +-#: ../panel-plugin/battery.c:1289 ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 + msgid "Run command in terminal" + msgstr "Izpildīt komandu terminālī" + +-#: ../panel-plugin/battery.c:1261 +-#: ../panel-plugin/battery.c:1301 ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 + msgid "Command:" + msgstr "Komanda:" + +@@ -115,15 +125,15 @@ + + #: ../panel-plugin/battery.c:1324 + msgid "Display label" +-msgstr "Rādit etiķeti" ++msgstr "Rādīt etiķeti" + + #: ../panel-plugin/battery.c:1327 + msgid "Display percentage" +-msgstr "Rādit procentus" ++msgstr "Rādīt procentus" + + #: ../panel-plugin/battery.c:1330 + msgid "Display time" +-msgstr "Rādit laiku" ++msgstr "Rādīt laiku" + + #: ../panel-plugin/battery.c:1333 + msgid "Hide time/percentage when full" +@@ -139,7 +149,7 @@ + + #: ../panel-plugin/battery.c:1342 + msgid "Display power" +-msgstr "Rādit enerģiju" ++msgstr "Rādīt enerģiju" + + #: ../panel-plugin/battery.c:1345 + msgid "Display icon" +@@ -147,5 +157,5 @@ + + #: ../panel-plugin/battmon.desktop.in.in.h:2 + msgid "Show and monitor the battery status" +-msgstr "Rādīt un novērtot baterijas stāvokli" ++msgstr "Rādīt un novērot baterijas stāvokli" + +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/nb.po xfce4-battery-plugin-0.5.1/po/nb.po +--- xfce4-battery-plugin-0.5.1.orig/po/nb.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/nb.po 2010-12-18 19:27:33.136625569 +0100 +@@ -0,0 +1,154 @@ ++# Norwegian Bokmal translations for xfce4-battery-plugin package. ++# Copyright (C) 2007 THE xfce4-battery-plugin'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the xfce4-battery-plugin package. ++# Terje Uriansrud , 2007. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin 0.5.0svn-r2842\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2007-06-20 14:12+0200\n" ++"Last-Translator: Terje Uriansrud \n" ++"Language-Team: Norwegian Bokmal \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Lader fra nett)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(Nettdrift)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) gjenstående" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d gjenstående" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% gjenstående" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "Batteridrift" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "" ++"WARNING: Your battery has reached critical status. You should plug in or " ++"shutdown your computer now to avoid possible data loss." ++msgstr "" ++"Advarsel: Batteriet har nådd kritisk lavt nivå. Du burde koble til nettdrift " ++"eller skru av datamaskinen nå for å unngå tap av data." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "" ++"WARNING: Your battery is running low. You should consider plugging in or " ++"shutting down your computer soon to avoid possible data loss." ++msgstr "" ++"Advarsel: Batteriet begynner å gå tomt for strøm. Du burde vurdere å gå " ++"over til nettdrift eller skru av datamaskinen snart for å unngå tap av " ++"data." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Batteri" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Velg fil" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Velg kommando" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Klarte ikke åpne url: %s" ++ ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Batteriovervåkning" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Lav prosent:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Kritisk prosent:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "Lavt batteri aksjon" ++ ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "Gjør ingenting" ++ ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Vis en advarsel" ++ ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Kjør kommando" ++ ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Kjør kommando i terminal" ++ ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Kommando:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "Kritisk batteri aksjon" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Vis etikett" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Vis prosent" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Vis tid" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Skjul tid/prosent når fullladet" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "Vis prosent i verktøytips" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "Vis gjenstående tid i verktøytips" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Vis tilkoblingsmodus" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "Vis ikon" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Vis og overvåk batteristatus" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/nl.po xfce4-battery-plugin-0.5.1/po/nl.po +--- xfce4-battery-plugin-0.5.1.orig/po/nl.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/nl.po 2010-12-18 19:27:33.136625569 +0100 +@@ -0,0 +1,143 @@ ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2008-07-15 22:17+0200\n" ++"Last-Translator: Mohamed Magdy \n" ++"Language-Team: Arabeyes \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Arabic\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Opladen van Netspanning)" ++ ++#: ../panel-plugin/battery.c:491 ++#, fuzzy ++msgid "(AC on-line)" ++msgstr " (Netstroomadapter ingeplugd)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%%(%02d:%02d ) resterend" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d resterend" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% resterend" ++ ++#: ../panel-plugin/battery.c:506 ++#, fuzzy ++msgid "AC off-line" ++msgstr "Netstroomadapter is niet ingeplugd" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "WAARSCHUWING: De batterij heeft kritieke status bereikt. U moet uw computer op netstroom aansluiten of uitzetten om mogelijke gegevensverlies te voorkomen." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "WAARSCHUWING: De batterij is bijna leeg. U moet overwegen uw computer op netstroom aan te sluiten of uit te zetten om mogelijke gegevensverlies te voorkomen." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Batterij" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Selecteer bestand" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Selecteer commando" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Kan de volgende URL niet openen: %s" ++ ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Batterij Monitor" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Laag percentage:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Kritiek percentage:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "Actie wanneer de accu bijna leeg is:" ++ ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "Niets doen" ++ ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Toon een waarschuwing" ++ ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Een commando uitvoeren" ++ ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Voer een commando uit in terminal" ++ ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Commando:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "Kritische batterij lading actie:" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Geef beschrijving weer" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Geef percentage weer" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Geef tijd weer" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Verberg tijd/percentage wanneer de batterij helemaal opgeladen is" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "Geef percentage in de tekstballon weer" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "Geef resterende tijd weer in de tekstballon" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Geef energie weer" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "Geef icoon weer" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Laat zien en houd toezicht op de status van de batterij" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/pa.po xfce4-battery-plugin-0.5.1/po/pa.po +--- xfce4-battery-plugin-0.5.1.orig/po/pa.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/pa.po 2010-12-18 19:27:33.136625569 +0100 +@@ -0,0 +1,150 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# A S Alam , 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2009-10-19 08:05+0530\n" ++"Last-Translator: A S Alam \n" ++"Language-Team: Punjabi/Panjabi \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(AC ਤੋਂ ਚਾਰਜ ਹੋ ਰਹੀ ਹੈ)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(AC ਆਨਲਾਈਨ)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) ਬਾਕੀ" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d ਬਾਕੀ" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% ਬਾਕੀ" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "AC ਆਫਲਾਈਨ" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "" ++"WARNING: Your battery has reached critical status. You should plug in or " ++"shutdown your computer now to avoid possible data loss." ++msgstr "" ++ ++#: ../panel-plugin/battery.c:584 ++msgid "" ++"WARNING: Your battery is running low. You should consider plugging in or " ++"shutting down your computer soon to avoid possible data loss." ++msgstr "" ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "ਬੈਟਰੀ" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "ਫਾਇਲ ਚੁਣੋ" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "ਕਮਾਂਡ ਚੁਣੋ" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "ਅੱਗੇ ਦਿੱਤਾ url ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ: %s" ++ ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "ਬੈਟਰੀ ਮਾਨੀਟਰ" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "ਘੱਟ ਫੀਸਦੀ:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "ਨਾਜ਼ੁਕ ਫੀਸਦੀ:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "ਘੱਟ ਬੈਟਰੀ ਐਕਸ਼ਨ:" ++ ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "ਕੁਝ ਨਾ ਕਰੋ" ++ ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "ਚੇਤਵਾਨੀ ਸੁਨੇਹਾ ਵੇਖਾਓ" ++ ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "ਕਮਾਂਡ ਚਲਾਓ" ++ ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "ਟਰਮੀਨਲ 'ਚ ਕਮਾਂਡ ਚਲਾਓ" ++ ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "ਕਮਾਂਡ:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "ਨਾਜ਼ੁਕ ਬੈਟਰੀ ਐਕਸ਼ਨ:" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "ਲੇਬਲ ਵੇਖੋ" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "ਫੀਸਦੀ ਵੇਖੋ" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "ਸਮਾਂ ਵੇਖੋ" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "ਜਦੋਂ ਪੂਰੀ ਹੋਵੇ ਤਾਂ ਸਮਾਂ/ਫੀਸਦੀ ਓਹਲੇ" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "ਟੂਲਟਿੱਪ ਵਿੱਚ ਫੀਸਦੀ ਵੇਖੋ" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "ਟੂਲਟਿੱਪ ਵਿੱਚ ਬਾਕੀ ਰਹਿੰਦਾ ਸਮਾਂ ਵੇਖੋ" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "ਪਾਵਰ ਵੇਖੋ" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "ਆਈਕਾਨ ਵੇਖੋ" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "ਬੈਟਰੀ ਹਾਲਤ ਵੇਖੋ ਅਤੇ ਨਿਗਰਾਨੀ ਕਰੋ" ++ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/pl.po xfce4-battery-plugin-0.5.1/po/pl.po +--- xfce4-battery-plugin-0.5.1.orig/po/pl.po 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/pl.po 2010-12-18 19:27:33.136625569 +0100 +@@ -8,8 +8,8 @@ + "Project-Id-Version: xfce4-battery-plugin 0.5.0\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-12-20 17:45+0100\n" +-"PO-Revision-Date: 2006-04-08 12:19+0900\n" +-"Last-Translator: Piotr Maliński \n" ++"PO-Revision-Date: 2009-02-03 12:47+0100\n" ++"Last-Translator: Piotr Sokół \n" + "Language-Team: Polish \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" +@@ -17,11 +17,11 @@ + + #: ../panel-plugin/battery.c:491 + msgid "(Charging from AC)" +-msgstr "(Ładuję z AC)" ++msgstr "(Ładowanie z sieci)" + + #: ../panel-plugin/battery.c:491 + msgid "(AC on-line)" +-msgstr "(AC podłączone)" ++msgstr "(Podłączony do sieci)" + + #: ../panel-plugin/battery.c:500 + #, c-format +@@ -43,20 +43,12 @@ + msgstr "Brak zasilania" + + #: ../panel-plugin/battery.c:570 +-msgid "" +-"WARNING: Your battery has reached critical status. You should plug in or " +-"shutdown your computer now to avoid possible data loss." +-msgstr "" +-"UWAGA: Bateria jest prawie rozładowana. Powinieneś wyłączyć komputer lub " +-"podłączyć zasilanie by uniknąć potencjalnej utraty danych." ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "UWAGA: Bateria została prawie całkowicie rozładowana. Zaleca się wyłączyć komputer lub podłączyć zasilanie sieciowe aby uniknąć potencjalnej utraty danych." + + #: ../panel-plugin/battery.c:584 +-msgid "" +-"WARNING: Your battery is running low. You should consider plugging in or " +-"shutting down your computer soon to avoid possible data loss." +-msgstr "" +-"UWAGA: Pojemność baterii spada. Powinieneś wyłączyć komputer lub podłączyć " +-"zasilanie by uniknąć potencjalnej utraty danych." ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "UWAGA: Pojemność baterii spada. Zaleca się wyłączyć komputer lub podłączyć zasilanie sieciowe aby uniknąć potencjalnej utraty danych." + + #: ../panel-plugin/battery.c:673 + msgid "Battery" +@@ -73,11 +65,12 @@ + #: ../panel-plugin/battery.c:1159 + #, c-format + msgid "Unable to open the following url: %s" +-msgstr "Nie można otworzyć URL: %s" ++msgstr "Nie można otworzyć adresu URL: %s" + +-#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++#: ../panel-plugin/battery.c:1183 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 + msgid "Battery Monitor" +-msgstr "Monitor Baterii" ++msgstr "Monitor baterii" + + #: ../panel-plugin/battery.c:1212 + msgid "Low percentage:" +@@ -89,43 +82,48 @@ + + #: ../panel-plugin/battery.c:1236 + msgid "Low battery action:" +-msgstr "Akcja dla stanu niskiego:" ++msgstr "Akcja stanu niskiego:" + +-#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++#: ../panel-plugin/battery.c:1242 ++#: ../panel-plugin/battery.c:1283 + msgid "Do nothing" +-msgstr "Nic nie rób" ++msgstr "Brak" + +-#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++#: ../panel-plugin/battery.c:1244 ++#: ../panel-plugin/battery.c:1285 + msgid "Display a warning message" + msgstr "Wyświetl ostrzeżenie" + +-#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++#: ../panel-plugin/battery.c:1246 ++#: ../panel-plugin/battery.c:1287 + msgid "Run command" + msgstr "Wykonaj polecenie" + +-#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++#: ../panel-plugin/battery.c:1248 ++#: ../panel-plugin/battery.c:1289 + msgid "Run command in terminal" + msgstr "Wykonaj polecenie w terminalu" + +-#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++#: ../panel-plugin/battery.c:1261 ++#: ../panel-plugin/battery.c:1301 + msgid "Command:" + msgstr "Polecenie:" + + #: ../panel-plugin/battery.c:1277 + msgid "Critical battery action:" +-msgstr "Akcja dla stanu krytycznego:" ++msgstr "Akcja stanu krytycznego:" + + #: ../panel-plugin/battery.c:1324 + msgid "Display label" +-msgstr "Wyświetl etykietę" ++msgstr "Etykieta" + + #: ../panel-plugin/battery.c:1327 + msgid "Display percentage" +-msgstr "Wyświetl procenty" ++msgstr "Procenty" + + #: ../panel-plugin/battery.c:1330 + msgid "Display time" +-msgstr "Wyświetl czas" ++msgstr "Pozostały czas" + + #: ../panel-plugin/battery.c:1333 + msgid "Hide time/percentage when full" +@@ -133,19 +131,19 @@ + + #: ../panel-plugin/battery.c:1336 + msgid "Display percentage in tooltip" +-msgstr "Wyświetl procenty w dymku" ++msgstr "Procenty w podpowiedzi" + + #: ../panel-plugin/battery.c:1339 + msgid "Display time remaining in tooltip" +-msgstr "Wyświetl pozostały czas w dymku" ++msgstr "Pozostały czas w podpowiedzi" + + #: ../panel-plugin/battery.c:1342 + msgid "Display power" +-msgstr "Wyświetl moc" ++msgstr "Moc" + + #: ../panel-plugin/battery.c:1345 + msgid "Display icon" +-msgstr "Wyświetl ikonę" ++msgstr "Ikona" + + #: ../panel-plugin/battmon.desktop.in.in.h:2 + msgid "Show and monitor the battery status" +@@ -153,3 +151,4 @@ + + #~ msgid "Configure Battery Monitor" + #~ msgstr "Konfiguracja Monitora Baterii" ++ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/pt.po xfce4-battery-plugin-0.5.1/po/pt.po +--- xfce4-battery-plugin-0.5.1.orig/po/pt.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/pt.po 2010-12-18 19:27:33.137625477 +0100 +@@ -0,0 +1,144 @@ ++# Europen Portuguese translation of xfce4-battery-plugin. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# Nuno Miguel , 2007. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin 0.5.0\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2007-06-30 11:42+0100\n" ++"Last-Translator: Nuno Miguel \n" ++"Language-Team: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Carregando da corrente)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(Ligado à corrente)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) restante" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d restante" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% restante" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "A trabalhar com bateria" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "Aviso: A sua bateria chegou ao estado crítico. Deve ligar à corrente ou desligar o computador para evitar perda de dados." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "Aviso: A sua bateria está fraca. Considere ligar à corrente ou desligar o computador rapidamente para evitar perda de dados." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Bateria" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Seleccione o ficheiro" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Seleccione o comando" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Incapaz de abrir o seguinte url: %s" ++ ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Monitor de bateria" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Baixa percentagem:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Percentagem crítica:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "Acção para bateria fraca:" ++ ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "Nada fazer" ++ ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Mostrar uma mensagem de aviso" ++ ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Executar comando" ++ ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Executar comando no terminal" ++ ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Comando:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "Acção para bateria crítica:" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Exibir texto" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Exibir percentagem" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Exibir tempo" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Ocultar tempo/percentagem quando cheia" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "Exibir percentagem como aviso" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "Exibir tempo restante como aviso " ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Exibir energia" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "exibir ícone" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Mostrar e monitorizar o estado da bateria" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ru.po xfce4-battery-plugin-0.5.1/po/ru.po +--- xfce4-battery-plugin-0.5.1.orig/po/ru.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/ru.po 2010-12-18 19:27:33.137625477 +0100 +@@ -0,0 +1,148 @@ ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: \n" ++"Last-Translator: Urmas \n" ++"Language-Team: None <->\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Russian\n" ++"X-Poedit-Country: RUSSIAN FEDERATION\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Зарядка от сети)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(От сети)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "Осталось %d%% (%02d:%02d)" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "Осталось %02d:%02d" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "Осталось %d%%" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "Отключен" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "ВНИМАНИЕ: Ваша батарея разрядилась до критически низкого уровня. Подключитесь к электросети или выключите компьютер во избежание потери данных." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "ВНИМАНИЕ: Ваша батарея разрядилась. Скоро вам потребуется подключиться к электросети или выключить компьютер во избежание потери данных." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Батарея" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Выбор файла" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Выбор команды" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Не удалось открыть адрес: %s" ++ ++#: ../panel-plugin/battery.c:1183 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Индикатор батареи" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Уровень низкого заряда:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Уровень критически низкого заряда:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "Действие при низком заряде:" ++ ++#: ../panel-plugin/battery.c:1242 ++#: ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "Ничего не делать" ++ ++#: ../panel-plugin/battery.c:1244 ++#: ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Показать предупреждение" ++ ++#: ../panel-plugin/battery.c:1246 ++#: ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Запустить команду" ++ ++#: ../panel-plugin/battery.c:1248 ++#: ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Запустить команду в терминале" ++ ++#: ../panel-plugin/battery.c:1261 ++#: ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Команда:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "Действие при критически низком заряде:" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Метка" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Уровень в процентах" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Оставшееся время" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Скрывать при полном заряде" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "Отображение в подсказке заряда в процентах" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "Отображать в подсказке оставшееся время работы" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Подключение к электросети" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "Значок" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Отслеживает состояние батареи" ++ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/sq.po xfce4-battery-plugin-0.5.1/po/sq.po +--- xfce4-battery-plugin-0.5.1.orig/po/sq.po 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/sq.po 2010-12-18 19:27:33.137625477 +0100 +@@ -8,17 +8,16 @@ + "Project-Id-Version: xfce4-battery-plugin 0.5.0\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-12-20 17:45+0100\n" +-"PO-Revision-Date: 2007-01-30 21:09+0200\n" ++"PO-Revision-Date: 2008-11-04 22:50+0200\n" + "Last-Translator: Besnik Bleta \n" + "Language-Team: Albanian \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + +- + #: ../panel-plugin/battery.c:491 + msgid "(Charging from AC)" +-msgstr "(Po e ngarkoj prej AC-së)" ++msgstr "(Po e ngarkon prej AC-së)" + + #: ../panel-plugin/battery.c:491 + msgid "(AC on-line)" +@@ -66,7 +65,7 @@ + #: ../panel-plugin/battery.c:1159 + #, c-format + msgid "Unable to open the following url: %s" +-msgstr "I pazoti të hap url-në vijuese: %s" ++msgstr "I pazoti të hapë url-në vijuese: %s" + + #: ../panel-plugin/battery.c:1183 + #: ../panel-plugin/battmon.desktop.in.in.h:1 +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/sv.po xfce4-battery-plugin-0.5.1/po/sv.po +--- xfce4-battery-plugin-0.5.1.orig/po/sv.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/sv.po 2010-12-18 19:27:33.137625477 +0100 +@@ -0,0 +1,152 @@ ++# Swedish translation for xfce4-battery-plugin. ++# Copyright (C) 2008, 2009 Free Software Foundation, Inc. ++# This file is distributed under the same license as the xfce4-battery-plugin package. ++# Daniel Nylander , 2008, 2009. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2009-02-01 18:41+0100\n" ++"PO-Revision-Date: 2009-02-01 18:44+0100\n" ++"Last-Translator: Daniel Nylander \n" ++"Language-Team: Swedish \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: ../panel-plugin/battery.c:494 ++msgid "(Charging from AC)" ++msgstr "(Laddar upp från extern strömkälla)" ++ ++#: ../panel-plugin/battery.c:494 ++msgid "(AC on-line)" ++msgstr "(Extern ström ansluten)" ++ ++#: ../panel-plugin/battery.c:503 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) återstår" ++ ++#: ../panel-plugin/battery.c:505 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d återstår" ++ ++#: ../panel-plugin/battery.c:507 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% återstår" ++ ++#: ../panel-plugin/battery.c:509 ++#, c-format ++msgid "AC off-line" ++msgstr "Extern ström frånkopplad" ++ ++#: ../panel-plugin/battery.c:573 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "VARNING: Ditt batteri har nått kritisk status. Du bör ansluta en extern strömkälla eller stänga av din dator nu för att undvika att data går förlorat." ++ ++#: ../panel-plugin/battery.c:587 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "VARNING: Ditt batteri börjar få låg laddningskapacitet. Du bör överväga att ansluta en extern strömkälla eller stänga av din dator snart för att undvika att data går förlorat." ++ ++#: ../panel-plugin/battery.c:672 ++msgid "Battery" ++msgstr "Batteri" ++ ++#: ../panel-plugin/battery.c:1098 ++msgid "Select file" ++msgstr "Välj fil" ++ ++#: ../panel-plugin/battery.c:1139 ++msgid "Select command" ++msgstr "Välj kommando" ++ ++#: ../panel-plugin/battery.c:1158 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Kunde inte öppna följande url: %s" ++ ++#: ../panel-plugin/battery.c:1182 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Batteriövervakare" ++ ++#: ../panel-plugin/battery.c:1211 ++msgid "Low percentage:" ++msgstr "Låg procentandel:" ++ ++#: ../panel-plugin/battery.c:1222 ++msgid "Critical percentage:" ++msgstr "Kritisk procentandel:" ++ ++#: ../panel-plugin/battery.c:1235 ++msgid "Low battery action:" ++msgstr "Åtgärd för låg batterikapacitet:" ++ ++#: ../panel-plugin/battery.c:1241 ++#: ../panel-plugin/battery.c:1282 ++msgid "Do nothing" ++msgstr "Gör ingenting" ++ ++#: ../panel-plugin/battery.c:1243 ++#: ../panel-plugin/battery.c:1284 ++msgid "Display a warning message" ++msgstr "Visa ett varningsmeddelande" ++ ++#: ../panel-plugin/battery.c:1245 ++#: ../panel-plugin/battery.c:1286 ++msgid "Run command" ++msgstr "Kör kommando" ++ ++#: ../panel-plugin/battery.c:1247 ++#: ../panel-plugin/battery.c:1288 ++msgid "Run command in terminal" ++msgstr "Kör kommando i terminal" ++ ++#: ../panel-plugin/battery.c:1260 ++#: ../panel-plugin/battery.c:1300 ++msgid "Command:" ++msgstr "Kommando:" ++ ++#: ../panel-plugin/battery.c:1276 ++msgid "Critical battery action:" ++msgstr "Åtgärd för kritisk batterikapacitet:" ++ ++#: ../panel-plugin/battery.c:1323 ++msgid "Display label" ++msgstr "Visa etikett" ++ ++#: ../panel-plugin/battery.c:1326 ++msgid "Display percentage" ++msgstr "Visa procentandel" ++ ++#: ../panel-plugin/battery.c:1329 ++msgid "Display time" ++msgstr "Visa tid" ++ ++#: ../panel-plugin/battery.c:1332 ++msgid "Hide time/percentage when full" ++msgstr "Dölj tid/procentandel vid fullständig laddning" ++ ++#: ../panel-plugin/battery.c:1335 ++msgid "Display percentage in tooltip" ++msgstr "Visa procentandel i verktygstips" ++ ++#: ../panel-plugin/battery.c:1338 ++msgid "Display time remaining in tooltip" ++msgstr "Visa återstående tid i verktygstips" ++ ++#: ../panel-plugin/battery.c:1341 ++msgid "Display power" ++msgstr "Visa strömkapacitet" ++ ++#: ../panel-plugin/battery.c:1344 ++msgid "Display icon" ++msgstr "Visa ikon" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Visa och övervaka batteristatus" ++ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/tr.po xfce4-battery-plugin-0.5.1/po/tr.po +--- xfce4-battery-plugin-0.5.1.orig/po/tr.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/tr.po 2010-12-18 19:27:33.137625477 +0100 +@@ -0,0 +1,149 @@ ++msgid "" ++msgstr "" ++"Project-Id-Version: XFCE\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: \n" ++"Last-Translator: Utku Aydın \n" ++"Language-Team: XFCE Türkiye\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Turkish\n" ++"X-Poedit-Country: TURKEY\n" ++"X-Poedit-SourceCharset: utf-8\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Fişten şarj ediyor)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "Fişe takılı" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) kaldı" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d kaldı" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% kaldı" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "Fişe takılı değil" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "UYARI: Piliniz çok az. Bilgisayarınızı hemen fişe takın veya kapatın yoksa veri kaybı yaşayabilirsiniz." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "UYARI: Piliniz bitmek üzere. Bilgisayarınızı en kısa sürede fişe takın ya da kapatın, aksi takdirde veri kaybı yaşayabilirsiniz." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Pil" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Dosya seç" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Komut seç" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Belirtilen URL açılamadı: %s" ++ ++#: ../panel-plugin/battery.c:1183 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Pil Gözlemcisi" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Düşük doluluk oranı:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Kritik doluluk oranı:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "Pil seviyesi düşük olduğunda gerçekleştirilecek işlem:" ++ ++#: ../panel-plugin/battery.c:1242 ++#: ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "Bir şey yapma" ++ ++#: ../panel-plugin/battery.c:1244 ++#: ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Hata mesajı göster" ++ ++#: ../panel-plugin/battery.c:1246 ++#: ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Komut çalıştır" ++ ++#: ../panel-plugin/battery.c:1248 ++#: ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Terminalde komut çalıştır" ++ ++#: ../panel-plugin/battery.c:1261 ++#: ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Komut:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "Pil seviyesi kritik olduğunda gerçekleştirilecek işlem:" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Etiketi göster" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Doluluk oranını göster" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Saati göster" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Doluyken saati/doluluk oranını gizle" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "İpucunda doluluk oranını göster" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "İpucunda kalan pil süresini göster" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Gücü göster" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "Simgeyi göster" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Pil durumunu göster ve gözlemle" ++ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ug.po xfce4-battery-plugin-0.5.1/po/ug.po +--- xfce4-battery-plugin-0.5.1.orig/po/ug.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/ug.po 2010-12-18 19:27:33.137625477 +0100 +@@ -0,0 +1,152 @@ ++# Uyghur translations for xfce4-battery-plugin package. ++# Copyright (C) Eduard Roccatello ++# This file is distributed under the same license as the xfce4-battery-plugin package. ++# Gheyret T.Kenji , 2010. ++# ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2008-12-05 22:54+0900\n" ++"PO-Revision-Date: 2008-12-06 23:24+0900\n" ++"Last-Translator: Gheyret T.Kenji \n" ++"Language-Team: Uyghur Computer Science Association \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: ../panel-plugin/battery.c:494 ++msgid "(Charging from AC)" ++msgstr "(AC دىن توكلاۋاتىدۇ)" ++ ++#: ../panel-plugin/battery.c:494 ++msgid "(AC on-line)" ++msgstr "(AC غا ئۇلاقلىق)" ++ ++#: ../panel-plugin/battery.c:503 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) قالدى" ++ ++#: ../panel-plugin/battery.c:505 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d قالدى" ++ ++#: ../panel-plugin/battery.c:507 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% قالدى" ++ ++#: ../panel-plugin/battery.c:509 ++#, c-format ++msgid "AC off-line" ++msgstr "AC ئۇلانماپتۇ" ++ ++#: ../panel-plugin/battery.c:573 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "دىققەت: توكدان تۈگەي دەپلا قالدى، سانلىق ئاساسلارنىڭ يوقاپ كەتمەسلىكى ئۈچۈن توكقا ئۇلاش ياكى كومپيۇتېرنى ئېتىشنى تېزدىن بېكىتىڭ." ++ ++#: ../panel-plugin/battery.c:587 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "دىققەت: توكداننىڭ توكى ئاز قالدى. سانلىق ئاساسلارنىڭ يوقاپ كەتمەسلىكى ئۈچۈن توكقا ئۇلاش ياكى كومپيۇتېرنى ئېتىشنى ئويلىشىپ كۆرۈڭ." ++ ++#: ../panel-plugin/battery.c:672 ++msgid "Battery" ++msgstr "توكدان" ++ ++#: ../panel-plugin/battery.c:1098 ++msgid "Select file" ++msgstr "ھۆججەت تاللا" ++ ++#: ../panel-plugin/battery.c:1139 ++msgid "Select command" ++msgstr "بۇيرۇق تاللا" ++ ++#: ../panel-plugin/battery.c:1158 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "次の URL を開くことができません: %s" ++ ++#: ../panel-plugin/battery.c:1182 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "توكدان كۆزەتكۈ" ++ ++#: ../panel-plugin/battery.c:1211 ++msgid "Low percentage:" ++msgstr "ئاز قالدىنىڭ پىرسەنتى:" ++ ++#: ../panel-plugin/battery.c:1222 ++msgid "Critical percentage:" ++msgstr "تۈگەي دەپ قالدىنىڭ پىرسەنتى:" ++ ++#: ../panel-plugin/battery.c:1235 ++msgid "Low battery action:" ++msgstr "توك ئاز قالغاندا ئېلىپ بارىدىغان مەشغۇلات:" ++ ++#: ../panel-plugin/battery.c:1241 ++#: ../panel-plugin/battery.c:1282 ++msgid "Do nothing" ++msgstr "ھېچ ئىش قىلما" ++ ++#: ../panel-plugin/battery.c:1243 ++#: ../panel-plugin/battery.c:1284 ++msgid "Display a warning message" ++msgstr "دىققەت ئۇچۇرى چىقىرىش" ++ ++#: ../panel-plugin/battery.c:1245 ++#: ../panel-plugin/battery.c:1286 ++msgid "Run command" ++msgstr "بۇيرۇق ئىجرا قىل" ++ ++#: ../panel-plugin/battery.c:1247 ++#: ../panel-plugin/battery.c:1288 ++msgid "Run command in terminal" ++msgstr "تېرمىنالدا بۇيرۇق ئىجرا قىل" ++ ++#: ../panel-plugin/battery.c:1260 ++#: ../panel-plugin/battery.c:1300 ++msgid "Command:" ++msgstr "بۇيرۇق:" ++ ++#: ../panel-plugin/battery.c:1276 ++msgid "Critical battery action:" ++msgstr "توك تۈگەي دەپ قالغاندا ئېلىپ بارىدىغان مەشغۇلات:" ++ ++#: ../panel-plugin/battery.c:1323 ++msgid "Display label" ++msgstr "ئەن كۆرسەت" ++ ++#: ../panel-plugin/battery.c:1326 ++msgid "Display percentage" ++msgstr "قالدۇق پىرسەنتىنى كۆرسەت" ++ ++#: ../panel-plugin/battery.c:1329 ++msgid "Display time" ++msgstr "ۋاقىت كۆرسەت" ++ ++#: ../panel-plugin/battery.c:1332 ++msgid "Hide time/percentage when full" ++msgstr "تولۇق توكلانغاندا ۋاقىت ۋە ئاز قالدۇق پىرسەنتىنى يوشۇر" ++ ++#: ../panel-plugin/battery.c:1335 ++msgid "Display percentage in tooltip" ++msgstr "قالدۇقنى tooltip تا كۆرسەت" ++ ++#: ../panel-plugin/battery.c:1338 ++msgid "Display time remaining in tooltip" ++msgstr "قالغان ۋاقىتنى tooltip تا كۆرسەت" ++ ++#: ../panel-plugin/battery.c:1341 ++msgid "Display power" ++msgstr "توك مەنبەسىنى كۆرسەت" ++ ++#: ../panel-plugin/battery.c:1344 ++msgid "Display icon" ++msgstr "سىنبەلگە كۆرسەت" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "توكدان ھالىتىنى كۆزىتىپ كۆرسەت" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ur_PK.po xfce4-battery-plugin-0.5.1/po/ur_PK.po +--- xfce4-battery-plugin-0.5.1.orig/po/ur_PK.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/ur_PK.po 2010-12-18 19:27:33.137625477 +0100 +@@ -0,0 +1,155 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR , YEAR. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2009-05-14 02:41+0500\n" ++"Last-Translator: Muhammad Ali Makki \n" ++"Language-Team: Urdu \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Urdu\n" ++"X-Poedit-Country: PAKISTAN\n" ++"X-Poedit-SourceCharset: utf-8\n" ++"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(چارجر سے چارجنگ جاری ہے)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(چارجر لگا ہوا ہے)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "%d%% (%02d:%02d) باقی ہے" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "%02d:%02d باقی ہے" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "%d%% باقی ہے" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "چارجر لگا ہوا نہیں ہے" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "انتباہ: آپ کی بیٹری خطرناک حد تک پہنچ گئی ہے. فوری طور پر چارج کریں یا کمپیوٹر بند کردیں تاکہ ڈیٹا کے کسی قسم کے نقصان سے بچا جاسکے." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "انتباہ: آپ کی بیٹری کم ہوگئی ہے. اسے فوری طور پر چارج کریں یا جلد ہی اپنا کمپیوٹر بند کردیں تاکہ کسی قسم کے ڈیٹا کے نقصان سے بچا جاسکے." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "بیٹری" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "فائل منتخب کریں" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "کمانڈ منتخب کریں" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "یہ url کھولنے میں ناکامی: %s" ++ ++#: ../panel-plugin/battery.c:1183 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "بیٹری مانیٹر" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "کم فیصد:" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "خطرناک فیصد:" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "کم بیٹری حرکت:" ++ ++#: ../panel-plugin/battery.c:1242 ++#: ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "کچھ نہ کریں" ++ ++#: ../panel-plugin/battery.c:1244 ++#: ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "انتباہی پیغام دکھائیں" ++ ++#: ../panel-plugin/battery.c:1246 ++#: ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "کمانڈ چلائیں" ++ ++#: ../panel-plugin/battery.c:1248 ++#: ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "کمانڈ ٹرمنل میں چلائیں" ++ ++#: ../panel-plugin/battery.c:1261 ++#: ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "کمانڈ:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "خطرناک بیٹری حرکت:" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "لیبل دکھائیں" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "فیصد دکھائیں" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "وقت دکھائیں" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "فُل ہونے پر وقت/فیصد مت دکھائیں" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "فیصد ٹول ٹپ میں دکھائیں" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "بقیہ وقت ٹول ٹپ میں دکھائیں" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "پاور دکھائیں" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "آئکن دکھائیں" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "ظاہر کریں اور بیٹری کی حالت دیکھتے رہیں" ++ +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ur.po xfce4-battery-plugin-0.5.1/po/ur.po +--- xfce4-battery-plugin-0.5.1.orig/po/ur.po 2008-09-04 22:53:40.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/po/ur.po 2010-12-18 19:27:33.137625477 +0100 +@@ -8,8 +8,8 @@ + "Project-Id-Version: xfce4-battery-plugin\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2006-12-20 17:45+0100\n" +-"PO-Revision-Date: 2007-10-26 17:39+0500\n" +-"Last-Translator: Muhammad Ali Makki \n" ++"PO-Revision-Date: 2009-05-14 02:41+0500\n" ++"Last-Translator: Muhammad Ali Makki \n" + "Language-Team: Urdu \n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=utf-8\n" +@@ -17,14 +17,15 @@ + "X-Poedit-Language: Urdu\n" + "X-Poedit-Country: PAKISTAN\n" + "X-Poedit-SourceCharset: utf-8\n" ++"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" + + #: ../panel-plugin/battery.c:491 + msgid "(Charging from AC)" +-msgstr "(ACسے چارجنگ)" ++msgstr "(چارجر سے چارجنگ جاری ہے)" + + #: ../panel-plugin/battery.c:491 + msgid "(AC on-line)" +-msgstr "(AC آن لائن)" ++msgstr "(چارجر لگا ہوا ہے)" + + #: ../panel-plugin/battery.c:500 + #, c-format +@@ -43,7 +44,7 @@ + + #: ../panel-plugin/battery.c:506 + msgid "AC off-line" +-msgstr "AC آف لائن" ++msgstr "چارجر لگا ہوا نہیں ہے" + + #: ../panel-plugin/battery.c:570 + msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/vi.po xfce4-battery-plugin-0.5.1/po/vi.po +--- xfce4-battery-plugin-0.5.1.orig/po/vi.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/vi.po 2010-12-18 19:27:33.137625477 +0100 +@@ -0,0 +1,154 @@ ++# Vietnamese translations for xfce-battery package. ++# Copyright (C) 2009 THE i'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the i package. ++# Nguyễn Quốc Vinh, , 2009 ++# Automatically generated, 2009. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2006-12-20 17:45+0100\n" ++"Last-Translator: Nguyen Quoc Vinh \n" ++"Language-Team: none\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "(Đang sạc pin)" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "(Đang sử dụng điện nguồn)" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "Còn lại %d%% (%02d:%02d)" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "Còn lại %02d:%02d" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "Còn lại %d%%" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "Nguồn không có điện" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "" ++"WARNING: Your battery has reached critical status. You should plug in or " ++"shutdown your computer now to avoid possible data loss." ++msgstr "" ++"Cảnh báo: Pin đã đạt mức báo động! Bạn nên cắm điện vào hay tắt máy tính để " ++"tránh mất dữ liệu." ++ ++#: ../panel-plugin/battery.c:584 ++msgid "" ++"WARNING: Your battery is running low. You should consider plugging in or " ++"shutting down your computer soon to avoid possible data loss." ++msgstr "" ++"Cảnh báo: Pin của bạn đang còn ít! Bạn nên cắm điện vào hay tắt máy tính để " ++"tránh mất dữ liệu." ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "Pin" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "Chọn file" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "Chọn lệnh" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "Không thể mở url sau: %s" ++ ++#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "Giám sát Pin" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "Mức thấp" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "Mức báo động" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "Hành động khi pin ở mức thấp" ++ ++#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "Không làm gì cả" ++ ++#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "Hiển thị cảnh báo" ++ ++#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "Chạy lệnh" ++ ++#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "Chạy lệnh trong terminal" ++ ++#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "Lệnh:" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "Hành động khi pin đạt mức báo động" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "Hiển thị nhãn" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "Hiển thị phần trăm" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "Hiển thị thời gian" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "Ẩn thời gian/phần trăm khi đầy" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "Hiển thị phần trăm trên chú thích" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "Hiển thị thời gian còn lại trên chú thích" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "Hiển thị nguồn" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "Hiển thị biểu tượng" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "Hiển thị và giám sát tình trạng pin" +diff -Nur xfce4-battery-plugin-0.5.1.orig/po/zh_CN.po xfce4-battery-plugin-0.5.1/po/zh_CN.po +--- xfce4-battery-plugin-0.5.1.orig/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 ++++ xfce4-battery-plugin-0.5.1/po/zh_CN.po 2010-12-18 19:27:33.138625386 +0100 +@@ -0,0 +1,151 @@ ++# Chinese translations for xfce package. ++# Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the xfce package. ++# Hunt Xu ", 2008. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: xfce 4-battery-plugin\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2006-12-20 17:45+0100\n" ++"PO-Revision-Date: 2008-12-04 18:19+0800\n" ++"Last-Translator: Hunt Xu \n" ++"Language-Team: Chinese (simplified)\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(Charging from AC)" ++msgstr "（从交流电源充电）" ++ ++#: ../panel-plugin/battery.c:491 ++msgid "(AC on-line)" ++msgstr "（已连接至交流电源）" ++ ++#: ../panel-plugin/battery.c:500 ++#, c-format ++msgid "%d%% (%02d:%02d) remaining" ++msgstr "剩余 %d%% (%02d:%02d)" ++ ++#: ../panel-plugin/battery.c:502 ++#, c-format ++msgid "%02d:%02d remaining" ++msgstr "剩余 %02d:%02d" ++ ++#: ../panel-plugin/battery.c:504 ++#, c-format ++msgid "%d%% remaining" ++msgstr "剩余 %d%%" ++ ++#: ../panel-plugin/battery.c:506 ++msgid "AC off-line" ++msgstr "交流电源已断开" ++ ++#: ../panel-plugin/battery.c:570 ++msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." ++msgstr "警告：您的电池电量已达临界值。请接上电源或者关机以避免数据丢失。" ++ ++#: ../panel-plugin/battery.c:584 ++msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." ++msgstr "警告：您的电池电量低。请接上电源或者关机以避免数据丢失。" ++ ++#: ../panel-plugin/battery.c:673 ++msgid "Battery" ++msgstr "电池" ++ ++#: ../panel-plugin/battery.c:1099 ++msgid "Select file" ++msgstr "选择文件" ++ ++#: ../panel-plugin/battery.c:1140 ++msgid "Select command" ++msgstr "选择命令" ++ ++#: ../panel-plugin/battery.c:1159 ++#, c-format ++msgid "Unable to open the following url: %s" ++msgstr "无法打开以下网址：%s" ++ ++#: ../panel-plugin/battery.c:1183 ++#: ../panel-plugin/battmon.desktop.in.in.h:1 ++msgid "Battery Monitor" ++msgstr "电池监视器" ++ ++#: ../panel-plugin/battery.c:1212 ++msgid "Low percentage:" ++msgstr "低电量百分比：" ++ ++#: ../panel-plugin/battery.c:1223 ++msgid "Critical percentage:" ++msgstr "临界电量百分比：" ++ ++#: ../panel-plugin/battery.c:1236 ++msgid "Low battery action:" ++msgstr "电量低时采取如下动作：" ++ ++#: ../panel-plugin/battery.c:1242 ++#: ../panel-plugin/battery.c:1283 ++msgid "Do nothing" ++msgstr "什么都不做" ++ ++#: ../panel-plugin/battery.c:1244 ++#: ../panel-plugin/battery.c:1285 ++msgid "Display a warning message" ++msgstr "显示一条警告信息" ++ ++#: ../panel-plugin/battery.c:1246 ++#: ../panel-plugin/battery.c:1287 ++msgid "Run command" ++msgstr "执行命令" ++ ++#: ../panel-plugin/battery.c:1248 ++#: ../panel-plugin/battery.c:1289 ++msgid "Run command in terminal" ++msgstr "在终端中执行命令" ++ ++#: ../panel-plugin/battery.c:1261 ++#: ../panel-plugin/battery.c:1301 ++msgid "Command:" ++msgstr "命令：" ++ ++#: ../panel-plugin/battery.c:1277 ++msgid "Critical battery action:" ++msgstr "电量到达临界值时采取如下动作：" ++ ++#: ../panel-plugin/battery.c:1324 ++msgid "Display label" ++msgstr "显示标签" ++ ++#: ../panel-plugin/battery.c:1327 ++msgid "Display percentage" ++msgstr "显示百分比" ++ ++#: ../panel-plugin/battery.c:1330 ++msgid "Display time" ++msgstr "显示时间" ++ ++#: ../panel-plugin/battery.c:1333 ++msgid "Hide time/percentage when full" ++msgstr "当电池电量满时隐藏时间与百分比" ++ ++#: ../panel-plugin/battery.c:1336 ++msgid "Display percentage in tooltip" ++msgstr "在工具提示中显示百分比" ++ ++#: ../panel-plugin/battery.c:1339 ++msgid "Display time remaining in tooltip" ++msgstr "在工具提示中显示剩余时间" ++ ++#: ../panel-plugin/battery.c:1342 ++msgid "Display power" ++msgstr "显示电源状态" ++ ++#: ../panel-plugin/battery.c:1345 ++msgid "Display icon" ++msgstr "显示图标" ++ ++#: ../panel-plugin/battmon.desktop.in.in.h:2 ++msgid "Show and monitor the battery status" ++msgstr "显示并监测电池状态" ++ diff --git a/xfce4-battery-plugin-0.5.1-use-sysfs.patch b/xfce4-battery-plugin-0.5.1-use-sysfs.patch new file mode 100644 index 0000000..f2414c6 --- /dev/null +++ b/xfce4-battery-plugin-0.5.1-use-sysfs.patch @@ -0,0 +1,354 @@ +--- xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c 2008-04-06 02:56:10.502679698 +0200 ++++ xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c 2008-04-06 03:15:11.306678469 +0200 +@@ -54,6 +54,10 @@ + + static char batteries[MAXBATT][128]; + static char battinfo[MAXBATT][128]; ++/* path to AC adapter because not all AC adapter are listed ++in /sys/class/power_supply/AC/ this obviously only supports one AC adapter. */ ++static char sysfsacdir[128]; ++ + #ifndef __linux__ + #if HAVE_SYSCTL + static int +@@ -181,9 +185,76 @@ + #endif + #endif + ++int check_acpi_sysfs(void) ++{ ++ DIR *sysfs; ++ struct dirent *batt; ++ char *name; ++ FILE *typefile; ++ char typepath[128]; ++ char tmptype[8]; ++ ++ sysfs = opendir("/sys/class/power_supply"); ++ if (sysfs == 0) ++ { ++ #ifdef DEBUG ++ printf("DBG:No acpi support for sysfs. Trying procfs...\n"); ++ #endif ++ return 2; ++ } ++ ++ while ((batt = readdir(sysfs))) ++ { ++ name = batt->d_name; ++ if (!strncmp(".", name, 1)) continue; ++ /* check whether /sys/class/power_supply/$name/type exists and ++ contains "Battery" or "Mains" */ ++ sprintf(typepath, "/sys/class/power_supply/%s/type",name); ++ if(!(typefile = fopen(typepath, "r"))) continue; ++ fgets(tmptype, 8, typefile); ++ fclose(typefile); ++ if(strncmp("Battery", tmptype, 7)==0) ++ { ++ sprintf(batteries[batt_count], "/sys/class/power_supply/%s", name); ++ #ifdef DEBUG ++ printf("DBG:battery number %d at:\n",batt_count); ++ printf("DBG:sysfs dir->%s\n",batteries[batt_count]); ++ printf("DBG:------------------------\n"); ++ #endif ++ batt_count++; ++ } ++ /* I guess that the type of the AC adapter is always "Mains" (?) */ ++ else if(strncmp("Mains", tmptype, 5)==0){ ++ sprintf(sysfsacdir, "/sys/class/power_supply/%s", name); ++ #ifdef DEBUG ++ printf("DBG:sysfs AC dir->%s\n",sysfsacdir); ++ printf("DBG:------------------------\n"); ++ #endif ++ } ++ } ++ closedir(sysfs); ++ if ( batt_count == 0 ) ++ { ++#ifdef DEBUG ++ printf("DBG:No acpi support for sysfs. Trying procfs...\n"); ++#endif ++ acpi_sysfs = 0; ++ return 2; ++ } ++ else ++ { ++ acpi_sysfs = 1; ++ return 0; ++ } ++} ++ + /* see if we have ACPI support */ + int check_acpi(void) + { ++#ifdef __linux__ ++ if ( check_acpi_sysfs() == 0 ) ++ return 0; ++#endif + DIR *battdir; + struct dirent *batt; + char *name; +@@ -262,9 +333,82 @@ + #endif + } + ++int read_sysfs_int(char* filename) ++{ ++ FILE* f; ++ f = fopen(filename,"r"); ++ if ( !f ) ++ { ++#ifdef DEBUG ++ printf("DBG:Could not open %s\n",filename); ++#endif ++ return 0; ++ } ++ int out; ++ fscanf(f,"%d",&out); ++ fclose(f); ++ return out; ++} ++ ++char* read_sysfs_string(char* filename) ++{ ++ FILE* f; ++ f = fopen(filename,"r"); ++ if ( !f ) ++ { ++#ifdef DEBUG ++ printf("DBG:Could not open %s\n",filename); ++#endif ++ return NULL; ++ } ++ fscanf(f,"%s",buf2); ++ fclose(f); ++ return buf2; ++} ++ ++int read_acad_state_sysfs(void) ++{ ++ DIR *sysfs; ++ struct dirent *propety; ++ char *name; ++ char onlinefilepath[128]; ++ ++ sysfs = opendir(sysfsacdir); ++ if (sysfs == 0) ++ { ++ #ifdef DEBUG ++ printf("DBG:Can't open %s",sysfsacdir); ++ #endif ++ return 0; ++ } ++ closedir(sysfs); ++ ++ if (!acadstate) acadstate=(ACADstate *)malloc(sizeof(ACADstate)); ++ /* this code doesn't make much sense.. why look at the whole directory?! ++ while ((propety = readdir(sysfs))) ++ { ++ name = propety->d_name; ++ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; ++ ++ if (strcmp(name,"online") == 0) ++ { ++ acadstate->state = ( read_sysfs_int("/sys/class/power_supply/AC/online") == 1 ) ; ++ } ++ } ++ */ ++ sprintf(onlinefilepath, "%s/online", sysfsacdir); ++ /* if onlinefilepath doesn't exist read_sysfs_int() will return 0 ++ so acadstate->state will be 0, that should be ok */ ++ acadstate->state = ( read_sysfs_int(onlinefilepath) == 1 ); ++ ++ return acadstate->state; ++} ++ + int read_acad_state(void) + { + #ifdef __linux__ ++ if (acpi_sysfs) ++ return read_acad_state_sysfs(); + FILE *acpi; + char *ptr; + char stat; +@@ -354,20 +498,83 @@ + #endif + } + ++int read_acpi_info_sysfs(int battery) ++{ ++ DIR *sysfs; ++ struct dirent *propety; ++ char *name; ++ ++ sysfs = opendir(batteries[battery]); ++ if (sysfs == 0) ++ { ++ #ifdef DEBUG ++ printf("DBG:Can't open %s!\n", batteries[battery]); ++ #endif ++ return 0; ++ } ++ /* malloc.. might explain the random battery level values on 2.6.24 ++ systems (energe_full is called charge_full so the value isn't initialised ++ and some random data from the heap is displayed..) ++ if (!acpiinfo) acpiinfo=(ACPIinfo *)malloc(sizeof(ACPIinfo)); ++ */ ++ if (!acpiinfo) acpiinfo=(ACPIinfo *)calloc(1, sizeof(ACPIinfo)); ++ ++ while ((propety = readdir(sysfs))) ++ { ++ name = propety->d_name; ++ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; ++ /* at least on my system this is called charge_full */ ++ if ((strcmp(name,"energy_full") == 0) || (strcmp(name,"charge_full") == 0)) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpiinfo->last_full_capacity = read_sysfs_int(buf); ++ } ++ if ((strcmp(name,"energy_full_design") == 0) || (strcmp(name,"charge_full_design") == 0)) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpiinfo->design_capacity = read_sysfs_int(buf); ++ } ++ if (strcmp(name,"technology") == 0) ++ { ++ char *tmp; ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ tmp = read_sysfs_string(buf); ++ if (tmp != NULL) ++ { ++ if (strcmp(tmp,"Li-ion") == 0) ++ acpiinfo->battery_technology = 1; ++ else ++ acpiinfo->battery_technology = 0; ++ } ++ } ++ if (strcmp(name,"present") == 0) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpiinfo->present = read_sysfs_int(buf); ++ } ++ } ++ closedir(sysfs); ++ return acpiinfo->present; ++} ++ + int read_acpi_info(int battery) + { + #ifdef __linux__ +- FILE *acpi; +- char *ptr; +- char stat; +- int temp; +- + if (battery > MAXBATT) { + #ifdef DEBUG + printf("DBG: error, battery > MAXBATT (%d)\n",MAXBATT); + #endif + return 0; + } ++ ++ if (acpi_sysfs) ++ return read_acpi_info_sysfs(battery); ++ ++ FILE *acpi; ++ char *ptr; ++ char stat; ++ int temp; ++ + if (!(acpi = fopen (battinfo[battery], "r"))) { + #ifdef DEBUG + printf("DBG:cannot open %s for read!\n",battinfo[battery]); +@@ -514,9 +721,80 @@ + + } + ++int read_acpi_state_sysfs(int battery) ++{ ++ DIR *sysfs; ++ struct dirent *propety; ++ char *name; ++ ++ sysfs = opendir(batteries[battery]); ++ if (sysfs == 0) ++ { ++ #ifdef DEBUG ++ printf("DBG:Can't open %s!\n", batteries[battery]); ++ #endif ++ return 0; ++ } ++ ++ /* again it might be better to use calloc ++ if (!acpistate) acpistate=(ACPIstate *)malloc(sizeof(ACPIstate)); ++ */ ++ if (!acpistate) acpistate=(ACPIstate *)calloc(1, sizeof(ACPIstate)); ++ ++ while ((propety = readdir(sysfs))) ++ { ++ name = propety->d_name; ++ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; ++ ++ if (strcmp(name,"status") == 0) ++ { ++ char *tmp; ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ tmp = read_sysfs_string(buf); ++ if ( tmp != NULL ) ++ { ++ if (strcmp(tmp,"Charging") == 0) ++ acpistate->state = CHARGING; ++ else if (strcmp(tmp,"Discharging") == 0) ++ acpistate->state = DISCHARGING; ++ else if (strcmp(tmp,"Full") == 0) ++ acpistate->state = POWER; ++ else ++ acpistate->state = UNKNOW; ++ } ++ } ++ /* on my system this is called charge_now */ ++ if ((strcmp(name,"energy_now") == 0) || (strcmp(name,"charge_now") == 0)) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpistate->rcapacity = read_sysfs_int(buf); ++ acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100; ++ } ++ if (strcmp(name,"current_now") == 0) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpistate->prate = read_sysfs_int(buf); ++ if ( acpistate->prate < 0 ) ++ acpistate->prate = 0; ++ if ( acpistate->prate > 0 ) ++ acpistate->rtime = (((float) acpistate->rcapacity) / acpistate->prate) * 60; ++ } ++ if (strcmp(name,"voltage_now") == 0) ++ { ++ sprintf(buf,"%s/%s",batteries[battery], name); ++ acpistate->pvoltage = read_sysfs_int(buf); ++ } ++ } ++ closedir(sysfs); ++ return acpiinfo->present; ++} ++ + int read_acpi_state(int battery) + { + #ifdef __linux__ ++ if (acpi_sysfs) ++ return read_acpi_state_sysfs(battery); ++ + FILE *acpi; + char *ptr; + char stat; +--- xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.h 2007-01-17 18:56:51.000000000 +0100 ++++ xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.h 2008-04-05 22:13:55.522679792 +0200 +@@ -80,6 +80,8 @@ + int batt_count; + /* temp buffer */ + char buf[512]; ++char buf2[512]; ++int acpi_sysfs; + #else + extern int batt_count; + extern ACPIstate *acpistate; diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index cf63a4f..e132666 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,55 +1,87 @@ -Name: xfce4-battery-plugin -Version: 0.5.1 -Release: 4%{?dist} -Summary: Battery monitor for the Xfce panel +%global minor_version 0.5 -Group: User Interface/Desktops -License: GPLv2+ -URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://goodies.xfce.org/releases/%{name}/%{name}-%{version}.tar.bz2 -Patch0: %{name}-0.5.0-fix-ftbfs-2.6.24.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Name: xfce4-battery-plugin +Version: 0.5.1 +Release: 5%{?dist} +Summary: Battery monitor for the Xfce panel -BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel -BuildRequires: gettext, perl(XML::Parser) -Requires: xfce4-panel >= 4.4.0 +Group: User Interface/Desktops +License: GPLv2+ +URL: http://goodies.xfce.org/projects/panel-plugins/%{name} +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +Patch0: %{name}-0.5.0-fix-ftbfs-2.6.24.patch +# http://bugzilla.xfce.org/show_bug.cgi?id=3793 +Patch1: xfce4-battery-plugin-0.5.1-use-sysfs.patch +# http://bugzilla.xfce.org/show_bug.cgi?id=3546 +Patch2: xfce4-battery-plugin-0.5.0-no-battery.patch +# contains all translations from +# http://translations.xfce.org/projects/p/xfce4-battery-plugin/c/master/ +# as of 2010-12-18 +Patch3: xfce4-battery-plugin-0.5.1-update-translations.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel +BuildRequires: gettext, intltool +Requires: xfce4-panel >= 4.4.0 %description A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. + %prep %setup -q %patch0 -p1 -b .2.6.24 +%patch1 -p1 -b .use-sysfs +%patch2 -p0 -b .no-battery +%patch3 -p1 -b .update-translations + %build %configure --disable-static -make +make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' %find_lang %{name} + %post -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + %postun -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %clean rm -rf $RPM_BUILD_ROOT + %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB ChangeLog README %{_libexecdir}/xfce4/panel-plugins/%{name} %{_datadir}/xfce4/panel-plugins/*.desktop -%{_datadir}/icons/hicolor/*/devices/battery.png -%{_datadir}/icons/hicolor/scalable/devices/battery.svg +%{_datadir}/icons/hicolor/*/*/* + %changelog +* Sat Dec 18 2010 Christoph Wickert - 0.5.1-5 +- Use sysfs instead of procfs (bugzilla.xfce.org #3793) +- Correctly handle case when no battery is present (bugzilla.xfce.org #3546) +- Update translations from Xfce Transifex +- Use parallel make +- Fix Source0 URL +- Update icon-cache scriptlets + * Mon Jul 27 2009 Fedora Release Engineering - 0.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 7f439dd60a5f3cee0947b021f357d0e0d4305ae5 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 9 Jan 2011 00:10:40 +0100 Subject: [PATCH 30/93] - Update to 1.0.0 - Patch for xfce4-panel >= 4.7.7 --- .gitignore | 1 + sources | 2 +- ...attery-plugin-0.5.0-fix-ftbfs-2.6.24.patch | 12 - xfce4-battery-plugin-0.5.0-no-battery.patch | 21 - ...ery-plugin-0.5.1-update-translations.patch | 3911 ----------------- xfce4-battery-plugin-0.5.1-use-sysfs.patch | 354 -- ...battery-plugin-0.5.1-xfce4-panel-4.7.patch | 12 + xfce4-battery-plugin.spec | 35 +- 8 files changed, 31 insertions(+), 4317 deletions(-) delete mode 100644 xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch delete mode 100644 xfce4-battery-plugin-0.5.0-no-battery.patch delete mode 100644 xfce4-battery-plugin-0.5.1-update-translations.patch delete mode 100644 xfce4-battery-plugin-0.5.1-use-sysfs.patch create mode 100644 xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch diff --git a/.gitignore b/.gitignore index 4507e8c..5e591fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xfce4-battery-plugin-0.5.1.tar.bz2 +/xfce4-battery-plugin-1.0.0.tar.bz2 diff --git a/sources b/sources index 187ac91..e408dad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8a666d85bb3c1dd007b547de4dd7037 xfce4-battery-plugin-0.5.1.tar.bz2 +2696307f34f6b9630fcaaea102004e78 xfce4-battery-plugin-1.0.0.tar.bz2 diff --git a/xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch b/xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch deleted file mode 100644 index 080707a..0000000 --- a/xfce4-battery-plugin-0.5.0-fix-ftbfs-2.6.24.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h.orig 2008-03-18 20:10:58.000000000 +0100 -+++ xfce4-battery-plugin-0.5.0/panel-plugin/libapm.h 2008-03-18 20:14:45.000000000 +0100 -@@ -17,8 +17,8 @@ - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include - #include -+#include - - #define APM_PROC "/proc/apm" - #define APM_DEVICE "/dev/apm_bios" diff --git a/xfce4-battery-plugin-0.5.0-no-battery.patch b/xfce4-battery-plugin-0.5.0-no-battery.patch deleted file mode 100644 index 7bad893..0000000 --- a/xfce4-battery-plugin-0.5.0-no-battery.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- panel-plugin/battery.c.old 2007-09-14 23:40:34.282880732 +0100 -+++ panel-plugin/battery.c 2007-09-15 00:31:27.768941875 +0100 -@@ -502,8 +502,16 @@ battmon.c:241: for each function it appe - - - if(acline) { -- char *t=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)"); -- if(battmon->options.tooltip_display_percentage) { -+ char *t1=(charge<99.9)?_("(Charging from AC)"):_("(AC on-line)"); -+ char *t2=_("(No battery, AC on-line)"); -+ char *t; -+ -+ if((battmon->method == BM_USE_ACPI) && (acpiinfo->present == 0)) -+ t=t2; -+ else -+ t=t1; -+ -+ if(battmon->options.tooltip_display_percentage) { - g_snprintf(buffer, sizeof(buffer), "%d%% %s", charge,t); - } - else diff --git a/xfce4-battery-plugin-0.5.1-update-translations.patch b/xfce4-battery-plugin-0.5.1-update-translations.patch deleted file mode 100644 index a3d43c6..0000000 --- a/xfce4-battery-plugin-0.5.1-update-translations.patch +++ /dev/null @@ -1,3911 +0,0 @@ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ar.po xfce4-battery-plugin-0.5.1/po/ar.po ---- xfce4-battery-plugin-0.5.1.orig/po/ar.po 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/ar.po 1970-01-01 01:00:00.000000000 +0100 -@@ -1,144 +0,0 @@ --msgid "" --msgstr "" --"Project-Id-Version: xfce\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2006-12-20 17:45+0100\n" --"PO-Revision-Date: 2008-07-15 22:17+0200\n" --"Last-Translator: Mohamed Magdy \n" --"Language-Team: Arabeyes \n" --"MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=UTF-8\n" --"Content-Transfer-Encoding: 8bit\n" --"X-Poedit-Language: Arabic\n" -- --#: ../panel-plugin/battery.c:491 --msgid "(Charging from AC)" --msgstr "" -- --#: ../panel-plugin/battery.c:491 --msgid "(AC on-line)" --msgstr "" -- --#: ../panel-plugin/battery.c:500 --#, c-format --msgid "%d%% (%02d:%02d) remaining" --msgstr "" -- --#: ../panel-plugin/battery.c:502 --#, c-format --msgid "%02d:%02d remaining" --msgstr "" -- --#: ../panel-plugin/battery.c:504 --#, c-format --msgid "%d%% remaining" --msgstr "" -- --#: ../panel-plugin/battery.c:506 --msgid "AC off-line" --msgstr "" -- --#: ../panel-plugin/battery.c:570 --msgid "" --"WARNING: Your battery has reached critical status. You should plug in or " --"shutdown your computer now to avoid possible data loss." --msgstr "" -- --#: ../panel-plugin/battery.c:584 --msgid "" --"WARNING: Your battery is running low. You should consider plugging in or " --"shutting down your computer soon to avoid possible data loss." --msgstr "" -- --#: ../panel-plugin/battery.c:673 --msgid "Battery" --msgstr "" -- --#: ../panel-plugin/battery.c:1099 --msgid "Select file" --msgstr "" -- --#: ../panel-plugin/battery.c:1140 --msgid "Select command" --msgstr "" -- --#: ../panel-plugin/battery.c:1159 --#, c-format --msgid "Unable to open the following url: %s" --msgstr "" -- --#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 --msgid "Battery Monitor" --msgstr "" -- --#: ../panel-plugin/battery.c:1212 --msgid "Low percentage:" --msgstr "" -- --#: ../panel-plugin/battery.c:1223 --msgid "Critical percentage:" --msgstr "" -- --#: ../panel-plugin/battery.c:1236 --msgid "Low battery action:" --msgstr "" -- --#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 --msgid "Do nothing" --msgstr "" -- --#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 --msgid "Display a warning message" --msgstr "" -- --#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 --msgid "Run command" --msgstr "" -- --#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 --msgid "Run command in terminal" --msgstr "" -- --#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 --msgid "Command:" --msgstr "" -- --#: ../panel-plugin/battery.c:1277 --msgid "Critical battery action:" --msgstr "" -- --#: ../panel-plugin/battery.c:1324 --msgid "Display label" --msgstr "" -- --#: ../panel-plugin/battery.c:1327 --msgid "Display percentage" --msgstr "" -- --#: ../panel-plugin/battery.c:1330 --msgid "Display time" --msgstr "" -- --#: ../panel-plugin/battery.c:1333 --msgid "Hide time/percentage when full" --msgstr "" -- --#: ../panel-plugin/battery.c:1336 --msgid "Display percentage in tooltip" --msgstr "" -- --#: ../panel-plugin/battery.c:1339 --msgid "Display time remaining in tooltip" --msgstr "" -- --#: ../panel-plugin/battery.c:1342 --msgid "Display power" --msgstr "" -- --#: ../panel-plugin/battery.c:1345 --msgid "Display icon" --msgstr "" -- --#: ../panel-plugin/battmon.desktop.in.in.h:2 --msgid "Show and monitor the battery status" --msgstr "" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ast.po xfce4-battery-plugin-0.5.1/po/ast.po ---- xfce4-battery-plugin-0.5.1.orig/po/ast.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/ast.po 2010-12-18 19:27:33.134625740 +0100 -@@ -0,0 +1,149 @@ -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce 4-battery-complementu\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2009-07-13 19:55+0100\n" -+"Last-Translator: Marcos Antonio Alvarez Costales \n" -+"Language-Team: Asturian \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Cargando d'alimentación)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(Alimentación coneutada)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) restante" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d restante" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% restante" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "Alimentación desconeutada" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "" -+"WARNING: Your battery has reached critical status. You should plug in or " -+"shutdown your computer now to avoid possible data loss." -+msgstr "" -+"ATENCIÓN: La batería algamó un estáu críticu. Tienes d'enchufar o apagar el " -+"to ordenador pa evitar una dable perda de datos." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "" -+"WARNING: Your battery is running low. You should consider plugging in or " -+"shutting down your computer soon to avoid possible data loss." -+msgstr "" -+"ATENCIÓN: La batería ta escosándose. Deberíes enchufar o apagar el to " -+"ordenador aína pa evitar una dable perda de datos." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Batería" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Seleicionar ficheru" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Seleicionar comandu" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Imposible abrir la siguiente URL: %s" -+ -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Monitor de batería" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Porcentaxe baxu:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Porcentaxe críticu:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "Aición de batería baxa:" -+ -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "Nun facer res" -+ -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Amosar un mensaxe d'alvertencia" -+ -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Executar comandu" -+ -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Executar comandu en terminal" -+ -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Comandu:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "Aición de batería crítica:" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Amosar etiqueta" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Amosar porcentaxe" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Amosar tiempu" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Anubrir tiempu/porcentaxe cuando tea completa" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "Amosar porcentaxe en ventanu emerxente" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "Amosar tiempu restante en " -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Amosar conexón" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "Amosar iconu" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Amosar y monitorizar l'estáu de la batería" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ChangeLog xfce4-battery-plugin-0.5.1/po/ChangeLog ---- xfce4-battery-plugin-0.5.1.orig/po/ChangeLog 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/ChangeLog 2010-12-18 19:28:11.324712057 +0100 -@@ -1,3 +1,90 @@ -+2009-08-08 Mike Massonnet -+ -+ * kk.po: Kazakh translation added (Baurzhan Muftakhidinov) -+ * ast.po: Asturian translation added (Marcos Alvarez Costales) -+ -+2009-07-23 Gabor Kelemen -+ -+ * hu.po: Translation reworked. -+ -+2009-06-28 Mike Massonnet -+ -+ * vi.po: Vietnamese translation update (Vincent Nguyen) -+ -+2009-05-29 Mike Massonnet -+ -+ * ur_PK.po: Urdu Pakistan translation update (Muhammad Ali Makki) -+ * ur.po: Urdu translation update (Muhammad Ali Makki) -+ -+2009-04-20 Mike Massonnet -+ -+ * gl.po: Galician translation update (Leandro Regueiro) -+ -+2009-04-16 Mike Massonnet -+ -+ * gl.po: Galician translation update (Leandro Regueiro) -+ -+2009-03-14 Maximilian Schleiss -+ -+ * gl.po: Galician translation update (Leandro Regueiro) -+ -+2009-03-05 Mike Massonnet -+ -+ * pt.po: Renamed pt_PT.po to pt.po (bug #4574) -+ -+2009-03-05 Mike Massonnet -+ -+ * nb.po: Renamed nb_NO.po to nb.po (bug #4574) -+ -+2009-02-22 Mike Massonnet -+ -+ * es.po: Add Spanish translation (Abel Martín) -+ -+2009-02-20 Maximilian Schleiss -+ -+ * gl.po: Galician translation update (Leandro Regueiro) -+ -+2009-02-19 Per Kongstad -+ -+ * da.po: Danish translation updated (Per Kongstad) -+ -+2009-02-07 Maximilian Schleiss -+ -+ * pl.po: Polish translation update (Piotr Sokół) -+ -+2009-02-07 Alexander Toresson -+ -+ * sv.po: Swedish translation update (Daniel Nylander) -+ -+2009-01-13 Alexander Toresson -+ -+ * sv.po, LINGUAS: Swedish translation added (Daniel Nylander) -+ -+2008-12-25 Maximilian Schleiss -+ -+ * gl.po: Galician translation update (Leandro Regueiro) -+ * ja.po: Japanese translation update (Masato Hashimoto) -+ -+2008-12-13 Maximilian Schleiss -+ -+ * zh_CN.po: Simplified Chinese translation added (Hunt Xu) -+ -+2008-11-17 Eren Türkay -+ -+ * tr.po: Turkish translation update (Turkish translation team) -+ -+2008-11-12 Piarres Beobide -+ -+ * eu.po: Basque translation update -+ -+2008-11-09 Maximilian Schleiss -+ -+ * sq.po: Albanian translation update (Besnik Bleta) -+ -+2008-10-18 Maximilian Schleiss -+ -+ * ja.po, LINGUAS: Japanese translation added (Nobuhiro Iwamatsu) -+ - 2008-07-15 Mohamed Magdy - - * ar.po: Add Arabic translation -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/da.po xfce4-battery-plugin-0.5.1/po/da.po ---- xfce4-battery-plugin-0.5.1.orig/po/da.po 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/da.po 2010-12-18 19:27:33.134625740 +0100 -@@ -1,28 +1,30 @@ --# Danish translation for the xfce4-battery-plugin --# Copyright (C) 2008 The xfce4-battery-plugin's COPYRIGHT HOLDER -+# translation of xfce4-battery-plugin to Danish -+# Copyright (C) 2007 THE xfce4-battery-plugin'S COPYRIGHT HOLDER - # This file is distributed under the same license as the xfce4-battery-plugin package. --# Jannich Brendle , 2008. --# --#, fuzzy -+# Jens Hyllegaard , 2007. -+# Per Kongstad , 2009. - msgid "" - msgstr "" --"Project-Id-Version: xfce4-battery-plugin 0.5.0\n" -+"Project-Id-Version: xfce4-battery-plugin 0.5.2\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-12-20 17:45+0100\n" --"PO-Revision-Date: 2008-05-13 13:51+0200\n" --"Last-Translator: Jannich Brendle \n" --"Language-Team: Danish \n" -+"PO-Revision-Date: 2009-02-19 16:24+0100\n" -+"Last-Translator: Per Kongstad \n" -+"Language-Team: Danish \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"X-Poedit-Language: Danish\n" -+"X-Poedit-Country: DENMARK\n" -+"X-Poedit-SourceCharset: utf-8\n" - - #: ../panel-plugin/battery.c:491 - msgid "(Charging from AC)" --msgstr "(Oplader fra AC)" -+msgstr "(Oplader via AC)" - - #: ../panel-plugin/battery.c:491 - msgid "(AC on-line)" --msgstr "(AC tilsluttet)" -+msgstr "(AC tilkoblet)" - - #: ../panel-plugin/battery.c:500 - #, c-format -@@ -41,23 +43,15 @@ - - #: ../panel-plugin/battery.c:506 - msgid "AC off-line" --msgstr "AC ikke tilsluttet" -+msgstr "AC frakoblet" - - #: ../panel-plugin/battery.c:570 --msgid "" --"WARNING: Your battery has reached critical status. You should plug in or " --"shutdown your computer now to avoid possible data loss." --msgstr "" --"ADVARSEL: Dit batteri har nået kritisk status. Du bør oplade eller" --"slukke din computer nu for at undgå eventuelt tab af data." -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "ADVARSEL: Dit batteri er næsten helt fladt. Du bør tilslutte din computer til en strømkilde, eller lukke den ned nu, for at undgå muligt datatab." - - #: ../panel-plugin/battery.c:584 --msgid "" --"WARNING: Your battery is running low. You should consider plugging in or " --"shutting down your computer soon to avoid possible data loss." --msgstr "" --"ADVARSEL: Dit batteri er ved at løbe tør for strøm. Du bør overveje at oplade eller" --"slukke din computer snart for at undgå eventuelt tab af data." -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "ADVARSEL: Dit batteri er ved at være fladt. Du bør overveje at tilslutte din computer til en strømkilde, eller lukke den ned, for at undgå muligt datatab." - - #: ../panel-plugin/battery.c:673 - msgid "Battery" -@@ -74,11 +68,12 @@ - #: ../panel-plugin/battery.c:1159 - #, c-format - msgid "Unable to open the following url: %s" --msgstr "Kan ikke åbne denne url: %s" -+msgstr "Kunne ikke åbne denne url: %s" - --#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+#: ../panel-plugin/battery.c:1183 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 - msgid "Battery Monitor" --msgstr "Batteriovervåger" -+msgstr "Batteriovervågning" - - #: ../panel-plugin/battery.c:1212 - msgid "Low percentage:" -@@ -90,35 +85,40 @@ - - #: ../panel-plugin/battery.c:1236 - msgid "Low battery action:" --msgstr "Lavt batteriniveau handling:" -+msgstr "Handling ved lav batteristand:" - --#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+#: ../panel-plugin/battery.c:1242 -+#: ../panel-plugin/battery.c:1283 - msgid "Do nothing" --msgstr "Gør intet" -+msgstr "Gør ingenting" - --#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+#: ../panel-plugin/battery.c:1244 -+#: ../panel-plugin/battery.c:1285 - msgid "Display a warning message" --msgstr "Vis en advarsel" -+msgstr "Vis advarselsmeddelelse" - --#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+#: ../panel-plugin/battery.c:1246 -+#: ../panel-plugin/battery.c:1287 - msgid "Run command" - msgstr "Kør kommando" - --#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+#: ../panel-plugin/battery.c:1248 -+#: ../panel-plugin/battery.c:1289 - msgid "Run command in terminal" --msgstr "Kør kommando i terminal" -+msgstr "Kør kommando i en terminal" - --#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+#: ../panel-plugin/battery.c:1261 -+#: ../panel-plugin/battery.c:1301 - msgid "Command:" --msgstr "Kommando" -+msgstr "Kommando:" - - #: ../panel-plugin/battery.c:1277 - msgid "Critical battery action:" --msgstr "Kritisk batteriniveauhandling:" -+msgstr "Handling ved kritisk batteristand:" - - #: ../panel-plugin/battery.c:1324 - msgid "Display label" --msgstr "Vis label" -+msgstr "Vis mærkat" - - #: ../panel-plugin/battery.c:1327 - msgid "Display percentage" -@@ -130,19 +130,19 @@ - - #: ../panel-plugin/battery.c:1333 - msgid "Hide time/percentage when full" --msgstr "Gem tid/procentdel når fuldt opladt" -+msgstr "Skjul tid/procentdel når fuld" - - #: ../panel-plugin/battery.c:1336 - msgid "Display percentage in tooltip" --msgstr "Vis procentdel i tooltip" -+msgstr "Vis procentdel i værktøjstip" - - #: ../panel-plugin/battery.c:1339 - msgid "Display time remaining in tooltip" --msgstr "Vis resterende tid i tooltip" -+msgstr "Vis tilbageværende tid i værktøjstip" - - #: ../panel-plugin/battery.c:1342 - msgid "Display power" --msgstr "Vis strømkilde" -+msgstr "Vis strøm" - - #: ../panel-plugin/battery.c:1345 - msgid "Display icon" -@@ -150,4 +150,4 @@ - - #: ../panel-plugin/battmon.desktop.in.in.h:2 - msgid "Show and monitor the battery status" --msgstr "Viser og overvåger batteristatus" -+msgstr "Vis og overvåg batteristatus" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/de.po xfce4-battery-plugin-0.5.1/po/de.po ---- xfce4-battery-plugin-0.5.1.orig/po/de.po 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/de.po 2010-12-18 19:27:33.134625740 +0100 -@@ -2,13 +2,13 @@ - # Copyright (C) 2007 THE xfce4-battery-plugin'S COPYRIGHT HOLDER - # This file is distributed under the same license as the xfce4-battery-plugin package. - # Fabian Nowak , 2007. --# -+# - msgid "" - msgstr "" - "Project-Id-Version: xfce4-battery-plugin 0.5.1svn-r3672\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2007-12-06 22:27+0100\n" --"PO-Revision-Date: 2007-12-06 22:27+0100\n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2009-02-01 16:15+0100\n" - "Last-Translator: Fabian Nowak \n" - "Language-Team: German\n" - "MIME-Version: 1.0\n" -@@ -16,138 +16,127 @@ - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - --#: ../panel-plugin/battery.c:490 -+#: ../panel-plugin/battery.c:491 - msgid "(Charging from AC)" --msgstr "(Lade von Steckdose)" -+msgstr "(Wird von Stromzufuhr geladen)" - --#: ../panel-plugin/battery.c:490 -+#: ../panel-plugin/battery.c:491 - msgid "(AC on-line)" - msgstr "(Externe Stromzufuhr vorhanden)" - --#: ../panel-plugin/battery.c:499 -+#: ../panel-plugin/battery.c:500 - #, c-format - msgid "%d%% (%02d:%02d) remaining" - msgstr "%d%% (%02d:%02d) verbleibend" - --#: ../panel-plugin/battery.c:501 -+#: ../panel-plugin/battery.c:502 - #, c-format - msgid "%02d:%02d remaining" - msgstr "%02d:%02d verbleibend" - --#: ../panel-plugin/battery.c:503 -+#: ../panel-plugin/battery.c:504 - #, c-format - msgid "%d%% remaining" - msgstr "%d%% verbleibend" - --#: ../panel-plugin/battery.c:505 --#, c-format -+#: ../panel-plugin/battery.c:506 - msgid "AC off-line" - msgstr "Keine externe Stromzufuhr" - --#: ../panel-plugin/battery.c:569 --msgid "" --"WARNING: Your battery has reached critical status. You should plug in or " --"shutdown your computer now to avoid possible data loss." --msgstr "" --"ACHTUNG: Ihr Akku hat einen kritischen Zustand erreicht. Sie sollten Ihr " --"Gerät jetzt an Strom anschließen oder herunterfahren, um möglichen " --"Datenverlust zu verhindern." -- --#: ../panel-plugin/battery.c:583 --msgid "" --"WARNING: Your battery is running low. You should consider plugging in or " --"shutting down your computer soon to avoid possible data loss." --msgstr "" --"ACHTUNG: Ihr Akku befindet sich in einem niedrigen Energiezustand. Sie " --"sollten es demnächst in Erwägung ziehen, ihr Gerät an Strom anzuschließen " --"oder herunterzufahren, um möglichen Datenverlust zu verhindern." -+#: ../panel-plugin/battery.c:570 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "ACHTUNG: Ihr Akku hat einen kritischen Zustand erreicht. Sie sollten Ihr Gerät jetzt an Strom anschließen oder herunterfahren, um möglichen Datenverlust zu vermeiden." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "ACHTUNG: Ihr Akku befindet sich in einem niedrigen Energiezustand. Sie sollten es demnächst in Erwägung ziehen, ihr Gerät an Strom anzuschließen oder herunterzufahren, um möglichen Datenverlust zu vermeiden." - --#: ../panel-plugin/battery.c:668 -+#: ../panel-plugin/battery.c:673 - msgid "Battery" --msgstr "Betteriezustand" -+msgstr "Batteriezustand" - --#: ../panel-plugin/battery.c:1094 -+#: ../panel-plugin/battery.c:1099 - msgid "Select file" --msgstr "Wählen Sie eine Datei" -+msgstr "Datei auswählen" - --#: ../panel-plugin/battery.c:1135 -+#: ../panel-plugin/battery.c:1140 - msgid "Select command" --msgstr "Wählen Sie einen Befehl" -+msgstr "Befehl auswählen" - --#: ../panel-plugin/battery.c:1154 -+#: ../panel-plugin/battery.c:1159 - #, c-format - msgid "Unable to open the following url: %s" - msgstr "Kann die folgende Adresse nicht öffnen: %s" - --#: ../panel-plugin/battery.c:1178 ../panel-plugin/battmon.desktop.in.in.h:1 -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 - msgid "Battery Monitor" - msgstr "Batterieüberwachung" - --#: ../panel-plugin/battery.c:1207 -+#: ../panel-plugin/battery.c:1212 - msgid "Low percentage:" - msgstr "Niedriger Prozentsatz:" - --#: ../panel-plugin/battery.c:1218 -+#: ../panel-plugin/battery.c:1223 - msgid "Critical percentage:" - msgstr "Kritischer Prozentsatz:" - --#: ../panel-plugin/battery.c:1231 -+#: ../panel-plugin/battery.c:1236 - msgid "Low battery action:" --msgstr "Ereignis bei niedrigen Emergiezustand:" -+msgstr "Ereignis bei niedrigem Energiezustand:" - --#: ../panel-plugin/battery.c:1237 ../panel-plugin/battery.c:1278 -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 - msgid "Do nothing" - msgstr "Nichts unternehmen" - --#: ../panel-plugin/battery.c:1239 ../panel-plugin/battery.c:1280 -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 - msgid "Display a warning message" - msgstr "Warnhinweis anzeigen" - --#: ../panel-plugin/battery.c:1241 ../panel-plugin/battery.c:1282 -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 - msgid "Run command" - msgstr "Befehl ausführen" - --#: ../panel-plugin/battery.c:1243 ../panel-plugin/battery.c:1284 -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 - msgid "Run command in terminal" --msgstr "Befehl im Terminal ausführen." -+msgstr "Befehl im Terminal ausführen" - --#: ../panel-plugin/battery.c:1256 ../panel-plugin/battery.c:1296 -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 - msgid "Command:" - msgstr "Befehl:" - --#: ../panel-plugin/battery.c:1272 -+#: ../panel-plugin/battery.c:1277 - msgid "Critical battery action:" - msgstr "Ereignis bei kritischem Energiezustand:" - --#: ../panel-plugin/battery.c:1319 -+#: ../panel-plugin/battery.c:1324 - msgid "Display label" - msgstr "Beschriftung anzeigen" - --#: ../panel-plugin/battery.c:1322 -+#: ../panel-plugin/battery.c:1327 - msgid "Display percentage" - msgstr "Prozentsatz anzeigen" - --#: ../panel-plugin/battery.c:1325 -+#: ../panel-plugin/battery.c:1330 - msgid "Display time" - msgstr "Zeit anzeigen" - --#: ../panel-plugin/battery.c:1328 -+#: ../panel-plugin/battery.c:1333 - msgid "Hide time/percentage when full" - msgstr "Zeit/Prozentsatz verstecken wenn voll" - --#: ../panel-plugin/battery.c:1331 -+#: ../panel-plugin/battery.c:1336 - msgid "Display percentage in tooltip" --msgstr "Prozentsatz in Tooltip anzeigen" -+msgstr "Prozentsatz in der Kurzhilfe anzeigen" - --#: ../panel-plugin/battery.c:1334 -+#: ../panel-plugin/battery.c:1339 - msgid "Display time remaining in tooltip" --msgstr "Verbleibdende Zeit in Tooltip anzeigen" -+msgstr "Verbleibende Zeit in der Kurzhilfe anzeigen" - --#: ../panel-plugin/battery.c:1337 -+#: ../panel-plugin/battery.c:1342 - msgid "Display power" --msgstr "Strom anzeigen" -+msgstr "Vorhandene Stromversorgung anzeigen" - --#: ../panel-plugin/battery.c:1340 -+#: ../panel-plugin/battery.c:1345 - msgid "Display icon" - msgstr "Symbol anzeigen" - -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/es.po xfce4-battery-plugin-0.5.1/po/es.po ---- xfce4-battery-plugin-0.5.1.orig/po/es.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/es.po 2010-12-18 19:27:33.135625652 +0100 -@@ -0,0 +1,153 @@ -+# Spanish translations for xfce package -+# Traducciones al español para el paquete xfce. -+# Copyright (C) 2009 THE xfce'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the xfce package. -+# , 2009. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce 4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2009-02-10 18:12+0100\n" -+"Last-Translator: Abel Martín \n" -+"Language-Team: Spanish\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Cargando de alimentación)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(Alimentación conectada)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) restante" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d restante" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% restante" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "Alimentación desconectada" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "ATENCIÓN: La batería ha alcanzado un estado crítico. Debe enchufar o apagar su ordenador para evitar una posible pérdida de datos." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "ATENCIÓN: La batería se está agotando. Debería considerar enchufar o apagar su ordenador pronto para evitar una posible pérdida de datos." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Batería" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Seleccionar archivo" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Seleccionar comando" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Imposible abrir la siguiente URL: %s" -+ -+#: ../panel-plugin/battery.c:1183 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Monitor de batería" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Porcentaje bajo:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Porcentaje crítico:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "Acción de batería baja:" -+ -+#: ../panel-plugin/battery.c:1242 -+#: ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "No hacer nada" -+ -+#: ../panel-plugin/battery.c:1244 -+#: ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Mostrar un mensaje de advertencia" -+ -+#: ../panel-plugin/battery.c:1246 -+#: ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Ejecutar comando" -+ -+#: ../panel-plugin/battery.c:1248 -+#: ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Ejecutar comando en terminal" -+ -+#: ../panel-plugin/battery.c:1261 -+#: ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Comando:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "Acción de batería crítica:" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Mostrar etiqueta" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Mostrar porcentaje" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Mostrar tiempo" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Ocultar tiempo/porcentaje cuando esté completa" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "Mostrar porcentaje en cuadro emergente" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "Mostrar tiempo restante en " -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Mostrar conexión" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "Mostrar icono" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Mostrar y monitorizar el estado de la batería" -+ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/eu.po xfce4-battery-plugin-0.5.1/po/eu.po ---- xfce4-battery-plugin-0.5.1.orig/po/eu.po 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/eu.po 2010-12-18 19:27:33.135625652 +0100 -@@ -8,14 +8,15 @@ - "Project-Id-Version: xfce4-battery-plugin 0.5.0\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-12-20 17:45+0100\n" --"PO-Revision-Date: 2006-10-24 13:10+0200\n" -+"PO-Revision-Date: 2008-11-09 15:38+0200\n" - "Last-Translator: Piarres Beobide \n" - "Language-Team: Basque \n" -+"Language: eu\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: KBabel 1.11.4\n" --"Plural-Forms: nplurals=2; plural=(n != 1)\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: Pootle 1.2.0\n" - - #: ../panel-plugin/battery.c:491 - msgid "(Charging from AC)" -@@ -143,11 +144,11 @@ - - #: ../panel-plugin/battery.c:1342 - msgid "Display power" --msgstr "Karga Bistarazi" -+msgstr "Bistarazi karga" - - #: ../panel-plugin/battery.c:1345 - msgid "Display icon" --msgstr "Ikonoa Bistarazi" -+msgstr "Bistarazi ikonoa" - - #: ../panel-plugin/battmon.desktop.in.in.h:2 - msgid "Show and monitor the battery status" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/gl.po xfce4-battery-plugin-0.5.1/po/gl.po ---- xfce4-battery-plugin-0.5.1.orig/po/gl.po 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/gl.po 2010-12-18 19:27:33.135625652 +0100 -@@ -1,19 +1,19 @@ - # Galician translation of xfce4-battery-plugin --# Copyright (C) 2008 Leandro Regueiro -+# Copyright (C) 2008-2009 Leandro Regueiro - # This file is distributed under the same license as the xfce package. --# --# Leandro Regueiro , 2008. --# -+# -+# Leandro Regueiro , 2008, 2009. -+# - # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas - # colaborar connosco, podes atopar máis información en --# -+# - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-12-20 17:45+0100\n" --"PO-Revision-Date: 2008-06-24 19:05+0100\n" --"Last-Translator: Leandro Regueiro \n" -+"PO-Revision-Date: 2009-07-15 17:28+0100\n" -+"Last-Translator: Leandro Regueiro \n" - "Language-Team: Galician \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -22,16 +22,16 @@ - - #: ../panel-plugin/battery.c:491 - msgid "(Charging from AC)" --msgstr "" -+msgstr "(Cargando da rede eléctrica)" - - #: ../panel-plugin/battery.c:491 - msgid "(AC on-line)" --msgstr "" -+msgstr "(Conectado á rede eléctrica)" - - #: ../panel-plugin/battery.c:500 - #, c-format - msgid "%d%% (%02d:%02d) remaining" --msgstr "" -+msgstr "%d%% (%02d:%02d) restante" - - #: ../panel-plugin/battery.c:502 - #, c-format -@@ -41,19 +41,19 @@ - #: ../panel-plugin/battery.c:504 - #, c-format - msgid "%d%% remaining" --msgstr "" -+msgstr "Quedan %d%%" - - #: ../panel-plugin/battery.c:506 - msgid "AC off-line" --msgstr "" -+msgstr "Desconectado da rede eléctrica" - - #: ../panel-plugin/battery.c:570 - msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." --msgstr "" -+msgstr "ADVERTENCIA: A batería chegou a un estado crítico. Debe enchufala ou apagar o ordenador agora para evitar unha posible perda de datos." - - #: ../panel-plugin/battery.c:584 - msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." --msgstr "" -+msgstr "ADVERTENCIA: A batería estase esgotando. Deberia considerar enchufala ou apagar o ordenador pronto para evitar unha posible perda de datos." - - #: ../panel-plugin/battery.c:673 - msgid "Battery" -@@ -61,96 +61,89 @@ - - #: ../panel-plugin/battery.c:1099 - msgid "Select file" --msgstr "" -+msgstr "Seleccione un ficheiro" - - #: ../panel-plugin/battery.c:1140 - msgid "Select command" --msgstr "" -+msgstr "Seleccione un comando" - - #: ../panel-plugin/battery.c:1159 - #, c-format - msgid "Unable to open the following url: %s" - msgstr "Non foi posible abrir o seguinte url: %s" - --#: ../panel-plugin/battery.c:1183 --#: ../panel-plugin/battmon.desktop.in.in.h:1 -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 - msgid "Battery Monitor" - msgstr "Monitor da Batería" - - #: ../panel-plugin/battery.c:1212 - msgid "Low percentage:" --msgstr "" -+msgstr "Porcentaxe baixa:" - - #: ../panel-plugin/battery.c:1223 - msgid "Critical percentage:" --msgstr "" -+msgstr "Porcentaxe crítica:" - - #: ../panel-plugin/battery.c:1236 - msgid "Low battery action:" --msgstr "" -+msgstr "Acción para cando a batería está baixa:" - --#: ../panel-plugin/battery.c:1242 --#: ../panel-plugin/battery.c:1283 -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 - msgid "Do nothing" - msgstr "Non facer nada" - --#: ../panel-plugin/battery.c:1244 --#: ../panel-plugin/battery.c:1285 -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 - msgid "Display a warning message" - msgstr "Mostrar unha mensaxe de advertencia" - --#: ../panel-plugin/battery.c:1246 --#: ../panel-plugin/battery.c:1287 -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 - msgid "Run command" - msgstr "Executar comando" - --#: ../panel-plugin/battery.c:1248 --#: ../panel-plugin/battery.c:1289 -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 - msgid "Run command in terminal" --msgstr "" -+msgstr "Executar o comando nun terminal" - --#: ../panel-plugin/battery.c:1261 --#: ../panel-plugin/battery.c:1301 -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 - msgid "Command:" - msgstr "Comando:" - - #: ../panel-plugin/battery.c:1277 - msgid "Critical battery action:" --msgstr "" -+msgstr "Acción para cando a batería está crítica:" - - #: ../panel-plugin/battery.c:1324 - msgid "Display label" --msgstr "" -+msgstr "Mostrar unha etiqueta" - - #: ../panel-plugin/battery.c:1327 - msgid "Display percentage" --msgstr "" -+msgstr "Mostrar a porcentaxe" - - #: ../panel-plugin/battery.c:1330 - msgid "Display time" --msgstr "" -+msgstr "Mostrar o tempo" - - #: ../panel-plugin/battery.c:1333 - msgid "Hide time/percentage when full" --msgstr "" -+msgstr "Ocultar tempo/porcentaxe cando estea cargada" - - #: ../panel-plugin/battery.c:1336 - msgid "Display percentage in tooltip" --msgstr "" -+msgstr "Mostrar a porcentaxe na notificación" - - #: ../panel-plugin/battery.c:1339 - msgid "Display time remaining in tooltip" --msgstr "" -+msgstr "Mostrar o tempo restante na notificación" - - #: ../panel-plugin/battery.c:1342 - msgid "Display power" --msgstr "" -+msgstr "Mostrar a enerxía" - - #: ../panel-plugin/battery.c:1345 - msgid "Display icon" --msgstr "" -+msgstr "Mostrar unha icona" - - #: ../panel-plugin/battmon.desktop.in.in.h:2 - msgid "Show and monitor the battery status" - msgstr "Mostrar e monitorizar o estado da batería" -- -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/hr.po xfce4-battery-plugin-0.5.1/po/hr.po ---- xfce4-battery-plugin-0.5.1.orig/po/hr.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/hr.po 2010-12-18 19:27:33.135625652 +0100 -@@ -0,0 +1,154 @@ -+# Croatian translations for xfce4-battery-plugin package. -+# Copyright (C) 2010 The Xfce development team. -+# This file is distributed under the same license as the xfce4-battery-plugin package. -+# Ivica Kolić, 2010. -+# Ivica Kolić <>, 2010. -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2010-06-12 18:02+0200\n" -+"Last-Translator: Ivica Kolić <>\n" -+"Language-Team: Croatian <>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Punjenje iz AC)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(AC on-line)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) preostalo" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d preostalo" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% preostalo" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "AC off-line" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "" -+"WARNING: Your battery has reached critical status. You should plug in or " -+"shutdown your computer now to avoid possible data loss." -+msgstr "" -+"UPOZORENJE:Vaša baterija je dosegla kritični status.Trebate je uključiti ili " -+"isključiti računalo da izbjegnete gubitak podataka." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "" -+"WARNING: Your battery is running low. You should consider plugging in or " -+"shutting down your computer soon to avoid possible data loss." -+msgstr "" -+"UPOZORENJE:Vaša se baterija prazni.Ramislite o uključivanju ili " -+"isključivanju računala uskoro da biste izbjegli gubitak podataka." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Baterija" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Odaberi datoteku" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Odaberi naredbu" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Neuspjeh u otvaranju slijedećeg url: %s" -+ -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Monitor baterije" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Niski postotak:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Kritični postotak:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "" -+ -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "Ne čini mišta" -+ -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Prikaži poruku upozorenja" -+ -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Pokreni naredbu" -+ -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Pokreni naredbu u terminalu" -+ -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Naredba:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Prikaži natips" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Prikaži postotak" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Prikaži vrijeme" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Sakrij vrijeme/postotak kada je puna" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Prikaži napajanje" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "Prikaži ikonu" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Pokaži i prati status baterije" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/hu.po xfce4-battery-plugin-0.5.1/po/hu.po ---- xfce4-battery-plugin-0.5.1.orig/po/hu.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/hu.po 2010-12-18 19:27:33.136625569 +0100 -@@ -0,0 +1,154 @@ -+# Hungarian translation of xfce4-battery-plugin -+# Copyright 2009. Free Software Foundation, Inc. -+# This file is distributed under the same license as the xfce4-battery-plugin package. -+# -+# Németh Csaba , 2007. -+# Gabor Kelemen , 2009. -+# SZERVÁC Attila -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2009-07-23 12:18+0200\n" -+"PO-Revision-Date: 2009-07-23 15:42+0200\n" -+"Last-Translator: Gabor Kelemen \n" -+"Language-Team: Hungarian \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11.4\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+ -+#: ../panel-plugin/battery.c:494 -+msgid "(Charging from AC)" -+msgstr "(Töltés váltóáramról)" -+ -+#: ../panel-plugin/battery.c:494 -+msgid "(AC on-line)" -+msgstr "(Energiaellátás elérhető)" -+ -+#: ../panel-plugin/battery.c:503 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d.%02d) van hátra" -+ -+#: ../panel-plugin/battery.c:505 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d.%02d van hátra" -+ -+#: ../panel-plugin/battery.c:507 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% van hátra" -+ -+#: ../panel-plugin/battery.c:509 -+#, c-format -+msgid "AC off-line" -+msgstr "Az energiaellátás megszűnt" -+ -+#: ../panel-plugin/battery.c:573 -+msgid "" -+"WARNING: Your battery has reached critical status. You should plug in or " -+"shutdown your computer now to avoid possible data loss." -+msgstr "FIGYELMEZTETÉS: az akkumulátor elérte a kritikus szintet. Csatlakoztassa a hálózatra vagy kapcsolja ki számítógépét az adatvesztés elkerülése érdekében." -+ -+#: ../panel-plugin/battery.c:587 -+msgid "" -+"WARNING: Your battery is running low. You should consider plugging in or " -+"shutting down your computer soon to avoid possible data loss." -+msgstr "FIGYELMEZTETÉS: az akkumulátor gyenge. Csatlakoztassa a hálózatra vagy kapcsolja ki számítógépét az adatvesztés elkerülése érdekében." -+ -+#: ../panel-plugin/battery.c:672 -+msgid "Battery" -+msgstr "Akkumulátor" -+ -+#: ../panel-plugin/battery.c:1098 -+msgid "Select file" -+msgstr "Válasszon fájlt" -+ -+#: ../panel-plugin/battery.c:1139 -+msgid "Select command" -+msgstr "Válasszon parancsot" -+ -+#: ../panel-plugin/battery.c:1158 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "A következő URL megnyitása meghiúsult: %s" -+ -+#: ../panel-plugin/battery.c:1182 ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Akkumulátorfigyelő" -+ -+#: ../panel-plugin/battery.c:1211 -+msgid "Low percentage:" -+msgstr "Alacsony töltöttség:" -+ -+#: ../panel-plugin/battery.c:1222 -+msgid "Critical percentage:" -+msgstr "Kritikus töltöttség:" -+ -+#: ../panel-plugin/battery.c:1235 -+msgid "Low battery action:" -+msgstr "Gyenge akkumulátor művelet:" -+ -+#: ../panel-plugin/battery.c:1241 ../panel-plugin/battery.c:1282 -+msgid "Do nothing" -+msgstr "Ne tegyen semmit" -+ -+#: ../panel-plugin/battery.c:1243 ../panel-plugin/battery.c:1284 -+msgid "Display a warning message" -+msgstr "Figyelmeztetés megjelenítése" -+ -+#: ../panel-plugin/battery.c:1245 ../panel-plugin/battery.c:1286 -+msgid "Run command" -+msgstr "Parancs futtatása" -+ -+#: ../panel-plugin/battery.c:1247 ../panel-plugin/battery.c:1288 -+msgid "Run command in terminal" -+msgstr "Parancs futtatása terminálban" -+ -+#: ../panel-plugin/battery.c:1260 ../panel-plugin/battery.c:1300 -+msgid "Command:" -+msgstr "Parancs:" -+ -+#: ../panel-plugin/battery.c:1276 -+msgid "Critical battery action:" -+msgstr "Kritikus akkumulátor művelet:" -+ -+#: ../panel-plugin/battery.c:1323 -+msgid "Display label" -+msgstr "Címke megjelenítése" -+ -+#: ../panel-plugin/battery.c:1326 -+msgid "Display percentage" -+msgstr "Százalék megjelenítése" -+ -+#: ../panel-plugin/battery.c:1329 -+msgid "Display time" -+msgstr "Idő megjelenítése" -+ -+#: ../panel-plugin/battery.c:1332 -+msgid "Hide time/percentage when full" -+msgstr "Idő/százalék elrejtése, ha fel van töltve" -+ -+#: ../panel-plugin/battery.c:1335 -+msgid "Display percentage in tooltip" -+msgstr "Százalék megjelenítése buboréksúgóban" -+ -+#: ../panel-plugin/battery.c:1338 -+msgid "Display time remaining in tooltip" -+msgstr "Hátralévő idő megjelenítése buboréksúgóban" -+ -+#: ../panel-plugin/battery.c:1341 -+msgid "Display power" -+msgstr "Energiaszint megjelenítése" -+ -+#: ../panel-plugin/battery.c:1344 -+msgid "Display icon" -+msgstr "Ikon megjelenítése" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Az akkumulátor állapotának megjelenítése és figyelése" -+ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ja.po xfce4-battery-plugin-0.5.1/po/ja.po ---- xfce4-battery-plugin-0.5.1.orig/po/ja.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/ja.po 2010-12-18 19:27:33.136625569 +0100 -@@ -0,0 +1,162 @@ -+# Japanese translations for xfce4-battery-plugin package. -+# Copyright (C) Eduard Roccatello -+# Eduard Roccatello -+# Benedikt Meurer -+# Edscott Wilson Garcia -+# Rickard E. Faith -+# Noberasco Michele <2001s098@educ.disi.unige.it> -+# Nick Schermer -+# This file is distributed under the same license as the xfce4-battery-plugin package. -+# Nobuhiro Iwamatsu , 2007,2008. -+# -+# battery: バッテリ(のばさない) -+# percentage: 残量 -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2008-12-05 22:54+0900\n" -+"PO-Revision-Date: 2008-12-06 23:24+0900\n" -+"Last-Translator: Masato Hashimoto \n" -+"Language-Team: Japanese \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: ../panel-plugin/battery.c:494 -+msgid "(Charging from AC)" -+msgstr "(AC から充電中)" -+ -+#: ../panel-plugin/battery.c:494 -+msgid "(AC on-line)" -+msgstr "(AC 接続)" -+ -+#: ../panel-plugin/battery.c:503 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "残り %d%% (%02d:%02d)" -+ -+#: ../panel-plugin/battery.c:505 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "残り %02d:%02d" -+ -+#: ../panel-plugin/battery.c:507 -+#, c-format -+msgid "%d%% remaining" -+msgstr "残り %d%%" -+ -+#: ../panel-plugin/battery.c:509 -+#, c-format -+msgid "AC off-line" -+msgstr "AC 未接続" -+ -+#: ../panel-plugin/battery.c:573 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "警告: バッテリが空に近い状態になりました。電源プラグを差し込むか、できるたけデータが消えないようにコンピュータをシャットダウンすべきです。" -+ -+#: ../panel-plugin/battery.c:587 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "警告: バッテリが残り少なくなりました。電源プラグを差し込むか、データが消えないようにコンピュータのシャットダウンを検討してください。" -+ -+#: ../panel-plugin/battery.c:672 -+msgid "Battery" -+msgstr "バッテリ" -+ -+#: ../panel-plugin/battery.c:1098 -+msgid "Select file" -+msgstr "ファイル選択" -+ -+#: ../panel-plugin/battery.c:1139 -+msgid "Select command" -+msgstr "コマンド選択" -+ -+#: ../panel-plugin/battery.c:1158 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "次の URL を開くことができません: %s" -+ -+#: ../panel-plugin/battery.c:1182 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "バッテリモニタ" -+ -+#: ../panel-plugin/battery.c:1211 -+msgid "Low percentage:" -+msgstr "残り少ないとする割合:" -+ -+#: ../panel-plugin/battery.c:1222 -+msgid "Critical percentage:" -+msgstr "空に近いとする割合:" -+ -+#: ../panel-plugin/battery.c:1235 -+msgid "Low battery action:" -+msgstr "バッテリーが少ない時のアクション:" -+ -+#: ../panel-plugin/battery.c:1241 -+#: ../panel-plugin/battery.c:1282 -+msgid "Do nothing" -+msgstr "なにもしない" -+ -+#: ../panel-plugin/battery.c:1243 -+#: ../panel-plugin/battery.c:1284 -+msgid "Display a warning message" -+msgstr "警告メッセージを表示する" -+ -+#: ../panel-plugin/battery.c:1245 -+#: ../panel-plugin/battery.c:1286 -+msgid "Run command" -+msgstr "コマンドを実行する" -+ -+#: ../panel-plugin/battery.c:1247 -+#: ../panel-plugin/battery.c:1288 -+msgid "Run command in terminal" -+msgstr "ターミナルでコマンドを実行する" -+ -+#: ../panel-plugin/battery.c:1260 -+#: ../panel-plugin/battery.c:1300 -+msgid "Command:" -+msgstr "コマンド:" -+ -+#: ../panel-plugin/battery.c:1276 -+msgid "Critical battery action:" -+msgstr "バッテリが空に近い時のアクション:" -+ -+#: ../panel-plugin/battery.c:1323 -+msgid "Display label" -+msgstr "ラベルを表示する" -+ -+#: ../panel-plugin/battery.c:1326 -+msgid "Display percentage" -+msgstr "残量を表示する" -+ -+#: ../panel-plugin/battery.c:1329 -+msgid "Display time" -+msgstr "時間を表示する" -+ -+#: ../panel-plugin/battery.c:1332 -+msgid "Hide time/percentage when full" -+msgstr "バッテリがフル充電時、時間と残量を隠す" -+ -+#: ../panel-plugin/battery.c:1335 -+msgid "Display percentage in tooltip" -+msgstr "残量をツールチップに表示する" -+ -+#: ../panel-plugin/battery.c:1338 -+msgid "Display time remaining in tooltip" -+msgstr "残り時間をツールチップに表示する" -+ -+#: ../panel-plugin/battery.c:1341 -+msgid "Display power" -+msgstr "電源を表示する" -+ -+#: ../panel-plugin/battery.c:1344 -+msgid "Display icon" -+msgstr "アイコンを表示する" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "バッテリ状況の表示と監視を行います" -+ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/kk.po xfce4-battery-plugin-0.5.1/po/kk.po ---- xfce4-battery-plugin-0.5.1.orig/po/kk.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/kk.po 2010-12-18 19:27:33.136625569 +0100 -@@ -0,0 +1,153 @@ -+# xfce4-battery-plugin to kazakh. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# Baurzhan Muftakhidinov , 2009. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: trunk\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2009-07-11 17:37+0600\n" -+"Last-Translator: Baurzhan Muftakhidinov \n" -+"Language-Team: Kazakh \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Электр желіден зарядталу)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(Электр желісіне қосулы тұр)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) қалды" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d қалды" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% қалды" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "Электр желісінде емес" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "" -+"WARNING: Your battery has reached critical status. You should plug in or " -+"shutdown your computer now to avoid possible data loss." -+msgstr "" -+"Ескерту: Батареяның заряд шамасы критикалық мәніне жетті. Ақпаратты " -+"жоғалтпас үшін компьютеріңізді электр желісіне қосыңыз не өшіріңіз." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "" -+"WARNING: Your battery is running low. You should consider plugging in or " -+"shutting down your computer soon to avoid possible data loss." -+msgstr "" -+"Ескерту: Батареяның заряд шамасы аз мәніне жетті. Ақпаратты жоғалтпас үшін " -+"компьютеріңізді электр желісіне қосыңыз не өшіріңіз." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Батарея" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Файлды таңдаңыз" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Команданы таңдаңыз" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Келесі url-ды ашу мүмкін емес: %s" -+ -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Батарея бақылаушысы" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Төмен заряд:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Критикалық заряд:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "Аз батарея әрекеті:" -+ -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "Ешнәрсе жасамау" -+ -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Ескерту хабарламасын көрсету" -+ -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Команданы орындау" -+ -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Команданы терминалда орындау" -+ -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Команда:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "Критикалық батарея әрекеті:" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Атауын көрсету" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Пайыз өлшемін көрсету" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Уақытын көрсету" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Батарея толық кезінде уақыт/пайыз шамаларын жасыру" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "Пайыз шамасын көмексөз түрінде көрсету" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "Қалған уақыт шамасын көмексөз түрінде көрсету" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Ток көзін көрсету" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "Таңбашаны көрсету" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Батарея қалпын көрсету және бақылау" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/LINGUAS xfce4-battery-plugin-0.5.1/po/LINGUAS ---- xfce4-battery-plugin-0.5.1.orig/po/LINGUAS 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/LINGUAS 2010-12-18 19:38:16.836154551 +0100 -@@ -1,2 +1,2 @@ - # set of available languages (in alphabetic order) --ar ca cs da de el en_GB eu fi fr gl id it lv nb_NO pl pt_BR pt_PT sq uk ur zh_TW -+ast ca cs da de el en_GB es eu fi fr gl hr hu id it ja kk lv nb_NO nb nl pa pl pt_BR pt pt_PT ru sq sv tr ug uk ur_PK ur vi zh_CN zh_TW -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/lv.po xfce4-battery-plugin-0.5.1/po/lv.po ---- xfce4-battery-plugin-0.5.1.orig/po/lv.po 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/lv.po 2010-12-18 19:27:33.136625569 +0100 -@@ -1,54 +1,70 @@ - # Latvian translation of the xfce4-battery-plugin package. - # Copyright (C) 2006-2007 The Xfce development team. - # This file is distributed under the same license as the xfce4-battery-plugin package. --# Rihards Prieditis , 2007. - # -+# Rihards Prieditis , 2007. -+# Rihards Prieditis , 2009. - msgid "" - msgstr "" - "Project-Id-Version: xfce4-battery-plugin 0.5.0\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-12-20 17:45+0100\n" --"PO-Revision-Date: 2007-11-15 22:12+0300\n" --"Last-Translator: Rihards Priedītis \n" --"Language-Team: Latvian \n" -+"PO-Revision-Date: 2009-09-18 21:30+0100\n" -+"Last-Translator: Rihards Prieditis \n" -+"Language-Team: Latvian \n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=utf-8\n" -+"Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Lokalize 1.0\n" -+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " -+"2);\n" - - #: ../panel-plugin/battery.c:491 - msgid "(Charging from AC)" --msgstr "(Lādējas no tīkla)" -+msgstr "(Lādējas no elektrotīkla)" - - #: ../panel-plugin/battery.c:491 - msgid "(AC on-line)" --msgstr "(Tīkls pieejams)" -+msgstr "(Elektrotīkls pieejams)" - - #: ../panel-plugin/battery.c:500 - #, c-format - msgid "%d%% (%02d:%02d) remaining" --msgstr "%d%% (%02d:%02d) paliek" -+msgstr "%d%% (%02d:%02d) atlicis" - - #: ../panel-plugin/battery.c:502 - #, c-format - msgid "%02d:%02d remaining" --msgstr "%02d:%02d paliek" -+msgstr "%02d:%02d atlicis" - - #: ../panel-plugin/battery.c:504 - #, c-format - msgid "%d%% remaining" --msgstr "%d%% paliek" -+msgstr "%d%% atlicis" - - #: ../panel-plugin/battery.c:506 - msgid "AC off-line" --msgstr "Tīkls atslēgts" -+msgstr "Elektrotīkls atslēgts" - - #: ../panel-plugin/battery.c:570 --msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." --msgstr "UZMANĪBU: Jūsu baterija ir sasniegusi kritisku līmeni. epieciešams pieslēgt elektroenerģijas tīklu, vai izslēgt datoru, lai novērstu iespējamo datu zudumu." -+msgid "" -+"WARNING: Your battery has reached critical status. You should plug in or " -+"shutdown your computer now to avoid possible data loss." -+msgstr "" -+"UZMANĪBU: Jūsu baterija ir sasniegusi kritisku līmeni. nepieciešams " -+"pieslēgties pie " -+"elektroenerģijas tīkla, vai izslēgt datoru, lai novērstu iespējamos datu " -+"zudumu." - - #: ../panel-plugin/battery.c:584 --msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." --msgstr "UZMANĪBU: Jūsu baterijai ir zems uzlādes līmenis. Nepieciešams pieslēgt elektroenerģijas tīklu, vai izslēgt datoru, lai novērstu iespējamo datu zudumu." -+msgid "" -+"WARNING: Your battery is running low. You should consider plugging in or " -+"shutting down your computer soon to avoid possible data loss." -+msgstr "" -+"UZMANĪBU: Jūsu baterijai ir zems uzlādēs līmenis. Nepieciešams pieslēgties " -+"pie " -+"elektroenerģijas tīkla, vai izslēgt datoru, lai novērstu iespējamos datu " -+"zudumu." - - #: ../panel-plugin/battery.c:673 - msgid "Battery" -@@ -67,45 +83,39 @@ - msgid "Unable to open the following url: %s" - msgstr "Neizdevās atvērt sekojošu url: %s" - --#: ../panel-plugin/battery.c:1183 --#: ../panel-plugin/battmon.desktop.in.in.h:1 -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 - msgid "Battery Monitor" --msgstr "Baterijas Novērotājs" -+msgstr "Baterijas novērotājs" - - #: ../panel-plugin/battery.c:1212 - msgid "Low percentage:" --msgstr "Procenti zemajam līmenim:" -+msgstr "Zems līmenis:" - - #: ../panel-plugin/battery.c:1223 - msgid "Critical percentage:" --msgstr "Procenti kritiskajam līmenim:" -+msgstr "Kritisks līmenis:" - - #: ../panel-plugin/battery.c:1236 - msgid "Low battery action:" --msgstr "Zema baterijas līmēņa darbības:" -+msgstr "Zema baterijas līmeņa darbība:" - --#: ../panel-plugin/battery.c:1242 --#: ../panel-plugin/battery.c:1283 -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 - msgid "Do nothing" - msgstr "Nedarīt neko" - --#: ../panel-plugin/battery.c:1244 --#: ../panel-plugin/battery.c:1285 -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 - msgid "Display a warning message" --msgstr "Rādit brīdinājuma paziņojumu" -+msgstr "Rādīt brīdinājuma paziņojumu" - --#: ../panel-plugin/battery.c:1246 --#: ../panel-plugin/battery.c:1287 -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 - msgid "Run command" - msgstr "Izpildīt komandu" - --#: ../panel-plugin/battery.c:1248 --#: ../panel-plugin/battery.c:1289 -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 - msgid "Run command in terminal" - msgstr "Izpildīt komandu terminālī" - --#: ../panel-plugin/battery.c:1261 --#: ../panel-plugin/battery.c:1301 -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 - msgid "Command:" - msgstr "Komanda:" - -@@ -115,15 +125,15 @@ - - #: ../panel-plugin/battery.c:1324 - msgid "Display label" --msgstr "Rādit etiķeti" -+msgstr "Rādīt etiķeti" - - #: ../panel-plugin/battery.c:1327 - msgid "Display percentage" --msgstr "Rādit procentus" -+msgstr "Rādīt procentus" - - #: ../panel-plugin/battery.c:1330 - msgid "Display time" --msgstr "Rādit laiku" -+msgstr "Rādīt laiku" - - #: ../panel-plugin/battery.c:1333 - msgid "Hide time/percentage when full" -@@ -139,7 +149,7 @@ - - #: ../panel-plugin/battery.c:1342 - msgid "Display power" --msgstr "Rādit enerģiju" -+msgstr "Rādīt enerģiju" - - #: ../panel-plugin/battery.c:1345 - msgid "Display icon" -@@ -147,5 +157,5 @@ - - #: ../panel-plugin/battmon.desktop.in.in.h:2 - msgid "Show and monitor the battery status" --msgstr "Rādīt un novērtot baterijas stāvokli" -+msgstr "Rādīt un novērot baterijas stāvokli" - -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/nb.po xfce4-battery-plugin-0.5.1/po/nb.po ---- xfce4-battery-plugin-0.5.1.orig/po/nb.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/nb.po 2010-12-18 19:27:33.136625569 +0100 -@@ -0,0 +1,154 @@ -+# Norwegian Bokmal translations for xfce4-battery-plugin package. -+# Copyright (C) 2007 THE xfce4-battery-plugin'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the xfce4-battery-plugin package. -+# Terje Uriansrud , 2007. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin 0.5.0svn-r2842\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2007-06-20 14:12+0200\n" -+"Last-Translator: Terje Uriansrud \n" -+"Language-Team: Norwegian Bokmal \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Lader fra nett)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(Nettdrift)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) gjenstående" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d gjenstående" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% gjenstående" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "Batteridrift" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "" -+"WARNING: Your battery has reached critical status. You should plug in or " -+"shutdown your computer now to avoid possible data loss." -+msgstr "" -+"Advarsel: Batteriet har nådd kritisk lavt nivå. Du burde koble til nettdrift " -+"eller skru av datamaskinen nå for å unngå tap av data." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "" -+"WARNING: Your battery is running low. You should consider plugging in or " -+"shutting down your computer soon to avoid possible data loss." -+msgstr "" -+"Advarsel: Batteriet begynner å gå tomt for strøm. Du burde vurdere å gå " -+"over til nettdrift eller skru av datamaskinen snart for å unngå tap av " -+"data." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Batteri" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Velg fil" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Velg kommando" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Klarte ikke åpne url: %s" -+ -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Batteriovervåkning" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Lav prosent:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Kritisk prosent:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "Lavt batteri aksjon" -+ -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "Gjør ingenting" -+ -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Vis en advarsel" -+ -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Kjør kommando" -+ -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Kjør kommando i terminal" -+ -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Kommando:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "Kritisk batteri aksjon" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Vis etikett" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Vis prosent" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Vis tid" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Skjul tid/prosent når fullladet" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "Vis prosent i verktøytips" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "Vis gjenstående tid i verktøytips" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Vis tilkoblingsmodus" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "Vis ikon" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Vis og overvåk batteristatus" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/nl.po xfce4-battery-plugin-0.5.1/po/nl.po ---- xfce4-battery-plugin-0.5.1.orig/po/nl.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/nl.po 2010-12-18 19:27:33.136625569 +0100 -@@ -0,0 +1,143 @@ -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2008-07-15 22:17+0200\n" -+"Last-Translator: Mohamed Magdy \n" -+"Language-Team: Arabeyes \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Poedit-Language: Arabic\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Opladen van Netspanning)" -+ -+#: ../panel-plugin/battery.c:491 -+#, fuzzy -+msgid "(AC on-line)" -+msgstr " (Netstroomadapter ingeplugd)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%%(%02d:%02d ) resterend" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d resterend" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% resterend" -+ -+#: ../panel-plugin/battery.c:506 -+#, fuzzy -+msgid "AC off-line" -+msgstr "Netstroomadapter is niet ingeplugd" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "WAARSCHUWING: De batterij heeft kritieke status bereikt. U moet uw computer op netstroom aansluiten of uitzetten om mogelijke gegevensverlies te voorkomen." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "WAARSCHUWING: De batterij is bijna leeg. U moet overwegen uw computer op netstroom aan te sluiten of uit te zetten om mogelijke gegevensverlies te voorkomen." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Batterij" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Selecteer bestand" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Selecteer commando" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Kan de volgende URL niet openen: %s" -+ -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Batterij Monitor" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Laag percentage:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Kritiek percentage:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "Actie wanneer de accu bijna leeg is:" -+ -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "Niets doen" -+ -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Toon een waarschuwing" -+ -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Een commando uitvoeren" -+ -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Voer een commando uit in terminal" -+ -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Commando:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "Kritische batterij lading actie:" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Geef beschrijving weer" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Geef percentage weer" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Geef tijd weer" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Verberg tijd/percentage wanneer de batterij helemaal opgeladen is" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "Geef percentage in de tekstballon weer" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "Geef resterende tijd weer in de tekstballon" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Geef energie weer" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "Geef icoon weer" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Laat zien en houd toezicht op de status van de batterij" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/pa.po xfce4-battery-plugin-0.5.1/po/pa.po ---- xfce4-battery-plugin-0.5.1.orig/po/pa.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/pa.po 2010-12-18 19:27:33.136625569 +0100 -@@ -0,0 +1,150 @@ -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# -+# A S Alam , 2009. -+msgid "" -+msgstr "" -+"Project-Id-Version: \n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2009-10-19 08:05+0530\n" -+"Last-Translator: A S Alam \n" -+"Language-Team: Punjabi/Panjabi \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: Lokalize 1.0\n" -+"Plural-Forms: nplurals=2; plural=n != 1;\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(AC ਤੋਂ ਚਾਰਜ ਹੋ ਰਹੀ ਹੈ)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(AC ਆਨਲਾਈਨ)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) ਬਾਕੀ" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d ਬਾਕੀ" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% ਬਾਕੀ" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "AC ਆਫਲਾਈਨ" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "" -+"WARNING: Your battery has reached critical status. You should plug in or " -+"shutdown your computer now to avoid possible data loss." -+msgstr "" -+ -+#: ../panel-plugin/battery.c:584 -+msgid "" -+"WARNING: Your battery is running low. You should consider plugging in or " -+"shutting down your computer soon to avoid possible data loss." -+msgstr "" -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "ਬੈਟਰੀ" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "ਫਾਇਲ ਚੁਣੋ" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "ਕਮਾਂਡ ਚੁਣੋ" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "ਅੱਗੇ ਦਿੱਤਾ url ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ: %s" -+ -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "ਬੈਟਰੀ ਮਾਨੀਟਰ" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "ਘੱਟ ਫੀਸਦੀ:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "ਨਾਜ਼ੁਕ ਫੀਸਦੀ:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "ਘੱਟ ਬੈਟਰੀ ਐਕਸ਼ਨ:" -+ -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "ਕੁਝ ਨਾ ਕਰੋ" -+ -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "ਚੇਤਵਾਨੀ ਸੁਨੇਹਾ ਵੇਖਾਓ" -+ -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "ਕਮਾਂਡ ਚਲਾਓ" -+ -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "ਟਰਮੀਨਲ 'ਚ ਕਮਾਂਡ ਚਲਾਓ" -+ -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "ਕਮਾਂਡ:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "ਨਾਜ਼ੁਕ ਬੈਟਰੀ ਐਕਸ਼ਨ:" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "ਲੇਬਲ ਵੇਖੋ" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "ਫੀਸਦੀ ਵੇਖੋ" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "ਸਮਾਂ ਵੇਖੋ" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "ਜਦੋਂ ਪੂਰੀ ਹੋਵੇ ਤਾਂ ਸਮਾਂ/ਫੀਸਦੀ ਓਹਲੇ" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "ਟੂਲਟਿੱਪ ਵਿੱਚ ਫੀਸਦੀ ਵੇਖੋ" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "ਟੂਲਟਿੱਪ ਵਿੱਚ ਬਾਕੀ ਰਹਿੰਦਾ ਸਮਾਂ ਵੇਖੋ" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "ਪਾਵਰ ਵੇਖੋ" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "ਆਈਕਾਨ ਵੇਖੋ" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "ਬੈਟਰੀ ਹਾਲਤ ਵੇਖੋ ਅਤੇ ਨਿਗਰਾਨੀ ਕਰੋ" -+ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/pl.po xfce4-battery-plugin-0.5.1/po/pl.po ---- xfce4-battery-plugin-0.5.1.orig/po/pl.po 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/pl.po 2010-12-18 19:27:33.136625569 +0100 -@@ -8,8 +8,8 @@ - "Project-Id-Version: xfce4-battery-plugin 0.5.0\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-12-20 17:45+0100\n" --"PO-Revision-Date: 2006-04-08 12:19+0900\n" --"Last-Translator: Piotr Maliński \n" -+"PO-Revision-Date: 2009-02-03 12:47+0100\n" -+"Last-Translator: Piotr Sokół \n" - "Language-Team: Polish \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -17,11 +17,11 @@ - - #: ../panel-plugin/battery.c:491 - msgid "(Charging from AC)" --msgstr "(Ładuję z AC)" -+msgstr "(Ładowanie z sieci)" - - #: ../panel-plugin/battery.c:491 - msgid "(AC on-line)" --msgstr "(AC podłączone)" -+msgstr "(Podłączony do sieci)" - - #: ../panel-plugin/battery.c:500 - #, c-format -@@ -43,20 +43,12 @@ - msgstr "Brak zasilania" - - #: ../panel-plugin/battery.c:570 --msgid "" --"WARNING: Your battery has reached critical status. You should plug in or " --"shutdown your computer now to avoid possible data loss." --msgstr "" --"UWAGA: Bateria jest prawie rozładowana. Powinieneś wyłączyć komputer lub " --"podłączyć zasilanie by uniknąć potencjalnej utraty danych." -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "UWAGA: Bateria została prawie całkowicie rozładowana. Zaleca się wyłączyć komputer lub podłączyć zasilanie sieciowe aby uniknąć potencjalnej utraty danych." - - #: ../panel-plugin/battery.c:584 --msgid "" --"WARNING: Your battery is running low. You should consider plugging in or " --"shutting down your computer soon to avoid possible data loss." --msgstr "" --"UWAGA: Pojemność baterii spada. Powinieneś wyłączyć komputer lub podłączyć " --"zasilanie by uniknąć potencjalnej utraty danych." -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "UWAGA: Pojemność baterii spada. Zaleca się wyłączyć komputer lub podłączyć zasilanie sieciowe aby uniknąć potencjalnej utraty danych." - - #: ../panel-plugin/battery.c:673 - msgid "Battery" -@@ -73,11 +65,12 @@ - #: ../panel-plugin/battery.c:1159 - #, c-format - msgid "Unable to open the following url: %s" --msgstr "Nie można otworzyć URL: %s" -+msgstr "Nie można otworzyć adresu URL: %s" - --#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+#: ../panel-plugin/battery.c:1183 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 - msgid "Battery Monitor" --msgstr "Monitor Baterii" -+msgstr "Monitor baterii" - - #: ../panel-plugin/battery.c:1212 - msgid "Low percentage:" -@@ -89,43 +82,48 @@ - - #: ../panel-plugin/battery.c:1236 - msgid "Low battery action:" --msgstr "Akcja dla stanu niskiego:" -+msgstr "Akcja stanu niskiego:" - --#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+#: ../panel-plugin/battery.c:1242 -+#: ../panel-plugin/battery.c:1283 - msgid "Do nothing" --msgstr "Nic nie rób" -+msgstr "Brak" - --#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+#: ../panel-plugin/battery.c:1244 -+#: ../panel-plugin/battery.c:1285 - msgid "Display a warning message" - msgstr "Wyświetl ostrzeżenie" - --#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+#: ../panel-plugin/battery.c:1246 -+#: ../panel-plugin/battery.c:1287 - msgid "Run command" - msgstr "Wykonaj polecenie" - --#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+#: ../panel-plugin/battery.c:1248 -+#: ../panel-plugin/battery.c:1289 - msgid "Run command in terminal" - msgstr "Wykonaj polecenie w terminalu" - --#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+#: ../panel-plugin/battery.c:1261 -+#: ../panel-plugin/battery.c:1301 - msgid "Command:" - msgstr "Polecenie:" - - #: ../panel-plugin/battery.c:1277 - msgid "Critical battery action:" --msgstr "Akcja dla stanu krytycznego:" -+msgstr "Akcja stanu krytycznego:" - - #: ../panel-plugin/battery.c:1324 - msgid "Display label" --msgstr "Wyświetl etykietę" -+msgstr "Etykieta" - - #: ../panel-plugin/battery.c:1327 - msgid "Display percentage" --msgstr "Wyświetl procenty" -+msgstr "Procenty" - - #: ../panel-plugin/battery.c:1330 - msgid "Display time" --msgstr "Wyświetl czas" -+msgstr "Pozostały czas" - - #: ../panel-plugin/battery.c:1333 - msgid "Hide time/percentage when full" -@@ -133,19 +131,19 @@ - - #: ../panel-plugin/battery.c:1336 - msgid "Display percentage in tooltip" --msgstr "Wyświetl procenty w dymku" -+msgstr "Procenty w podpowiedzi" - - #: ../panel-plugin/battery.c:1339 - msgid "Display time remaining in tooltip" --msgstr "Wyświetl pozostały czas w dymku" -+msgstr "Pozostały czas w podpowiedzi" - - #: ../panel-plugin/battery.c:1342 - msgid "Display power" --msgstr "Wyświetl moc" -+msgstr "Moc" - - #: ../panel-plugin/battery.c:1345 - msgid "Display icon" --msgstr "Wyświetl ikonę" -+msgstr "Ikona" - - #: ../panel-plugin/battmon.desktop.in.in.h:2 - msgid "Show and monitor the battery status" -@@ -153,3 +151,4 @@ - - #~ msgid "Configure Battery Monitor" - #~ msgstr "Konfiguracja Monitora Baterii" -+ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/pt.po xfce4-battery-plugin-0.5.1/po/pt.po ---- xfce4-battery-plugin-0.5.1.orig/po/pt.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/pt.po 2010-12-18 19:27:33.137625477 +0100 -@@ -0,0 +1,144 @@ -+# Europen Portuguese translation of xfce4-battery-plugin. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# Nuno Miguel , 2007. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin 0.5.0\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2007-06-30 11:42+0100\n" -+"Last-Translator: Nuno Miguel \n" -+"Language-Team: \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Carregando da corrente)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(Ligado à corrente)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) restante" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d restante" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% restante" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "A trabalhar com bateria" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "Aviso: A sua bateria chegou ao estado crítico. Deve ligar à corrente ou desligar o computador para evitar perda de dados." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "Aviso: A sua bateria está fraca. Considere ligar à corrente ou desligar o computador rapidamente para evitar perda de dados." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Bateria" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Seleccione o ficheiro" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Seleccione o comando" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Incapaz de abrir o seguinte url: %s" -+ -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Monitor de bateria" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Baixa percentagem:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Percentagem crítica:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "Acção para bateria fraca:" -+ -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "Nada fazer" -+ -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Mostrar uma mensagem de aviso" -+ -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Executar comando" -+ -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Executar comando no terminal" -+ -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Comando:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "Acção para bateria crítica:" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Exibir texto" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Exibir percentagem" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Exibir tempo" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Ocultar tempo/percentagem quando cheia" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "Exibir percentagem como aviso" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "Exibir tempo restante como aviso " -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Exibir energia" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "exibir ícone" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Mostrar e monitorizar o estado da bateria" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ru.po xfce4-battery-plugin-0.5.1/po/ru.po ---- xfce4-battery-plugin-0.5.1.orig/po/ru.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/ru.po 2010-12-18 19:27:33.137625477 +0100 -@@ -0,0 +1,148 @@ -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: \n" -+"Last-Translator: Urmas \n" -+"Language-Team: None <->\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Poedit-Language: Russian\n" -+"X-Poedit-Country: RUSSIAN FEDERATION\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Зарядка от сети)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(От сети)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "Осталось %d%% (%02d:%02d)" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "Осталось %02d:%02d" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "Осталось %d%%" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "Отключен" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "ВНИМАНИЕ: Ваша батарея разрядилась до критически низкого уровня. Подключитесь к электросети или выключите компьютер во избежание потери данных." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "ВНИМАНИЕ: Ваша батарея разрядилась. Скоро вам потребуется подключиться к электросети или выключить компьютер во избежание потери данных." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Батарея" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Выбор файла" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Выбор команды" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Не удалось открыть адрес: %s" -+ -+#: ../panel-plugin/battery.c:1183 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Индикатор батареи" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Уровень низкого заряда:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Уровень критически низкого заряда:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "Действие при низком заряде:" -+ -+#: ../panel-plugin/battery.c:1242 -+#: ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "Ничего не делать" -+ -+#: ../panel-plugin/battery.c:1244 -+#: ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Показать предупреждение" -+ -+#: ../panel-plugin/battery.c:1246 -+#: ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Запустить команду" -+ -+#: ../panel-plugin/battery.c:1248 -+#: ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Запустить команду в терминале" -+ -+#: ../panel-plugin/battery.c:1261 -+#: ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Команда:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "Действие при критически низком заряде:" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Метка" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Уровень в процентах" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Оставшееся время" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Скрывать при полном заряде" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "Отображение в подсказке заряда в процентах" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "Отображать в подсказке оставшееся время работы" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Подключение к электросети" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "Значок" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Отслеживает состояние батареи" -+ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/sq.po xfce4-battery-plugin-0.5.1/po/sq.po ---- xfce4-battery-plugin-0.5.1.orig/po/sq.po 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/sq.po 2010-12-18 19:27:33.137625477 +0100 -@@ -8,17 +8,16 @@ - "Project-Id-Version: xfce4-battery-plugin 0.5.0\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-12-20 17:45+0100\n" --"PO-Revision-Date: 2007-01-30 21:09+0200\n" -+"PO-Revision-Date: 2008-11-04 22:50+0200\n" - "Last-Translator: Besnik Bleta \n" - "Language-Team: Albanian \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - -- - #: ../panel-plugin/battery.c:491 - msgid "(Charging from AC)" --msgstr "(Po e ngarkoj prej AC-së)" -+msgstr "(Po e ngarkon prej AC-së)" - - #: ../panel-plugin/battery.c:491 - msgid "(AC on-line)" -@@ -66,7 +65,7 @@ - #: ../panel-plugin/battery.c:1159 - #, c-format - msgid "Unable to open the following url: %s" --msgstr "I pazoti të hap url-në vijuese: %s" -+msgstr "I pazoti të hapë url-në vijuese: %s" - - #: ../panel-plugin/battery.c:1183 - #: ../panel-plugin/battmon.desktop.in.in.h:1 -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/sv.po xfce4-battery-plugin-0.5.1/po/sv.po ---- xfce4-battery-plugin-0.5.1.orig/po/sv.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/sv.po 2010-12-18 19:27:33.137625477 +0100 -@@ -0,0 +1,152 @@ -+# Swedish translation for xfce4-battery-plugin. -+# Copyright (C) 2008, 2009 Free Software Foundation, Inc. -+# This file is distributed under the same license as the xfce4-battery-plugin package. -+# Daniel Nylander , 2008, 2009. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2009-02-01 18:41+0100\n" -+"PO-Revision-Date: 2009-02-01 18:44+0100\n" -+"Last-Translator: Daniel Nylander \n" -+"Language-Team: Swedish \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: ../panel-plugin/battery.c:494 -+msgid "(Charging from AC)" -+msgstr "(Laddar upp från extern strömkälla)" -+ -+#: ../panel-plugin/battery.c:494 -+msgid "(AC on-line)" -+msgstr "(Extern ström ansluten)" -+ -+#: ../panel-plugin/battery.c:503 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) återstår" -+ -+#: ../panel-plugin/battery.c:505 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d återstår" -+ -+#: ../panel-plugin/battery.c:507 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% återstår" -+ -+#: ../panel-plugin/battery.c:509 -+#, c-format -+msgid "AC off-line" -+msgstr "Extern ström frånkopplad" -+ -+#: ../panel-plugin/battery.c:573 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "VARNING: Ditt batteri har nått kritisk status. Du bör ansluta en extern strömkälla eller stänga av din dator nu för att undvika att data går förlorat." -+ -+#: ../panel-plugin/battery.c:587 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "VARNING: Ditt batteri börjar få låg laddningskapacitet. Du bör överväga att ansluta en extern strömkälla eller stänga av din dator snart för att undvika att data går förlorat." -+ -+#: ../panel-plugin/battery.c:672 -+msgid "Battery" -+msgstr "Batteri" -+ -+#: ../panel-plugin/battery.c:1098 -+msgid "Select file" -+msgstr "Välj fil" -+ -+#: ../panel-plugin/battery.c:1139 -+msgid "Select command" -+msgstr "Välj kommando" -+ -+#: ../panel-plugin/battery.c:1158 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Kunde inte öppna följande url: %s" -+ -+#: ../panel-plugin/battery.c:1182 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Batteriövervakare" -+ -+#: ../panel-plugin/battery.c:1211 -+msgid "Low percentage:" -+msgstr "Låg procentandel:" -+ -+#: ../panel-plugin/battery.c:1222 -+msgid "Critical percentage:" -+msgstr "Kritisk procentandel:" -+ -+#: ../panel-plugin/battery.c:1235 -+msgid "Low battery action:" -+msgstr "Åtgärd för låg batterikapacitet:" -+ -+#: ../panel-plugin/battery.c:1241 -+#: ../panel-plugin/battery.c:1282 -+msgid "Do nothing" -+msgstr "Gör ingenting" -+ -+#: ../panel-plugin/battery.c:1243 -+#: ../panel-plugin/battery.c:1284 -+msgid "Display a warning message" -+msgstr "Visa ett varningsmeddelande" -+ -+#: ../panel-plugin/battery.c:1245 -+#: ../panel-plugin/battery.c:1286 -+msgid "Run command" -+msgstr "Kör kommando" -+ -+#: ../panel-plugin/battery.c:1247 -+#: ../panel-plugin/battery.c:1288 -+msgid "Run command in terminal" -+msgstr "Kör kommando i terminal" -+ -+#: ../panel-plugin/battery.c:1260 -+#: ../panel-plugin/battery.c:1300 -+msgid "Command:" -+msgstr "Kommando:" -+ -+#: ../panel-plugin/battery.c:1276 -+msgid "Critical battery action:" -+msgstr "Åtgärd för kritisk batterikapacitet:" -+ -+#: ../panel-plugin/battery.c:1323 -+msgid "Display label" -+msgstr "Visa etikett" -+ -+#: ../panel-plugin/battery.c:1326 -+msgid "Display percentage" -+msgstr "Visa procentandel" -+ -+#: ../panel-plugin/battery.c:1329 -+msgid "Display time" -+msgstr "Visa tid" -+ -+#: ../panel-plugin/battery.c:1332 -+msgid "Hide time/percentage when full" -+msgstr "Dölj tid/procentandel vid fullständig laddning" -+ -+#: ../panel-plugin/battery.c:1335 -+msgid "Display percentage in tooltip" -+msgstr "Visa procentandel i verktygstips" -+ -+#: ../panel-plugin/battery.c:1338 -+msgid "Display time remaining in tooltip" -+msgstr "Visa återstående tid i verktygstips" -+ -+#: ../panel-plugin/battery.c:1341 -+msgid "Display power" -+msgstr "Visa strömkapacitet" -+ -+#: ../panel-plugin/battery.c:1344 -+msgid "Display icon" -+msgstr "Visa ikon" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Visa och övervaka batteristatus" -+ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/tr.po xfce4-battery-plugin-0.5.1/po/tr.po ---- xfce4-battery-plugin-0.5.1.orig/po/tr.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/tr.po 2010-12-18 19:27:33.137625477 +0100 -@@ -0,0 +1,149 @@ -+msgid "" -+msgstr "" -+"Project-Id-Version: XFCE\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: \n" -+"Last-Translator: Utku Aydın \n" -+"Language-Team: XFCE Türkiye\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Poedit-Language: Turkish\n" -+"X-Poedit-Country: TURKEY\n" -+"X-Poedit-SourceCharset: utf-8\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Fişten şarj ediyor)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "Fişe takılı" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) kaldı" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d kaldı" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% kaldı" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "Fişe takılı değil" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "UYARI: Piliniz çok az. Bilgisayarınızı hemen fişe takın veya kapatın yoksa veri kaybı yaşayabilirsiniz." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "UYARI: Piliniz bitmek üzere. Bilgisayarınızı en kısa sürede fişe takın ya da kapatın, aksi takdirde veri kaybı yaşayabilirsiniz." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Pil" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Dosya seç" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Komut seç" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Belirtilen URL açılamadı: %s" -+ -+#: ../panel-plugin/battery.c:1183 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Pil Gözlemcisi" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Düşük doluluk oranı:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Kritik doluluk oranı:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "Pil seviyesi düşük olduğunda gerçekleştirilecek işlem:" -+ -+#: ../panel-plugin/battery.c:1242 -+#: ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "Bir şey yapma" -+ -+#: ../panel-plugin/battery.c:1244 -+#: ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Hata mesajı göster" -+ -+#: ../panel-plugin/battery.c:1246 -+#: ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Komut çalıştır" -+ -+#: ../panel-plugin/battery.c:1248 -+#: ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Terminalde komut çalıştır" -+ -+#: ../panel-plugin/battery.c:1261 -+#: ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Komut:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "Pil seviyesi kritik olduğunda gerçekleştirilecek işlem:" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Etiketi göster" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Doluluk oranını göster" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Saati göster" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Doluyken saati/doluluk oranını gizle" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "İpucunda doluluk oranını göster" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "İpucunda kalan pil süresini göster" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Gücü göster" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "Simgeyi göster" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Pil durumunu göster ve gözlemle" -+ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ug.po xfce4-battery-plugin-0.5.1/po/ug.po ---- xfce4-battery-plugin-0.5.1.orig/po/ug.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/ug.po 2010-12-18 19:27:33.137625477 +0100 -@@ -0,0 +1,152 @@ -+# Uyghur translations for xfce4-battery-plugin package. -+# Copyright (C) Eduard Roccatello -+# This file is distributed under the same license as the xfce4-battery-plugin package. -+# Gheyret T.Kenji , 2010. -+# -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2008-12-05 22:54+0900\n" -+"PO-Revision-Date: 2008-12-06 23:24+0900\n" -+"Last-Translator: Gheyret T.Kenji \n" -+"Language-Team: Uyghur Computer Science Association \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: ../panel-plugin/battery.c:494 -+msgid "(Charging from AC)" -+msgstr "(AC دىن توكلاۋاتىدۇ)" -+ -+#: ../panel-plugin/battery.c:494 -+msgid "(AC on-line)" -+msgstr "(AC غا ئۇلاقلىق)" -+ -+#: ../panel-plugin/battery.c:503 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) قالدى" -+ -+#: ../panel-plugin/battery.c:505 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d قالدى" -+ -+#: ../panel-plugin/battery.c:507 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% قالدى" -+ -+#: ../panel-plugin/battery.c:509 -+#, c-format -+msgid "AC off-line" -+msgstr "AC ئۇلانماپتۇ" -+ -+#: ../panel-plugin/battery.c:573 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "دىققەت: توكدان تۈگەي دەپلا قالدى، سانلىق ئاساسلارنىڭ يوقاپ كەتمەسلىكى ئۈچۈن توكقا ئۇلاش ياكى كومپيۇتېرنى ئېتىشنى تېزدىن بېكىتىڭ." -+ -+#: ../panel-plugin/battery.c:587 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "دىققەت: توكداننىڭ توكى ئاز قالدى. سانلىق ئاساسلارنىڭ يوقاپ كەتمەسلىكى ئۈچۈن توكقا ئۇلاش ياكى كومپيۇتېرنى ئېتىشنى ئويلىشىپ كۆرۈڭ." -+ -+#: ../panel-plugin/battery.c:672 -+msgid "Battery" -+msgstr "توكدان" -+ -+#: ../panel-plugin/battery.c:1098 -+msgid "Select file" -+msgstr "ھۆججەت تاللا" -+ -+#: ../panel-plugin/battery.c:1139 -+msgid "Select command" -+msgstr "بۇيرۇق تاللا" -+ -+#: ../panel-plugin/battery.c:1158 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "次の URL を開くことができません: %s" -+ -+#: ../panel-plugin/battery.c:1182 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "توكدان كۆزەتكۈ" -+ -+#: ../panel-plugin/battery.c:1211 -+msgid "Low percentage:" -+msgstr "ئاز قالدىنىڭ پىرسەنتى:" -+ -+#: ../panel-plugin/battery.c:1222 -+msgid "Critical percentage:" -+msgstr "تۈگەي دەپ قالدىنىڭ پىرسەنتى:" -+ -+#: ../panel-plugin/battery.c:1235 -+msgid "Low battery action:" -+msgstr "توك ئاز قالغاندا ئېلىپ بارىدىغان مەشغۇلات:" -+ -+#: ../panel-plugin/battery.c:1241 -+#: ../panel-plugin/battery.c:1282 -+msgid "Do nothing" -+msgstr "ھېچ ئىش قىلما" -+ -+#: ../panel-plugin/battery.c:1243 -+#: ../panel-plugin/battery.c:1284 -+msgid "Display a warning message" -+msgstr "دىققەت ئۇچۇرى چىقىرىش" -+ -+#: ../panel-plugin/battery.c:1245 -+#: ../panel-plugin/battery.c:1286 -+msgid "Run command" -+msgstr "بۇيرۇق ئىجرا قىل" -+ -+#: ../panel-plugin/battery.c:1247 -+#: ../panel-plugin/battery.c:1288 -+msgid "Run command in terminal" -+msgstr "تېرمىنالدا بۇيرۇق ئىجرا قىل" -+ -+#: ../panel-plugin/battery.c:1260 -+#: ../panel-plugin/battery.c:1300 -+msgid "Command:" -+msgstr "بۇيرۇق:" -+ -+#: ../panel-plugin/battery.c:1276 -+msgid "Critical battery action:" -+msgstr "توك تۈگەي دەپ قالغاندا ئېلىپ بارىدىغان مەشغۇلات:" -+ -+#: ../panel-plugin/battery.c:1323 -+msgid "Display label" -+msgstr "ئەن كۆرسەت" -+ -+#: ../panel-plugin/battery.c:1326 -+msgid "Display percentage" -+msgstr "قالدۇق پىرسەنتىنى كۆرسەت" -+ -+#: ../panel-plugin/battery.c:1329 -+msgid "Display time" -+msgstr "ۋاقىت كۆرسەت" -+ -+#: ../panel-plugin/battery.c:1332 -+msgid "Hide time/percentage when full" -+msgstr "تولۇق توكلانغاندا ۋاقىت ۋە ئاز قالدۇق پىرسەنتىنى يوشۇر" -+ -+#: ../panel-plugin/battery.c:1335 -+msgid "Display percentage in tooltip" -+msgstr "قالدۇقنى tooltip تا كۆرسەت" -+ -+#: ../panel-plugin/battery.c:1338 -+msgid "Display time remaining in tooltip" -+msgstr "قالغان ۋاقىتنى tooltip تا كۆرسەت" -+ -+#: ../panel-plugin/battery.c:1341 -+msgid "Display power" -+msgstr "توك مەنبەسىنى كۆرسەت" -+ -+#: ../panel-plugin/battery.c:1344 -+msgid "Display icon" -+msgstr "سىنبەلگە كۆرسەت" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "توكدان ھالىتىنى كۆزىتىپ كۆرسەت" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ur_PK.po xfce4-battery-plugin-0.5.1/po/ur_PK.po ---- xfce4-battery-plugin-0.5.1.orig/po/ur_PK.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/ur_PK.po 2010-12-18 19:27:33.137625477 +0100 -@@ -0,0 +1,155 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2009-05-14 02:41+0500\n" -+"Last-Translator: Muhammad Ali Makki \n" -+"Language-Team: Urdu \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Poedit-Language: Urdu\n" -+"X-Poedit-Country: PAKISTAN\n" -+"X-Poedit-SourceCharset: utf-8\n" -+"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(چارجر سے چارجنگ جاری ہے)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(چارجر لگا ہوا ہے)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "%d%% (%02d:%02d) باقی ہے" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "%02d:%02d باقی ہے" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "%d%% باقی ہے" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "چارجر لگا ہوا نہیں ہے" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "انتباہ: آپ کی بیٹری خطرناک حد تک پہنچ گئی ہے. فوری طور پر چارج کریں یا کمپیوٹر بند کردیں تاکہ ڈیٹا کے کسی قسم کے نقصان سے بچا جاسکے." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "انتباہ: آپ کی بیٹری کم ہوگئی ہے. اسے فوری طور پر چارج کریں یا جلد ہی اپنا کمپیوٹر بند کردیں تاکہ کسی قسم کے ڈیٹا کے نقصان سے بچا جاسکے." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "بیٹری" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "فائل منتخب کریں" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "کمانڈ منتخب کریں" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "یہ url کھولنے میں ناکامی: %s" -+ -+#: ../panel-plugin/battery.c:1183 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "بیٹری مانیٹر" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "کم فیصد:" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "خطرناک فیصد:" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "کم بیٹری حرکت:" -+ -+#: ../panel-plugin/battery.c:1242 -+#: ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "کچھ نہ کریں" -+ -+#: ../panel-plugin/battery.c:1244 -+#: ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "انتباہی پیغام دکھائیں" -+ -+#: ../panel-plugin/battery.c:1246 -+#: ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "کمانڈ چلائیں" -+ -+#: ../panel-plugin/battery.c:1248 -+#: ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "کمانڈ ٹرمنل میں چلائیں" -+ -+#: ../panel-plugin/battery.c:1261 -+#: ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "کمانڈ:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "خطرناک بیٹری حرکت:" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "لیبل دکھائیں" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "فیصد دکھائیں" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "وقت دکھائیں" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "فُل ہونے پر وقت/فیصد مت دکھائیں" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "فیصد ٹول ٹپ میں دکھائیں" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "بقیہ وقت ٹول ٹپ میں دکھائیں" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "پاور دکھائیں" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "آئکن دکھائیں" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "ظاہر کریں اور بیٹری کی حالت دیکھتے رہیں" -+ -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/ur.po xfce4-battery-plugin-0.5.1/po/ur.po ---- xfce4-battery-plugin-0.5.1.orig/po/ur.po 2008-09-04 22:53:40.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/po/ur.po 2010-12-18 19:27:33.137625477 +0100 -@@ -8,8 +8,8 @@ - "Project-Id-Version: xfce4-battery-plugin\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2006-12-20 17:45+0100\n" --"PO-Revision-Date: 2007-10-26 17:39+0500\n" --"Last-Translator: Muhammad Ali Makki \n" -+"PO-Revision-Date: 2009-05-14 02:41+0500\n" -+"Last-Translator: Muhammad Ali Makki \n" - "Language-Team: Urdu \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" -@@ -17,14 +17,15 @@ - "X-Poedit-Language: Urdu\n" - "X-Poedit-Country: PAKISTAN\n" - "X-Poedit-SourceCharset: utf-8\n" -+"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" - - #: ../panel-plugin/battery.c:491 - msgid "(Charging from AC)" --msgstr "(ACسے چارجنگ)" -+msgstr "(چارجر سے چارجنگ جاری ہے)" - - #: ../panel-plugin/battery.c:491 - msgid "(AC on-line)" --msgstr "(AC آن لائن)" -+msgstr "(چارجر لگا ہوا ہے)" - - #: ../panel-plugin/battery.c:500 - #, c-format -@@ -43,7 +44,7 @@ - - #: ../panel-plugin/battery.c:506 - msgid "AC off-line" --msgstr "AC آف لائن" -+msgstr "چارجر لگا ہوا نہیں ہے" - - #: ../panel-plugin/battery.c:570 - msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/vi.po xfce4-battery-plugin-0.5.1/po/vi.po ---- xfce4-battery-plugin-0.5.1.orig/po/vi.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/vi.po 2010-12-18 19:27:33.137625477 +0100 -@@ -0,0 +1,154 @@ -+# Vietnamese translations for xfce-battery package. -+# Copyright (C) 2009 THE i'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the i package. -+# Nguyễn Quốc Vinh, , 2009 -+# Automatically generated, 2009. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2006-12-20 17:45+0100\n" -+"Last-Translator: Nguyen Quoc Vinh \n" -+"Language-Team: none\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0;\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "(Đang sạc pin)" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "(Đang sử dụng điện nguồn)" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "Còn lại %d%% (%02d:%02d)" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "Còn lại %02d:%02d" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "Còn lại %d%%" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "Nguồn không có điện" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "" -+"WARNING: Your battery has reached critical status. You should plug in or " -+"shutdown your computer now to avoid possible data loss." -+msgstr "" -+"Cảnh báo: Pin đã đạt mức báo động! Bạn nên cắm điện vào hay tắt máy tính để " -+"tránh mất dữ liệu." -+ -+#: ../panel-plugin/battery.c:584 -+msgid "" -+"WARNING: Your battery is running low. You should consider plugging in or " -+"shutting down your computer soon to avoid possible data loss." -+msgstr "" -+"Cảnh báo: Pin của bạn đang còn ít! Bạn nên cắm điện vào hay tắt máy tính để " -+"tránh mất dữ liệu." -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "Pin" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "Chọn file" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "Chọn lệnh" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "Không thể mở url sau: %s" -+ -+#: ../panel-plugin/battery.c:1183 ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "Giám sát Pin" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "Mức thấp" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "Mức báo động" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "Hành động khi pin ở mức thấp" -+ -+#: ../panel-plugin/battery.c:1242 ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "Không làm gì cả" -+ -+#: ../panel-plugin/battery.c:1244 ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "Hiển thị cảnh báo" -+ -+#: ../panel-plugin/battery.c:1246 ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "Chạy lệnh" -+ -+#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "Chạy lệnh trong terminal" -+ -+#: ../panel-plugin/battery.c:1261 ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "Lệnh:" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "Hành động khi pin đạt mức báo động" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "Hiển thị nhãn" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "Hiển thị phần trăm" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "Hiển thị thời gian" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "Ẩn thời gian/phần trăm khi đầy" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "Hiển thị phần trăm trên chú thích" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "Hiển thị thời gian còn lại trên chú thích" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "Hiển thị nguồn" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "Hiển thị biểu tượng" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "Hiển thị và giám sát tình trạng pin" -diff -Nur xfce4-battery-plugin-0.5.1.orig/po/zh_CN.po xfce4-battery-plugin-0.5.1/po/zh_CN.po ---- xfce4-battery-plugin-0.5.1.orig/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 -+++ xfce4-battery-plugin-0.5.1/po/zh_CN.po 2010-12-18 19:27:33.138625386 +0100 -@@ -0,0 +1,151 @@ -+# Chinese translations for xfce package. -+# Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the xfce package. -+# Hunt Xu ", 2008. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: xfce 4-battery-plugin\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2006-12-20 17:45+0100\n" -+"PO-Revision-Date: 2008-12-04 18:19+0800\n" -+"Last-Translator: Hunt Xu \n" -+"Language-Team: Chinese (simplified)\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(Charging from AC)" -+msgstr "（从交流电源充电）" -+ -+#: ../panel-plugin/battery.c:491 -+msgid "(AC on-line)" -+msgstr "（已连接至交流电源）" -+ -+#: ../panel-plugin/battery.c:500 -+#, c-format -+msgid "%d%% (%02d:%02d) remaining" -+msgstr "剩余 %d%% (%02d:%02d)" -+ -+#: ../panel-plugin/battery.c:502 -+#, c-format -+msgid "%02d:%02d remaining" -+msgstr "剩余 %02d:%02d" -+ -+#: ../panel-plugin/battery.c:504 -+#, c-format -+msgid "%d%% remaining" -+msgstr "剩余 %d%%" -+ -+#: ../panel-plugin/battery.c:506 -+msgid "AC off-line" -+msgstr "交流电源已断开" -+ -+#: ../panel-plugin/battery.c:570 -+msgid "WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss." -+msgstr "警告：您的电池电量已达临界值。请接上电源或者关机以避免数据丢失。" -+ -+#: ../panel-plugin/battery.c:584 -+msgid "WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss." -+msgstr "警告：您的电池电量低。请接上电源或者关机以避免数据丢失。" -+ -+#: ../panel-plugin/battery.c:673 -+msgid "Battery" -+msgstr "电池" -+ -+#: ../panel-plugin/battery.c:1099 -+msgid "Select file" -+msgstr "选择文件" -+ -+#: ../panel-plugin/battery.c:1140 -+msgid "Select command" -+msgstr "选择命令" -+ -+#: ../panel-plugin/battery.c:1159 -+#, c-format -+msgid "Unable to open the following url: %s" -+msgstr "无法打开以下网址：%s" -+ -+#: ../panel-plugin/battery.c:1183 -+#: ../panel-plugin/battmon.desktop.in.in.h:1 -+msgid "Battery Monitor" -+msgstr "电池监视器" -+ -+#: ../panel-plugin/battery.c:1212 -+msgid "Low percentage:" -+msgstr "低电量百分比：" -+ -+#: ../panel-plugin/battery.c:1223 -+msgid "Critical percentage:" -+msgstr "临界电量百分比：" -+ -+#: ../panel-plugin/battery.c:1236 -+msgid "Low battery action:" -+msgstr "电量低时采取如下动作：" -+ -+#: ../panel-plugin/battery.c:1242 -+#: ../panel-plugin/battery.c:1283 -+msgid "Do nothing" -+msgstr "什么都不做" -+ -+#: ../panel-plugin/battery.c:1244 -+#: ../panel-plugin/battery.c:1285 -+msgid "Display a warning message" -+msgstr "显示一条警告信息" -+ -+#: ../panel-plugin/battery.c:1246 -+#: ../panel-plugin/battery.c:1287 -+msgid "Run command" -+msgstr "执行命令" -+ -+#: ../panel-plugin/battery.c:1248 -+#: ../panel-plugin/battery.c:1289 -+msgid "Run command in terminal" -+msgstr "在终端中执行命令" -+ -+#: ../panel-plugin/battery.c:1261 -+#: ../panel-plugin/battery.c:1301 -+msgid "Command:" -+msgstr "命令：" -+ -+#: ../panel-plugin/battery.c:1277 -+msgid "Critical battery action:" -+msgstr "电量到达临界值时采取如下动作：" -+ -+#: ../panel-plugin/battery.c:1324 -+msgid "Display label" -+msgstr "显示标签" -+ -+#: ../panel-plugin/battery.c:1327 -+msgid "Display percentage" -+msgstr "显示百分比" -+ -+#: ../panel-plugin/battery.c:1330 -+msgid "Display time" -+msgstr "显示时间" -+ -+#: ../panel-plugin/battery.c:1333 -+msgid "Hide time/percentage when full" -+msgstr "当电池电量满时隐藏时间与百分比" -+ -+#: ../panel-plugin/battery.c:1336 -+msgid "Display percentage in tooltip" -+msgstr "在工具提示中显示百分比" -+ -+#: ../panel-plugin/battery.c:1339 -+msgid "Display time remaining in tooltip" -+msgstr "在工具提示中显示剩余时间" -+ -+#: ../panel-plugin/battery.c:1342 -+msgid "Display power" -+msgstr "显示电源状态" -+ -+#: ../panel-plugin/battery.c:1345 -+msgid "Display icon" -+msgstr "显示图标" -+ -+#: ../panel-plugin/battmon.desktop.in.in.h:2 -+msgid "Show and monitor the battery status" -+msgstr "显示并监测电池状态" -+ diff --git a/xfce4-battery-plugin-0.5.1-use-sysfs.patch b/xfce4-battery-plugin-0.5.1-use-sysfs.patch deleted file mode 100644 index f2414c6..0000000 --- a/xfce4-battery-plugin-0.5.1-use-sysfs.patch +++ /dev/null @@ -1,354 +0,0 @@ ---- xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c 2008-04-06 02:56:10.502679698 +0200 -+++ xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.c 2008-04-06 03:15:11.306678469 +0200 -@@ -54,6 +54,10 @@ - - static char batteries[MAXBATT][128]; - static char battinfo[MAXBATT][128]; -+/* path to AC adapter because not all AC adapter are listed -+in /sys/class/power_supply/AC/ this obviously only supports one AC adapter. */ -+static char sysfsacdir[128]; -+ - #ifndef __linux__ - #if HAVE_SYSCTL - static int -@@ -181,9 +185,76 @@ - #endif - #endif - -+int check_acpi_sysfs(void) -+{ -+ DIR *sysfs; -+ struct dirent *batt; -+ char *name; -+ FILE *typefile; -+ char typepath[128]; -+ char tmptype[8]; -+ -+ sysfs = opendir("/sys/class/power_supply"); -+ if (sysfs == 0) -+ { -+ #ifdef DEBUG -+ printf("DBG:No acpi support for sysfs. Trying procfs...\n"); -+ #endif -+ return 2; -+ } -+ -+ while ((batt = readdir(sysfs))) -+ { -+ name = batt->d_name; -+ if (!strncmp(".", name, 1)) continue; -+ /* check whether /sys/class/power_supply/$name/type exists and -+ contains "Battery" or "Mains" */ -+ sprintf(typepath, "/sys/class/power_supply/%s/type",name); -+ if(!(typefile = fopen(typepath, "r"))) continue; -+ fgets(tmptype, 8, typefile); -+ fclose(typefile); -+ if(strncmp("Battery", tmptype, 7)==0) -+ { -+ sprintf(batteries[batt_count], "/sys/class/power_supply/%s", name); -+ #ifdef DEBUG -+ printf("DBG:battery number %d at:\n",batt_count); -+ printf("DBG:sysfs dir->%s\n",batteries[batt_count]); -+ printf("DBG:------------------------\n"); -+ #endif -+ batt_count++; -+ } -+ /* I guess that the type of the AC adapter is always "Mains" (?) */ -+ else if(strncmp("Mains", tmptype, 5)==0){ -+ sprintf(sysfsacdir, "/sys/class/power_supply/%s", name); -+ #ifdef DEBUG -+ printf("DBG:sysfs AC dir->%s\n",sysfsacdir); -+ printf("DBG:------------------------\n"); -+ #endif -+ } -+ } -+ closedir(sysfs); -+ if ( batt_count == 0 ) -+ { -+#ifdef DEBUG -+ printf("DBG:No acpi support for sysfs. Trying procfs...\n"); -+#endif -+ acpi_sysfs = 0; -+ return 2; -+ } -+ else -+ { -+ acpi_sysfs = 1; -+ return 0; -+ } -+} -+ - /* see if we have ACPI support */ - int check_acpi(void) - { -+#ifdef __linux__ -+ if ( check_acpi_sysfs() == 0 ) -+ return 0; -+#endif - DIR *battdir; - struct dirent *batt; - char *name; -@@ -262,9 +333,82 @@ - #endif - } - -+int read_sysfs_int(char* filename) -+{ -+ FILE* f; -+ f = fopen(filename,"r"); -+ if ( !f ) -+ { -+#ifdef DEBUG -+ printf("DBG:Could not open %s\n",filename); -+#endif -+ return 0; -+ } -+ int out; -+ fscanf(f,"%d",&out); -+ fclose(f); -+ return out; -+} -+ -+char* read_sysfs_string(char* filename) -+{ -+ FILE* f; -+ f = fopen(filename,"r"); -+ if ( !f ) -+ { -+#ifdef DEBUG -+ printf("DBG:Could not open %s\n",filename); -+#endif -+ return NULL; -+ } -+ fscanf(f,"%s",buf2); -+ fclose(f); -+ return buf2; -+} -+ -+int read_acad_state_sysfs(void) -+{ -+ DIR *sysfs; -+ struct dirent *propety; -+ char *name; -+ char onlinefilepath[128]; -+ -+ sysfs = opendir(sysfsacdir); -+ if (sysfs == 0) -+ { -+ #ifdef DEBUG -+ printf("DBG:Can't open %s",sysfsacdir); -+ #endif -+ return 0; -+ } -+ closedir(sysfs); -+ -+ if (!acadstate) acadstate=(ACADstate *)malloc(sizeof(ACADstate)); -+ /* this code doesn't make much sense.. why look at the whole directory?! -+ while ((propety = readdir(sysfs))) -+ { -+ name = propety->d_name; -+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; -+ -+ if (strcmp(name,"online") == 0) -+ { -+ acadstate->state = ( read_sysfs_int("/sys/class/power_supply/AC/online") == 1 ) ; -+ } -+ } -+ */ -+ sprintf(onlinefilepath, "%s/online", sysfsacdir); -+ /* if onlinefilepath doesn't exist read_sysfs_int() will return 0 -+ so acadstate->state will be 0, that should be ok */ -+ acadstate->state = ( read_sysfs_int(onlinefilepath) == 1 ); -+ -+ return acadstate->state; -+} -+ - int read_acad_state(void) - { - #ifdef __linux__ -+ if (acpi_sysfs) -+ return read_acad_state_sysfs(); - FILE *acpi; - char *ptr; - char stat; -@@ -354,20 +498,83 @@ - #endif - } - -+int read_acpi_info_sysfs(int battery) -+{ -+ DIR *sysfs; -+ struct dirent *propety; -+ char *name; -+ -+ sysfs = opendir(batteries[battery]); -+ if (sysfs == 0) -+ { -+ #ifdef DEBUG -+ printf("DBG:Can't open %s!\n", batteries[battery]); -+ #endif -+ return 0; -+ } -+ /* malloc.. might explain the random battery level values on 2.6.24 -+ systems (energe_full is called charge_full so the value isn't initialised -+ and some random data from the heap is displayed..) -+ if (!acpiinfo) acpiinfo=(ACPIinfo *)malloc(sizeof(ACPIinfo)); -+ */ -+ if (!acpiinfo) acpiinfo=(ACPIinfo *)calloc(1, sizeof(ACPIinfo)); -+ -+ while ((propety = readdir(sysfs))) -+ { -+ name = propety->d_name; -+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; -+ /* at least on my system this is called charge_full */ -+ if ((strcmp(name,"energy_full") == 0) || (strcmp(name,"charge_full") == 0)) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpiinfo->last_full_capacity = read_sysfs_int(buf); -+ } -+ if ((strcmp(name,"energy_full_design") == 0) || (strcmp(name,"charge_full_design") == 0)) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpiinfo->design_capacity = read_sysfs_int(buf); -+ } -+ if (strcmp(name,"technology") == 0) -+ { -+ char *tmp; -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ tmp = read_sysfs_string(buf); -+ if (tmp != NULL) -+ { -+ if (strcmp(tmp,"Li-ion") == 0) -+ acpiinfo->battery_technology = 1; -+ else -+ acpiinfo->battery_technology = 0; -+ } -+ } -+ if (strcmp(name,"present") == 0) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpiinfo->present = read_sysfs_int(buf); -+ } -+ } -+ closedir(sysfs); -+ return acpiinfo->present; -+} -+ - int read_acpi_info(int battery) - { - #ifdef __linux__ -- FILE *acpi; -- char *ptr; -- char stat; -- int temp; -- - if (battery > MAXBATT) { - #ifdef DEBUG - printf("DBG: error, battery > MAXBATT (%d)\n",MAXBATT); - #endif - return 0; - } -+ -+ if (acpi_sysfs) -+ return read_acpi_info_sysfs(battery); -+ -+ FILE *acpi; -+ char *ptr; -+ char stat; -+ int temp; -+ - if (!(acpi = fopen (battinfo[battery], "r"))) { - #ifdef DEBUG - printf("DBG:cannot open %s for read!\n",battinfo[battery]); -@@ -514,9 +721,80 @@ - - } - -+int read_acpi_state_sysfs(int battery) -+{ -+ DIR *sysfs; -+ struct dirent *propety; -+ char *name; -+ -+ sysfs = opendir(batteries[battery]); -+ if (sysfs == 0) -+ { -+ #ifdef DEBUG -+ printf("DBG:Can't open %s!\n", batteries[battery]); -+ #endif -+ return 0; -+ } -+ -+ /* again it might be better to use calloc -+ if (!acpistate) acpistate=(ACPIstate *)malloc(sizeof(ACPIstate)); -+ */ -+ if (!acpistate) acpistate=(ACPIstate *)calloc(1, sizeof(ACPIstate)); -+ -+ while ((propety = readdir(sysfs))) -+ { -+ name = propety->d_name; -+ if (!strncmp(".", name, 1) || !strncmp("..", name, 2)) continue; -+ -+ if (strcmp(name,"status") == 0) -+ { -+ char *tmp; -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ tmp = read_sysfs_string(buf); -+ if ( tmp != NULL ) -+ { -+ if (strcmp(tmp,"Charging") == 0) -+ acpistate->state = CHARGING; -+ else if (strcmp(tmp,"Discharging") == 0) -+ acpistate->state = DISCHARGING; -+ else if (strcmp(tmp,"Full") == 0) -+ acpistate->state = POWER; -+ else -+ acpistate->state = UNKNOW; -+ } -+ } -+ /* on my system this is called charge_now */ -+ if ((strcmp(name,"energy_now") == 0) || (strcmp(name,"charge_now") == 0)) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpistate->rcapacity = read_sysfs_int(buf); -+ acpistate->percentage = (((float) acpistate->rcapacity)/acpiinfo->last_full_capacity) * 100; -+ } -+ if (strcmp(name,"current_now") == 0) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpistate->prate = read_sysfs_int(buf); -+ if ( acpistate->prate < 0 ) -+ acpistate->prate = 0; -+ if ( acpistate->prate > 0 ) -+ acpistate->rtime = (((float) acpistate->rcapacity) / acpistate->prate) * 60; -+ } -+ if (strcmp(name,"voltage_now") == 0) -+ { -+ sprintf(buf,"%s/%s",batteries[battery], name); -+ acpistate->pvoltage = read_sysfs_int(buf); -+ } -+ } -+ closedir(sysfs); -+ return acpiinfo->present; -+} -+ - int read_acpi_state(int battery) - { - #ifdef __linux__ -+ if (acpi_sysfs) -+ return read_acpi_state_sysfs(battery); -+ - FILE *acpi; - char *ptr; - char stat; ---- xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.h 2007-01-17 18:56:51.000000000 +0100 -+++ xfce4-battery-plugin-0.5.0.orig/panel-plugin/libacpi.h 2008-04-05 22:13:55.522679792 +0200 -@@ -80,6 +80,8 @@ - int batt_count; - /* temp buffer */ - char buf[512]; -+char buf2[512]; -+int acpi_sysfs; - #else - extern int batt_count; - extern ACPIstate *acpistate; diff --git a/xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch b/xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch new file mode 100644 index 0000000..6e3becc --- /dev/null +++ b/xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch @@ -0,0 +1,12 @@ +diff -dur xfce4-battery-plugin-0.5.1.orig/panel-plugin/Makefile.in xfce4-battery-plugin-0.5.1/panel-plugin/Makefile.in +--- xfce4-battery-plugin-0.5.1.orig/panel-plugin/Makefile.in 2008-09-04 23:06:12.000000000 +0200 ++++ xfce4-battery-plugin-0.5.1/panel-plugin/Makefile.in 2011-01-02 19:45:39.554176979 +0100 +@@ -279,7 +279,7 @@ + # + # Desktop file + # +-desktopdir = $(datadir)/xfce4/panel-plugins ++desktopdir = $(datadir)/xfce4/panel/plugins + desktop_in_in_files = battmon.desktop.in.in + desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index e132666..b6a7e6c 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,25 +1,20 @@ -%global minor_version 0.5 +%global minor_version 1.0 Name: xfce4-battery-plugin -Version: 0.5.1 -Release: 5%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 -Patch0: %{name}-0.5.0-fix-ftbfs-2.6.24.patch -# http://bugzilla.xfce.org/show_bug.cgi?id=3793 -Patch1: xfce4-battery-plugin-0.5.1-use-sysfs.patch -# http://bugzilla.xfce.org/show_bug.cgi?id=3546 -Patch2: xfce4-battery-plugin-0.5.0-no-battery.patch -# contains all translations from -# http://translations.xfce.org/projects/p/xfce4-battery-plugin/c/master/ -# as of 2010-12-18 -Patch3: xfce4-battery-plugin-0.5.1-update-translations.patch +# needed for xfce4-panel >= 4.7.7 +Patch4: xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.3.90.2, libxfcegui4-devel >= 4.3.90.2, libxml2-devel +BuildRequires: xfce4-panel-devel >= 4.3.90.2 +BuildRequires: libxfcegui4-devel >= 4.3.90.2 +BuildRequires: libxml2-devel BuildRequires: gettext, intltool Requires: xfce4-panel >= 4.4.0 @@ -29,10 +24,7 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q -%patch0 -p1 -b .2.6.24 -%patch1 -p1 -b .use-sysfs -%patch2 -p0 -b .no-battery -%patch3 -p1 -b .update-translations +%patch4 -p1 -b .xfce4-panel-4.7 %build @@ -69,11 +61,18 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB ChangeLog README %{_libexecdir}/xfce4/panel-plugins/%{name} -%{_datadir}/xfce4/panel-plugins/*.desktop +%{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/*/* %changelog +* Mon Jan 03 2011 Christoph Wickert - 1.0.0-1 +- Update to 1.0.0 +- Patch for xfce4-panel >= 4.7.7 + +* Sat Dec 18 2010 Christoph Wickert - 0.5.1-6 +- Rebuild for xfce4-panel 4.7 + * Sat Dec 18 2010 Christoph Wickert - 0.5.1-5 - Use sysfs instead of procfs (bugzilla.xfce.org #3793) - Correctly handle case when no battery is present (bugzilla.xfce.org #3546) From b484c3ee3e480f7ae974f7e89820563843a14ef3 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 9 Jan 2011 00:47:10 +0100 Subject: [PATCH 31/93] Apply patch conditionally --- xfce4-battery-plugin.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index b6a7e6c..afb1056 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -24,7 +24,9 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q +%if 0%{?fedora} >= 15 %patch4 -p1 -b .xfce4-panel-4.7 +%endif %build From c3f6e7d8592923723eeea7c0a17f8c32f373f28e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 22:43:20 -0600 Subject: [PATCH 32/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index afb1056..8d44227 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-battery-plugin Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Mon Jan 03 2011 Christoph Wickert - 1.0.0-1 - Update to 1.0.0 - Patch for xfce4-panel >= 4.7.7 From a4f83ad5dfc7bf3f6c5ad0bbf7595c9df0a9f0f5 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 6 Dec 2011 01:35:33 -0500 Subject: [PATCH 33/93] Rebuild for new libpng --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 8d44227..40ea916 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-battery-plugin Version: 1.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 06 2011 Adam Jackson - 1.0.0-3 +- Rebuild for new libpng + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 28add61d6fe153df8209058d0a34e046d75d7833 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:46:45 -0600 Subject: [PATCH 34/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 40ea916..3b51256 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-battery-plugin Version: 1.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 06 2011 Adam Jackson - 1.0.0-3 - Rebuild for new libpng From a43745b21b9983339e894b45c056e98df9d003fc Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 4 Apr 2012 23:30:30 -0600 Subject: [PATCH 35/93] Rebuild for Xfce 4.10 --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 3b51256..09dd5e3 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-battery-plugin Version: 1.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 05 2012 Kevin Fenzi - 1.0.0-5 +- Rebuild for Xfce 4.10 + * Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 8c62317919d0a32f9b62c96b76b82429853e4036 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 15 Apr 2012 09:48:04 -0600 Subject: [PATCH 36/93] Rebuild for Xfce 4.10(pre2) --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 09dd5e3..4e4140d 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-battery-plugin Version: 1.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 15 2012 Kevin Fenzi - 1.0.0-6 +- Rebuild for Xfce 4.10(pre2) + * Thu Apr 05 2012 Kevin Fenzi - 1.0.0-5 - Rebuild for Xfce 4.10 From 01a5c7f9aa0f5d646241e8228f3846bf0c9d6c46 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 21 Apr 2012 19:54:47 -0600 Subject: [PATCH 37/93] Update to 1.0.1 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 16 +++++++--------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5e591fa..f429ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.0.0.tar.bz2 +/xfce4-battery-plugin-1.0.1.tar.bz2 diff --git a/sources b/sources index e408dad..d1a5415 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2696307f34f6b9630fcaaea102004e78 xfce4-battery-plugin-1.0.0.tar.bz2 +ad2a1f12ae3e2ea66948c89a1c8a287d xfce4-battery-plugin-1.0.1.tar.bz2 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 4e4140d..5a753f0 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,16 +1,14 @@ %global minor_version 1.0 Name: xfce4-battery-plugin -Version: 1.0.0 -Release: 6%{?dist} +Version: 1.0.1 +Release: 1%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 -# needed for xfce4-panel >= 4.7.7 -Patch4: xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.3.90.2 BuildRequires: libxfcegui4-devel >= 4.3.90.2 @@ -24,10 +22,6 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q -%if 0%{?fedora} >= 15 -%patch4 -p1 -b .xfce4-panel-4.7 -%endif - %build %configure --disable-static @@ -38,6 +32,7 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' %find_lang %{name} +rm -rf $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel/plugins/libbattery.la %post @@ -62,12 +57,15 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB ChangeLog README -%{_libexecdir}/xfce4/panel-plugins/%{name} +%{_libdir}/xfce4/panel/plugins/libbattery.so %{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/*/* %changelog +* Sat Apr 21 2012 Kevin Fenzi - 1.0.1-1 +- Update to 1.0.1 + * Sun Apr 15 2012 Kevin Fenzi - 1.0.0-6 - Rebuild for Xfce 4.10(pre2) From 22a8275002a93661aeea632c1afcf454dd49deba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 25 Apr 2012 00:00:55 +0300 Subject: [PATCH 38/93] Fix -debuginfo. --- xfce4-battery-plugin.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 5a753f0..db09afd 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,7 +2,7 @@ Name: xfce4-battery-plugin Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -31,6 +31,7 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +chmod -c +x $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libbattery.so %find_lang %{name} rm -rf $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel/plugins/libbattery.la @@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 24 2012 Ville Skyttä - 1.0.1-2 +- Fix -debuginfo. + * Sat Apr 21 2012 Kevin Fenzi - 1.0.1-1 - Update to 1.0.1 From bd9929c9a5f1f2d0ee12ac275dcb9ce65cdfe004 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 30 Apr 2012 18:59:03 +0200 Subject: [PATCH 39/93] Update to 1.0.2 (Xfce 4.10 final) - Add VCS key --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 44 ++++++++++++++++++++++++++------------- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index f429ab2..bf9fc23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.0.0.tar.bz2 /xfce4-battery-plugin-1.0.1.tar.bz2 +/xfce4-battery-plugin-1.0.2.tar.bz2 diff --git a/sources b/sources index d1a5415..7e67640 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad2a1f12ae3e2ea66948c89a1c8a287d xfce4-battery-plugin-1.0.1.tar.bz2 +4fb65d12928d438273eebbe76bba5d6d xfce4-battery-plugin-1.0.2.tar.bz2 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index db09afd..254bea3 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,20 +1,25 @@ -%global minor_version 1.0 +# Review: https://bugzilla.redhat.com/show_bug.cgi?id=173105 + +%global minorversion 1.0 +%global xfceversion 4.10 Name: xfce4-battery-plugin -Version: 1.0.1 +Version: 1.0.2 Release: 2%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-%{version}.tar.bz2 +#VCS: git:git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.3.90.2 -BuildRequires: libxfcegui4-devel >= 4.3.90.2 -BuildRequires: libxml2-devel -BuildRequires: gettext, intltool -Requires: xfce4-panel >= 4.4.0 + +BuildRequires: libxfce4ui-devel >= 4.8.0 +BuildRequires: xfce4-panel-devel >= 4.8.0 +BuildRequires: gettext +BuildRequires: intltool +Requires: xfce4-panel >= %{xfceversion} %description A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. @@ -24,16 +29,21 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %setup -q %build -%configure --disable-static +%configure make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' -chmod -c +x $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libbattery.so +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL='install -p' + +# remove la file +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +# make sure debuginfo is generated properly +chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so + %find_lang %{name} -rm -rf $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel/plugins/libbattery.la %post @@ -52,18 +62,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB ChangeLog README -%{_libdir}/xfce4/panel/plugins/libbattery.so +%{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/*/* %changelog +* Mon Apr 30 2012 Christoph Wickert - 1.0.2-1 +- Update to 1.0.2 (Xfce 4.10 final) +- Add VCS key + * Tue Apr 24 2012 Ville Skyttä - 1.0.1-2 - Fix -debuginfo. From 12b556db218346ec0225c359def9ada586aae557 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 13 May 2012 22:55:38 +0200 Subject: [PATCH 40/93] Update to 1.0.3 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch | 12 ------------ xfce4-battery-plugin.spec | 7 +++++-- 4 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch diff --git a/.gitignore b/.gitignore index bf9fc23..7857a9f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.0.0.tar.bz2 /xfce4-battery-plugin-1.0.1.tar.bz2 /xfce4-battery-plugin-1.0.2.tar.bz2 +/xfce4-battery-plugin-1.0.3.tar.bz2 diff --git a/sources b/sources index 7e67640..7efba78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4fb65d12928d438273eebbe76bba5d6d xfce4-battery-plugin-1.0.2.tar.bz2 +bb191943c4913763fe8799adbc325235 xfce4-battery-plugin-1.0.3.tar.bz2 diff --git a/xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch b/xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch deleted file mode 100644 index 6e3becc..0000000 --- a/xfce4-battery-plugin-0.5.1-xfce4-panel-4.7.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur xfce4-battery-plugin-0.5.1.orig/panel-plugin/Makefile.in xfce4-battery-plugin-0.5.1/panel-plugin/Makefile.in ---- xfce4-battery-plugin-0.5.1.orig/panel-plugin/Makefile.in 2008-09-04 23:06:12.000000000 +0200 -+++ xfce4-battery-plugin-0.5.1/panel-plugin/Makefile.in 2011-01-02 19:45:39.554176979 +0100 -@@ -279,7 +279,7 @@ - # - # Desktop file - # --desktopdir = $(datadir)/xfce4/panel-plugins -+desktopdir = $(datadir)/xfce4/panel/plugins - desktop_in_in_files = battmon.desktop.in.in - desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 254bea3..bce4d31 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -4,8 +4,8 @@ %global xfceversion 4.10 Name: xfce4-battery-plugin -Version: 1.0.2 -Release: 2%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -74,6 +74,9 @@ rm -rf %{buildroot} %changelog +* Sat May 13 2012 Christoph Wickert - 1.0.3-1 +- Update to 1.0.3 + * Mon Apr 30 2012 Christoph Wickert - 1.0.2-1 - Update to 1.0.2 (Xfce 4.10 final) - Add VCS key From c62920a0ee3e8f0238c1b4264b342124288bf044 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 14 May 2012 21:05:58 +0200 Subject: [PATCH 41/93] Update to 1.0.4 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7857a9f..49821aa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.0.1.tar.bz2 /xfce4-battery-plugin-1.0.2.tar.bz2 /xfce4-battery-plugin-1.0.3.tar.bz2 +/xfce4-battery-plugin-1.0.4.tar.bz2 diff --git a/sources b/sources index 7efba78..e91f05e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb191943c4913763fe8799adbc325235 xfce4-battery-plugin-1.0.3.tar.bz2 +a458fd2dbd2da604db1cf517288fc6db xfce4-battery-plugin-1.0.4.tar.bz2 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index bce4d31..1262dac 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -4,7 +4,7 @@ %global xfceversion 4.10 Name: xfce4-battery-plugin -Version: 1.0.3 +Version: 1.0.4 Release: 1%{?dist} Summary: Battery monitor for the Xfce panel @@ -74,7 +74,10 @@ rm -rf %{buildroot} %changelog -* Sat May 13 2012 Christoph Wickert - 1.0.3-1 +* Mon May 14 2012 Christoph Wickert - 1.0.4-1 +- Update to 1.0.4 + +* Sun May 13 2012 Christoph Wickert - 1.0.3-1 - Update to 1.0.3 * Mon Apr 30 2012 Christoph Wickert - 1.0.2-1 From ff4c5410e4cb508840b99dceb3b41f36e75f7ee3 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 30 Jun 2012 21:11:52 +0200 Subject: [PATCH 42/93] Update to 1.0.5 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 49821aa..419c5da 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.0.2.tar.bz2 /xfce4-battery-plugin-1.0.3.tar.bz2 /xfce4-battery-plugin-1.0.4.tar.bz2 +/xfce4-battery-plugin-1.0.5.tar.bz2 diff --git a/sources b/sources index e91f05e..c257c72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a458fd2dbd2da604db1cf517288fc6db xfce4-battery-plugin-1.0.4.tar.bz2 +ca2d394e411a20442a519efa0d14f8ec xfce4-battery-plugin-1.0.5.tar.bz2 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 1262dac..466eb4d 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -4,7 +4,7 @@ %global xfceversion 4.10 Name: xfce4-battery-plugin -Version: 1.0.4 +Version: 1.0.5 Release: 1%{?dist} Summary: Battery monitor for the Xfce panel @@ -74,6 +74,9 @@ rm -rf %{buildroot} %changelog +* Sat Jun 30 2012 Christoph Wickert - 1.0.5-1 +- Update to 1.0.5 + * Mon May 14 2012 Christoph Wickert - 1.0.4-1 - Update to 1.0.4 From e7cf0580b8ee21a8bc84f8dc8598ffb91277b1cf Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 30 Jun 2012 23:19:46 +0200 Subject: [PATCH 43/93] Define the Xfce version conditionally --- xfce4-battery-plugin.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 466eb4d..aaca95a 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,11 +1,16 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=173105 %global minorversion 1.0 -%global xfceversion 4.10 + +%if 0%{?fedora} >= 18 + %global xfceversion 4.10 +%else + %global xfceversion 4.8 +%endif Name: xfce4-battery-plugin Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -74,6 +79,9 @@ rm -rf %{buildroot} %changelog +* Sat Jun 30 2012 Christoph Wickert - 1.0.5-2 +- Define the Xfce version conditionally + * Sat Jun 30 2012 Christoph Wickert - 1.0.5-1 - Update to 1.0.5 From 3b508b91dee2a5642d31a335b63c691c5fa66cdc Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sun, 1 Jul 2012 00:51:28 +0200 Subject: [PATCH 44/93] Use macros consistently --- xfce4-battery-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index aaca95a..ace70ea 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -43,7 +43,7 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL='install -p' # remove la file -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find %{buildroot} -name '*.la' -exec rm -f {} ';' # make sure debuginfo is generated properly chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so From 28b0aa62bf95c85eb6a8cffefd5610abcfee08ca Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 23:59:37 -0500 Subject: [PATCH 45/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index ace70ea..2d0a458 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -10,7 +10,7 @@ Name: xfce4-battery-plugin Version: 1.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -79,6 +79,9 @@ rm -rf %{buildroot} %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 1.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jun 30 2012 Christoph Wickert - 1.0.5-2 - Define the Xfce version conditionally From 5b20905dcd91d3e9b1cd48860f4edf6a5baa09f6 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Mon, 6 Aug 2012 16:07:58 +0200 Subject: [PATCH 46/93] Fix VCS tag --- xfce4-battery-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 2d0a458..37e08f7 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -16,7 +16,7 @@ Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -#VCS: git:git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin +#VCS: git:git://git.xfce.org/panel-plugins/xfce4-weather-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From 4527d00543dd6c7ed35c29c9afad25032be72e7a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:34:24 -0600 Subject: [PATCH 47/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 37e08f7..1918d52 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -10,7 +10,7 @@ Name: xfce4-battery-plugin Version: 1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -79,6 +79,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 1.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 1.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From b10ffb6541e1edc50da5fa8067d2396208388215 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 02:54:32 -0500 Subject: [PATCH 48/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 1918d52..76443c8 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -10,7 +10,7 @@ Name: xfce4-battery-plugin Version: 1.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -79,6 +79,9 @@ rm -rf %{buildroot} %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Feb 15 2013 Fedora Release Engineering - 1.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 0869c8fb8a2d18ce75d8bfb5f28c5a7e37b15f70 Mon Sep 17 00:00:00 2001 From: Christoph Wickert Date: Sat, 26 Oct 2013 23:43:20 +0200 Subject: [PATCH 49/93] Minor specfile fixes (no build) --- xfce4-battery-plugin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 76443c8..4aae255 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,7 +2,7 @@ %global minorversion 1.0 -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6 %global xfceversion 4.10 %else %global xfceversion 4.8 @@ -16,7 +16,7 @@ Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -#VCS: git:git://git.xfce.org/panel-plugins/xfce4-weather-plugin +#VCS: git:git://git.xfce.org/panel-plugins/xfce4-battery-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From 408ae8ba487a0f9a019afc15346544dc0ddd3e0e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 00:32:51 -0500 Subject: [PATCH 50/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 4aae255..2c49928 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -10,7 +10,7 @@ Name: xfce4-battery-plugin Version: 1.0.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -79,6 +79,9 @@ rm -rf %{buildroot} %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.0.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From c4f924bc7288dade48e82d7af67768190c276434 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 09:37:58 +0000 Subject: [PATCH 51/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 2c49928..bf21070 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -10,7 +10,7 @@ Name: xfce4-battery-plugin Version: 1.0.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -79,6 +79,9 @@ rm -rf %{buildroot} %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.0.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a80b056dc4375bc7bc0568c0412264ca92cec8a7 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 28 Feb 2015 20:06:24 -0700 Subject: [PATCH 52/93] Rebuild for Xfce 4.12 --- xfce4-battery-plugin.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index bf21070..ef5c78a 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,15 +2,15 @@ %global minorversion 1.0 -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 6 - %global xfceversion 4.10 +%if 0%{?fedora} > 21 || 0%{?rhel} > 7 + %global xfceversion 4.12 %else - %global xfceversion 4.8 + %global xfceversion 4.10 %endif Name: xfce4-battery-plugin Version: 1.0.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -79,6 +79,9 @@ rm -rf %{buildroot} %changelog +* Sat Feb 28 2015 Kevin Fenzi 1.0.5-8 +- Rebuild for Xfce 4.12 + * Mon Aug 18 2014 Fedora Release Engineering - 1.0.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 72491ebc8899c29c31bb7b970f809eec2e61f02d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 19 Mar 2015 15:36:38 +0100 Subject: [PATCH 53/93] fix build on aarch64 --- fix-unistd-include.patch | 20 ++++++++++++++++++++ xfce4-battery-plugin.spec | 7 ++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 fix-unistd-include.patch diff --git a/fix-unistd-include.patch b/fix-unistd-include.patch new file mode 100644 index 0000000..d2ac141 --- /dev/null +++ b/fix-unistd-include.patch @@ -0,0 +1,20 @@ +Index: xfce4-battery-plugin-1.0.5/panel-plugin/libacpi.c +=================================================================== +--- xfce4-battery-plugin-1.0.5.orig/panel-plugin/libacpi.c ++++ xfce4-battery-plugin-1.0.5/panel-plugin/libacpi.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #ifdef __FreeBSD__ + #include +@@ -52,7 +53,6 @@ static int acpifd; + #include + #include + #include +-#include + + #endif + diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index ef5c78a..edfa8af 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -10,7 +10,7 @@ Name: xfce4-battery-plugin Version: 1.0.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -18,6 +18,7 @@ License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-battery-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +Patch0: fix-unistd-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxfce4ui-devel >= 4.8.0 @@ -32,6 +33,7 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q +%patch0 -p1 %build %configure @@ -79,6 +81,9 @@ rm -rf %{buildroot} %changelog +* Thu Mar 19 2015 Marcin Juszkiewicz - 1.0.5-9 +- fix build on aarch64 + * Sat Feb 28 2015 Kevin Fenzi 1.0.5-8 - Rebuild for Xfce 4.12 From 499172ac075f6d49ea3f1b5201471eba7f263ebe Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 03:53:14 +0000 Subject: [PATCH 54/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index edfa8af..9ff97f6 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -10,7 +10,7 @@ Name: xfce4-battery-plugin Version: 1.0.5 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -81,6 +81,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.0.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Mar 19 2015 Marcin Juszkiewicz - 1.0.5-9 - fix build on aarch64 From b6c579715efa1d0737ddae1ddde27b63a4f0bd4e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:24:10 +0000 Subject: [PATCH 55/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 9ff97f6..7a38c76 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -10,7 +10,7 @@ Name: xfce4-battery-plugin Version: 1.0.5 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -81,6 +81,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.0.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.0.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 59886c87cf45b39e6086fea5b3ebabd2c56b661e Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 5 Nov 2016 08:55:17 -0400 Subject: [PATCH 56/93] Update to stable release of gtk3 port - version 1.1.0 - Minor spec file clean up --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 25 ++++++++++--------------- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 419c5da..1291290 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.0.3.tar.bz2 /xfce4-battery-plugin-1.0.4.tar.bz2 /xfce4-battery-plugin-1.0.5.tar.bz2 +/xfce4-battery-plugin-1.1.0.tar.bz2 diff --git a/sources b/sources index c257c72..2d51621 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ca2d394e411a20442a519efa0d14f8ec xfce4-battery-plugin-1.0.5.tar.bz2 +f78d8d0cc13d40753a207a836869b953 xfce4-battery-plugin-1.1.0.tar.bz2 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 7a38c76..468bb66 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,16 +1,11 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=173105 -%global minorversion 1.0 - -%if 0%{?fedora} > 21 || 0%{?rhel} > 7 - %global xfceversion 4.12 -%else - %global xfceversion 4.10 -%endif +%global minorversion 1.1 +%global xfceversion 4.12 Name: xfce4-battery-plugin -Version: 1.0.5 -Release: 11%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -21,8 +16,8 @@ Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion Patch0: fix-unistd-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libxfce4ui-devel >= 4.8.0 -BuildRequires: xfce4-panel-devel >= 4.8.0 +BuildRequires: libxfce4ui-devel >= 4.12.0 +BuildRequires: xfce4-panel-devel >= 4.12.0 BuildRequires: gettext BuildRequires: intltool Requires: xfce4-panel >= %{xfceversion} @@ -68,10 +63,6 @@ fi gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%clean -rm -rf %{buildroot} - - %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB ChangeLog README @@ -81,6 +72,10 @@ rm -rf %{buildroot} %changelog +* Sat Nov 05 2016 Mukundan Ragavan - 1.1.0-1 +- Update to stable release of gtk3 port - version 1.1.0 +- Minor spec file clean up + * Fri Feb 05 2016 Fedora Release Engineering - 1.0.5-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 1d873c708c3faf51064f3be6be6368d52ee1e7bd Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 5 Nov 2016 09:11:40 -0400 Subject: [PATCH 57/93] Drop unneeded patch --- xfce4-battery-plugin.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 468bb66..9c215de 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -5,7 +5,7 @@ Name: xfce4-battery-plugin Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -13,8 +13,6 @@ License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-battery-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 -Patch0: fix-unistd-include.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxfce4ui-devel >= 4.12.0 BuildRequires: xfce4-panel-devel >= 4.12.0 @@ -28,7 +26,6 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep %setup -q -%patch0 -p1 %build %configure @@ -72,6 +69,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Nov 05 2016 Mukundan Ragavan - 1.1.0-2 +- Drop unneeded patch + * Sat Nov 05 2016 Mukundan Ragavan - 1.1.0-1 - Update to stable release of gtk3 port - version 1.1.0 - Minor spec file clean up From 1698292db640d871fcf973445e5dd1369d588ca0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:46:29 +0000 Subject: [PATCH 58/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 9c215de..ff67a70 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -5,7 +5,7 @@ Name: xfce4-battery-plugin Version: 1.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -69,6 +69,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Sat Nov 05 2016 Mukundan Ragavan - 1.1.0-2 - Drop unneeded patch From 65ad0882a5e5fa619e449d89a1573333905fecd7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:01:17 +0000 Subject: [PATCH 59/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index ff67a70..0ba9fba 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -5,7 +5,7 @@ Name: xfce4-battery-plugin Version: 1.1.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -69,6 +69,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 1.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 083a9edb6a043a052adc7e1c1a92b02b77b9ae5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:35:21 +0000 Subject: [PATCH 60/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 0ba9fba..3641516 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -5,7 +5,7 @@ Name: xfce4-battery-plugin Version: 1.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -69,6 +69,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From d2a5d66c641132f73c50eb605f54d9d700a35cd9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:30:40 +0000 Subject: [PATCH 61/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 3641516..0a2342c 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -5,7 +5,7 @@ Name: xfce4-battery-plugin Version: 1.1.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -69,6 +69,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 77a84bb6a09d5bc653a17f0db817d1df8d728ebd Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sun, 11 Feb 2018 11:12:40 -0200 Subject: [PATCH 62/93] - Spec cleanup / modernization --- xfce4-battery-plugin.spec | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 0a2342c..54b460d 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,11 +1,12 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=173105 +%global _hardened_build 1 %global minorversion 1.1 %global xfceversion 4.12 Name: xfce4-battery-plugin Version: 1.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -25,15 +26,14 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %prep -%setup -q +%autosetup %build %configure -make %{?_smp_mflags} +%make_build %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} INSTALL='install -p' # remove la file @@ -45,23 +45,7 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %find_lang %{name} -%post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - - -%postun -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB ChangeLog README %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop @@ -69,6 +53,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sun Feb 11 2018 Filipe Rosset - 1.1.0-7 +- Spec cleanup / modernization + * Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5e779834cad099efc06209eca059dac96564f72a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 63/93] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xfce4-battery-plugin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 54b460d..67a2647 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -15,6 +15,7 @@ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-battery-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +BuildRequires: gcc BuildRequires: libxfce4ui-devel >= 4.12.0 BuildRequires: xfce4-panel-devel >= 4.12.0 BuildRequires: gettext From 01bee0853c5bd14537b6aec936d570f608f03dd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:12:52 +0000 Subject: [PATCH 64/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 67a2647..2bb0db4 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -54,6 +54,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Feb 11 2018 Filipe Rosset - 1.1.0-7 - Spec cleanup / modernization From ff4708eed0df353076a9fbcbcb1bd3ce75c59332 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 11 Aug 2018 20:07:32 -0400 Subject: [PATCH 65/93] Rebuilt (xfce 4.13) --- xfce4-battery-plugin.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 2bb0db4..c2561dd 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,11 +2,11 @@ %global _hardened_build 1 %global minorversion 1.1 -%global xfceversion 4.12 +%global xfceversion 4.13 Name: xfce4-battery-plugin Version: 1.1.0 -Release: 8%{?dist} +Release: 20%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -15,9 +15,9 @@ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-battery-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 -BuildRequires: gcc -BuildRequires: libxfce4ui-devel >= 4.12.0 -BuildRequires: xfce4-panel-devel >= 4.12.0 +BuildRequires: gcc-c++ +BuildRequires: libxfce4ui-devel >= %{xfceversion} +BuildRequires: xfce4-panel-devel >= %{xfceversion} BuildRequires: gettext BuildRequires: intltool Requires: xfce4-panel >= %{xfceversion} @@ -35,7 +35,7 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %install -make install DESTDIR=%{buildroot} INSTALL='install -p' +%make_install # remove la file find %{buildroot} -name '*.la' -exec rm -f {} ';' @@ -47,13 +47,17 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %files -f %{name}.lang -%doc AUTHORS COPYING COPYING.LIB ChangeLog README +%license COPYING +%doc AUTHORS COPYING.LIB ChangeLog README %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/*/* %changelog +* Sat Aug 11 2018 Mukundan Ragavan - 1.1.0-20 +- Rebuilt (xfce 4.13) + * Sat Jul 14 2018 Fedora Release Engineering - 1.1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From d291727ab6dc67177d60d39414d6695a7d1394b7 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 22 Sep 2018 20:18:53 -0400 Subject: [PATCH 66/93] Update to 1.1.1 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1291290..2488cd5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.0.4.tar.bz2 /xfce4-battery-plugin-1.0.5.tar.bz2 /xfce4-battery-plugin-1.1.0.tar.bz2 +/xfce4-battery-plugin-1.1.1.tar.bz2 diff --git a/sources b/sources index 2d51621..1c5cd25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f78d8d0cc13d40753a207a836869b953 xfce4-battery-plugin-1.1.0.tar.bz2 +SHA512 (xfce4-battery-plugin-1.1.1.tar.bz2) = 15c0755f95cc03db95f8fe61faa87607dcdb24622c8de3a7941c254e15bf3d65b6683e5a0ff1fd96ca252afede6763f4440c8455665e346169b1107ad44d6651 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index c2561dd..8768898 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -5,8 +5,8 @@ %global xfceversion 4.13 Name: xfce4-battery-plugin -Version: 1.1.0 -Release: 20%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: Battery monitor for the Xfce panel Group: User Interface/Desktops @@ -55,6 +55,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Sat Sep 22 2018 Mukundan Ragavan - 1.1.1-1 +- Update to 1.1.1 + * Sat Aug 11 2018 Mukundan Ragavan - 1.1.0-20 - Rebuilt (xfce 4.13) From bd7bca43fcc22495c69b9a90be3312011137b651 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Mon, 14 Jan 2019 21:24:31 -0500 Subject: [PATCH 67/93] Update to 1.1.2 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2488cd5..69e3ec5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.0.5.tar.bz2 /xfce4-battery-plugin-1.1.0.tar.bz2 /xfce4-battery-plugin-1.1.1.tar.bz2 +/xfce4-battery-plugin-1.1.2.tar.bz2 diff --git a/sources b/sources index 1c5cd25..d773fd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-battery-plugin-1.1.1.tar.bz2) = 15c0755f95cc03db95f8fe61faa87607dcdb24622c8de3a7941c254e15bf3d65b6683e5a0ff1fd96ca252afede6763f4440c8455665e346169b1107ad44d6651 +SHA512 (xfce4-battery-plugin-1.1.2.tar.bz2) = 51778d00c34c41bdad234893c4a91f3bd562481df343d811e266719cb7903f60e1d56ba39f64f14ab882ce6419d0f0f4010aa112e9d0059133e7e4d30470f491 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 8768898..4bf177e 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -5,7 +5,7 @@ %global xfceversion 4.13 Name: xfce4-battery-plugin -Version: 1.1.1 +Version: 1.1.2 Release: 1%{?dist} Summary: Battery monitor for the Xfce panel @@ -55,6 +55,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Mon Jan 14 2019 Mukundan Ragavan - 1.1.2-1 +- Update to 1.1.2 + * Sat Sep 22 2018 Mukundan Ragavan - 1.1.1-1 - Update to 1.1.1 From 082c6a2f38fdb26ddb9fdd0f1a0f602643100a68 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 68/93] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xfce4-battery-plugin.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 4bf177e..1c92292 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -9,7 +9,6 @@ Version: 1.1.2 Release: 1%{?dist} Summary: Battery monitor for the Xfce panel -Group: User Interface/Desktops License: GPLv2+ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-battery-plugin From 0439bd8574311ea13d7d30eb80d1c545c93caf5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:17:03 +0000 Subject: [PATCH 69/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 1c92292..d8a299a 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -54,6 +54,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 14 2019 Mukundan Ragavan - 1.1.2-1 - Update to 1.1.2 From 3cfbbf3fe8f78d369a4d49ab006094121cd72d87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:03:44 +0000 Subject: [PATCH 70/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index d8a299a..2d41ea8 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -54,6 +54,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.1.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e0f735bba0b0da13b6744f293a79a766cd2e77ea Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Tue, 13 Aug 2019 17:54:32 -0400 Subject: [PATCH 71/93] Update to 1.1.3 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 69e3ec5..5712803 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.1.0.tar.bz2 /xfce4-battery-plugin-1.1.1.tar.bz2 /xfce4-battery-plugin-1.1.2.tar.bz2 +/xfce4-battery-plugin-1.1.3.tar.bz2 diff --git a/sources b/sources index d773fd3..780b475 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-battery-plugin-1.1.2.tar.bz2) = 51778d00c34c41bdad234893c4a91f3bd562481df343d811e266719cb7903f60e1d56ba39f64f14ab882ce6419d0f0f4010aa112e9d0059133e7e4d30470f491 +SHA512 (xfce4-battery-plugin-1.1.3.tar.bz2) = a591fb37855efbd54d18ae97e320fa4521da611c8ea107813bfd66fa570e8c84576fcf779c7b676ee9918709912de728b0fed490e64d3d2ad403baf719db4520 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 2d41ea8..08bb2a9 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,11 +2,11 @@ %global _hardened_build 1 %global minorversion 1.1 -%global xfceversion 4.13 +%global xfceversion 4.14 Name: xfce4-battery-plugin -Version: 1.1.2 -Release: 3%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -54,6 +54,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Tue Aug 13 2019 Mukundan Ragavan - 1.1.3-1 +- Update to 1.1.3 + * Sat Jul 27 2019 Fedora Release Engineering - 1.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 040ac7c618fbcbfb83150aa7256e1eeaec89b09f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:18:51 +0000 Subject: [PATCH 72/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 08bb2a9..c210b6c 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -54,6 +54,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 13 2019 Mukundan Ragavan - 1.1.3-1 - Update to 1.1.3 From d23f0a35166ceaeca078e8779630dd42253877a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:37:16 +0000 Subject: [PATCH 73/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index c210b6c..2f6c4a8 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -54,6 +54,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 717749fef1389db38bce14f2cdd22a524a1a7ab5 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:17:15 +0000 Subject: [PATCH 74/93] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xfce4-battery-plugin.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 2f6c4a8..e476026 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -14,6 +14,7 @@ URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-battery-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: xfce4-panel-devel >= %{xfceversion} From bdf6d41a920307a2d0b762df29e096fcaf837169 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:56:51 +0000 Subject: [PATCH 75/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index e476026..5011b3b 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -55,6 +55,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 238f71e3e84bdd995d5be92f75f17f483d7cbe1e Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Thu, 25 Mar 2021 21:10:00 -0400 Subject: [PATCH 76/93] Update to 1.1.4 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5712803..c1de974 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.1.1.tar.bz2 /xfce4-battery-plugin-1.1.2.tar.bz2 /xfce4-battery-plugin-1.1.3.tar.bz2 +/xfce4-battery-plugin-1.1.4.tar.bz2 diff --git a/sources b/sources index 780b475..828610b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-battery-plugin-1.1.3.tar.bz2) = a591fb37855efbd54d18ae97e320fa4521da611c8ea107813bfd66fa570e8c84576fcf779c7b676ee9918709912de728b0fed490e64d3d2ad403baf719db4520 +SHA512 (xfce4-battery-plugin-1.1.4.tar.bz2) = 6a59630800a79d2c62434c1c50f5d891ae9ebae48037ea0859d6edd66c856a76e6f11c6e8866ca3c94ae1e5b57bdba4e9fadd4bc92c7fcef278cd2f7b82203f2 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 5011b3b..378339c 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -2,11 +2,11 @@ %global _hardened_build 1 %global minorversion 1.1 -%global xfceversion 4.14 +%global xfceversion 4.16 Name: xfce4-battery-plugin -Version: 1.1.3 -Release: 4%{?dist} +Version: 1.1.4 +Release: 1%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -48,13 +48,16 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %files -f %{name}.lang %license COPYING -%doc AUTHORS COPYING.LIB ChangeLog README +%doc AUTHORS COPYING.LIB ChangeLog README.md %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/*/* %changelog +* Thu Mar 25 2021 Mukundan Ragavan - 1.1.4-1 +- Update to 1.1.4 + * Wed Jan 27 2021 Fedora Release Engineering - 1.1.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From ff0cc5fa4a128af63da1d690d1695998c9ba12b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:28:10 +0000 Subject: [PATCH 77/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 378339c..f8a4ec8 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -55,6 +55,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Mar 25 2021 Mukundan Ragavan - 1.1.4-1 - Update to 1.1.4 From 49ac77ad8c068afda2ada52ed1fdf722f15b3319 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:59:43 +0000 Subject: [PATCH 78/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index f8a4ec8..e46dfe7 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -55,6 +55,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.1.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 839a688f89e191f6f7a066c12c3c1d2ca3ab4311 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:00:41 +0000 Subject: [PATCH 79/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index e46dfe7..970fc3c 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -55,6 +55,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.1.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f37e91be53ee64108bef02cf9be6d83c0b433cdc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:21:19 +0000 Subject: [PATCH 80/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xfce4-battery-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 970fc3c..5e741c8 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -55,6 +55,9 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d6fd0ebe88a086e0cac9af5fce69736d9d6c483d Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Thu, 20 Apr 2023 19:40:29 -0500 Subject: [PATCH 81/93] rpmautospec --- changelog | 220 +++++++++++++++++++++++++++++++++++++ xfce4-battery-plugin.spec | 223 +------------------------------------- 2 files changed, 222 insertions(+), 221 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..62f55df --- /dev/null +++ b/changelog @@ -0,0 +1,220 @@ +* Sat Jan 21 2023 Fedora Release Engineering - 1.1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Mar 25 2021 Mukundan Ragavan - 1.1.4-1 +- Update to 1.1.4 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Aug 13 2019 Mukundan Ragavan - 1.1.3-1 +- Update to 1.1.3 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 14 2019 Mukundan Ragavan - 1.1.2-1 +- Update to 1.1.2 + +* Sat Sep 22 2018 Mukundan Ragavan - 1.1.1-1 +- Update to 1.1.1 + +* Sat Aug 11 2018 Mukundan Ragavan - 1.1.0-20 +- Rebuilt (xfce 4.13) + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sun Feb 11 2018 Filipe Rosset - 1.1.0-7 +- Spec cleanup / modernization + +* Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Nov 05 2016 Mukundan Ragavan - 1.1.0-2 +- Drop unneeded patch + +* Sat Nov 05 2016 Mukundan Ragavan - 1.1.0-1 +- Update to stable release of gtk3 port - version 1.1.0 +- Minor spec file clean up + +* Fri Feb 05 2016 Fedora Release Engineering - 1.0.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.0.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 19 2015 Marcin Juszkiewicz - 1.0.5-9 +- fix build on aarch64 + +* Sat Feb 28 2015 Kevin Fenzi 1.0.5-8 +- Rebuild for Xfce 4.12 + +* Mon Aug 18 2014 Fedora Release Engineering - 1.0.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 15 2013 Fedora Release Engineering - 1.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jun 30 2012 Christoph Wickert - 1.0.5-2 +- Define the Xfce version conditionally + +* Sat Jun 30 2012 Christoph Wickert - 1.0.5-1 +- Update to 1.0.5 + +* Mon May 14 2012 Christoph Wickert - 1.0.4-1 +- Update to 1.0.4 + +* Sun May 13 2012 Christoph Wickert - 1.0.3-1 +- Update to 1.0.3 + +* Mon Apr 30 2012 Christoph Wickert - 1.0.2-1 +- Update to 1.0.2 (Xfce 4.10 final) +- Add VCS key + +* Tue Apr 24 2012 Ville Skyttä - 1.0.1-2 +- Fix -debuginfo. + +* Sat Apr 21 2012 Kevin Fenzi - 1.0.1-1 +- Update to 1.0.1 + +* Sun Apr 15 2012 Kevin Fenzi - 1.0.0-6 +- Rebuild for Xfce 4.10(pre2) + +* Thu Apr 05 2012 Kevin Fenzi - 1.0.0-5 +- Rebuild for Xfce 4.10 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 06 2011 Adam Jackson - 1.0.0-3 +- Rebuild for new libpng + +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 03 2011 Christoph Wickert - 1.0.0-1 +- Update to 1.0.0 +- Patch for xfce4-panel >= 4.7.7 + +* Sat Dec 18 2010 Christoph Wickert - 0.5.1-6 +- Rebuild for xfce4-panel 4.7 + +* Sat Dec 18 2010 Christoph Wickert - 0.5.1-5 +- Use sysfs instead of procfs (bugzilla.xfce.org #3793) +- Correctly handle case when no battery is present (bugzilla.xfce.org #3546) +- Update translations from Xfce Transifex +- Use parallel make +- Fix Source0 URL +- Update icon-cache scriptlets + +* Mon Jul 27 2009 Fedora Release Engineering - 0.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Jan 18 2009 Christoph Wickert - 0.5.1-2 +- Rebuild for Xfce 4.6 (Beta 3) + +* Fri Sep 05 2008 Christoph Wickert - 0.5.1-1 +- Update to 0.5.1 +- Remove acpi.patch (included upstream) +- Remove lower-acpi-polling.patch (upstream use different values) + +* Sat Apr 05 2008 Christoph Wickert - 0.5.0-4 +- Fix for kernel 2.6.24 (bugzilla.xfce.org #3938) +- Lower acpi polling. (bugzilla.xfce.org #2948) +- Rebuild with gcc 4.3.0 + +* Tue Aug 28 2007 Christoph Wickert - 0.5.0-3 +- Fix for x86_64 kernels >= 2.6.21. (bugzilla.xfce.org #3190) +- Update license tag + +* Mon Apr 23 2007 Christoph Wickert - 0.5.0-2 +- Rebuild for Xfce 4.4.1 + +* Mon Jan 22 2007 Christoph Wickert - 0.5.0-1 +- Update to 0.5.0 on Xfce 4.4. + +* Sat Nov 11 2006 Christoph Wickert - 0.4.90.3-1 +- Update to 0.4.90.3 on XFCE 4.3.99.2. + +* Thu Oct 05 2006 Christoph Wickert - 0.4.90.2-3 +- Bump release for devel checkin. + +* Wed Sep 13 2006 Christoph Wickert - 0.4.90.2-2 +- Rebuild for XFCE 4.3.99.1. +- BR perl(XML::Parser). + +* Mon Sep 04 2006 Christoph Wickert - 0.4.90.2-1 +- Update to 0.4.90.2 on XFCE 4.3.90.2. + +* Mon Sep 04 2006 Christoph Wickert - 0.3.0-7 +- Mass rebuild for Fedora Core 6. + +* Tue Apr 11 2006 Christoph Wickert - 0.3.0-6 +- Require xfce4-panel. +- Change license back to LGPL (#173105). + +* Wed Feb 15 2006 Christoph Wickert - 0.3.0-5 +- Rebuild for Fedora Extras 5. + +* Fri Dec 30 2005 Christoph Wickert - 0.3.0-4 +- Add libxfcegui4-devel BuildReqs. +- Fix %%defattr. + +* Sat Nov 19 2005 Christoph Wickert - 0.3.0-3 +- Use {?_smp_mflags}. +- Replace wrong BSD license with a copy of the GPL (#173105). + +* Mon Nov 14 2005 Christoph Wickert - 0.3.0-2 +- Initial Fedora Extras version. +- Rebuild for XFCE 4.2.3. +- disable-static instead of removing .a files. + +* Fri Sep 23 2005 Christoph Wickert - 0.3.0-1.fc4.cw +- Update to 0.3.0. +- Add libxml2 BuildReqs. + +* Sat Jul 09 2005 Christoph Wickert - 0.2.0-1.fc4.cw +- Rebuild for Core 4. + +* Wed Apr 13 2005 Christoph Wickert - 0.2.0-1.fc3.cw +- Initial RPM release. diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 5e741c8..d183ad2 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -6,7 +6,7 @@ Name: xfce4-battery-plugin Version: 1.1.4 -Release: 5%{?dist} +Release: %autorelease Summary: Battery monitor for the Xfce panel License: GPLv2+ @@ -55,223 +55,4 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %changelog -* Sat Jan 21 2023 Fedora Release Engineering - 1.1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Mar 25 2021 Mukundan Ragavan - 1.1.4-1 -- Update to 1.1.4 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Aug 13 2019 Mukundan Ragavan - 1.1.3-1 -- Update to 1.1.3 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Mukundan Ragavan - 1.1.2-1 -- Update to 1.1.2 - -* Sat Sep 22 2018 Mukundan Ragavan - 1.1.1-1 -- Update to 1.1.1 - -* Sat Aug 11 2018 Mukundan Ragavan - 1.1.0-20 -- Rebuilt (xfce 4.13) - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Feb 11 2018 Filipe Rosset - 1.1.0-7 -- Spec cleanup / modernization - -* Fri Feb 09 2018 Fedora Release Engineering - 1.1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Nov 05 2016 Mukundan Ragavan - 1.1.0-2 -- Drop unneeded patch - -* Sat Nov 05 2016 Mukundan Ragavan - 1.1.0-1 -- Update to stable release of gtk3 port - version 1.1.0 -- Minor spec file clean up - -* Fri Feb 05 2016 Fedora Release Engineering - 1.0.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.0.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Mar 19 2015 Marcin Juszkiewicz - 1.0.5-9 -- fix build on aarch64 - -* Sat Feb 28 2015 Kevin Fenzi 1.0.5-8 -- Rebuild for Xfce 4.12 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.0.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.0.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.0.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 1.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jun 30 2012 Christoph Wickert - 1.0.5-2 -- Define the Xfce version conditionally - -* Sat Jun 30 2012 Christoph Wickert - 1.0.5-1 -- Update to 1.0.5 - -* Mon May 14 2012 Christoph Wickert - 1.0.4-1 -- Update to 1.0.4 - -* Sun May 13 2012 Christoph Wickert - 1.0.3-1 -- Update to 1.0.3 - -* Mon Apr 30 2012 Christoph Wickert - 1.0.2-1 -- Update to 1.0.2 (Xfce 4.10 final) -- Add VCS key - -* Tue Apr 24 2012 Ville Skyttä - 1.0.1-2 -- Fix -debuginfo. - -* Sat Apr 21 2012 Kevin Fenzi - 1.0.1-1 -- Update to 1.0.1 - -* Sun Apr 15 2012 Kevin Fenzi - 1.0.0-6 -- Rebuild for Xfce 4.10(pre2) - -* Thu Apr 05 2012 Kevin Fenzi - 1.0.0-5 -- Rebuild for Xfce 4.10 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 06 2011 Adam Jackson - 1.0.0-3 -- Rebuild for new libpng - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Jan 03 2011 Christoph Wickert - 1.0.0-1 -- Update to 1.0.0 -- Patch for xfce4-panel >= 4.7.7 - -* Sat Dec 18 2010 Christoph Wickert - 0.5.1-6 -- Rebuild for xfce4-panel 4.7 - -* Sat Dec 18 2010 Christoph Wickert - 0.5.1-5 -- Use sysfs instead of procfs (bugzilla.xfce.org #3793) -- Correctly handle case when no battery is present (bugzilla.xfce.org #3546) -- Update translations from Xfce Transifex -- Use parallel make -- Fix Source0 URL -- Update icon-cache scriptlets - -* Mon Jul 27 2009 Fedora Release Engineering - 0.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Jan 18 2009 Christoph Wickert - 0.5.1-2 -- Rebuild for Xfce 4.6 (Beta 3) - -* Fri Sep 05 2008 Christoph Wickert - 0.5.1-1 -- Update to 0.5.1 -- Remove acpi.patch (included upstream) -- Remove lower-acpi-polling.patch (upstream use different values) - -* Sat Apr 05 2008 Christoph Wickert - 0.5.0-4 -- Fix for kernel 2.6.24 (bugzilla.xfce.org #3938) -- Lower acpi polling. (bugzilla.xfce.org #2948) -- Rebuild with gcc 4.3.0 - -* Tue Aug 28 2007 Christoph Wickert - 0.5.0-3 -- Fix for x86_64 kernels >= 2.6.21. (bugzilla.xfce.org #3190) -- Update license tag - -* Mon Apr 23 2007 Christoph Wickert - 0.5.0-2 -- Rebuild for Xfce 4.4.1 - -* Mon Jan 22 2007 Christoph Wickert - 0.5.0-1 -- Update to 0.5.0 on Xfce 4.4. - -* Sat Nov 11 2006 Christoph Wickert - 0.4.90.3-1 -- Update to 0.4.90.3 on XFCE 4.3.99.2. - -* Thu Oct 05 2006 Christoph Wickert - 0.4.90.2-3 -- Bump release for devel checkin. - -* Wed Sep 13 2006 Christoph Wickert - 0.4.90.2-2 -- Rebuild for XFCE 4.3.99.1. -- BR perl(XML::Parser). - -* Mon Sep 04 2006 Christoph Wickert - 0.4.90.2-1 -- Update to 0.4.90.2 on XFCE 4.3.90.2. - -* Mon Sep 04 2006 Christoph Wickert - 0.3.0-7 -- Mass rebuild for Fedora Core 6. - -* Tue Apr 11 2006 Christoph Wickert - 0.3.0-6 -- Require xfce4-panel. -- Change license back to LGPL (#173105). - -* Wed Feb 15 2006 Christoph Wickert - 0.3.0-5 -- Rebuild for Fedora Extras 5. - -* Fri Dec 30 2005 Christoph Wickert - 0.3.0-4 -- Add libxfcegui4-devel BuildReqs. -- Fix %%defattr. - -* Sat Nov 19 2005 Christoph Wickert - 0.3.0-3 -- Use {?_smp_mflags}. -- Replace wrong BSD license with a copy of the GPL (#173105). - -* Mon Nov 14 2005 Christoph Wickert - 0.3.0-2 -- Initial Fedora Extras version. -- Rebuild for XFCE 4.2.3. -- disable-static instead of removing .a files. - -* Fri Sep 23 2005 Christoph Wickert - 0.3.0-1.fc4.cw -- Update to 0.3.0. -- Add libxml2 BuildReqs. - -* Sat Jul 09 2005 Christoph Wickert - 0.2.0-1.fc4.cw -- Rebuild for Core 4. - -* Wed Apr 13 2005 Christoph Wickert - 0.2.0-1.fc3.cw -- Initial RPM release. +%autochangelog From 71e469b7238799f1224feacb590303ee7b07bcb5 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Thu, 20 Apr 2023 19:46:11 -0500 Subject: [PATCH 82/93] Update to v1.1.5 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c1de974..0501690 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.1.2.tar.bz2 /xfce4-battery-plugin-1.1.3.tar.bz2 /xfce4-battery-plugin-1.1.4.tar.bz2 +/xfce4-battery-plugin-1.1.5.tar.bz2 diff --git a/sources b/sources index 828610b..5b95777 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-battery-plugin-1.1.4.tar.bz2) = 6a59630800a79d2c62434c1c50f5d891ae9ebae48037ea0859d6edd66c856a76e6f11c6e8866ca3c94ae1e5b57bdba4e9fadd4bc92c7fcef278cd2f7b82203f2 +SHA512 (xfce4-battery-plugin-1.1.5.tar.bz2) = e6e09a4839911dda50fe1fed100d5fd46f6da47e5042529c2cbffa5498babc838bed56178baa23d2162b70cd6e5f005276d4b9f1fc44a1891737c94c2bf525d0 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index d183ad2..3b6ca5a 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -5,7 +5,7 @@ %global xfceversion 4.16 Name: xfce4-battery-plugin -Version: 1.1.4 +Version: 1.1.5 Release: %autorelease Summary: Battery monitor for the Xfce panel From e121178d5e07951f4c90088c05057954f72a92b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:43:50 +0000 Subject: [PATCH 83/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 510318b92869740bbbeb1ff853ebe047dc8052d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:33:09 +0000 Subject: [PATCH 84/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1a2e92de6bfdb023f7d0a96f645a172f13491233 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:56:38 +0000 Subject: [PATCH 85/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 61843093aecb52ad85abb7377596b5e25258ccae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:48:50 +0200 Subject: [PATCH 86/93] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xfce4-battery-plugin.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index 3b6ca5a..d7a080f 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -9,7 +9,8 @@ Version: 1.1.5 Release: %autorelease Summary: Battery monitor for the Xfce panel -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-battery-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 From e1d73002681041eb537d798daf3fd695a368d7ce Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 22 Dec 2024 16:01:28 -0600 Subject: [PATCH 87/93] rebuild for xfce-4.20 From a23791f95a1f3ee6a4cf8f0ebfcf546649fb7b1e Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Tue, 24 Dec 2024 06:17:27 -0600 Subject: [PATCH 88/93] Update to v1.1.6 --- .gitignore | 1 + sources | 2 +- xfce4-battery-plugin.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0501690..2f1b88d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.1.3.tar.bz2 /xfce4-battery-plugin-1.1.4.tar.bz2 /xfce4-battery-plugin-1.1.5.tar.bz2 +/xfce4-battery-plugin-1.1.6.tar.bz2 diff --git a/sources b/sources index 5b95777..f0efde3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-battery-plugin-1.1.5.tar.bz2) = e6e09a4839911dda50fe1fed100d5fd46f6da47e5042529c2cbffa5498babc838bed56178baa23d2162b70cd6e5f005276d4b9f1fc44a1891737c94c2bf525d0 +SHA512 (xfce4-battery-plugin-1.1.6.tar.bz2) = 809c0f24adf914501ae9431af43caa36f72594dc686451bdd27b895cca80a51e76120a1cf191944e4b8b004d18ecc890caca9faa725cee230516bb1d0ad57415 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index d7a080f..a6ae50a 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -5,7 +5,7 @@ %global xfceversion 4.16 Name: xfce4-battery-plugin -Version: 1.1.5 +Version: 1.1.6 Release: %autorelease Summary: Battery monitor for the Xfce panel From 15257c395fde5a32c601e5ceec5b408cc9a1e919 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:41:20 +0000 Subject: [PATCH 89/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From ead8bcdbea4ff0ba3fc443189d1a39968f113d1b Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sun, 1 Jun 2025 17:07:19 -0500 Subject: [PATCH 90/93] Update to v1.2.0; switch to meson build system --- .gitignore | 1 + fix-unistd-include.patch | 20 -------------------- sources | 2 +- xfce4-battery-plugin.spec | 21 ++++++++++----------- 4 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 fix-unistd-include.patch diff --git a/.gitignore b/.gitignore index 2f1b88d..6d5c82b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ xfce4-battery-plugin-0.5.1.tar.bz2 /xfce4-battery-plugin-1.1.4.tar.bz2 /xfce4-battery-plugin-1.1.5.tar.bz2 /xfce4-battery-plugin-1.1.6.tar.bz2 +/xfce4-battery-plugin-1.2.0.tar.xz diff --git a/fix-unistd-include.patch b/fix-unistd-include.patch deleted file mode 100644 index d2ac141..0000000 --- a/fix-unistd-include.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: xfce4-battery-plugin-1.0.5/panel-plugin/libacpi.c -=================================================================== ---- xfce4-battery-plugin-1.0.5.orig/panel-plugin/libacpi.c -+++ xfce4-battery-plugin-1.0.5/panel-plugin/libacpi.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #ifdef __FreeBSD__ - #include -@@ -52,7 +53,6 @@ static int acpifd; - #include - #include - #include --#include - - #endif - diff --git a/sources b/sources index f0efde3..b71668d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-battery-plugin-1.1.6.tar.bz2) = 809c0f24adf914501ae9431af43caa36f72594dc686451bdd27b895cca80a51e76120a1cf191944e4b8b004d18ecc890caca9faa725cee230516bb1d0ad57415 +SHA512 (xfce4-battery-plugin-1.2.0.tar.xz) = 7a5a90117a885f758a8b6fe19116e1815ef7ac5c3108ffabc4a8a5466ce7e01ed9fccadfa36262abf6dd7977d6ef34e6e1b9cab50e817258203e77f318cab774 diff --git a/xfce4-battery-plugin.spec b/xfce4-battery-plugin.spec index a6ae50a..e7fd6b4 100644 --- a/xfce4-battery-plugin.spec +++ b/xfce4-battery-plugin.spec @@ -1,11 +1,11 @@ # Review: https://bugzilla.redhat.com/show_bug.cgi?id=173105 %global _hardened_build 1 -%global minorversion 1.1 -%global xfceversion 4.16 +%global minorversion 1.2 +%global xfceversion 4.20 Name: xfce4-battery-plugin -Version: 1.1.6 +Version: 1.2.0 Release: %autorelease Summary: Battery monitor for the Xfce panel @@ -13,14 +13,13 @@ Summary: Battery monitor for the Xfce panel License: GPL-2.0-or-later URL: http://goodies.xfce.org/projects/panel-plugins/%{name} #VCS: git:git://git.xfce.org/panel-plugins/xfce4-battery-plugin -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.xz -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: xfce4-panel-devel >= %{xfceversion} -BuildRequires: gettext -BuildRequires: intltool +BuildRequires: meson Requires: xfce4-panel >= %{xfceversion} %description @@ -31,12 +30,12 @@ A battery monitor plugin for the Xfce panel, compatible with APM and ACPI. %autosetup %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install # remove la file find %{buildroot} -name '*.la' -exec rm -f {} ';' @@ -49,7 +48,7 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so %files -f %{name}.lang %license COPYING -%doc AUTHORS COPYING.LIB ChangeLog README.md +%doc AUTHORS COPYING.LIB README.md %{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/icons/hicolor/*/*/* From 439984d843c3f95631424dbb81832959fd5f3e6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:45:51 +0000 Subject: [PATCH 91/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 477bc6e6938038317c08e89636f8c73c3c007261 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:35:49 +0000 Subject: [PATCH 92/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 1c1468d7a0ba335ca30f937950adc55199f6e11f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:08:59 +0000 Subject: [PATCH 93/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild