[Migration] Fixed build error.

diff --git a/po/ar.po b/po/ar.po
index 1531341..ae5c869 100644 (file)
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -17,51 +17,42 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""
-

diff --git a/po/az_IR.po b/po/az_IR.po
index e8d57c3..8fb0a30 100644 (file)
--- a/po/az_IR.po
+++ b/po/az_IR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -16,50 +16,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/de.po b/po/de.po
index 05e5881..0ff9f12 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary 0.7.0.57309\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2011-02-25 20:22+0100\n"
 "Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
 "Language-Team: German\n"
@@ -18,50 +18,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr "Aufwärts"
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr "Persönlicher Ordner"
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "Standard: LTR"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr "Auswählen"
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr "Ausschneiden"
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/fa.po b/po/fa.po
index e8d57c3..8fb0a30 100644 (file)
--- a/po/fa.po
+++ b/po/fa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -16,50 +16,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/fr.po b/po/fr.po
index b04c807..8a56760 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2011-03-26 08:13+0400\n"
 "Last-Translator: batden <batden@orange.fr>\n"
 "Language-Team: Enlightenment French Team <pourunmondesansgourou@gmail.com>\n"
@@ -18,50 +18,42 @@ msgstr ""
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr "Monter"
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr "Home"
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "LTR par défaut"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr "Sélectionner"
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr "Coller"
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr "Copier"
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr "Couper"
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/he.po b/po/he.po
index 935a357..9fcf205 100644 (file)
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Aharon Hillel <a.hillel@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -16,50 +16,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr "בטל"
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr "אשר"
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr "התחל בחירה"
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr "הדבק"
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr "העתק"
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr "גזור"
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/it.po b/po/it.po
index c1717d0..b5dfe8e 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2011-03-26 13:53+0100\n"
 "Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
 "Language-Team: none\n"
@@ -14,50 +14,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr "Su"
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr "Home"
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "predefintito: LTR"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr "Incolla"
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr "Copia"
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr "Taglia"
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/ko_KR.po b/po/ko_KR.po
index 7d56215..0e94406 100644 (file)
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2011-02-22 09:09-0800\n"
 "Last-Translator: Daniel Juyung Seo <seojuyung@gmail.com>\n"
 "Language-Team: General\n"
@@ -16,50 +16,42 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr "위로"
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr "홈"
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr "취소"
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr "확인"
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr "선택"
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr "복사"
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr "잘라내기"
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/nl.po b/po/nl.po
index 461c55c..03d50af 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary 0.7.0.57309\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-04-29 19:58-0700\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2011-06-19 16:41+0100\n"
 "Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n"
 "Language-Team: Dutch <vistausss@gmail.com>\n"
@@ -20,40 +20,42 @@ msgstr ""
 "X-Poedit-Language: Dutch\n"
 "X-Poedit-Country: NETHERLANDS\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr "Persoonlijke map"
 
-#: src/lib/elc_fileselector.c:791
-#: src/lib/elm_entry.c:930
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr "OK"
 
-#: src/lib/elm_config.c:1544
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "Standaard: LTR"
 
-#: src/lib/elm_entry.c:924
-msgid "Copy"
-msgstr "Kopiëren"
-
-#: src/lib/elm_entry.c:927
-msgid "Cut"
-msgstr "Knippen"
-
-#: src/lib/elm_entry.c:941
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr "Selecteren"
 
-#: src/lib/elm_entry.c:947
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr "Plakken"
 
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
+msgid "More"
+msgstr ""
+
+#: src/lib/elm_entry.c:1276
+msgid "Copy"
+msgstr "Kopiëren"
+
+#: src/lib/elm_entry.c:1279
+msgid "Cut"
+msgstr "Knippen"

diff --git a/po/ps.po b/po/ps.po
index 80ff3ec..eb58c1c 100644 (file)
--- a/po/ps.po
+++ b/po/ps.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -15,50 +15,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/pt.po b/po/pt.po
index 1b31468..55e8c46 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2011-02-16 11:42-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: \n"
@@ -16,50 +16,42 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: Portugal\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "omissão:LTR"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr "Selecionar"
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr "Colar"
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr "Cortar"
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/ur.po b/po/ur.po
index 80ff3ec..eb58c1c 100644 (file)
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -15,50 +15,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/po/yi.po b/po/yi.po
index 80ff3ec..eb58c1c 100644 (file)
--- a/po/yi.po
+++ b/po/yi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: elementary\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-06-20 14:18+0530\n"
+"POT-Creation-Date: 2011-07-08 20:09+0900\n"
 "PO-Revision-Date: 2010-12-26 10:05+0200\n"
 "Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
 "Language-Team: General\n"
