[gnome-color-manager] Updated Lithuanian translation

From: Žygimantas Beručka <zygis src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-color-manager] Updated Lithuanian translation
Date: Sun, 12 Sep 2010 15:55:02 +0000 (UTC)
commit 6cf261ffe8578a670fa191775bb343f7cdad784a
Author: Aurimas Ä?ernius <aurisc4 gmail com>
Date:   Sun Sep 12 18:51:06 2010 +0300

    Updated Lithuanian translation

 po/lt.po |  503 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 491 insertions(+), 12 deletions(-)
---
diff --git a/po/lt.po b/po/lt.po
index 4f958a1..091677c 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9,8 +9,13 @@ msgstr ""
 "Project-Id-Version: gnome-color-manager master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
 "color-manager\n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2010-07-08 16:40+0000\n"
 "PO-Revision-Date: 2010-07-12 14:16+0300\n"
+=======
+"POT-Creation-Date: 2010-09-08 09:07+0000\n"
+"PO-Revision-Date: 2010-09-12 18:47+0300\n"
+>>>>>>> 504456d... Updated Lithuanian translation
 "Last-Translator: Å½ygimantas BeruÄ?ka <zygis gnome org>\n"
 "Language-Team: Lithuanian <gnome-lt lists akl lt>\n"
 "Language: lt\n"
@@ -94,6 +99,7 @@ msgstr "Derinimo parinktys"
 msgid "Show debugging options"
 msgstr "Rodyti derinimo parinktis"
 
+<<<<<<< HEAD
 #. TRANSLATORS: could not save for all users
 #: ../src/cc-color-panel.c:153
 msgid "Failed to save defaults for all users"
@@ -339,6 +345,8 @@ msgstr ""
 msgid "More color profiles could be automatically installed."
 msgstr "Galima automatiÅ¡kai Ä¯diegti daugiau spalvÅ³ profiliÅ³."
 
+=======
+>>>>>>> 504456d... Updated Lithuanian translation
 #. TRANSLATORS: we use this mode at login as we're sure there are no previous settings to clear
 #: ../src/gcm-apply.c:54
 msgid "Do not attempt to clear previously applied settings"
@@ -359,32 +367,56 @@ msgstr ""
 "ekrane ir pamatuojant jas prietaisu."
 
 #. TRANSLATORS: title, patches are specific colours used in calibration
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:549
+=======
+#: ../src/gcm-calibrate-argyll.c:545
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Reading the patches"
 msgstr "Matuojamos dÄ?mÄ?s"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:551
+=======
+#: ../src/gcm-calibrate-argyll.c:547
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Reading the patches using the color measuring instrument."
 msgstr "Matuojamos dÄ?mÄ?s naudojant spalvÅ³ matavimo Ä¯renginÄ¯."
 
 #. TRANSLATORS: title, patches are specific colours used in calibration
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:641
+=======
+#: ../src/gcm-calibrate-argyll.c:633
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Generating the patches"
 msgstr "Generuojamos dÄ?mÄ?s"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:643
+=======
+#: ../src/gcm-calibrate-argyll.c:635
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Generating the patches that will be measured with the color instrument."
 msgstr "Generuojamos dÄ?mÄ?s, kurios bus matuojamos naudojant spalvÅ³ Ä¯renginÄ¯."
 
 #. TRANSLATORS: title, drawing means painting to the screen
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:750
+=======
+#: ../src/gcm-calibrate-argyll.c:738
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Drawing the patches"
 msgstr "PieÅ¡iamos dÄ?mÄ?s"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:752
+=======
+#: ../src/gcm-calibrate-argyll.c:740
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Drawing the generated patches to the screen, which will then be measured by "
 "the hardware device."
@@ -392,55 +424,95 @@ msgstr "Ekrane pieÅ¡iamos sugeneruotos dÄ?mÄ?s, kurios bus pamatuotos prietaisu.
 
 #. TRANSLATORS: this is the copyright string, where it might be "Copyright (c) 2009 Edward Scissorhands" - YOU NEED TO STICK TO ASCII
 #. TRANSLATORS: this is the copyright string, where it might be "Copyright (c) 2009 Edward Scissorhands"
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:862 ../src/gcm-calibrate-argyll.c:1204
+=======
+#: ../src/gcm-calibrate-argyll.c:846 ../src/gcm-calibrate-argyll.c:1181
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Copyright (c)"
 msgstr "Autoriaus teisÄ?s Â©"
 
 #. TRANSLATORS: title, a profile is a ICC file
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:865 ../src/gcm-calibrate-argyll.c:1207
+=======
+#: ../src/gcm-calibrate-argyll.c:849 ../src/gcm-calibrate-argyll.c:1184
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Generating the profile"
 msgstr "Generuojamas profilis"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:867
+=======
+#: ../src/gcm-calibrate-argyll.c:851
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Generating the ICC color profile that can be used with this screen."
 msgstr "Generuojamas ICC spalvÅ³ profilis, kurÄ¯ galima naudoti Å¡iam ekranui."
 
 #. TRANSLATORS: title, a profile is a ICC file
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1004
+=======
+#: ../src/gcm-calibrate-argyll.c:985
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Copying files"
 msgstr "Kopijuojami failai"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1006
