diff options
author | raveit65 <[email protected]> | 2015-08-26 13:01:22 +0200 |
---|---|---|
committer | infirit <[email protected]> | 2015-08-29 12:01:19 +0200 |
commit | f840fc05ba1178838c1c163f1ed3908a927ba447 (patch) | |
tree | 8d9802d11c5870dc0a232cfbf99b7b4e15e3936c /help/pa/pa.po | |
parent | 7cb9010fc3e01e23f0b4ae3d3415949201427094 (diff) | |
download | mate-control-center-f840fc05ba1178838c1c163f1ed3908a927ba447.tar.bz2 mate-control-center-f840fc05ba1178838c1c163f1ed3908a927ba447.tar.xz |
Help: fix merge conflicts
Diffstat (limited to 'help/pa/pa.po')
-rw-r--r-- | help/pa/pa.po | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/help/pa/pa.po b/help/pa/pa.po index 8be6d960..37f3251d 100644 --- a/help/pa/pa.po +++ b/help/pa/pa.po @@ -96,7 +96,7 @@ msgid "" "To launch the <application>MATE Control Center</application>, type " "<command>mate-control-center</command> in a terminal window." msgstr "" -"<application>ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਇੱਕ ਟਰਮੀਨਲ ਝਰੋਖੇ 'ਚ <command>mate-control-" +"<application>ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ</application>, ਇੱਕ ਟਰਮੀਨਲ ਝਰੋਖੇ 'ਚ <command>mate-control-" "center</command> ਲਿਖੋ।" #: C/control-center.xml:73(para) |