Merge remote-tracking branch 'remotes/origin/upstream'

[framework/uifw/elementary.git] / po / de.po

diff --git a/po/de.po b/po/de.po
index ffe9504..457746c 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -4,12 +4,20 @@
 # This file is distributed under the same license as the elementary package.
 # Fabian Nowak <timystery@arcor.de>, 2011.
 #
+<<<<<<< HEAD
 #: src/lib/elm_config.c:1417
+=======
+#: src/lib/elm_config.c:1943
+>>>>>>> remotes/origin/upstream
 msgid ""
 msgstr ""
 "Project-Id-Version: elementary 0.7.0.57309\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2012-02-05 10:59+0900\n"
+=======
+"POT-Creation-Date: 2012-03-08 01:42+0900\n"
+>>>>>>> remotes/origin/upstream
 "PO-Revision-Date: 2011-02-25 20:22+0100\n"
 "Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
 "Language-Team: German\n"
@@ -27,12 +35,20 @@ msgstr "Aufwärts"
 msgid "Home"
 msgstr "Persönlicher Ordner"
 
+<<<<<<< HEAD
 #: src/lib/elc_fileselector.c:1001 src/lib/elm_entry.c:1468
 #: src/lib/elm_searchbar.c:211
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: src/lib/elc_fileselector.c:1011
+=======
+#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1357
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/lib/elc_fileselector.c:1019
+>>>>>>> remotes/origin/upstream
 msgid "OK"
 msgstr "OK"
 
@@ -40,8 +56,13 @@ msgstr "OK"
 msgid "Clicked"
 msgstr ""
 
+<<<<<<< HEAD
 #: src/lib/elm_button.c:408 src/lib/elm_check.c:392 src/lib/elm_radio.c:295
 #: src/lib/elm_toolbar.c:759
+=======
+#: src/lib/elm_button.c:408 src/lib/elm_check.c:394 src/lib/elm_radio.c:295
+#: src/lib/elm_toolbar.c:886
+>>>>>>> remotes/origin/upstream
 msgid "State: Disabled"
 msgstr ""
 
@@ -53,16 +74,25 @@ msgstr ""
 msgid "%B %Y"
 msgstr ""
 
+<<<<<<< HEAD
 #: src/lib/elm_check.c:309 src/lib/elm_check.c:312 src/lib/elm_check.c:403
+=======
+#: src/lib/elm_check.c:311 src/lib/elm_check.c:314 src/lib/elm_check.c:405
+>>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:231 src/lib/elm_radio.c:297
 msgid "State: On"
 msgstr ""
 
+<<<<<<< HEAD
 #: src/lib/elm_check.c:322 src/lib/elm_check.c:325 src/lib/elm_check.c:412
+=======
+#: src/lib/elm_check.c:324 src/lib/elm_check.c:327 src/lib/elm_check.c:414
+>>>>>>> remotes/origin/upstream
 #: src/lib/elm_radio.c:298
 msgid "State: Off"
 msgstr ""
 
+<<<<<<< HEAD
 #: src/lib/elm_check.c:399 src/lib/elm_check.c:409
 msgid "State"
 msgstr ""
@@ -100,6 +130,33 @@ msgid "Select"
 msgstr "Auswählen"
 
 #: src/lib/elm_entry.c:1485
+=======
+#: src/lib/elm_check.c:401 src/lib/elm_check.c:411
+msgid "State"
+msgstr ""
+
+#: src/lib/elm_check.c:467
+msgid "Check"
+msgstr ""
+
+#: src/lib/elm_config.c:1358
+msgid "default:LTR"
+msgstr "Standard: LTR"
+
+#: src/lib/elm_entry.c:1351
+msgid "Copy"
+msgstr "Kopieren"
+
+#: src/lib/elm_entry.c:1354
+msgid "Cut"
+msgstr "Ausschneiden"
+
+#: src/lib/elm_entry.c:1368
+msgid "Select"
+msgstr "Auswählen"
+
+#: src/lib/elm_entry.c:1374
+>>>>>>> remotes/origin/upstream
 msgid "Paste"
 msgstr "Einfügen"
 
@@ -107,10 +164,13 @@ msgstr "Einfügen"
 msgid "Radio"
 msgstr ""
 
+<<<<<<< HEAD
 #: src/lib/elm_searchbar.c:199
 msgid "Search"
 msgstr ""
 
+=======
+>>>>>>> remotes/origin/upstream
 #: src/lib/elm_toggle.c:11
 msgid "ON"
 msgstr ""
@@ -119,11 +179,16 @@ msgstr ""
 msgid "OFF"
 msgstr ""
 
+<<<<<<< HEAD
 #: src/lib/elm_toolbar.c:676
+=======
+#: src/lib/elm_toolbar.c:802
+>>>>>>> remotes/origin/upstream
 #, fuzzy
 msgid "Selected"
 msgstr "Auswählen"
 
+<<<<<<< HEAD
 #: src/lib/elm_toolbar.c:757
 msgid "Separator"
 msgstr ""
@@ -137,5 +202,20 @@ msgid "Has menu"
 msgstr ""
 
 #: src/lib/elm_toolbar.c:821
+=======
+#: src/lib/elm_toolbar.c:884
+msgid "Separator"
+msgstr ""
+
+#: src/lib/elm_toolbar.c:888
+msgid "State: Selected"
+msgstr ""
+
+#: src/lib/elm_toolbar.c:890
+msgid "Has menu"
+msgstr ""
+
+#: src/lib/elm_toolbar.c:954
+>>>>>>> remotes/origin/upstream
 msgid "Tool Item"
 msgstr ""