[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth po/wesnoth-ei/fr.po po/wesnoth-tdh/fr.p...
|
From: |
Isaac Clerencia |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth po/wesnoth-ei/fr.po po/wesnoth-tdh/fr.p... |
|
Date: |
Sun, 24 Apr 2005 15:15:40 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Isaac Clerencia <address@hidden> 05/04/24 19:15:39
Modified files:
po/wesnoth-ei : fr.po
po/wesnoth-tdh : fr.po
po/wesnoth-trow: de.po
src : actions.cpp game.cpp multiplayer_ui.cpp
playturn.cpp
src/serialization: tokenizer.cpp
Log message:
Remove CRLF line endings
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-ei/fr.po.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-tdh/fr.po.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-trow/de.po.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.210&tr2=1.211&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.237&tr2=1.238&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_ui.cpp.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.363&tr2=1.364&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/serialization/tokenizer.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: wesnoth/po/wesnoth-ei/fr.po
diff -u wesnoth/po/wesnoth-ei/fr.po:1.50 wesnoth/po/wesnoth-ei/fr.po:1.51
--- wesnoth/po/wesnoth-ei/fr.po:1.50 Wed Apr 20 19:52:31 2005
+++ wesnoth/po/wesnoth-ei/fr.po Sun Apr 24 19:15:27 2005
@@ -1,11 +1,11 @@
-# Language french translations for Battle for Wesnoth package
-# vim:set encoding=utf-8:
-# Traduction anglaise du package Battle for Wesnoth.
-# Copyright (C) 2004 THE Battle for Wesnoth'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the Battle for Wesnoth
package.
-# French Wesnoth translation team <address@hidden>, 2004.
-#
-#
+# Language french translations for Battle for Wesnoth package
+# vim:set encoding=utf-8:
+# Traduction anglaise du package Battle for Wesnoth.
+# Copyright (C) 2004 THE Battle for Wesnoth'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Battle for Wesnoth
package.
+# French Wesnoth translation team <address@hidden>, 2004.
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.7.11-CVS\n"
Index: wesnoth/po/wesnoth-tdh/fr.po
diff -u wesnoth/po/wesnoth-tdh/fr.po:1.28 wesnoth/po/wesnoth-tdh/fr.po:1.29
--- wesnoth/po/wesnoth-tdh/fr.po:1.28 Wed Apr 20 19:52:32 2005
+++ wesnoth/po/wesnoth-tdh/fr.po Sun Apr 24 19:15:36 2005
@@ -1,13 +1,13 @@
-# #-#-#-#-# wesnoth-tdh.po (wesnoth-tdh) #-#-#-#-#
-# translation of wesnoth-tdh.po to French
-# Language french translations for Battle for Wesnoth package
-# vim:set encoding=utf-8:
-# Traduction anglaise du package Battle for Wesnoth.
-# Copyright (C) 2004 THE Battle for Wesnoth'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the Battle for Wesnoth
package.
-# French Wesnoth translation team <address@hidden>, 2004.
-# Yann Dirson <address@hidden>, 2004.
-#
+# #-#-#-#-# wesnoth-tdh.po (wesnoth-tdh) #-#-#-#-#
+# translation of wesnoth-tdh.po to French
+# Language french translations for Battle for Wesnoth package
+# vim:set encoding=utf-8:
+# Traduction anglaise du package Battle for Wesnoth.
+# Copyright (C) 2004 THE Battle for Wesnoth'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Battle for Wesnoth
package.
+# French Wesnoth translation team <address@hidden>, 2004.
+# Yann Dirson <address@hidden>, 2004.
+#
msgid ""
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.7.11-CVS\n"
Index: wesnoth/po/wesnoth-trow/de.po
diff -u wesnoth/po/wesnoth-trow/de.po:1.53 wesnoth/po/wesnoth-trow/de.po:1.54
--- wesnoth/po/wesnoth-trow/de.po:1.53 Wed Apr 20 20:19:12 2005
+++ wesnoth/po/wesnoth-trow/de.po Sun Apr 24 19:15:36 2005
@@ -1,8 +1,8 @@
-# German translations for Battle for Wesnoth package.
-# Copyright (C) 2004 Wesnoth development team
-# This file is distributed under the same license as the Battle for Wesnoth
package.
-# Automatically generated, 2004.
-#
+# German translations for Battle for Wesnoth package.
+# Copyright (C) 2004 Wesnoth development team
+# This file is distributed under the same license as the Battle for Wesnoth
package.
+# Automatically generated, 2004.
+#
msgid ""
msgstr ""
"Project-Id-Version: Battle for Wesnoth 0.9.0+CVS\n"
@@ -3212,9 +3212,9 @@
"Abgesehen von der Niederlage im Krieg im Westen, dem Flüchtlingskrieg gegen "
"euer Volk und dieser Sache mit den Orks war es kein schlechtes Geschäft."
-# "Oh-ho, Habt ihr mal darüber nachgedacht, dass der unheilige Akt, der die "
-# "besten und hellsten Köpfe eures Volkes in Untote verwandelt der Grund sein
"
-# "könnte, weshalb sie der Dunkelheit anheim fallen?"
+# "Oh-ho, Habt ihr mal darüber nachgedacht, dass der unheilige Akt, der die "
+# "besten und hellsten Köpfe eures Volkes in Untote verwandelt der Grund sein
"
+# "könnte, weshalb sie der Dunkelheit anheim fallen?"
#: data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg:403
#: data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg:244
msgid ""
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.210 wesnoth/src/actions.cpp:1.211
--- wesnoth/src/actions.cpp:1.210 Sat Apr 23 12:17:23 2005
+++ wesnoth/src/actions.cpp Sun Apr 24 19:15:36 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.210 2005/04/23 12:17:23 gruikya Exp $ */
+/* $Id: actions.cpp,v 1.211 2005/04/24 19:15:36 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1752,21 +1752,21 @@
if(steps.size() < 2) {
return 0;
}
-
- //move the unit on the screen. Hide the unit in its current location,
but don't actually
- //remove it until the move is done, so that while the unit is moving
status etc will
+
+ //move the unit on the screen. Hide the unit in its current location,
but don't actually
+ //remove it until the move is done, so that while the unit is moving
status etc will
//still display the correct number of units.
- if(disp != NULL) {
+ if(disp != NULL) {
disp->hide_unit(ui->first,true);
unit_display::move_unit(*disp,map,steps,u,status.get_time_of_day(),units,teams);
}
- u.set_movement(moves_left);
-
- if(disp != NULL) {
- disp->hide_unit(gamemap::location());
+ u.set_movement(moves_left);
+
+ if(disp != NULL) {
+ disp->hide_unit(gamemap::location());
}
-
+
units.erase(ui);
ui =
units.insert(std::pair<gamemap::location,unit>(steps.back(),u)).first;
if(disp != NULL) {
@@ -1817,12 +1817,12 @@
for(std::set<gamemap::location>::const_iterator i =
seen_units.begin(); i != seen_units.end(); ++i) {
LOG_NG << "processing unit at " << (i->x+1) <<
"," << (i->y+1) << "\n";
const unit_map::const_iterator u =
units.find(*i);
-
- //unit may have been removed by an event.
- if(u == units.end()) {
- LOG_NG << "was removed\n";
- continue;
- }
+
+ //unit may have been removed by an event.
+ if(u == units.end()) {
+ LOG_NG << "was removed\n";
+ continue;
+ }
if(team.is_enemy(u->second.side())) {
++nenemies;
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.237 wesnoth/src/game.cpp:1.238
--- wesnoth/src/game.cpp:1.237 Sun Apr 24 11:05:45 2005
+++ wesnoth/src/game.cpp Sun Apr 24 19:15:36 2005
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.237 2005/04/24 11:05:45 gruikya Exp $ */
+/* $Id: game.cpp,v 1.238 2005/04/24 19:15:36 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1080,21 +1080,21 @@
if(title == "") {
title = name;
std::replace(title.begin(),title.end(),'_',' ');
- }
-
- std::string version = (**i)["version"],
- author = (**i)["author"];
-
- if(title.size() > 20) {
- title.resize(20);
- }
-
- if(version.size() > 12) {
- version.resize(12);
- }
-
- if(author.size() > 16) {
- author.resize(16);
+ }
+
+ std::string version = (**i)["version"],
+ author = (**i)["author"];
+
+ if(title.size() > 20) {
+ title.resize(20);
+ }
+
+ if(version.size() > 12) {
+ version.resize(12);
+ }
+
+ if(author.size() > 16) {
+ author.resize(16);
}
options.push_back(IMAGE_PREFIX + (**i)["icon"].str() +
COLUMN_SEPARATOR +
Index: wesnoth/src/multiplayer_ui.cpp
diff -u wesnoth/src/multiplayer_ui.cpp:1.20 wesnoth/src/multiplayer_ui.cpp:1.21
--- wesnoth/src/multiplayer_ui.cpp:1.20 Fri Apr 22 21:40:34 2005
+++ wesnoth/src/multiplayer_ui.cpp Sun Apr 24 19:15:36 2005
@@ -1,4 +1,4 @@
-/* $Id: multiplayer_ui.cpp,v 1.20 2005/04/22 21:40:34 Sirp Exp $ */
+/* $Id: multiplayer_ui.cpp,v 1.21 2005/04/24 19:15:36 isaaccp Exp $ */
/*
Copyright (C)
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -243,31 +243,31 @@
{
//On enter, adds the current chat message to the chat textbox.
if(event.keysym.sym == SDLK_RETURN && !entry_textbox_.text().empty()) {
-
- const std::string& text = entry_textbox_.text();
-
- //if the text starts with '/query' it's a query to the server.
- //otherwise it's just a chat message
- static const std::string query = "/query ";
-
- config data;
-
- if(text.size() >= query.size() &&
std::equal(query.begin(),query.end(),text.begin())) {
- const std::string args = text.substr(query.size());
-
- data.add_child("query")["type"] = args;
-
- } else {
+
+ const std::string& text = entry_textbox_.text();
+
+ //if the text starts with '/query' it's a query to the server.
+ //otherwise it's just a chat message
+ static const std::string query = "/query ";
+
+ config data;
+
+ if(text.size() >= query.size() &&
std::equal(query.begin(),query.end(),text.begin())) {
+ const std::string args = text.substr(query.size());
+
+ data.add_child("query")["type"] = args;
+
+ } else {
// Sends the message to the network
config msg;
msg["message"] = text;
- msg["sender"] = preferences::login();
- data.add_child("message", msg);
-
- chat_.add_message(preferences::login(),
entry_textbox_.text());
- chat_.update_textbox(chat_textbox_);
-
+ msg["sender"] = preferences::login();
+ data.add_child("message", msg);
+
+ chat_.add_message(preferences::login(),
entry_textbox_.text());
+ chat_.update_textbox(chat_textbox_);
+
}
network::send_data(data);
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.363 wesnoth/src/playturn.cpp:1.364
--- wesnoth/src/playturn.cpp:1.363 Sun Apr 24 11:05:45 2005
+++ wesnoth/src/playturn.cpp Sun Apr 24 19:15:39 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.363 2005/04/24 11:05:45 gruikya Exp $ */
+/* $Id: playturn.cpp,v 1.364 2005/04/24 19:15:39 isaaccp Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1052,7 +1052,7 @@
case hotkey::HOTKEY_QUIT_GAME:
case hotkey::HOTKEY_SEARCH:
case hotkey::HOTKEY_HELP:
- case hotkey::HOTKEY_USER_CMD:
+ case hotkey::HOTKEY_USER_CMD:
case hotkey::HOTKEY_SAVE_GAME:
return true;
@@ -1383,11 +1383,11 @@
unit un = u->second;
un.set_goto(gamemap::location());
-
+
gui_.hide_unit(u->first,true);
-
unit_display::move_unit(gui_,map_,route,un,status_.get_time_of_day(),units_,teams_);
+
unit_display::move_unit(gui_,map_,route,un,status_.get_time_of_day(),units_,teams_);
gui_.hide_unit(gamemap::location());
-
+
units_.erase(u);
un.set_movement(starting_moves);
units_.insert(std::pair<gamemap::location,unit>(route.back(),un));
@@ -1466,11 +1466,11 @@
unit un = u->second;
un.set_goto(gamemap::location());
-
+
gui_.hide_unit(u->first,true);
-
unit_display::move_unit(gui_,map_,route,un,status_.get_time_of_day(),units_,teams_);
- gui_.hide_unit(gamemap::location());
-
+
unit_display::move_unit(gui_,map_,route,un,status_.get_time_of_day(),units_,teams_);
+ gui_.hide_unit(gamemap::location());
+
units_.erase(u);
un.set_movement(starting_moves);
units_.insert(std::pair<gamemap::location,unit>(route.back(),un));
Index: wesnoth/src/serialization/tokenizer.cpp
diff -u wesnoth/src/serialization/tokenizer.cpp:1.7
wesnoth/src/serialization/tokenizer.cpp:1.8
--- wesnoth/src/serialization/tokenizer.cpp:1.7 Fri Apr 15 02:37:22 2005
+++ wesnoth/src/serialization/tokenizer.cpp Sun Apr 24 19:15:39 2005
@@ -1,4 +1,4 @@
-/* $Id: tokenizer.cpp,v 1.7 2005/04/15 02:37:22 Sirp Exp $ */
+/* $Id: tokenizer.cpp,v 1.8 2005/04/24 19:15:39 isaaccp Exp $ */
/*
Copyright (C) 2004 by Philippe Plantier <address@hidden>
Part of the Battle for Wesnoth Project http://www.wesnoth.org
@@ -10,8 +10,8 @@
See the COPYING file for more details.
*/
-
-#include "global.hpp"
+
+#include "global.hpp"
#include "tokenizer.hpp"
#include "string_utils.hpp"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth po/wesnoth-ei/fr.po po/wesnoth-tdh/fr.p...,
Isaac Clerencia <=