+=======
+#: ../src/gcm-calibrate-argyll.c:987
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Copying source image, chart data and CIE reference values."
 msgstr ""
 "Kopijuojamas Å¡altinio paveikslÄ?lis, diagramos duomenys ir CIE pavyzdinÄ?s "
 "reikÅ¡mÄ?s."
 
 #. TRANSLATORS: title, drawing means painting to the screen
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1081
+=======
+#: ../src/gcm-calibrate-argyll.c:1062
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Measuring the patches"
 msgstr "Matuojamos dÄ?mÄ?s"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1083
+=======
+#: ../src/gcm-calibrate-argyll.c:1064
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Detecting the reference patches and measuring them."
 msgstr "Nustatomos ir matuojamos pavyzdinÄ?s dÄ?mÄ?s."
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1209
+=======
+#: ../src/gcm-calibrate-argyll.c:1186
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Generating the ICC color profile that can be used with this device."
 msgstr ""
 "Generuojamas ICC spalvÅ³ profilis, kurÄ¯ galima naudoti su Å¡iuo prietaisu."
 
 #. TRANSLATORS: title, hardware refers to a calibration device
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1400
+=======
+#: ../src/gcm-calibrate-argyll.c:1373
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Set up display"
 msgstr "Nustatyti vaizduoklÄ¯"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1403
+=======
+#: ../src/gcm-calibrate-argyll.c:1376
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Setting up display device for useâ?¦"
 msgstr "Ekranas nustatomas naudojimuiâ?¦"
 
@@ -455,22 +527,38 @@ msgid "Setting up the device to read a spot colorâ?¦"
 msgstr "Ä®renginys nustatomas dÄ?mÄ?s spalvai skaitytiâ?¦"
 
 #. TRANSLATORS: title, patches are specific colors used in calibration
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1614
+=======
+#: ../src/gcm-calibrate-argyll.c:1475
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Printing patches"
 msgstr "Spausdinamos dÄ?mÄ?s"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1617
+=======
+#: ../src/gcm-calibrate-argyll.c:1478
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Rendering the patches for the selected paper and ink."
 msgstr "PieÅ¡iamos dÄ?mÄ?s pasirinktam popieriui ir raÅ¡alui."
 
 #. TRANSLATORS: title, patches are specific colours used in calibration
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1959
+=======
+#: ../src/gcm-calibrate-argyll.c:1814
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Wait for the ink to dry"
 msgstr "Palaukite, kol raÅ¡alas iÅ¡dÅ¾ius"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:1962
+=======
+#: ../src/gcm-calibrate-argyll.c:1817
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Please wait a few minutes for the ink to dry. Profiling damp ink will "
 "produce a poor profile and may damage your color measuring instrument."
@@ -479,12 +567,20 @@ msgstr ""
 "sukurs prastÄ? profilÄ¯, be to, galite sugadinti spalvÅ³ matavimo Ä¯renginÄ¯."
 
 #. TRANSLATORS: the supplied image contains an alpha channel which we have to strip out
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2104
+=======
+#: ../src/gcm-calibrate-argyll.c:1959
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Image is not suitable without conversion"
 msgstr "PaveikslÄ?lis netinkamas be konvertavimo"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2107
+=======
+#: ../src/gcm-calibrate-argyll.c:1962
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "The supplied image contains an alpha channel which the profiling tools do "
 "not understand."
@@ -493,7 +589,11 @@ msgstr ""
 "nesupranta."
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2111
+=======
+#: ../src/gcm-calibrate-argyll.c:1966
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "It is normally safe to convert the image, although you should ensure that "
 "the generated profile is valid."
@@ -502,27 +602,47 @@ msgstr ""
 "kad sugeneruotas profilis yra teisingas."
 
 #. TRANSLATORS: button text to convert the RGBA image into RGB
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2118
+=======
+#: ../src/gcm-calibrate-argyll.c:1973
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Convert"
 msgstr "Konvertuoti"
 
 #. TRANSLATORS: title, instrument refers to a calibration device
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2176
+=======
+#: ../src/gcm-calibrate-argyll.c:2031
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Set up instrument"
 msgstr "Nustatomas Ä¯renginys"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2179
+=======
+#: ../src/gcm-calibrate-argyll.c:2034
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Setting up the instrument for useâ?¦"
 msgstr "Ä®renginys nustatomas naudojimuiâ?¦"
 
 #. TRANSLATORS: title, instrument is a hardware color calibration sensor
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2278
+=======
+#: ../src/gcm-calibrate-argyll.c:2127
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Please attach instrument"
 msgstr "Prijunkite Ä¯renginÄ¯"
 
 #. TRANSLATORS: dialog message, ask user to attach device, and there's an example image
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2286
+=======
+#: ../src/gcm-calibrate-argyll.c:2135
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Please attach the measuring instrument to the center of the screen on the "
 "gray square like the image below."