@@ -15,50 +15,42 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/lib/elc_fileselector.c:595
+#: src/lib/elc_fileselector.c:849
 msgid "Up"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:610
+#: src/lib/elc_fileselector.c:864
 msgid "Home"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:791 src/lib/elm_entry.c:1097
+#: src/lib/elc_fileselector.c:1052 src/lib/elm_entry.c:1282
 msgid "Cancel"
 msgstr ""
 
-#: src/lib/elc_fileselector.c:801
+#: src/lib/elc_fileselector.c:1062
 msgid "OK"
 msgstr ""
 
-#: src/lib/elm_config.c:1622
+#: src/lib/elm_config.c:1647
 msgid "default:LTR"
 msgstr "default:RTL"
 
-#: src/lib/elm_entry.c:1071
+#: src/lib/elm_entry.c:1256
 msgid "Select"
 msgstr ""
 
-#: src/lib/elm_entry.c:1076
+#: src/lib/elm_entry.c:1261
 msgid "Paste"
 msgstr ""
 
-#: src/lib/elm_entry.c:1081 src/lib/elm_entry.c:1101
+#: src/lib/elm_entry.c:1266 src/lib/elm_entry.c:1286
 msgid "More"
 msgstr ""
 
-#: src/lib/elm_entry.c:1091
+#: src/lib/elm_entry.c:1276
 msgid "Copy"
 msgstr ""
 
-#: src/lib/elm_entry.c:1094
+#: src/lib/elm_entry.c:1279
 msgid "Cut"
 msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "On"
-msgstr ""
-
-#: src/lib/elm_check.c:156
-msgid "Off"
-msgstr ""

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index b94f6f8..dacd9f3 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -34,7 +34,6 @@ EXTRA_PROGRAMS = elementary_test elementary_config
 elementary_test_SOURCES = \
 test.c \
 test_3d.c \
-test_actionslider.c \
 test_anchorblock.c \
 test_anchorview.c \
 test_anim.c \
@@ -109,7 +108,6 @@ test_win_state.c
 if HAVE_EIO
 elementary_test_SOURCES += test_eio.c
 endif
->>>>>>> upstream
 
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
        @ELEMENTARY_EWEATHER_LIBS@ \

diff --git a/src/bin/test.c b/src/bin/test.c
index c29324f..ccb2ad2 100644 (file)
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -58,7 +58,7 @@ void test_inwin2(void *data, Evas_Object *obj, void *event_info);
 void test_scaling(void *data, Evas_Object *obj, void *event_info);
 void test_scaling2(void *data, Evas_Object *obj, void *event_info);
 void test_slider(void *data, Evas_Object *obj, void *event_info);
-void test_actionslider(void *data, Evas_Object *obj, void *event_info);
+//void test_actionslider(void *data, Evas_Object *obj, void *event_info);
 void test_genlist(void *data, Evas_Object *obj, void *event_info);
 void test_genlist2(void *data, Evas_Object *obj, void *event_info);
 void test_genlist3(void *data, Evas_Object *obj, void *event_info);
@@ -335,7 +335,7 @@ my_win_main(char *autorun)
    ADD_TEST("Scaling", test_scaling);
    ADD_TEST("Scaling 2", test_scaling2);
    ADD_TEST("Slider", test_slider);
-   ADD_TEST("Actionslider", test_actionslider);
+   //ADD_TEST("Actionslider", test_actionslider);
    ADD_TEST("Genlist", test_genlist);
    ADD_TEST("Genlist 2", test_genlist2);
    ADD_TEST("Genlist 3", test_genlist3);

