@@ -144,7 +144,7 @@ p, li { white-space: pre-wrap; }
144
144
<location filename="../python/plugins/fTools/tools/frmPointsInPolygon.ui" line="105"/>
145
145
<location filename="../python/plugins/fTools/tools/frmRandPoints.ui" line="220"/>
146
146
<location filename="../python/plugins/fTools/tools/frmReProject.ui" line="136"/>
147
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="211 "/>
147
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="223 "/>
148
148
<location filename="../python/plugins/fTools/tools/frmSpatialJoin.ui" line="166"/>
149
149
<location filename="../python/plugins/fTools/tools/frmSumLines.ui" line="77"/>
150
150
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="321"/>
@@ -243,7 +243,7 @@ p, li { white-space: pre-wrap; }
243
243
<location filename="../python/plugins/fTools/tools/frmPointsInPolygon.ui" line="89"/>
244
244
<location filename="../python/plugins/fTools/tools/frmRandPoints.ui" line="204"/>
245
245
<location filename="../python/plugins/fTools/tools/frmReProject.ui" line="120"/>
246
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="195 "/>
246
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="207 "/>
247
247
<location filename="../python/plugins/fTools/tools/frmSumLines.ui" line="61"/>
248
248
<source>Output Shapefile</source>
249
249
<translation type="unfinished"></translation>
@@ -442,7 +442,7 @@ p, li { white-space: pre-wrap; }
442
442
<message>
443
443
<location filename="../python/plugins/fTools/tools/frmRandPoints.ui" line="84"/>
444
444
<location filename="../python/plugins/fTools/tools/frmRandPoints.ui" line="125"/>
445
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="140 "/>
445
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="149 "/>
446
446
<source>Use this number of points</source>
447
447
<translation type="unfinished"></translation>
448
448
</message>
@@ -538,51 +538,63 @@ p, li { white-space: pre-wrap; }
538
538
<translation type="unfinished"></translation>
539
539
</message>
540
540
<message>
541
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="39"/>
541
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="32"/>
542
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="45"/>
543
+ <source>buttonGroup</source>
544
+ <translation type="unfinished"></translation>
545
+ </message>
546
+ <message>
547
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="42"/>
542
548
<source>Input Coordinates</source>
543
549
<translation type="unfinished"></translation>
544
550
</message>
545
551
<message>
546
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="48 "/>
552
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="54 "/>
547
553
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="66"/>
548
554
<source>X Min</source>
549
555
<translation type="unfinished"></translation>
550
556
</message>
551
557
<message>
552
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="62 "/>
558
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="68 "/>
553
559
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="93"/>
554
560
<source>Y Min</source>
555
561
<translation type="unfinished"></translation>
556
562
</message>
557
563
<message>
558
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="76 "/>
564
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="82 "/>
559
565
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="120"/>
560
566
<source>X Max</source>
561
567
<translation type="unfinished"></translation>
562
568
</message>
563
569
<message>
564
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="90 "/>
570
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="96 "/>
565
571
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="147"/>
566
572
<source>Y Max</source>
567
573
<translation type="unfinished"></translation>
568
574
</message>
569
575
<message>
570
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="102 "/>
576
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="108 "/>
571
577
<source>Grid Spacing</source>
572
578
<translation type="unfinished"></translation>
573
579
</message>
574
580
<message>
575
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="110 "/>
581
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="116 "/>
576
582
<source>Use this point spacing</source>
577
583
<translation type="unfinished"></translation>
578
584
</message>
579
585
<message>
580
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="159"/>
586
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="122"/>
587
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="152"/>
588
+ <source>buttonGroup_2</source>
589
+ <translation type="unfinished"></translation>
590
+ </message>
591
+ <message>
592
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="171"/>
581
593
<source>Apply random offset to point spacing</source>
582
594
<translation type="unfinished"></translation>
583
595
</message>
584
596
<message>
585
- <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="179 "/>
597
+ <location filename="../python/plugins/fTools/tools/frmRegPoints.ui" line="191 "/>
586
598
<source>Initial inset from corner (LH side)</source>
587
599
<translation type="unfinished"></translation>
588
600
</message>
@@ -7763,22 +7775,22 @@ p, li { white-space: pre-wrap; }
7763
7775
<context>
7764
7776
<name>QgsAttributeDialog</name>
7765
7777
<message>
7766
- <location filename="../src/app/qgsattributedialog.cpp" line="140 "/>
7778
+ <location filename="../src/app/qgsattributedialog.cpp" line="143 "/>
7767
7779
<source> (int)</source>
7768
7780
<translation type="unfinished"></translation>
7769
7781
</message>
7770
7782
<message>
7771
- <location filename="../src/app/qgsattributedialog.cpp" line="144 "/>
7783
+ <location filename="../src/app/qgsattributedialog.cpp" line="147 "/>
7772
7784
<source> (dbl)</source>
7773
7785
<translation type="unfinished"></translation>
7774
7786
</message>
7775
7787
<message>
7776
- <location filename="../src/app/qgsattributedialog.cpp" line="149 "/>
7788
+ <location filename="../src/app/qgsattributedialog.cpp" line="152 "/>
7777
7789
<source> (txt)</source>
7778
7790
<translation type="unfinished"></translation>
7779
7791
</message>
7780
7792
<message>
7781
- <location filename="../src/app/qgsattributedialog.cpp" line="190 "/>
7793
+ <location filename="../src/app/qgsattributedialog.cpp" line="193 "/>
7782
7794
<source>Attributes - %1</source>
7783
7795
<translation type="unfinished"></translation>
7784
7796
</message>
@@ -11934,7 +11946,7 @@ p, li { white-space: pre-wrap; }
11934
11946
</message>
11935
11947
<message>
11936
11948
<location filename="../src/app/gps/qgsgpsinformationwidget.cpp" line="600"/>
11937
- <source>Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'.</source>
11949
+ <source>Cannot edit the vector layer. Use 'Toggle Editing' to make it editable .</source>
11938
11950
<translation type="unfinished"></translation>
11939
11951
</message>
11940
11952
<message>
@@ -17114,14 +17126,14 @@ This may be a problem in your network connection or at the WMS server.</source>
17114
17126
<context>
17115
17127
<name>QgsMapCanvas</name>
17116
17128
<message>
17117
- <location filename="../src/gui/qgsmapcanvas.cpp" line="1378 "/>
17129
+ <location filename="../src/gui/qgsmapcanvas.cpp" line="1381 "/>
17118
17130
<source>Could not draw %1 because:
17119
17131
%2</source>
17120
17132
<comment>COMMENTED OUT</comment>
17121
17133
<translation type="unfinished"></translation>
17122
17134
</message>
17123
17135
<message>
17124
- <location filename="../src/gui/qgsmapcanvas.cpp" line="1384 "/>
17136
+ <location filename="../src/gui/qgsmapcanvas.cpp" line="1387 "/>
17125
17137
<source>Could not draw %1 because:
17126
17138
%2</source>
17127
17139
<translation type="unfinished"></translation>
@@ -17268,7 +17280,7 @@ This may be a problem in your network connection or at the WMS server.</source>
17268
17280
</message>
17269
17281
<message>
17270
17282
<location filename="../src/app/qgsmaptooladdfeature.cpp" line="73"/>
17271
- <source>Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'.</source>
17283
+ <source>Cannot edit the vector layer. Use 'Toggle Editing' to make it editable .</source>
17272
17284
<translation type="unfinished"></translation>
17273
17285
</message>
17274
17286
<message>
@@ -17356,7 +17368,7 @@ This may be a problem in your network connection or at the WMS server.</source>
17356
17368
</message>
17357
17369
<message>
17358
17370
<location filename="../src/app/qgsmaptooladdisland.cpp" line="53"/>
17359
- <source>Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'.</source>
17371
+ <source>Cannot edit the vector layer. Use 'Toggle Editing' to make it editable .</source>
17360
17372
<translation type="unfinished"></translation>
17361
17373
</message>
17362
17374
<message>
@@ -17432,7 +17444,7 @@ This may be a problem in your network connection or at the WMS server.</source>
17432
17444
</message>
17433
17445
<message>
17434
17446
<location filename="../src/app/qgsmaptooladdring.cpp" line="51"/>
17435
- <source>Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'.</source>
17447
+ <source>Cannot edit the vector layer. Use 'Toggle Editing' to make it editable .</source>
17436
17448
<translation type="unfinished"></translation>
17437
17449
</message>
17438
17450
<message>
@@ -17634,7 +17646,7 @@ This may be a problem in your network connection or at the WMS server.</source>
17634
17646
</message>
17635
17647
<message>
17636
17648
<location filename="../src/app/qgsmaptoolmovefeature.cpp" line="66"/>
17637
- <source>Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'.</source>
17649
+ <source>Cannot edit the vector layer. Use 'Toggle Editing' to make it editable .</source>
17638
17650
<translation type="unfinished"></translation>
17639
17651
</message>
17640
17652
<message>
@@ -17689,7 +17701,7 @@ This may be a problem in your network connection or at the WMS server.</source>
17689
17701
</message>
17690
17702
<message>
17691
17703
<location filename="../src/app/qgsmaptoolreshape.cpp" line="50"/>
17692
- <source>Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'.</source>
17704
+ <source>Cannot edit the vector layer. Use 'Toggle Editing' to make it editable .</source>
17693
17705
<translation type="unfinished"></translation>
17694
17706
</message>
17695
17707
<message>
@@ -17802,7 +17814,7 @@ This may be a problem in your network connection or at the WMS server.</source>
17802
17814
</message>
17803
17815
<message>
17804
17816
<location filename="../src/app/qgsmaptoolsplitfeatures.cpp" line="50"/>
17805
- <source>Cannot edit the vector layer. To make it editable, go to the file item of the layer, right click and check 'Allow Editing'.</source>
17817
+ <source>Cannot edit the vector layer. Use 'Toggle Editing' to make it editable .</source>
17806
17818
<translation type="unfinished"></translation>
17807
17819
</message>
17808
17820
<message>
@@ -20713,6 +20725,14 @@ You need to restart Quantum GIS in order to reload it.</source>
20713
20725
<source>Warning: this plugin isn't available in any accessible repository!</source>
20714
20726
<translation type="unfinished"></translation>
20715
20727
</message>
20728
+ <message>
20729
+ <source>Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation.</source>
20730
+ <translation type="unfinished"></translation>
20731
+ </message>
20732
+ <message>
20733
+ <source>Plugin Installer update uninstalled. Please restart QGIS in order to load its primary version.</source>
20734
+ <translation type="unfinished"></translation>
20735
+ </message>
20716
20736
<message>
20717
20737
<source>Plugin uninstalled successfully</source>
20718
20738
<translation type="unfinished"></translation>
@@ -27077,17 +27097,17 @@ Should the existing classes be deleted before classification?</source>
27077
27097
<context>
27078
27098
<name>QgsVectorLayerSaveAsDialog</name>
27079
27099
<message>
27080
- <location filename="../src/app/ogr/qgsvectorlayersaveasdialog.cpp" line="57 "/>
27100
+ <location filename="../src/app/ogr/qgsvectorlayersaveasdialog.cpp" line="58 "/>
27081
27101
<source>Original CRS</source>
27082
27102
<translation type="unfinished"></translation>
27083
27103
</message>
27084
27104
<message>
27085
- <location filename="../src/app/ogr/qgsvectorlayersaveasdialog.cpp" line="94 "/>
27105
+ <location filename="../src/app/ogr/qgsvectorlayersaveasdialog.cpp" line="96 "/>
27086
27106
<source>Save layer as...</source>
27087
27107
<translation type="unfinished"></translation>
27088
27108
</message>
27089
27109
<message>
27090
- <location filename="../src/app/ogr/qgsvectorlayersaveasdialog.cpp" line="106 "/>
27110
+ <location filename="../src/app/ogr/qgsvectorlayersaveasdialog.cpp" line="108 "/>
27091
27111
<source>Select the coordinate reference system for the vector file. The data points will be transformed from the layer coordinate reference system.</source>
27092
27112
<translation type="unfinished"></translation>
27093
27113
</message>
@@ -27768,7 +27788,7 @@ This might be an server configuration error. Should the URL be used?</source>
27768
27788
</message>
27769
27789
<message>
27770
27790
<location filename="../src/providers/wms/qgswmsprovider.cpp" line="811"/>
27771
- <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2748 "/>
27791
+ <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2747 "/>
27772
27792
<source>map request error %1: %2</source>
27773
27793
<translation type="unfinished"></translation>
27774
27794
</message>
@@ -28184,17 +28204,17 @@ Tried URL: %1</source>
28184
28204
<translation type="unfinished"></translation>
28185
28205
</message>
28186
28206
<message>
28187
- <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2683 "/>
28207
+ <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2682 "/>
28188
28208
<source>Layer cannot be queried in plain text.</source>
28189
28209
<translation type="unfinished"></translation>
28190
28210
</message>
28191
28211
<message>
28192
- <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2689 "/>
28212
+ <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2688 "/>
28193
28213
<source>Layer cannot be queried.</source>
28194
28214
<translation type="unfinished"></translation>
28195
28215
</message>
28196
28216
<message>
28197
- <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2733 "/>
28217
+ <location filename="../src/providers/wms/qgswmsprovider.cpp" line="2732 "/>
28198
28218
<source>identify request redirected.</source>
28199
28219
<translation type="unfinished"></translation>
28200
28220
</message>
0 commit comments