@@ -531,13 +651,18 @@ msgstr ""
 "paveikslÄ?lyje."
 
 #. TRANSLATORS: dialog message, ask user to attach device
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2289
+=======
+#: ../src/gcm-calibrate-argyll.c:2138
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Please attach the measuring instrument to the center of the screen on the "
 "gray square."
 msgstr "PridÄ?kite Ä¯renginÄ¯ ties ekrano viduriu pilkame kvadrate."
 
 #. TRANSLATORS: button text
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2302 ../src/gcm-calibrate-argyll.c:2356
 #: ../src/gcm-calibrate-argyll.c:2411
 msgid "Continue"
@@ -545,54 +670,112 @@ msgstr "TÄ?sti"
 
 #. TRANSLATORS: title, instrument is a hardware color calibration sensor
 #: ../src/gcm-calibrate-argyll.c:2333 ../src/gcm-calibrate-argyll.c:2388
+=======
+#: ../src/gcm-calibrate-argyll.c:2151 ../src/gcm-calibrate-argyll.c:2205
+#: ../src/gcm-calibrate-argyll.c:2257
+msgid "Continue"
+msgstr "TÄ?sti"
+
+#. TRANSLATORS: this is the application name for libcanberra
+#: ../src/gcm-calibrate-argyll.c:2161 ../src/gcm-calibrate-argyll.c:2211
+#: ../src/gcm-calibrate-argyll.c:2263 ../src/gcm-calibrate-argyll.c:2342
+#: ../src/gcm-calibrate-argyll.c:2402 ../src/gcm-calibrate-argyll.c:2443
+#: ../src/gcm-prefs.c:819 ../src/gcm-prefs.c:1987
+msgid "GNOME Color Manager"
+msgstr "GNOME spalvÅ³ valdyklÄ?"
+
+#. TRANSLATORS: title, instrument is a hardware color calibration sensor
+#: ../src/gcm-calibrate-argyll.c:2182 ../src/gcm-calibrate-argyll.c:2234
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Please configure instrument"
 msgstr "Nustatykite Ä¯renginÄ¯"
 
 #. TRANSLATORS: this is when the user has to change a setting on the sensor, and we're showing a picture
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2343
+=======
+#: ../src/gcm-calibrate-argyll.c:2192
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Please set the measuring instrument to calibration mode like the image below."
 msgstr ""
 "Nustatykite Ä¯renginÄ¯ Ä¯ kalibravimo veiksenÄ? kaip parodyta paveikslÄ?lyje."
 
 #. TRANSLATORS: this is when the user has to change a setting on the sensor
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2346
+=======
+#: ../src/gcm-calibrate-argyll.c:2195
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Please set the measuring instrument to calibration mode."
 msgstr "Nustatykite Ä¯renginÄ¯ Ä¯ kalibravimo veiksenÄ?."
 
 #. TRANSLATORS: this is when the user has to change a setting on the sensor, and we're showing a picture
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2398
+=======
+#: ../src/gcm-calibrate-argyll.c:2244
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Please set the measuring instrument to screen mode like the image below."
 msgstr "Nustatykite Ä¯renginÄ¯ Ä¯ ekrano veiksenÄ? kaip parodyta paveikslÄ?lyje."
 
 #. TRANSLATORS: this is when the user has to change a setting on the sensor
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2401
 msgid "Please set the measuring instrument to screen mode."
 msgstr "Nustatykite Ä¯renginÄ¯ Ä¯ ekrano veiksenÄ?."
 
 #. TRANSLATORS: title, the calibration failed
 #: ../src/gcm-calibrate-argyll.c:2472 ../src/gcm-calibrate-argyll.c:2541
+=======
+#: ../src/gcm-calibrate-argyll.c:2247
+msgid ""
+"Please set the measuring instrument to screen mode, and ensure it is "
+"attached to the screen."
+msgstr ""
+"Nustatykite Ä¯renginÄ¯ Ä¯ ekrano reÅ¾imÄ? kaip parodyta paveikslÄ?lyje ir "
+"uÅ¾tikrinkite, kad jis prilipdytas prie ekrano."
+
+#. TRANSLATORS: title, the calibration failed
+#: ../src/gcm-calibrate-argyll.c:2321 ../src/gcm-calibrate-argyll.c:2369
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Calibration error"
 msgstr "Kalibravimo klaida"
 
 #. TRANSLATORS: message, the sample was not read correctly
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2475
+=======
+#: ../src/gcm-calibrate-argyll.c:2324
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "The sample could not be read at this time."
 msgstr "PavyzdÅ¾io Å¡iuo metu nepavyko nuskaityti."
 
 #. TRANSLATORS: button text
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2483
+=======
+#: ../src/gcm-calibrate-argyll.c:2332
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Try again"
 msgstr "Bandykite dar kartÄ?"
 
 #. TRANSLATORS: message, no firmware is available
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2545
+=======
+#: ../src/gcm-calibrate-argyll.c:2373
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "No firmware is installed for this instrument."
 msgstr "PrograminÄ? Ä¯ranga neÄ¯diegta Å¡iam prietaisui."
 
 #. TRANSLATORS: message, the image wasn't good enough
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2548
+=======
+#: ../src/gcm-calibrate-argyll.c:2376
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "The pattern match wasn't good enough. Ensure you have the correct type of "
 "target selected."
