Author: jsuchome Date: Wed Nov 16 11:20:49 2011 New Revision: 66812 URL: http://svn.opensuse.org/viewcvs/yast?rev=66812&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/snapper/VERSION trunk/snapper/package/yast2-snapper.changes trunk/snapper/src/Snapper.ycp trunk/snapper/src/dialogs.ycp trunk/snapper/src/helps.ycp Modified: trunk/snapper/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/VERSION?rev=66812&r1=66811&r2=66812&view=diff ============================================================================== --- trunk/snapper/VERSION (original) +++ trunk/snapper/VERSION Wed Nov 16 11:20:49 2011 @@ -1 +1 @@ -2.21.16 +2.22.0 Modified: trunk/snapper/package/yast2-snapper.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/package/yast2-snapper.changes?rev=66812&r1=66811&r2=66812&view=diff ============================================================================== --- trunk/snapper/package/yast2-snapper.changes (original) +++ trunk/snapper/package/yast2-snapper.changes Wed Nov 16 11:20:49 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 11:20:22 CET 2011 - jsuchome@suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Fri Oct 14 10:15:38 CEST 2011 - jsuchome@suse.cz - use the <pre> tag for the diff, so spaces are not lost Modified: trunk/snapper/src/Snapper.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/Snapper.ycp?rev=66812&r1=66811&r2=66812&view=diff ============================================================================== --- trunk/snapper/src/Snapper.ycp (original) +++ trunk/snapper/src/Snapper.ycp Wed Nov 16 11:20:49 2011 @@ -203,7 +203,7 @@ if (configs == nil) { // error popup - Report::Error (_("File /etc/sysconfig/snapper is not available")); + Report::Error (_("File /etc/sysconfig/snapper is not available.")); configs = [ "root" ]; } return configs; Modified: trunk/snapper/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/dialogs.ycp?rev=66812&r1=66811&r2=66812&view=diff ============================================================================== --- trunk/snapper/src/dialogs.ycp (original) +++ trunk/snapper/src/dialogs.ycp Wed Nov 16 11:20:49 2011 @@ -410,9 +410,9 @@ `VSquash (`HBox ( `HStretch (), // button label - type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), _("R&estore From First")), + type == `SINGLE ? `Empty () : `PushButton (`id (`restore_pre), _("R&estore from First")), // button label - `PushButton (`id (`restore), type == `SINGLE ? _("Restore") : _("Res&tore From Second")) + `PushButton (`id (`restore), type == `SINGLE ? _("Restore") : _("Res&tore from Second")) )) ), `HSpacing (0.5)) ); @@ -677,7 +677,7 @@ // popup headline if (Popup::AnyQuestionRichText (_("Restoring files"), // popup message, %1 is snapshot number, %2 list of files - sformat (_("These files will be copied from snapshot '%1' to current system: <p>%2</p>Are you sure?"), + sformat (_("These files will be copied from snapshot '%1' to current system: <p>%2.</p>Are you sure?"), previous_num, mergestring (to_restore, "<br>")), 60, 20, Label::YesButton (), Label::NoButton (), `focus_no)) { Modified: trunk/snapper/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/snapper/src/helps.ycp?rev=66812&r1=66811&r2=66812&view=diff ============================================================================== --- trunk/snapper/src/helps.ycp (original) +++ trunk/snapper/src/helps.ycp Wed Nov 16 11:20:49 2011 @@ -38,32 +38,37 @@ /* Read dialog help */ "read" : _("<p><b><big>Reading the list of snapshots</big></b><br> -Please wait...<br></p> +</p> "), /* Summary dialog help: */ "summary" : _("<p><b><big>Snapshots Configuration</big></b><p> -<p>The table shows a list of root filesystem snapshots. There are three types of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are used for storing file system state in certain time, while Pre and Post are used to define the changes done by special operation proceeded between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p> -<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the file system changes new in specified snapshot.</p> +<p>The table shows a list of root filesystem snapshots. There are three types +of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are +used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p> +<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the +new file system changes in the specified snapshot.</p> "), /* Show snapshot dialog help */ "show_couple" : _("<p><b><big>Snapshot Overview</big></b><p> <p> -The tree shows all the files that were modified between creating first ('pre') and second ('post') snapshot. On the right side, you can see the description generated when the first snapshot was created and the time of creation for both snapshots. +The tree shows all the files that were modified between creating the first ('pre') and second ('post') snapshot. On the right side, you see the description generated when the first snapshot was created and the time of creation for both snapshots. </p> <p> -When file is selected in the tree, you can see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions. -</p>"), +When a file is selected in the tree, you see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions. +</p> +"), /* Show snapshot dialog help, alternative for single snapshots */ "show_single" : _("<p><b><big>Snapshot Overview</big></b><p> <p> -The tree shows all the files that are different between selected snapshot and current system. On the right side, you can see the snapshot description and time of its creation. +The tree shows all the files that differ in a selected snapshot and the current system. On the right side, you see the snapshot description and time of its creation. </p> <p> -When file is selected in the tree, you can see the its difference between snapshot version and current system. -</p>"), +When a file is selected in the tree, you can see the its difference between snapshot version and current system. +</p> +"), ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org