|
|
4.
|
|
|
Nothing selected to add
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\add.py:151
|
|
|
38.
|
|
|
Local branch is out of date with master branch. 
To commit to master branch, update the local branch.
You can also pass select local to commit to continue working disconnected. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\commit.py:280
|
|
|
40.
|
|
|
Update
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\commit.py:298 lib\logwidget.py:477
|
|
|
102.
|
|
|
Select editor executable
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\config.py:719
|
|
|
122.
|
|
|
Set up external_merge app in qconfig under the Merge tab
|
|
|
|
|
(no translation yet)
|
|
Translated and reviewed by
Hannie Dumoleyn
|
|
|
|
Located in
lib\conflicts.py:275
|
|
|
124.
|
|
|
The extmerge definition: '%(tool)s' is invalid.
Missing the flag: %(flags)s. This must be fixed in qconfig under the Merge tab. |
|
|
represents a line break.
Start a new line in the equivalent position in the translation.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\conflicts.py:299
|
|
|
162.
|
|
|
&Complete
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\diffwindow.py:268 lib/widgets\shelvelist.py:116
|
|
|
166.
|
|
|
Left side encoding
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\diffwindow.py:320
|
|
|
167.
|
|
|
Right side encoding
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\diffwindow.py:330
|
|
|
168.
|
|
|
&Ignore whitespace changes
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
lib\diffwindow.py:336
|