@@ -601,7 +784,11 @@ msgstr ""
 "teisingÄ? tikslÄ?."
 
 #. TRANSLATORS: message, the sensor got no readings
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2552
+=======
+#: ../src/gcm-calibrate-argyll.c:2380
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "The measuring instrument got no valid readings. Please ensure the aperture "
 "is fully open."
@@ -610,7 +797,11 @@ msgstr ""
 "atverta."
 
 #. TRANSLATORS: message, the colorimeter has got confused
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2555
+=======
+#: ../src/gcm-calibrate-argyll.c:2383
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "The measuring instrument is busy and is not starting up. Please remove the "
 "USB plug and re-insert before trying to use this device."
@@ -619,34 +810,58 @@ msgstr ""
 "vÄ?l Ä¯junkite prieÅ¡ mÄ?gindami naudoti Å¡Ä¯ prietaisÄ?."
 
 #. TRANSLATORS: dialog title
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2593
+=======
+#: ../src/gcm-calibrate-argyll.c:2421
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Reading target"
 msgstr "Nuskaitomas tikslinis paveikslÄ?lis"
 
 #. TRANSLATORS: message, no firmware is available
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2596
+=======
+#: ../src/gcm-calibrate-argyll.c:2424
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Failed to read the strip correctly."
 msgstr "Nepavyko tinkamai nuskaityti atraiÅ¾Å³."
 
 #. TRANSLATORS: button text
+<<<<<<< HEAD
 #. TRANSLATORS: button
 #: ../src/gcm-calibrate-argyll.c:2605 ../src/gcm-calibrate-argyll.c:2679
+=======
+#: ../src/gcm-calibrate-argyll.c:2433
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Retry"
 msgstr "Pakartoti"
 
 #. TRANSLATORS: dialog title, where %s is a letter like 'A'
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2628
+=======
+#: ../src/gcm-calibrate-argyll.c:2456
+>>>>>>> 504456d... Updated Lithuanian translation
 #, c-format
 msgid "Read strip %s rather than %s!"
 msgstr "Nuskaityti atraiÅ¾Ä? %s vietoj %s!"
 
 #. TRANSLATORS: dialog message, just follow the hardware instructions
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2633
+=======
+#: ../src/gcm-calibrate-argyll.c:2461
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "It looks like you've measured the wrong strip."
 msgstr "Atrodo, kad jÅ«s nuskaitÄ?te ne tÄ? atraiÅ¾Ä?."
 
 #. TRANSLATORS: dialog message, just follow the hardware instructions
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2637
+=======
+#: ../src/gcm-calibrate-argyll.c:2465
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "If you've really measured the right one, it's okay, it could just be unusual "
 "paper."
@@ -655,7 +870,11 @@ msgstr ""
 "popierius."
 
 #. TRANSLATORS: button
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2647
+=======
+#: ../src/gcm-calibrate-argyll.c:2475
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Use anyway"
 msgstr "Vis tiek naudoti"
 
@@ -670,13 +889,21 @@ msgid "The device could not measure the color spot correctly."
 msgstr "Prietaisui nepavyko teisingai nustatyti dÄ?mÄ?s spalvos."
 
 #. TRANSLATORS: dialog title, where %s is a letter like 'A'
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2691
+=======
+#: ../src/gcm-calibrate-argyll.c:2487
+>>>>>>> 504456d... Updated Lithuanian translation
 #, c-format
 msgid "Ready to read strip %s"
 msgstr "PasiruoÅ¡Ä?s nuskaityti atraiÅ¾Ä? %s"
 
 #. TRANSLATORS: dialog message, just follow the hardware instructions
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2696
+=======
+#: ../src/gcm-calibrate-argyll.c:2492
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Place the colorimeter on the area of white next to the letter and click and "
 "hold the measure switch."
@@ -685,7 +912,11 @@ msgstr ""
 "laikykite matavimo jungiklÄ¯."
 
 #. TRANSLATORS: dialog message, just follow the hardware instructions
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2700
+=======
+#: ../src/gcm-calibrate-argyll.c:2496
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Slowly scan the target line from left to right and release the switch when "
 "you get to the end of the page."
@@ -694,7 +925,11 @@ msgstr ""
 "pasieksite puslapio pabaigÄ?."
 
 #. TRANSLATORS: dialog message, the sensor has to be above the line
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2704
+=======
+#: ../src/gcm-calibrate-argyll.c:2500
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Ensure the center of the device is properly aligned with the row you are "
 "trying to measure."
@@ -703,7 +938,11 @@ msgstr ""
 "matuojate."
 
 #. TRANSLATORS: dialog message, just follow the hardware instructions
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2708
+=======
+#: ../src/gcm-calibrate-argyll.c:2504
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "If you make a mistake just release the switch and you'll get a chance to try "
 "again."
@@ -712,32 +951,56 @@ msgstr ""
 "kartÄ?."
 
 #. TRANSLATORS: title, printing reference files to media
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2856
+=======
+#: ../src/gcm-calibrate-argyll.c:2642
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Printing"
 msgstr "Spausdinimas"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2863