diff --git a/src/edje_externals/elm_gengrid.c b/src/edje_externals/elm_gengrid.c
index 080bf71..6c3bf07 100644 (file)
--- a/src/edje_externals/elm_gengrid.c
+++ b/src/edje_externals/elm_gengrid.c
@@ -81,8 +81,7 @@ external_gengrid_state_set(void *data __UNUSED__, Evas_Object *obj, const void *
         int h_itemsize, v_itemsize;
         elm_gengrid_item_size_get(obj, &h_itemsize, &v_itemsize);
         elm_gengrid_item_size_set(obj, p->h_itemsize, v_itemsize);
-   else if (p->align_x_exists && p->align_y_exists)
-     elm_gengrid_align_set(obj, p->align_x, p->align_y);
+     }
    else if (p->align_x_exists || p->align_y_exists)
      {
         double x, y;

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 3a9bca2..5d1e59c 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -3139,7 +3139,7 @@ extern "C" {
    EAPI void         elm_entry_autosave_set(Evas_Object *obj, Eina_Bool autosave) EINA_ARG_NONNULL(1);
    EAPI Eina_Bool    elm_entry_autosave_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
    EAPI void         elm_entry_cnp_textonly_set(Evas_Object *obj, Eina_Bool textonly) EINA_ARG_NONNULL(1);
-   EAPI Eina_Bool    elm_entry_cnp_textonly_get(Evas_Object *obj) EINA_ARG_NONNULL(1);
+   EAPI Eina_Bool    elm_entry_cnp_textonly_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
    EAPI void         elm_entry_autocapitalization_set(Evas_Object *obj, Eina_Bool autocap);
    EAPI void         elm_entry_autoperiod_set(Evas_Object *obj, Eina_Bool autoperiod);
    EAPI void         elm_entry_autoenable_returnkey_set(Evas_Object *obj, Eina_Bool on);
@@ -3162,7 +3162,7 @@ extern "C" {
    EAPI void         elm_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);
    EAPI void         elm_entry_bounce_set(Evas_Object *obj, Eina_Bool h_bounce, Eina_Bool v_bounce);
    EAPI void         elm_entry_bounce_get(const Evas_Object *obj, Eina_Bool *h_bounce, Eina_Bool *v_bounce);
-        
+
    /* pre-made filters for entries */
    typedef struct _Elm_Entry_Filter_Limit_Size Elm_Entry_Filter_Limit_Size;
    struct _Elm_Entry_Filter_Limit_Size
@@ -4842,7 +4842,7 @@ extern "C" {
    EAPI void            elm_index_item_data_set(Elm_Index_Item *it, const void *data) EINA_ARG_NONNULL(1);
    EAPI void            elm_index_item_del_cb_set(Elm_Index_Item *it, Evas_Smart_Cb func) EINA_ARG_NONNULL(1);
    EAPI const char     *elm_index_item_letter_get(const Elm_Index_Item *item) EINA_ARG_NONNULL(1);
-   EAPI void         elm_index_button_image_invisible_set(Evas_Object *obj, Eina_Bool invisible);
+   EAPI void            elm_index_button_image_invisible_set(Evas_Object *obj, Eina_Bool invisible) EINA_ARG_NONNULL(1);
    /* smart callbacks called:
     * "changed" - when the selected index item changes
     * "delay,changed" - when the selected index item changes, but after some small idle period

diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 89c0e5b..95c6fcf 100644 (file)
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -118,7 +118,7 @@ _del_hook(Evas_Object *obj)
 }
 
 static Elm_Actionslider_Indicator_Pos
-_get_pos_by_orientation(const Evas_Object *obj, Elm_Actionslider_Pos pos)
+_get_pos_by_orientation(const Evas_Object *obj, Elm_Actionslider_Indicator_Pos pos)
 {
    if (elm_widget_mirrored_get(obj))
      {

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index f7e8ca0..8b18c81 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -152,11 +152,8 @@ struct _Widget_Data
    Elm_Scroller_Policy policy_h, policy_v;
    Elm_Wrap_Type linewrap;
    Eina_Bool changed : 1;
-   Eina_Bool linewrap : 1;
-   Eina_Bool char_linewrap : 1;
    Eina_Bool single_line : 1;
    Eina_Bool password : 1;
-   Eina_Bool show_last_character : 1;
    Eina_Bool editable : 1;
    Eina_Bool selection_asked : 1;
    Eina_Bool have_selection : 1;
@@ -721,7 +718,7 @@ _recalc_cursor_geometry(Evas_Object *obj)
               &cx, &cy, &cw, &ch);
         if (wd->cur_changed)
           {
-             elm_widget_show_region_set(obj, cx, cy, cw, ch);
+             elm_widget_show_region_set(obj, cx, cy, cw, ch, EINA_FALSE);
              wd->cur_changed = EINA_FALSE;
           }
      }
@@ -764,7 +761,7 @@ _elm_win_recalc_job(void *data)
                                                   &cx, &cy, &cw, &ch);
         if (wd->cur_changed)
           {
-             elm_widget_show_region_set(data, cx, cy, cw, ch);
+             elm_widget_show_region_set(data, cx, cy, cw, ch, EINA_FALSE);
              wd->cur_changed = EINA_FALSE;
           }
      }

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index eebaaed..522f263 100644 (file)
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -1858,6 +1858,8 @@ elm_autocapitalization_allow_all_set(Eina_Bool on)
    if (!atom) atom = ecore_x_atom_get("ENLIGHTENMENT_AUTOCAPITAL_ALLOW");
    ecore_x_window_prop_card32_set(ecore_x_window_root_first_get(),
                                   atom, &on_i, 1);
+#endif
+}
 
 EAPI void
 elm_autoperiod_allow_all_set(Eina_Bool on)

diff --git a/src/lib/elm_table.c b/src/lib/elm_table.c
index ec02526..5ead6a0 100644 (file)
--- a/src/lib/elm_table.c
+++ b/src/lib/elm_table.c
@@ -330,7 +330,7 @@ elm_table_pack_get(Evas_Object *subobj, int *x, int *y, int *w, int *h)
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
-   evas_object_table_pack_get(wd->tbl, subobj, &ix, &iy, &iw, &ih);
+   //evas_object_table_pack_get(wd->tbl, subobj, &ix, &iy, &iw, &ih); // MIGRATION: TEMP
    if (x) *x = ix;
    if (y) *y = iy;
    if (w) *w = iw;

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 4acbc09..59c5799 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -1833,13 +1833,15 @@ elm_widget_show_region_set(Evas_Object *obj,
                            Evas_Coord   x,
                            Evas_Coord   y,
                            Evas_Coord   w,
-                           Evas_Coord   h)
+                           Evas_Coord   h,
+                           Eina_Bool forceshow)
 {
    Evas_Object *parent_obj, *child_obj;
    Evas_Coord px, py, cx, cy;
 
    API_ENTRY return;
-   if ((x == sd->rx) && (y == sd->ry) && (w == sd->rw) && (h == sd->rh)) return;
+   if (!forceshow && (x == sd->rx) && (y == sd->ry)
+            && (w == sd->rw) && (h == sd->rh)) return;
    sd->rx = x;
    sd->ry = y;
    sd->rw = w;

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index ab57237..da39a90 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -272,7 +272,8 @@ EAPI void             elm_widget_activate(Evas_Object *obj);
 EAPI void             elm_widget_change(Evas_Object *obj);
 EAPI void             elm_widget_disabled_set(Evas_Object *obj, Eina_Bool disabled);
 EAPI Eina_Bool        elm_widget_disabled_get(const Evas_Object *obj);
-EAPI void             elm_widget_show_region_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
+EAPI void             elm_widget_show_region_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h, Eina_Bool forceshow);
+EAPI void             elm_widget_show_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
 EAPI void             elm_widget_show_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
 EAPI void             elm_widget_focus_region_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
 EAPI void             elm_widget_scroll_hold_push(Evas_Object *obj);

diff --git a/src/lib/els_scroller.c b/src/lib/els_scroller.c
index caed1f4..06607f4 100644 (file)
--- a/src/lib/els_scroller.c
+++ b/src/lib/els_scroller.c
@@ -719,8 +719,6 @@ _smart_bounce_y_animator(void *data)
    Smart_Data *sd;
    Evas_Coord x, y, dy, py, h, ody, ed, md;
    double t, p, dt, pd, r;
-   Evas_Coord x, y, dy;
-   double t, p, dt;
 
    sd = data;
    t = ecore_loop_time_get();