yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2019-03-08 06:00:16 +01:00
parent d92791af07
commit 54d236df37
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/dimscreen/package/metadata.desktop
View file

@ -27,6 +27,7 @@ Comment[ia]=Il obscura le schermo integre quando il demanda privileges de super-
Comment[id]=Pergelap seluruh layar ketika meminta hak akses root Comment[id]=Pergelap seluruh layar ketika meminta hak akses root
Comment[is]=Skyggir allan skjáinn þegar beðið er um lykilorð kerfisstjóra Comment[is]=Skyggir allan skjáinn þegar beðið er um lykilorð kerfisstjóra
Comment[it]=Scurisce tutto lo schermo quando si richiedono i privilegi di root Comment[it]=Scurisce tutto lo schermo quando si richiedono i privilegi di root
Comment[ja]=root 権限が要求されるとスクリーン全体を暗くします
Comment[kk]=root құқығын сұрағанда бүкіл экранды күңгірттеу Comment[kk]=root құқығын сұрағанда бүкіл экранды күңгірттеу
Comment[km]=ធ្វើ​ឲ្យ​អេក្រង់ទាំងមូល​ងងឹត​នៅពេល​បង្ហាញ​សិទ្ធិជា​ root Comment[km]=ធ្វើ​ឲ្យ​អេក្រង់ទាំងមូល​ងងឹត​នៅពេល​បង្ហាញ​សិទ្ធិជា​ root
Comment[kn]=ನಿರ್ವಾಹಕ ಸವಲತ್ತುಗಳನ್ನು ಕೇಳುವಾಗ ಇಡೀ ತೆರೆಯನ್ನು ಮಂಕಾಗಿಸುತ್ತದೆ Comment[kn]=ನಿರ್ವಾಹಕ ಸವಲತ್ತುಗಳನ್ನು ಕೇಳುವಾಗ ಇಡೀ ತೆರೆಯನ್ನು ಮಂಕಾಗಿಸುತ್ತದೆ
@ -88,6 +89,7 @@ Name[ia]=Schermo Dim pro modo de administrator
Name[id]=Dim Screen untuk Administrator Mode Name[id]=Dim Screen untuk Administrator Mode
Name[is]=Dimma skjá fyrir kerfisstjóraham Name[is]=Dimma skjá fyrir kerfisstjóraham
Name[it]=Scurisci lo schermo in modalità amministrativa Name[it]=Scurisci lo schermo in modalità amministrativa
Name[ja]=管理者モードでスクリーンを暗く
Name[kk]=Әкімші режімде экранды күңгірттеп көрсету Name[kk]=Әкімші режімде экранды күңгірттеп көрсету
Name[km]=បន្ថយ​ពន្លឺ​អេក្រង់ សម្រាប់​របៀប​ជា​អ្នក​គ្រប់គ្រង Name[km]=បន្ថយ​ពន្លឺ​អេក្រង់ សម្រាប់​របៀប​ជា​អ្នក​គ្រប់គ្រង
Name[kn]=ನಿರ್ವಾಹಕ ವಿಧಾನದಲ್ಲಿ (ಅ ಡ್ಮಿನಿಸ್ಟ್ರೇಟರ್ ಮೋಡ್) ತೆರೆಯನ್ನು ಮಂಕಾಗಿಸು Name[kn]=ನಿರ್ವಾಹಕ ವಿಧಾನದಲ್ಲಿ (ಅ ಡ್ಮಿನಿಸ್ಟ್ರೇಟರ್ ಮೋಡ್) ತೆರೆಯನ್ನು ಮಂಕಾಗಿಸು

1
effects/showpaint/showpaint_config.desktop
View file

@ -36,6 +36,7 @@ Name[ia]=Monstra pictura
Name[id]=Show Paint Name[id]=Show Paint
Name[is]=Sýna teikningu Name[is]=Sýna teikningu
Name[it]=Mostra il ridisegno Name[it]=Mostra il ridisegno
Name[ja]=描画領域を表示
Name[kk]=Бояулау Name[kk]=Бояулау
Name[km]=បង្ហាញគំនូរ Name[km]=បង្ហាញគំនូរ
Name[kn]=ಕೆಪೈಂಟ್ ತೋರಿಸು Name[kn]=ಕೆಪೈಂಟ್ ತೋರಿಸು