+=======
+#: ../src/gcm-calibrate-argyll.c:2649
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Preparing the data for the printer."
 msgstr "RuoÅ¡iami duomenys spausdintuvui."
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2869
+=======
+#: ../src/gcm-calibrate-argyll.c:2655
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Sending the targets to the printer."
 msgstr "SiunÄ?iami spalvÅ³ tiksliniai paveikslÄ?liai spausdintuvui."
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2873
+=======
+#: ../src/gcm-calibrate-argyll.c:2659
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Printing the targets..."
 msgstr "Spausdinami spalvÅ³ tiksliniai paveikslÄ?liaiâ?¦"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2877
+=======
+#: ../src/gcm-calibrate-argyll.c:2663
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "The printing has finished."
 msgstr "Spausdinimas baigtas."
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate-argyll.c:2881
+=======
+#: ../src/gcm-calibrate-argyll.c:2667
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "The print was aborted."
 msgstr "Spausdinimas atÅ¡auktas."
 
@@ -762,51 +1025,88 @@ msgid "Unknown device"
 msgstr "NeÅ¾inomas prietaisas"
 
 #. TRANSLATORS: title, usually we can tell based on the EDID data or output name
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:372
+=======
+#: ../src/gcm-calibrate.c:391
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Could not detect screen type"
 msgstr "Nepavyko automatiÅ¡kai nustatyti ekrano tipo"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:375
+=======
+#: ../src/gcm-calibrate.c:394
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Please indicate if the screen you are trying to profile is an LCD, CRT or a "
 "projector."
 msgstr "Nurodykite, ar profiliuojamas ekranas yra CRT, LCD ar projektorius."
 
 #. TRANSLATORS: title, the hardware calibration device does not support projectors
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:400
+=======
+#: ../src/gcm-calibrate.c:419
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Could not calibrate and profile using this color measuring instrument"
 msgstr ""
 "Negalima kalibruoti ir profiliuoti naudojant Å¡Ä¯ spalvÅ³ matavimo prietaisÄ?"
 
 #. TRANSLATORS: dialog message
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:403
+=======
+#: ../src/gcm-calibrate.c:422
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "This color measuring instrument is not designed to support calibration and "
 "profiling projectors."
 msgstr "Å is spalvÅ³ matavimo prietaisas nepalaiko projektoriÅ³ profiliavimo."
 
 #. TRANSLATORS: dialog title
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:464
 msgid "Profile Precision"
 msgstr "ProfiliÅ³ tikslumas"
 
 #. TRANSLATORS: this is the message body for the chart selection
 #: ../src/gcm-calibrate.c:467
+=======
+#: ../src/gcm-calibrate.c:483
+msgid "Profile Precision"
+msgstr "Profilio tikslumas"
+
+#. TRANSLATORS: this is the message body for the chart selection
+#: ../src/gcm-calibrate.c:486
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "A higher precision profile provides higher accuracy in color matching but "
 "requires more time for reading the color patches."
 msgstr ""
+<<<<<<< HEAD
 "Didelio tikslumo profiliai leidÅ¾ia tiksliau priderinti spalvas, taÄ?iau "
 "reikalauja daugiau laiko spalvÅ³ pavyzdÅ¾iams nuskaityti."
 
 #. TRANSLATORS: this is the message body for the chart selection
 #: ../src/gcm-calibrate.c:470
+=======
+"Naudojant didesnio tikslumo profilÄ¯ pagerinamas spalvÅ³ atitikimo tikslumas, "
+"taÄ?iau tam prireikia daugiau laiko spalvÅ³ pavyzdÅ¾iams nuskaityti."
+
+#. TRANSLATORS: this is the message body for the chart selection
+#: ../src/gcm-calibrate.c:489
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "For a typical workflow, a normal precision profile is sufficient."
 msgstr "Ä®prastiniam darbui pakanka Ä¯prastinio profilio."
 
 #. TRANSLATORS: dialog message, preface
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:475
+=======
+#: ../src/gcm-calibrate.c:494
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "The high precision profile also requires more paper and printer ink."
 msgstr ""
 "Didelio tikslumo profiliai taip pat reikalauja daugiau popieriaus ir "
@@ -883,68 +1183,125 @@ msgstr "Vaizduoklio sÄ?ranka"
 #. TRANSLATORS: dialog for file->open dialog. A calibration target image is the
 #. * aquired image of the calibration target, e.g. an image file that looks
 #. * a bit like this: http://www.colorreference.de/targets/target.jpg
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:712
+=======
+#: ../src/gcm-calibrate.c:702
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Select calibration target image"
 msgstr "Pasirinkite kalibravimo pavyzdinÄ¯ paveikslÄ?lÄ¯"
 
 #. TRANSLATORS: filter name on the file->open dialog
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:725
 msgid "Supported images files"
 msgstr "Palaikomi paveikslÄ?liÅ³ failai"
 
 #. TRANSLATORS: dialog for file->open dialog
 #: ../src/gcm-calibrate.c:757
