[Bf-translations-svn] SVN commit: /data/svn/bf-translations [1898] branches/hu/hu.po: Removed all unresolved svn conflicts from the file...
bf-translations at blender.org
bf-translations at blender.org
Sat May 25 11:45:03 CEST 2013
Revision: 1898
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-translations&revision=1898
Author: mont29
Date: 2013-05-25 09:45:03 +0000 (Sat, 25 May 2013)
Log Message:
-----------
Removed all unresolved svn conflicts from the file... Please be careful to check your po file is valid before committing it!
Modified Paths:
--------------
branches/hu/hu.po
Modified: branches/hu/hu.po
===================================================================
--- branches/hu/hu.po 2013-05-23 22:46:00 UTC (rev 1897)
+++ branches/hu/hu.po 2013-05-25 09:45:03 UTC (rev 1898)
@@ -1901,12 +1901,8 @@
#. :src: bpy.types.NearSensor.distance
#. :src: bpy.types.RadarSensor.distance
#. :src: bpy.types.WorldLighting.distance
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:397 scripts/addons/cycles/ui.py:746
-=======
#: scripts/addons/cycles/ui.py:400
#: scripts/addons/cycles/ui.py:749
->>>>>>> .r1873
#: scripts/startup/bl_ui/properties_constraint.py:218
#: scripts/startup/bl_ui/properties_data_bone.py:352
#: scripts/startup/bl_ui/properties_data_camera.py:173
@@ -4078,16 +4074,8 @@
msgid "Spell Cache"
msgstr ""
-<<<<<<< .mine
-#. :src: bpy.types.UI_AP_i18n_settings.FRIBIDI_LIB
-msgid ""
-"The FriBidi C compiled library (.so under Linux, .dll under windows...), "
-"you’ll likely have to edit it if you’re under Windows, e.g. using the one "
-"included in svn's libraries repository"
-=======
#. :src: bpy.types.UI_AP_i18n_settings.SPELL_CACHE
msgid "A cache storing validated msgids, to avoid re-spellchecking them"
->>>>>>> .r1873
msgstr ""
#. :src: bpy.types.UI_AP_i18n_settings.GETTEXT_MSGFMT_EXECUTABLE
@@ -4100,27 +4088,6 @@
"Windows"
msgstr ""
-<<<<<<< .mine
-#. :src: bpy.types.UI_AP_i18n_settings.I18N_DIR
-msgid "Translation Root"
-msgstr ""
-
-#. :src: bpy.types.UI_AP_i18n_settings.I18N_DIR
-msgid "The bf-translation repository"
-msgstr ""
-
-#. :src: bpy.types.UI_AP_i18n_settings.WARN_MSGID_NOT_CAPITALIZED
-msgid "Warn Msgid Not Capitalized"
-msgstr ""
-
-#. :src: bpy.types.UI_AP_i18n_settings.WARN_MSGID_NOT_CAPITALIZED
-msgid ""
-"Warn about messages not starting by a capitalized letter (with a few allowed "
-"exceptions!)"
-msgstr ""
-
-=======
->>>>>>> .r1873
#. :src: bpy.types.UI_AP_i18n_settings.PY_SYS_PATHS
msgid "Import Paths"
msgstr ""
@@ -5137,14 +5104,9 @@
#. :src: bpy.types.TextureSlot.scale
#. :src: bpy.types.ParticleSettingsTextureSlot.use_map_size
#. :src: bpy.types.WorldStarsSettings.size
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:670 scripts/addons/cycles/ui.py:405
-#: scripts/addons/cycles/ui.py:613
-=======
#: scripts/addons/cycles/ui.py:673
#: scripts/addons/cycles/ui.py:408
#: scripts/addons/cycles/ui.py:616
->>>>>>> .r1873
#: scripts/startup/bl_ui/properties_data_camera.py:197
#: scripts/startup/bl_ui/properties_data_camera.py:143
#: scripts/startup/bl_ui/properties_data_curve.py:141
@@ -8033,15 +7995,10 @@
#. :src: bpy.types.TextureSlot.color
#. :src: bpy.types.TextureSlot.blend_type:'COLOR'
#. :src: bpy.types.LampTextureSlot.use_map_color
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:340 scripts/addons/cycles/ui.py:345
-#: scripts/addons/cycles/ui.py:350 scripts/addons/cycles/ui.py:704
-=======
#: scripts/addons/cycles/ui.py:343
#: scripts/addons/cycles/ui.py:348
#: scripts/addons/cycles/ui.py:353
#: scripts/addons/cycles/ui.py:707
->>>>>>> .r1873
#: scripts/startup/bl_ui/properties_material.py:537
#: source/blender/editors/space_image/image_buttons.c:777
#: source/blender/editors/space_outliner/outliner_tree.c:363
@@ -8187,12 +8144,8 @@
#. :src: bpy.types.TransformSequence.interpolation
#. :src: bpy.types.ShapeKey.interpolation
#. :src: bpy.types.VoxelData.interpolation
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:1074 scripts/addons/cycles/ui.py:1083
-=======
#: scripts/addons/cycles/ui.py:1076
#: scripts/addons/cycles/ui.py:1085
->>>>>>> .r1873
#: scripts/startup/bl_ui/space_userpref.py:360
msgid "Interpolation"
msgstr "Interpoláció"
@@ -11454,13 +11407,7 @@
msgstr ""
#. :src: bpy.types.DopeSheet.show_expanded_summary
-<<<<<<< .mine
-msgid ""
-"Collapse summary when shown, so all other channels get hidden (DopeSheet "
-"editors only)"
-=======
msgid "Collapse summary when shown, so all other channels get hidden (Dope Sheet editors only)"
->>>>>>> .r1873
msgstr ""
#. :src: bpy.types.DopeSheet.show_transforms
@@ -12317,12 +12264,8 @@
#. :src: bpy.types.TRANSFORM_OT_tosphere.value
#. :src: bpy.types.TRANSFORM_OT_vert_slide.value
#. :src: bpy.types.WorldLighting.ao_factor
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:745 scripts/addons/cycles/ui.py:979
-=======
#: scripts/addons/cycles/ui.py:748
#: scripts/addons/cycles/ui.py:982
->>>>>>> .r1873
#: scripts/startup/bl_ui/properties_data_lamp.py:151
#: scripts/startup/bl_ui/properties_data_modifier.py:383
#: scripts/startup/bl_ui/properties_data_modifier.py:769
@@ -25781,12 +25724,8 @@
#. :src: bpy.types.MESH_OT_bevel.segments
#. :src: bpy.types.MESH_OT_primitive_uv_sphere_add.segments
#. :src: bpy.types.CyclesCurveRenderSettings.segments
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:1077 scripts/addons/cycles/ui.py:1085
-=======
#: scripts/addons/cycles/ui.py:1079
#: scripts/addons/cycles/ui.py:1087
->>>>>>> .r1873
#: scripts/startup/bl_ui/properties_data_bone.py:365
msgid "Segments"
msgstr ""
@@ -34711,13 +34650,7 @@
msgstr ""
#. :src: bpy.types.MeshVertex.undeformed_co
-<<<<<<< .mine
-msgid ""
-"For meshes with modifiers applied, the coordinate of the vertex with no "
-"deforming modifiers applied, as used for generated texture coordinates. "
-=======
msgid "For meshes with modifiers applied, the coordinate of the vertex with no deforming modifiers applied, as used for generated texture coordinates"
->>>>>>> .r1873
msgstr ""
#. :src: bpy.types.MetaElement
@@ -49022,14 +48955,9 @@
#. :src: bpy.types.SOUND_OT_unpack.method
#. :src: bpy.types.UV_OT_unwrap.method
#. :src: bpy.types.WM_OT_demo_mode_setup.mode
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:490 scripts/addons/cycles/ui.py:1057
-#: scripts/addons/cycles/ui.py:1070
-=======
#: scripts/addons/cycles/ui.py:493
#: scripts/addons/cycles/ui.py:1059
#: scripts/addons/cycles/ui.py:1072
->>>>>>> .r1873
#: scripts/startup/bl_ui/properties_texture.py:1125
msgid "Method"
msgstr ""
@@ -54258,27 +54186,13 @@
msgid "Node type"
msgstr ""
-<<<<<<< .mine
-#. :src: bpy.types.NODE_OT_add_group_node.grouptree
-#, fuzzy
-msgid "Group tree"
-msgstr "Csoport-fa"
-=======
#. :src: bpy.types.NODE_OT_add_and_link_node.link_socket_index
msgid "Link Socket Index"
msgstr ""
->>>>>>> .r1873
-<<<<<<< .mine
-#. :src: bpy.types.NODE_OT_add_group_node.grouptree
-#, fuzzy
-msgid "Group node tree name"
-msgstr "Csomópont-csoport neve"
-=======
#. :src: bpy.types.NODE_OT_add_and_link_node.link_socket_index
msgid "Index of the socket to link"
msgstr ""
->>>>>>> .r1873
#. :src: bpy.types.NODE_OT_add_file
msgctxt "Operator"
@@ -68007,12 +67921,8 @@
msgstr ""
#. :src: bpy.types.CyclesCurveRenderSettings.use_backfacing
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:1062 scripts/addons/cycles/ui.py:1081
-=======
#: scripts/addons/cycles/ui.py:1064
#: scripts/addons/cycles/ui.py:1083
->>>>>>> .r1873
msgid "Check back-faces"
msgstr ""
@@ -69382,14 +69292,9 @@
#. :src: bpy.types.RenderLayer.use_pass_indirect
#. :src: bpy.types.SceneRenderLayer.use_pass_indirect
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:339 scripts/addons/cycles/ui.py:344
-#: scripts/addons/cycles/ui.py:349
-=======
#: scripts/addons/cycles/ui.py:342
#: scripts/addons/cycles/ui.py:347
#: scripts/addons/cycles/ui.py:352
->>>>>>> .r1873
#: source/blender/editors/space_outliner/outliner_tree.c:391
#: source/blender/nodes/composite/nodes/node_composite_image.c:52
msgid "Indirect"
@@ -83165,14 +83070,9 @@
msgid "Diffuse:"
msgstr ""
-<<<<<<< .mine
-#: scripts/addons/cycles/ui.py:338 scripts/addons/cycles/ui.py:343
-#: scripts/addons/cycles/ui.py:348
-=======
#: scripts/addons/cycles/ui.py:341
#: scripts/addons/cycles/ui.py:346
#: scripts/addons/cycles/ui.py:351
->>>>>>> .r1873
msgid "Direct"
msgstr ""
@@ -92936,26 +92836,10 @@
msgid "Hide pulldown menus"
msgstr ""
-<<<<<<< .mine
-#: source/blender/editors/screen/area.c:1506
-msgid ""
-"Editor type: %t|3D View %x1|%l|Timeline %x15|Graph Editor %x2|DopeSheet %x12|"
-"NLA Editor %x13|%l|UV/Image Editor %x6|Video Sequence Editor %x8|Movie Clip "
-"Editor %x20|Text Editor %x9|Node Editor %x16|Logic Editor %x17|%l|Properties "
-"%x4|Outliner %x3|User Preferences %x19|Info %x7|%l|File Browser %x5|%l|"
-"Python Console %x18"
-msgstr ""
-"Szerkesztők:%t|3D Nézet %x1|%l|Idővonal %x15|Graph Editor %x2|DopeSheet %x12|"
-"NLA Editor %x13|%l|UV/Kép szerkesztő %x6|Videoszekvencia szerkesztő %x8|Film "
-"klip szerkesztő %x20|Szövegszerkesztő %x9|Node Editor %x16|Logic Editor %x17|"
-"%l|Tulajdonságok %x4|Outliner %x3|Felhasználói beállítások %x19|Infó%x7|%l|"
-"Fájl böngésző %x5|%l|Python Konzol %x18"
-=======
#: source/blender/editors/screen/area.c:1514
#, fuzzy
msgid "Editor type: %t|3D View %x1|%l|Timeline %x15|Graph Editor %x2|Dope Sheet %x12|NLA Editor %x13|%l|UV/Image Editor %x6|Video Sequence Editor %x8|Movie Clip Editor %x20|Text Editor %x9|Node Editor %x16|Logic Editor %x17|%l|Properties %x4|Outliner %x3|User Preferences %x19|Info %x7|%l|File Browser %x5|%l|Python Console %x18"
msgstr "Szerkesztők:%t|3D Nézet %x1|%l|Idővonal %x15|Graph Editor %x2|DopeSheet %x12|NLA Editor %x13|%l|UV/Kép szerkesztő %x6|Videoszekvencia szerkesztő %x8|Film klip szerkesztő %x20|Szövegszerkesztő %x9|Node Editor %x16|Logic Editor %x17|%l|Tulajdonságok %x4|Outliner %x3|Felhasználói beállítások %x19|Infó%x7|%l|Fájl böngésző %x5|%l|Python Konzol %x18"
->>>>>>> .r1873
#: source/blender/editors/screen/screen_ops.c:2947
msgid "Flip to Bottom"
@@ -96914,583 +96798,4 @@
#. :src: Language categories’ labels from bl_i18n_utils/settings.py
#, fuzzy
msgid "Starting"
-msgstr "Indulás v. kezdet"
-
-<<<<<<< .mine
-=======
-
-#~ msgid "ShapeKey Editor"
-#~ msgstr ""
-
-
-#~ msgctxt "Operator"
-#~ msgid "Update I18n Data"
-#~ msgstr ""
-
-
->>>>>>> .r1873
-#~ msgid "Translate:"
-#~ msgstr "Fordítás:"
-
-#~ msgid "Select vertices with no edges nor faces, and edges with no faces"
-#~ msgstr ""
-
-<<<<<<< .mine
-=======
-
-#~ msgid "Description of the Struct's purpose"
-#~ msgstr ""
-
-
-#~ msgid "Select element under the mouse, delect everything is there's nothing under the mouse"
-#~ msgstr ""
-
-
-#~ msgid "Space DopeSheet Editor"
-#~ msgstr ""
-
-
-#~ msgid "Property that gives the name of the struct"
-#~ msgstr ""
-
-
-#~ msgid "Translation..."
-#~ msgstr ""
-
-
-#~ msgid "DopeSheet"
-#~ msgstr "KulcsTábla"
-
-
-#~ msgctxt "Operator"
-#~ msgid "Clear Paths"
-#~ msgstr "Útvonal(ak) törlése"
-
-
-#~ msgid "Group node tree type %s undefined"
-#~ msgstr ""
-
-
-#~ msgid "Render Passes"
-#~ msgstr ""
-
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-translations-svn
mailing list