+=======
+#: ../src/gcm-calibrate.c:715
+msgid "Supported images files"
+msgstr "Palaikomi paveikslÄ?liÅ³ failai"
+
+#. TRANSLATORS: filter name on the file->open dialog
+#: ../src/gcm-calibrate.c:722 ../src/gcm-calibrate.c:774
+#: ../src/gcm-prefs.c:543
+msgid "All files"
+msgstr "Visi failai"
+
+#. TRANSLATORS: dialog for file->open dialog
+#: ../src/gcm-calibrate.c:747
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Select CIE reference values file"
 msgstr "Pasirinkite CIE pavyzdiniÅ³ reikÅ¡miÅ³ failÄ?"
 
 #. TRANSLATORS: filter name on the file->open dialog
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:777
 msgid "CIE values"
 msgstr "CIE reikÅ¡mÄ?s"
 
 #: ../src/gcm-calibrate.c:853
+=======
+#: ../src/gcm-calibrate.c:767
+msgid "CIE values"
+msgstr "CIE reikÅ¡mÄ?s"
+
+#. TRANSLATORS: dialog for file->open dialog
+#: ../src/gcm-calibrate.c:840 ../src/gcm-prefs.c:515
+msgid "Select ICC Profile File"
+msgstr "Pasirinkite ICC profilio failÄ?"
+
+#: ../src/gcm-calibrate.c:843
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Open"
 msgstr "Atverti"
 
 #. TRANSLATORS: title, you can profile all at once, or in steps
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:889
+=======
+#: ../src/gcm-calibrate.c:879
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Please choose a profiling mode"
 msgstr "Pasirinkite profiliavimo veiksenÄ?"
 
 #. TRANSLATORS: dialog message. Test patches are pages of colored squares
 #. * that are printed with a printer, and then read in with a calibration
 #. * device to create a profile
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:894
+=======
+#: ../src/gcm-calibrate.c:884
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Please indicate if you want to profile a local printer, generate some test "
 "patches, or profile using existing test patches."
 msgstr ""
-"Nurodykite, ar norite profiliuoti vietinÄ¯ spausdintuvÄ?, generuoti ar "
-"apdoroti pavyzdinius paveikslÄ?lius."
+"Nurodykite, ar norite profiliuoti vietinÄ¯ spausdintuvÄ?, generuoti "
+"pavyzdinius paveikslÄ?lius ar profiliuoti naudojant esamus pavyzdÅ¾ius."
 
 #. TRANSLATORS: title, usually we can tell based on the EDID data or output name
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1005
+=======
+#: ../src/gcm-calibrate.c:996
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Install missing files?"
 msgstr "Ä®diegti trÅ«kstamus failus?"
 
 #. TRANSLATORS: dialog message saying the color targets are not installed
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1008
+=======
+#: ../src/gcm-calibrate.c:999
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Common color target files are not installed on this computer."
 msgstr "Å iame kompiuteryje neÄ¯diegta bendrÅ³ spalvÅ³ tiksliniÅ³ failÅ³."
 
 #. TRANSLATORS: dialog message saying the color targets are not installed
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1010
+=======
+#: ../src/gcm-calibrate.c:1001
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Color target files are needed to convert the image to a color profile."
 msgstr ""
 "Tiksliniai spalvÅ³ failai reikalingi norint konvertuoti paveikslÄ?lÄ¯ Ä¯ spalvÅ³ "
 "profilÄ¯."
 
 #. TRANSLATORS: dialog message, asking if it's okay to install them
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1012
+=======
+#: ../src/gcm-calibrate.c:1003
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Do you want them to be installed?"
 msgstr "Ar norite juos Ä¯diegti automatiÅ¡kai?"
 
 #. TRANSLATORS: dialog message, if the user has the target file on a CDROM then there's no need for this package
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1014
 msgid "If you already have the correct file, you can skip this step."
 msgstr "Jei jau turite teisingÄ? failÄ?, galite praleisti Å¡Ä¯ Å¾ingsnÄ¯."
@@ -959,6 +1316,34 @@ msgstr "Pasirinkite kalibravimo pavyzdÄ¯"
 #. TRANSLATORS: dialog message, preface. A calibration target looks like
 #. * this: http://www.colorreference.de/targets/target.jpg
 #: ../src/gcm-calibrate.c:1041
+=======
+#: ../src/gcm-calibrate.c:1005
+msgid "If you already have the correct file, you can skip this step."
+msgstr "Jei jau turite teisingÄ? failÄ?, galite praleisti Å¡Ä¯ Å¾ingsnÄ¯."
+
+#. TRANSLATORS: button, skip installing a package
+#: ../src/gcm-calibrate.c:1010 ../src/gcm-prefs.c:702
+msgid "Do not install"
+msgstr "NeÄ¯diegti"
+
+#. TRANSLATORS: button, install a package
+#. TRANSLATORS: button text
+#. TRANSLATORS: button, install a package
+#: ../src/gcm-calibrate.c:1012 ../src/gcm-import.c:188 ../src/gcm-prefs.c:700
+msgid "Install"
+msgstr "Ä®diegti"
+
+#. TRANSLATORS: this is the window title for when the user selects the calibration target.
+#. * A calibration target is an accuratly printed grid of colors, for instance:
+#. * the IT 8.7 targets available here: http://www.targets.coloraid.de/
+#: ../src/gcm-calibrate.c:1027
+msgid "Please select a calibration target"
+msgstr "Pasirinkite kalibravimo pavyzdinÄ¯ paveikslÄ?lÄ¯"
+
+#. TRANSLATORS: dialog message, preface. A calibration target looks like
+#. * this: http://www.colorreference.de/targets/target.jpg
+#: ../src/gcm-calibrate.c:1032
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Before profiling the device, you have to manually capture an image of a "
 "calibration target and save it as a TIFF image file."
@@ -967,7 +1352,11 @@ msgstr ""
 "paveikslÄ?lÄ¯ ir Ä¯raÅ¡yti jÄ¯ kaip TIFF failÄ?."
 
 #. TRANSLATORS: dialog message, preface
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1046
+=======
+#: ../src/gcm-calibrate.c:1037
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Ensure that the contrast and brightness are not changed and color correction "
 "profiles are not applied."
@@ -976,7 +1365,11 @@ msgstr ""
 "spalvÅ³ korekcijos profiliai."
 
 #. TRANSLATORS: dialog message, suffix
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1049
+=======
+#: ../src/gcm-calibrate.c:1040
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "The device sensor should have been cleaned prior to scanning and the output "
 "file resolution should be at least 200dpi."
@@ -985,7 +1378,11 @@ msgstr ""
 "raiÅ¡ka turi bÅ«ti bent 200 dpi."
 
 #. TRANSLATORS: dialog message, preface
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1055
+=======
+#: ../src/gcm-calibrate.c:1046
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "Ensure that the white-balance has not been modified by the camera and that "
 "the lens is clean."
@@ -994,7 +1391,11 @@ msgstr ""
 "kad lÄ?Å¡is yra Å¡varus."
 
 #. TRANSLATORS: dialog message, suffix
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1059
+=======
+#: ../src/gcm-calibrate.c:1050
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid ""
 "For best results, the reference target should also be less than two years "
 "old."
@@ -1003,59 +1404,69 @@ msgstr ""
 "senesnis kaip dviejÅ³ metÅ³."
 
 #. TRANSLATORS: this is the message body for the chart selection
+<<<<<<< HEAD
 #: ../src/gcm-calibrate.c:1062
 msgid ""
 "Please select the calibration target type which corresponds to your "
 "reference file."
 msgstr "Pasirinkite kalibravimo pavyzdÅ¾io tipÄ?, atitinkantÄ¯ pavyzdinÄ¯ failÄ?."
+=======
+#: ../src/gcm-calibrate.c:1053
+msgid ""
+"Please select the calibration target type which corresponds to your "
+"reference file."
+msgstr ""
+"Pasirinkite kalibravimo pavyzdinÄ¯ paveikslÄ?lÄ¯, atitinkantÄ¯ jÅ«sÅ³ pavyzdÅ¾io "
+"failÄ?."
+>>>>>>> 504456d... Updated Lithuanian translation
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:556
+#: ../src/gcm-calibrate-dialog.c:567
 msgid "CMP Digital Target 3"
 msgstr "CMP Digital Target 3"
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:560
+#: ../src/gcm-calibrate-dialog.c:571
 msgid "CMP DT 003"
 msgstr "CMP DT 003"
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:564
+#: ../src/gcm-calibrate-dialog.c:575
 msgid "Color Checker"
 msgstr "Color Checker"
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:568
+#: ../src/gcm-calibrate-dialog.c:579
 msgid "Color Checker DC"
 msgstr "Color Checker DC"
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:572
+#: ../src/gcm-calibrate-dialog.c:583
 msgid "Color Checker SG"
 msgstr "Color Checker SG"
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:576
+#: ../src/gcm-calibrate-dialog.c:587
 msgid "Hutchcolor"
 msgstr "Hutchcolor"
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:580
+#: ../src/gcm-calibrate-dialog.c:591
 msgid "i1 RGB Scan 1.4"
 msgstr "i1 RGB Scan 1.4"
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:584
+#: ../src/gcm-calibrate-dialog.c:595
 msgid "IT8.7/2"
 msgstr "IT8.7/2"
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:588
+#: ../src/gcm-calibrate-dialog.c:599
 msgid "Laser Soft DC Pro"
 msgstr "Laser Soft DC Pro"
 
 #. TRANSLATORS: this is probably a brand name
-#: ../src/gcm-calibrate-dialog.c:592
+#: ../src/gcm-calibrate-dialog.c:603
 msgid "QPcard 201"
 msgstr "QPcard 201"
 
@@ -1129,9 +1540,16 @@ msgstr ""
 "Å is vaizduoklis kalibruotas. Galite pakeisti dabartinÄ¯ profilÄ¯ naudodami "
 "programÄ? SpalvÅ³ profiliai."
 
+<<<<<<< HEAD
 #: ../src/gcm-cell-renderer-profile.c:80
 msgid "Default"
 msgstr "Numatytieji"
+=======
+#. TRANSLATORS: error message
+#: ../src/gcm-client.c:1103
+msgid "This device already exists"
+msgstr "Å is prietaisas jau yra"
+>>>>>>> 504456d... Updated Lithuanian translation
 
 #. TRANSLATORS: this is when the device is not recognized
 #: ../src/gcm-colorimeter.c:414
@@ -1139,7 +1557,11 @@ msgid "Measuring instrument not recognized"
 msgstr "Matavimo Ä¯renginys neatpaÅ¾intas"
 
 #. TRANSLATORS: this is the name of the internal panel
+<<<<<<< HEAD
 #: ../src/gcm-device-xrandr.c:149
+=======
+#: ../src/gcm-device-xrandr.c:128
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Laptop LCD"
 msgstr "NeÅ¡iojamo kompiuterio LCD"
 
@@ -1235,32 +1657,56 @@ msgid "CMYK"
 msgstr "CMYK"
 
 #. TRANSLATORS: command line option
+<<<<<<< HEAD
 #: ../src/gcm-fix-profile.c:140
+=======
+#: ../src/gcm-fix-profile.c:124
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "The description of the profile"
 msgstr "Profilio apraÅ¡ymas"
 
 #. TRANSLATORS: command line option
+<<<<<<< HEAD
 #: ../src/gcm-fix-profile.c:143
+=======
+#: ../src/gcm-fix-profile.c:127
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "The copyright of the profile"
 msgstr "Profilio autoriaus teisÄ?s"
 
 #. TRANSLATORS: command line option
+<<<<<<< HEAD
 #: ../src/gcm-fix-profile.c:146
+=======
+#: ../src/gcm-fix-profile.c:130
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "The model of the profile"
 msgstr "Profilio modelis"
 
 #. TRANSLATORS: command line option
+<<<<<<< HEAD
 #: ../src/gcm-fix-profile.c:149
+=======
+#: ../src/gcm-fix-profile.c:133
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "The manufacturer of the profile"
 msgstr "Profilio gamintojas"
 
 #. TRANSLATORS: command line option: a list of icc files to fix
+<<<<<<< HEAD
 #: ../src/gcm-fix-profile.c:152
+=======
+#: ../src/gcm-fix-profile.c:136
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Profiles to fix"
 msgstr "Taisytini profiliai"
 
 #. TRANSLATORS: this fixes broken profiles
+<<<<<<< HEAD
 #: ../src/gcm-fix-profile.c:163
+=======
+#: ../src/gcm-fix-profile.c:147
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "ICC profile fix program"
 msgstr "ICC profiliÅ³ taisymo programa"
 
@@ -1485,7 +1931,11 @@ msgstr "Å altinio failo vardas turi bÅ«ti su absoliuÄ?iu keliu."
 #. TRANSLATORS: error details
 #: ../src/gcm-install-system-wide.c:196
 msgid "Failed to get content type:"
+<<<<<<< HEAD
 msgstr "Nepavyko aptikti turinio tipo."
+=======
+msgstr "Nepavyko aptikti turinio tipo:"
+>>>>>>> 504456d... Updated Lithuanian translation
 
 #. TRANSLATORS: the content type is the detected type of file
 #: ../src/gcm-install-system-wide.c:206
@@ -1635,12 +2085,20 @@ msgid "CMY"
 msgstr "CMY"
 
 #. TRANSLATORS: if the device has a VCGT profile
+<<<<<<< HEAD
 #: ../src/gcm-viewer.c:721
+=======
+#: ../src/gcm-prefs.c:1576
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Yes"
 msgstr "Taip"
 
 #. TRANSLATORS: if the device has a VCGT profile
+<<<<<<< HEAD
 #: ../src/gcm-viewer.c:724
+=======
+#: ../src/gcm-prefs.c:1579
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "No"
 msgstr "Ne"
 
@@ -1683,8 +2141,13 @@ msgstr "PaveikslÄ?lio perÅ¾iÅ«ra (Ä¯vestis)"
 msgid "Image preview (output)"
 msgstr "PaveikslÄ?lio perÅ¾iÅ«ra (iÅ¡vestis)"
 
+<<<<<<< HEAD
 #. TRANSLATORS: this is where the ICC profile has no description
 #: ../src/gcm-profile.c:140
+=======
+#. TRANSLATORS: this is where the ICC profile_lcms1 has no description
+#: ../src/gcm-profile.c:130
+>>>>>>> 504456d... Updated Lithuanian translation
 msgid "Missing description"
 msgstr "NÄ?ra apraÅ¡ymo"
 
@@ -2374,6 +2837,22 @@ msgstr "_Atstatyti numatytuosius"
 #~ msgid "_Import Profile"
 #~ msgstr "_Importuoti profilÄ¯"
 
+#~ msgid "Choose the precision of the profile"
+#~ msgstr "Pasirinkite profilio tikslumÄ?"
+
+#~ msgid "Please choose the profile precision."
+#~ msgstr "Pasirinkite profilio tikslumÄ?."
+
+#~ msgid ""
+#~ "High precision profiles provide higher accuracy in color matching. "
+#~ "Correspondingly, low precision profiles result in lower quality."
+#~ msgstr ""
+#~ "Didelio tikslumo profiliai suteikia tikslesnÄ¯ spalvÅ³ atitikimÄ?. "
+#~ "AnalogiÅ¡kai maÅ¾o tikslumo profiliai duoda prastesnÄ?s kokybÄ?s profilius."
+
+#~ msgid "Select reference image"
+#~ msgstr "Pasirinkite pavyzdinÄ¯ paveikslÄ?lÄ¯"
+
 #~ msgid "Measuring instrument not registered"
 #~ msgstr "Matavimo Ä¯renginys neregistruotas"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]